Unifield Server

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

  1. US-3902
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4869
Proposed branch: lp:~julie-w/unifield-server/US-3902
Merge into: lp:unifield-server
Diff against target: 183 lines (+37/-20) (has conflicts)
4 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+13/-0)
bin/addons/register_accounting/report/liquidity_position_pdf.rml (+1/-1)
bin/addons/register_accounting/report/liquidity_position_xls.mako (+20/-18)
bin/addons/register_accounting/report/report_liquidity_position.py (+3/-1)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-3902
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+343872@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/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po 2018-04-20 07:09:56 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po 2018-04-24 07:17:17 +0000
@@ -107561,6 +107561,7 @@
107561#, python-format107561#, python-format
107562msgid "You have to load the template first."107562msgid "You have to load the template first."
107563msgstr "Vous devez d'abord charger le modèle."107563msgstr "Vous devez d'abord charger le modèle."
107564<<<<<<< TREE
107564107565
107565#. module: account_corrections107566#. module: account_corrections
107566#: code:addons/account_corrections/account_move_line.py:929107567#: code:addons/account_corrections/account_move_line.py:929
@@ -107642,3 +107643,15 @@
107642#: report:addons/account_mcdb/report/combined_journals_report.mako:181107643#: report:addons/account_mcdb/report/combined_journals_report.mako:181
107643msgid "SELECTION"107644msgid "SELECTION"
107644msgstr "SÉLECTION"107645msgstr "SÉLECTION"
107646=======
107647
107648#. module: register_accounting
107649#: report:addons/register_accounting/report/liquidity_position_xls.mako:655
107650msgid "Grand Total Func. Currency"
107651msgstr "Total Général Devise Fonc."
107652
107653#. module: register_accounting
107654#: report:addons/register_accounting/report/liquidity_position_xls.mako:632
107655msgid "Grand Total Reg. Currency"
107656msgstr "Total Général Devise du Reg."
107657>>>>>>> MERGE-SOURCE
107645107658
=== modified file 'bin/addons/register_accounting/report/liquidity_position_pdf.rml'
--- bin/addons/register_accounting/report/liquidity_position_pdf.rml 2018-03-14 15:27:59 +0000
+++ bin/addons/register_accounting/report/liquidity_position_pdf.rml 2018-04-24 07:17:17 +0000
@@ -130,7 +130,7 @@
130 <td><para style="text">Fun. ccy</para></td>130 <td><para style="text">Fun. ccy</para></td>
131 </tr>131 </tr>
132 <tr>132 <tr>
133 [[ repeatIn(getPendingCheques()['registers'], 'journal') ]]133 [[ repeatIn(getChqJournalCodes(), 'journal') ]]
134 <td><para style="text">[[ getPendingCheques()['registers'][journal]['instance'] ]]</para></td>134 <td><para style="text">[[ getPendingCheques()['registers'][journal]['instance'] ]]</para></td>
135 <td><para style="text">[[ journal ]] - [[ getPendingCheques()['registers'][journal]['journal_name'] ]]</para></td>135 <td><para style="text">[[ journal ]] - [[ getPendingCheques()['registers'][journal]['journal_name'] ]]</para></td>
136 <td><para style="text">[[ getPendingCheques()['registers'][journal]['state'] ]]</para></td>136 <td><para style="text">[[ getPendingCheques()['registers'][journal]['state'] ]]</para></td>
137137
=== modified file 'bin/addons/register_accounting/report/liquidity_position_xls.mako'
--- bin/addons/register_accounting/report/liquidity_position_xls.mako 2018-03-14 15:27:59 +0000
+++ bin/addons/register_accounting/report/liquidity_position_xls.mako 2018-04-24 07:17:17 +0000
@@ -83,11 +83,11 @@
83 <NumberFormat ss:Format="Short Date" />83 <NumberFormat ss:Format="Short Date" />
84 </Style>84 </Style>
85 <Style ss:ID="short_date2">85 <Style ss:ID="short_date2">
86 <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" />86 <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" />
87 <NumberFormat ss:Format="Short Date" />87 <NumberFormat ss:Format="Short Date" />
88 </Style>88 </Style>
89 <Style ss:ID="pop">89 <Style ss:ID="pop">
90 <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" />90 <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" />
91 </Style>91 </Style>
92 <Style ss:ID="s25">92 <Style ss:ID="s25">
93 <Borders>93 <Borders>
@@ -101,6 +101,7 @@
101 <Style ss:ID="s25c" />101 <Style ss:ID="s25c" />
102 <Style ss:ID="s25b">102 <Style ss:ID="s25b">
103 <Font ss:Bold="1" />103 <Font ss:Bold="1" />
104 <Alignment ss:Horizontal="Left" ss:Vertical="Center" />
104 </Style>105 </Style>
105106
106 <Style ss:ID="s26" >107 <Style ss:ID="s26" >
@@ -237,7 +238,7 @@
237 </Style>238 </Style>
238239
239 <Style ss:ID="s52">240 <Style ss:ID="s52">
240 <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>241 <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
241 <Borders>242 <Borders>
242 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>243 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
243 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>244 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
@@ -251,21 +252,22 @@
251252
252 <Worksheet ss:Name="Liquidity position">253 <Worksheet ss:Name="Liquidity position">
253 <Table >254 <Table >
254 <Column ss:AutoFitWidth="0" ss:Width="110.5"/>255 <Column ss:AutoFitWidth="0" ss:Width="161.25"/>
255 <Column ss:AutoFitWidth="0" ss:Width="102.75" ss:Span="1"/>256 <Column ss:AutoFitWidth="0" ss:Width="40.5"/>
256 <Column ss:AutoFitWidth="0" ss:Width="60.5" ss:Span="1"/>257 <Column ss:AutoFitWidth="0" ss:Width="138.75"/>
257 <Column ss:AutoFitWidth="0" ss:Width="75.75"/>258 <Column ss:AutoFitWidth="0" ss:Width="57"/>
258 <Column ss:AutoFitWidth="0" ss:Width="60.5" ss:Span="1"/>259 <Column ss:AutoFitWidth="0" ss:Width="60.75"/>
259 <Column ss:AutoFitWidth="0" ss:Width="75.75"/>260 <Column ss:AutoFitWidth="0" ss:Width="75.75" ss:Span="2"/>
260 <Column ss:AutoFitWidth="0" ss:Width="82" ss:Span="1"/>261 <Column ss:AutoFitWidth="0" ss:Width="57"/>
261 <Column ss:AutoFitWidth="0" ss:Width="75.75"/>262 <Column ss:AutoFitWidth="0" ss:Width="75.75" ss:Span="1"/>
263 <Column ss:AutoFitWidth="0" ss:Width="55.5"/>
262264
263 <% period = getPeriod() %>265 <% period = getPeriod() %>
264 <Row>266 <Row>
265 <Cell ss:StyleID="s25b" >267 <Cell ss:StyleID="s25b" >
266 <Data ss:Type="String">${_('LIQUIDITY POSITION')|x}</Data>268 <Data ss:Type="String">${_('LIQUIDITY POSITION')|x}</Data>
267 </Cell>269 </Cell>
268 <Cell ss:StyleID="s25b" >270 <Cell ss:StyleID="s25b" ss:MergeAcross="1">
269 <Data ss:Type="String">${period.name|x}</Data>271 <Data ss:Type="String">${period.name|x}</Data>
270 </Cell>272 </Cell>
271 </Row>273 </Row>
@@ -275,7 +277,7 @@
275 <Data ss:Type="String">${_('Period end date:')|x}</Data>277 <Data ss:Type="String">${_('Period end date:')|x}</Data>
276 </Cell>278 </Cell>
277 % if isDate(period.date_stop):279 % if isDate(period.date_stop):
278 <Cell ss:StyleID="short_date2">280 <Cell ss:StyleID="short_date2" ss:MergeAcross="1">
279 <Data ss:Type="DateTime">${period.date_stop|n}T00:00:00.000</Data>281 <Data ss:Type="DateTime">${period.date_stop|n}T00:00:00.000</Data>
280 </Cell>282 </Cell>
281 % else:283 % else:
@@ -288,7 +290,7 @@
288 <Cell>290 <Cell>
289 <Data ss:Type="String">${_('Prop Instance: ')|x}</Data>291 <Data ss:Type="String">${_('Prop Instance: ')|x}</Data>
290 </Cell>292 </Cell>
291 <Cell ss:StyleID="pop">293 <Cell ss:StyleID="pop" ss:MergeAcross="1">
292 <Data ss:Type="String">${( company.instance_id and company.instance_id.code or '')|x}</Data>294 <Data ss:Type="String">${( company.instance_id and company.instance_id.code or '')|x}</Data>
293 </Cell>295 </Cell>
294 </Row>296 </Row>
@@ -296,7 +298,7 @@
296 <Cell>298 <Cell>
297 <Data ss:Type="String">${_('Report date:')}</Data>299 <Data ss:Type="String">${_('Report date:')}</Data>
298 </Cell>300 </Cell>
299 <Cell ss:StyleID="short_date2">301 <Cell ss:StyleID="short_date2" ss:MergeAcross="1">
300 <Data ss:Type="DateTime">${time.strftime('%Y-%m-%d')|n}T00:00:00.000</Data>302 <Data ss:Type="DateTime">${time.strftime('%Y-%m-%d')|n}T00:00:00.000</Data>
301 </Cell>303 </Cell>
302 </Row>304 </Row>
@@ -497,7 +499,7 @@
497 </Row>499 </Row>
498500
499 <% pending_cheques = getPendingCheques() %>501 <% pending_cheques = getPendingCheques() %>
500 % for journal in pending_cheques['registers']:502 % for journal in getChqJournalCodes():
501 <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s35">503 <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s35">
502 <Cell ss:StyleID="s25">504 <Cell ss:StyleID="s25">
503 <Data ss:Type="String">${ pending_cheques['registers'][journal]['instance'] |x }</Data>505 <Data ss:Type="String">${ pending_cheques['registers'][journal]['instance'] |x }</Data>
@@ -628,7 +630,7 @@
628 <Cell ss:StyleID="s25c"/>630 <Cell ss:StyleID="s25c"/>
629 <Cell ss:StyleID="s25c"/>631 <Cell ss:StyleID="s25c"/>
630 <Cell ss:MergeAcross="1" ss:StyleID="s52">632 <Cell ss:MergeAcross="1" ss:StyleID="s52">
631 <Data ss:Type="String">Grand Total Register Currency</Data>633 <Data ss:Type="String">${_('Grand Total Reg. Currency')}</Data>
632 </Cell>634 </Cell>
633 <Cell ss:StyleID="s50">635 <Cell ss:StyleID="s50">
634 <!-- total of register balances + pendinq cheque amount in register currency -->636 <!-- total of register balances + pendinq cheque amount in register currency -->
@@ -651,7 +653,7 @@
651 <Cell ss:StyleID="s25c"/>653 <Cell ss:StyleID="s25c"/>
652 <Cell ss:StyleID="s25c"/>654 <Cell ss:StyleID="s25c"/>
653 <Cell ss:MergeAcross="1" ss:StyleID="s52">655 <Cell ss:MergeAcross="1" ss:StyleID="s52">
654 <Data ss:Type="String">Grand Total Functional Currency</Data>656 <Data ss:Type="String">${_('Grand Total Func. Currency')}</Data>
655 </Cell>657 </Cell>
656 <Cell ss:StyleID="s50">658 <Cell ss:StyleID="s50">
657 <!-- total of register balances + pendinq cheque amount in func. currency -->659 <!-- total of register balances + pendinq cheque amount in func. currency -->
658660
=== modified file 'bin/addons/register_accounting/report/report_liquidity_position.py'
--- bin/addons/register_accounting/report/report_liquidity_position.py 2018-03-14 15:37:12 +0000
+++ bin/addons/register_accounting/report/report_liquidity_position.py 2018-04-24 07:17:17 +0000
@@ -49,6 +49,8 @@
49 'getConvert': self.getConvert,49 'getConvert': self.getConvert,
50 'getOpeningBalance': self.getOpeningBalance,50 'getOpeningBalance': self.getOpeningBalance,
51 'getPendingCheques': self.getPendingCheques,51 'getPendingCheques': self.getPendingCheques,
52 # Cheque Journals to display, in alphabetical order:
53 'getChqJournalCodes': lambda *a: sorted(self.getPendingCheques()['registers']),
52 'getGrandTotalRegCurrency': self.getGrandTotalRegCurrency,54 'getGrandTotalRegCurrency': self.getGrandTotalRegCurrency,
53 'getRevaluationLines': self.getRevaluationLines,55 'getRevaluationLines': self.getRevaluationLines,
54 })56 })
@@ -96,7 +98,7 @@
96 pool = pooler.get_pool(self.cr.dbname)98 pool = pooler.get_pool(self.cr.dbname)
97 reg_obj = pool.get('account.bank.statement')99 reg_obj = pool.get('account.bank.statement')
98 args = [('period_id', '=', self.period_id)]100 args = [('period_id', '=', self.period_id)]
99 reg_ids = reg_obj.search(self.cr, self.uid, args)101 reg_ids = reg_obj.search(self.cr, self.uid, args, order='journal_id')
100 regs = reg_obj.browse(self.cr, self.uid, reg_ids, context={'lang': self.localcontext.get('lang')})102 regs = reg_obj.browse(self.cr, self.uid, reg_ids, context={'lang': self.localcontext.get('lang')})
101103
102 self.func_currency = regs[0].journal_id.company_id.currency_id.name104 self.func_currency = regs[0].journal_id.company_id.currency_id.name

Subscribers

People subscribed via source and target branches