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
=== modified file 'bin/addons/account_override/report/account_print_invoice.rml'
--- bin/addons/account_override/report/account_print_invoice.rml 2014-08-05 15:36:49 +0000
+++ bin/addons/account_override/report/account_print_invoice.rml 2019-07-31 12:05:26 +0000
@@ -38,38 +38,18 @@
38 <blockTableStyle id="Table_Invoice_General_Header">38 <blockTableStyle id="Table_Invoice_General_Header">
39 <blockAlignment value="LEFT"/>39 <blockAlignment value="LEFT"/>
40 <blockValign value="TOP"/>40 <blockValign value="TOP"/>
41 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>41 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
42 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>42 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
43 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>43 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
44 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>44 <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
45 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
46 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
47 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
48 <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
49 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
50 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
51 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
52 <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
53 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
54 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
55 </blockTableStyle>45 </blockTableStyle>
56 <blockTableStyle id="Table_General_Detail_Content">46 <blockTableStyle id="Table_General_Detail_Content">
57 <blockAlignment value="LEFT"/>47 <blockAlignment value="LEFT"/>
58 <blockValign value="TOP"/>48 <blockValign value="TOP"/>
59 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>49 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
60 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>50 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
61 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>51 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
62 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>52 <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
63 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
64 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
65 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
66 <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
67 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
68 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
69 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
70 <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
71 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
72 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
73 </blockTableStyle>53 </blockTableStyle>
74 <blockTableStyle id="Table7">54 <blockTableStyle id="Table7">
75 <blockAlignment value="LEFT"/>55 <blockAlignment value="LEFT"/>
@@ -243,10 +223,13 @@
243 <para style="terp_default_8">223 <para style="terp_default_8">
244 <font color="white"> </font>224 <font color="white"> </font>
245 </para>225 </para>
246 <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_Invoice_General_Header">226 <blockTable colWidths="106,106,106,106,106" style="Table_Invoice_General_Header">
247 <tr>227 <tr>
248 <td>228 <td>
249 <para style="terp_tblheader_General_Centre">Date</para>229 <para style="terp_tblheader_General_Centre">[[ o.is_intermission and translate('I/MI voucher date') or translate('Document Date') ]]</para>
230 </td>
231 <td>
232 <para style="terp_tblheader_General_Centre">Posting Date</para>
250 </td>233 </td>
251 <td>234 <td>
252 <para style="terp_tblheader_General_Centre">Description</para>235 <para style="terp_tblheader_General_Centre">Description</para>
@@ -259,9 +242,12 @@
259 </td>242 </td>
260 </tr>243 </tr>
261 </blockTable>244 </blockTable>
262 <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_General_Detail_Content">245 <blockTable colWidths="106,106,106,106,106" style="Table_General_Detail_Content">
263 <tr>246 <tr>
264 <td>247 <td>
248 <para style="terp_default_Centre_9">[[ formatLang(o.document_date, date=True) ]]</para>
249 </td>
250 <td>
265 <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>251 <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
266 </td>252 </td>
267 <td>253 <td>
268254
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po 2019-07-26 15:23:04 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po 2019-07-31 12:05:26 +0000
@@ -26030,6 +26030,7 @@
2603026030
26031#. module: account_override26031#. module: account_override
26032#: view:account.invoice:026032#: view:account.invoice:0
26033#: report:account.invoice2:0
26033msgid "I/MI voucher date"26034msgid "I/MI voucher date"
26034msgstr "I/MI date du bon"26035msgstr "I/MI date du bon"
2603526036
@@ -37851,7 +37852,6 @@
37851#: field:account.entries.report,date:037852#: field:account.entries.report,date:0
37852#: selection:account.general.journal,filter:037853#: selection:account.general.journal,filter:0
37853#: field:account.invoice.report,date:037854#: field:account.invoice.report,date:0
37854#: report:account.invoice2:0
37855#: report:account.journal.period.print:037855#: report:account.journal.period.print:0
37856#: view:account.move:037856#: view:account.move:0
37857#: field:account.move,date:037857#: field:account.move,date:0
@@ -66054,6 +66054,7 @@
66054#: report:addons/register_accounting/report/open_advances_xls.mako:14866054#: report:addons/register_accounting/report/open_advances_xls.mako:148
66055#: report:addons/register_accounting/report/pending_cheque_xls.mako:21866055#: report:addons/register_accounting/report/pending_cheque_xls.mako:218
66056#: report:addons/vertical_integration/report/open_invoices_xls.mako:29166056#: report:addons/vertical_integration/report/open_invoices_xls.mako:291
66057#: report:account.invoice2:0
66057#: field:hq.entries.split,date:066058#: field:hq.entries.split,date:0
66058#: selection:integrity.finance.wizard,filter:066059#: selection:integrity.finance.wizard,filter:0
66059#, python-format66060#, python-format
@@ -97419,6 +97420,7 @@
97419#: field:wizard.advance.line,document_date:097420#: field:wizard.advance.line,document_date:0
97420#: field:wizard.invoice.line,document_date:097421#: field:wizard.invoice.line,document_date:0
97421#: report:addons/vertical_integration/report/open_invoices_xls.mako:29097422#: report:addons/vertical_integration/report/open_invoices_xls.mako:290
97423#: report:account.invoice2:0
97422#, python-format97424#, python-format
97423msgid "Document Date"97425msgid "Document Date"
97424msgstr "Date du Document"97426msgstr "Date du Document"

Subscribers

People subscribed via source and target branches