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
1=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2018-04-20 07:09:56 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2018-04-24 07:17:17 +0000
4@@ -107561,6 +107561,7 @@
5 #, python-format
6 msgid "You have to load the template first."
7 msgstr "Vous devez d'abord charger le modèle."
8+<<<<<<< TREE
9
10 #. module: account_corrections
11 #: code:addons/account_corrections/account_move_line.py:929
12@@ -107642,3 +107643,15 @@
13 #: report:addons/account_mcdb/report/combined_journals_report.mako:181
14 msgid "SELECTION"
15 msgstr "SÉLECTION"
16+=======
17+
18+#. module: register_accounting
19+#: report:addons/register_accounting/report/liquidity_position_xls.mako:655
20+msgid "Grand Total Func. Currency"
21+msgstr "Total Général Devise Fonc."
22+
23+#. module: register_accounting
24+#: report:addons/register_accounting/report/liquidity_position_xls.mako:632
25+msgid "Grand Total Reg. Currency"
26+msgstr "Total Général Devise du Reg."
27+>>>>>>> MERGE-SOURCE
28
29=== modified file 'bin/addons/register_accounting/report/liquidity_position_pdf.rml'
30--- bin/addons/register_accounting/report/liquidity_position_pdf.rml 2018-03-14 15:27:59 +0000
31+++ bin/addons/register_accounting/report/liquidity_position_pdf.rml 2018-04-24 07:17:17 +0000
32@@ -130,7 +130,7 @@
33 <td><para style="text">Fun. ccy</para></td>
34 </tr>
35 <tr>
36- [[ repeatIn(getPendingCheques()['registers'], 'journal') ]]
37+ [[ repeatIn(getChqJournalCodes(), 'journal') ]]
38 <td><para style="text">[[ getPendingCheques()['registers'][journal]['instance'] ]]</para></td>
39 <td><para style="text">[[ journal ]] - [[ getPendingCheques()['registers'][journal]['journal_name'] ]]</para></td>
40 <td><para style="text">[[ getPendingCheques()['registers'][journal]['state'] ]]</para></td>
41
42=== modified file 'bin/addons/register_accounting/report/liquidity_position_xls.mako'
43--- bin/addons/register_accounting/report/liquidity_position_xls.mako 2018-03-14 15:27:59 +0000
44+++ bin/addons/register_accounting/report/liquidity_position_xls.mako 2018-04-24 07:17:17 +0000
45@@ -83,11 +83,11 @@
46 <NumberFormat ss:Format="Short Date" />
47 </Style>
48 <Style ss:ID="short_date2">
49- <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" />
50+ <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" />
51 <NumberFormat ss:Format="Short Date" />
52 </Style>
53 <Style ss:ID="pop">
54- <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" />
55+ <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" />
56 </Style>
57 <Style ss:ID="s25">
58 <Borders>
59@@ -101,6 +101,7 @@
60 <Style ss:ID="s25c" />
61 <Style ss:ID="s25b">
62 <Font ss:Bold="1" />
63+ <Alignment ss:Horizontal="Left" ss:Vertical="Center" />
64 </Style>
65
66 <Style ss:ID="s26" >
67@@ -237,7 +238,7 @@
68 </Style>
69
70 <Style ss:ID="s52">
71- <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
72+ <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
73 <Borders>
74 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
75 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
76@@ -251,21 +252,22 @@
77
78 <Worksheet ss:Name="Liquidity position">
79 <Table >
80- <Column ss:AutoFitWidth="0" ss:Width="110.5"/>
81- <Column ss:AutoFitWidth="0" ss:Width="102.75" ss:Span="1"/>
82- <Column ss:AutoFitWidth="0" ss:Width="60.5" ss:Span="1"/>
83- <Column ss:AutoFitWidth="0" ss:Width="75.75"/>
84- <Column ss:AutoFitWidth="0" ss:Width="60.5" ss:Span="1"/>
85- <Column ss:AutoFitWidth="0" ss:Width="75.75"/>
86- <Column ss:AutoFitWidth="0" ss:Width="82" ss:Span="1"/>
87- <Column ss:AutoFitWidth="0" ss:Width="75.75"/>
88+ <Column ss:AutoFitWidth="0" ss:Width="161.25"/>
89+ <Column ss:AutoFitWidth="0" ss:Width="40.5"/>
90+ <Column ss:AutoFitWidth="0" ss:Width="138.75"/>
91+ <Column ss:AutoFitWidth="0" ss:Width="57"/>
92+ <Column ss:AutoFitWidth="0" ss:Width="60.75"/>
93+ <Column ss:AutoFitWidth="0" ss:Width="75.75" ss:Span="2"/>
94+ <Column ss:AutoFitWidth="0" ss:Width="57"/>
95+ <Column ss:AutoFitWidth="0" ss:Width="75.75" ss:Span="1"/>
96+ <Column ss:AutoFitWidth="0" ss:Width="55.5"/>
97
98 <% period = getPeriod() %>
99 <Row>
100 <Cell ss:StyleID="s25b" >
101 <Data ss:Type="String">${_('LIQUIDITY POSITION')|x}</Data>
102 </Cell>
103- <Cell ss:StyleID="s25b" >
104+ <Cell ss:StyleID="s25b" ss:MergeAcross="1">
105 <Data ss:Type="String">${period.name|x}</Data>
106 </Cell>
107 </Row>
108@@ -275,7 +277,7 @@
109 <Data ss:Type="String">${_('Period end date:')|x}</Data>
110 </Cell>
111 % if isDate(period.date_stop):
112- <Cell ss:StyleID="short_date2">
113+ <Cell ss:StyleID="short_date2" ss:MergeAcross="1">
114 <Data ss:Type="DateTime">${period.date_stop|n}T00:00:00.000</Data>
115 </Cell>
116 % else:
117@@ -288,7 +290,7 @@
118 <Cell>
119 <Data ss:Type="String">${_('Prop Instance: ')|x}</Data>
120 </Cell>
121- <Cell ss:StyleID="pop">
122+ <Cell ss:StyleID="pop" ss:MergeAcross="1">
123 <Data ss:Type="String">${( company.instance_id and company.instance_id.code or '')|x}</Data>
124 </Cell>
125 </Row>
126@@ -296,7 +298,7 @@
127 <Cell>
128 <Data ss:Type="String">${_('Report date:')}</Data>
129 </Cell>
130- <Cell ss:StyleID="short_date2">
131+ <Cell ss:StyleID="short_date2" ss:MergeAcross="1">
132 <Data ss:Type="DateTime">${time.strftime('%Y-%m-%d')|n}T00:00:00.000</Data>
133 </Cell>
134 </Row>
135@@ -497,7 +499,7 @@
136 </Row>
137
138 <% pending_cheques = getPendingCheques() %>
139- % for journal in pending_cheques['registers']:
140+ % for journal in getChqJournalCodes():
141 <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s35">
142 <Cell ss:StyleID="s25">
143 <Data ss:Type="String">${ pending_cheques['registers'][journal]['instance'] |x }</Data>
144@@ -628,7 +630,7 @@
145 <Cell ss:StyleID="s25c"/>
146 <Cell ss:StyleID="s25c"/>
147 <Cell ss:MergeAcross="1" ss:StyleID="s52">
148- <Data ss:Type="String">Grand Total Register Currency</Data>
149+ <Data ss:Type="String">${_('Grand Total Reg. Currency')}</Data>
150 </Cell>
151 <Cell ss:StyleID="s50">
152 <!-- total of register balances + pendinq cheque amount in register currency -->
153@@ -651,7 +653,7 @@
154 <Cell ss:StyleID="s25c"/>
155 <Cell ss:StyleID="s25c"/>
156 <Cell ss:MergeAcross="1" ss:StyleID="s52">
157- <Data ss:Type="String">Grand Total Functional Currency</Data>
158+ <Data ss:Type="String">${_('Grand Total Func. Currency')}</Data>
159 </Cell>
160 <Cell ss:StyleID="s50">
161 <!-- total of register balances + pendinq cheque amount in func. currency -->
162
163=== modified file 'bin/addons/register_accounting/report/report_liquidity_position.py'
164--- bin/addons/register_accounting/report/report_liquidity_position.py 2018-03-14 15:37:12 +0000
165+++ bin/addons/register_accounting/report/report_liquidity_position.py 2018-04-24 07:17:17 +0000
166@@ -49,6 +49,8 @@
167 'getConvert': self.getConvert,
168 'getOpeningBalance': self.getOpeningBalance,
169 'getPendingCheques': self.getPendingCheques,
170+ # Cheque Journals to display, in alphabetical order:
171+ 'getChqJournalCodes': lambda *a: sorted(self.getPendingCheques()['registers']),
172 'getGrandTotalRegCurrency': self.getGrandTotalRegCurrency,
173 'getRevaluationLines': self.getRevaluationLines,
174 })
175@@ -96,7 +98,7 @@
176 pool = pooler.get_pool(self.cr.dbname)
177 reg_obj = pool.get('account.bank.statement')
178 args = [('period_id', '=', self.period_id)]
179- reg_ids = reg_obj.search(self.cr, self.uid, args)
180+ reg_ids = reg_obj.search(self.cr, self.uid, args, order='journal_id')
181 regs = reg_obj.browse(self.cr, self.uid, reg_ids, context={'lang': self.localcontext.get('lang')})
182
183 self.func_currency = regs[0].journal_id.company_id.currency_id.name

Subscribers

People subscribed via source and target branches