[FIX] address layout + remove unuseful term in report

This commit is contained in:
vrenaville
2015-02-27 14:00:03 +01:00
parent 243c6b2427
commit 9764dcfd2b
5 changed files with 28 additions and 49 deletions

View File

@@ -914,16 +914,6 @@ msgstr "Die bei Partnern verwendete Standard-Mahnregel. Diese Einstellung kann j
msgid "Overdue Level"
msgstr "Fälligkeitsstufe"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:167
msgid "Reminder"
msgstr "Erinnerung"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:170
msgid "Dear"
msgstr "Geehrter"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:177
msgid "Summary"

View File

@@ -999,16 +999,6 @@ msgstr "Overdue Level"
msgid "Reminder"
msgstr "Reminder"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:170
msgid "Dear"
msgstr "Dear"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:177
msgid "Summary"
msgstr "Summary"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:179
msgid "Invoice number"

View File

@@ -992,16 +992,6 @@ msgstr ""
msgid "Overdue Level"
msgstr "Overdue Level"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:167
msgid "Reminder"
msgstr "Reminder"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:170
msgid "Dear"
msgstr "Dear"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:177
msgid "Summary"

View File

@@ -975,20 +975,10 @@ msgstr ""
msgid "Overdue Level"
msgstr "Niveau de relance"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:167
msgid "Reminder"
msgstr "Rappel"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:170
msgid "Dear"
msgstr "Madame, Monsieur"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:177
msgid "Summary"
msgstr "Listes des factures en attente de règlement"
msgstr "Facture(s) en attente de règlement"
#. module: account_credit_control
#: report:addons/account_credit_control/report/credit_control_summary.html.mako:179

View File

@@ -10,6 +10,7 @@ body {
.custom_text {
font-family: helvetica;
text-align: justify;
font-size: 12px;
}
@@ -97,8 +98,22 @@ table {
.address .recipient {
font-size: 12px;
margin-top: 60px;
float: left;
position: absolute;
border-collapse: collapse;
top: 0mm;
left: 115mm;
width: 80mm;
text-wrap: normal;
}
.address .date_city {
font-size: 12px;
position: absolute;
border-collapse: collapse;
top: 30mm;
left: 115mm;
width: 80mm;
text-wrap: normal;
}
@@ -143,15 +158,13 @@ tr.line {
%>
%if comm.partner_id.id == add.id:
<tr>
<td style="width: 50%" class="name">${comm.partner_id.title and comm.partner_id.title.name or ''} ${comm.partner_id.name }</td>
<td style="width: 50%; text-align: right">${formatLang(str(date.today()), date=True)}</td>
<td class="name">${comm.partner_id.title and comm.partner_id.title.name or ''} ${comm.partner_id.name }</td>
</tr>
<% address_lines = comm.partner_id.contact_address.split("\n") %>
%else:
<tr>
<td style="width: 50%" class="name">${comm.partner_id.name or ''}</td>
<td style="width: 50%; text-align: right">${formatLang(str(date.today()), date=True)}</td>
<td class="name">${comm.partner_id.name or ''}</td>
</tr>
<tr><td>${add.title and add.title.name or ''} ${add.name}</td></tr>
<% address_lines = add.contact_address.split("\n")[1:] %>
@@ -161,6 +174,12 @@ tr.line {
<tr><td>${part}</td></tr>
%endif
%endfor
</table>
<br/>
<table class="date_city" width="100%">
<tr>
<td>${company.city}, ${formatLang(str(date.today()), date=True)}</td>
</tr>
</table>
<br/>
<br/>
@@ -174,10 +193,10 @@ tr.line {
<div>
<h3 style="clear: both; padding-top: 20px;">
${_('Reminder')}: ${comm.current_policy_level.name or '' }
${comm.current_policy_level.name or '' }
</h3>
<p>${_('Dear')},</p>
<p class="custom_text" width="95%">${comm.current_policy_level.custom_text.replace('\n', '<br />')}</p>
<br/>