Unifield Server

Merge lp:~julie-w/unifield-server/US-5955 into lp:unifield-server

  1. US-5955
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5443
Proposed branch: lp:~julie-w/unifield-server/US-5955
Merge into: lp:unifield-server
Diff against target: 116 lines (+20/-32)
2 files modified
bin/addons/account_override/report/account_print_invoice.rml (+17/-31)
bin/addons/msf_profile/i18n/fr_MF.po (+3/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-5955
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+370818@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/account_override/report/account_print_invoice.rml'
2--- bin/addons/account_override/report/account_print_invoice.rml 2014-08-05 15:36:49 +0000
3+++ bin/addons/account_override/report/account_print_invoice.rml 2019-07-31 12:05:26 +0000
4@@ -38,38 +38,18 @@
5 <blockTableStyle id="Table_Invoice_General_Header">
6 <blockAlignment value="LEFT"/>
7 <blockValign value="TOP"/>
8- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
9- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
10- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
11- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
12- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
13- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
14- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
15- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
16- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
17- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
18- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
19- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
20- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
21- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
22+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
23+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
24+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
25+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
26 </blockTableStyle>
27 <blockTableStyle id="Table_General_Detail_Content">
28 <blockAlignment value="LEFT"/>
29 <blockValign value="TOP"/>
30- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
31- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
32- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
33- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
34- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
35- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
36- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
37- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
38- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
39- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
40- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
41- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
42- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
43- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
44+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
45+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
46+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
47+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
48 </blockTableStyle>
49 <blockTableStyle id="Table7">
50 <blockAlignment value="LEFT"/>
51@@ -243,10 +223,13 @@
52 <para style="terp_default_8">
53 <font color="white"> </font>
54 </para>
55- <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_Invoice_General_Header">
56+ <blockTable colWidths="106,106,106,106,106" style="Table_Invoice_General_Header">
57 <tr>
58 <td>
59- <para style="terp_tblheader_General_Centre">Date</para>
60+ <para style="terp_tblheader_General_Centre">[[ o.is_intermission and translate('I/MI voucher date') or translate('Document Date') ]]</para>
61+ </td>
62+ <td>
63+ <para style="terp_tblheader_General_Centre">Posting Date</para>
64 </td>
65 <td>
66 <para style="terp_tblheader_General_Centre">Description</para>
67@@ -259,9 +242,12 @@
68 </td>
69 </tr>
70 </blockTable>
71- <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_General_Detail_Content">
72+ <blockTable colWidths="106,106,106,106,106" style="Table_General_Detail_Content">
73 <tr>
74 <td>
75+ <para style="terp_default_Centre_9">[[ formatLang(o.document_date, date=True) ]]</para>
76+ </td>
77+ <td>
78 <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
79 </td>
80 <td>
81
82=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
83--- bin/addons/msf_profile/i18n/fr_MF.po 2019-07-26 15:23:04 +0000
84+++ bin/addons/msf_profile/i18n/fr_MF.po 2019-07-31 12:05:26 +0000
85@@ -26030,6 +26030,7 @@
86
87 #. module: account_override
88 #: view:account.invoice:0
89+#: report:account.invoice2:0
90 msgid "I/MI voucher date"
91 msgstr "I/MI date du bon"
92
93@@ -37851,7 +37852,6 @@
94 #: field:account.entries.report,date:0
95 #: selection:account.general.journal,filter:0
96 #: field:account.invoice.report,date:0
97-#: report:account.invoice2:0
98 #: report:account.journal.period.print:0
99 #: view:account.move:0
100 #: field:account.move,date:0
101@@ -66054,6 +66054,7 @@
102 #: report:addons/register_accounting/report/open_advances_xls.mako:148
103 #: report:addons/register_accounting/report/pending_cheque_xls.mako:218
104 #: report:addons/vertical_integration/report/open_invoices_xls.mako:291
105+#: report:account.invoice2:0
106 #: field:hq.entries.split,date:0
107 #: selection:integrity.finance.wizard,filter:0
108 #, python-format
109@@ -97419,6 +97420,7 @@
110 #: field:wizard.advance.line,document_date:0
111 #: field:wizard.invoice.line,document_date:0
112 #: report:addons/vertical_integration/report/open_invoices_xls.mako:290
113+#: report:account.invoice2:0
114 #, python-format
115 msgid "Document Date"
116 msgstr "Date du Document"

Subscribers

People subscribed via source and target branches