Merge lp:~julie-w/unifield-server/US-3902 into lp:unifield-server
- US-3902
- 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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+343872@code.launchpad.net |
Commit message
Description of the change
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 | 107561 | #, python-format | 107561 | #, python-format |
6 | 107562 | msgid "You have to load the template first." | 107562 | msgid "You have to load the template first." |
7 | 107563 | msgstr "Vous devez d'abord charger le modèle." | 107563 | msgstr "Vous devez d'abord charger le modèle." |
8 | 107564 | <<<<<<< TREE | ||
9 | 107564 | 107565 | ||
10 | 107565 | #. module: account_corrections | 107566 | #. module: account_corrections |
11 | 107566 | #: code:addons/account_corrections/account_move_line.py:929 | 107567 | #: code:addons/account_corrections/account_move_line.py:929 |
12 | @@ -107642,3 +107643,15 @@ | |||
13 | 107642 | #: report:addons/account_mcdb/report/combined_journals_report.mako:181 | 107643 | #: report:addons/account_mcdb/report/combined_journals_report.mako:181 |
14 | 107643 | msgid "SELECTION" | 107644 | msgid "SELECTION" |
15 | 107644 | msgstr "SÉLECTION" | 107645 | msgstr "SÉLECTION" |
16 | 107646 | ======= | ||
17 | 107647 | |||
18 | 107648 | #. module: register_accounting | ||
19 | 107649 | #: report:addons/register_accounting/report/liquidity_position_xls.mako:655 | ||
20 | 107650 | msgid "Grand Total Func. Currency" | ||
21 | 107651 | msgstr "Total Général Devise Fonc." | ||
22 | 107652 | |||
23 | 107653 | #. module: register_accounting | ||
24 | 107654 | #: report:addons/register_accounting/report/liquidity_position_xls.mako:632 | ||
25 | 107655 | msgid "Grand Total Reg. Currency" | ||
26 | 107656 | msgstr "Total Général Devise du Reg." | ||
27 | 107657 | >>>>>>> MERGE-SOURCE | ||
28 | 107645 | 107658 | ||
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 | 130 | <td><para style="text">Fun. ccy</para></td> | 130 | <td><para style="text">Fun. ccy</para></td> |
34 | 131 | </tr> | 131 | </tr> |
35 | 132 | <tr> | 132 | <tr> |
37 | 133 | [[ repeatIn(getPendingCheques()['registers'], 'journal') ]] | 133 | [[ repeatIn(getChqJournalCodes(), 'journal') ]] |
38 | 134 | <td><para style="text">[[ getPendingCheques()['registers'][journal]['instance'] ]]</para></td> | 134 | <td><para style="text">[[ getPendingCheques()['registers'][journal]['instance'] ]]</para></td> |
39 | 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> |
40 | 136 | <td><para style="text">[[ getPendingCheques()['registers'][journal]['state'] ]]</para></td> | 136 | <td><para style="text">[[ getPendingCheques()['registers'][journal]['state'] ]]</para></td> |
41 | 137 | 137 | ||
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 | 83 | <NumberFormat ss:Format="Short Date" /> | 83 | <NumberFormat ss:Format="Short Date" /> |
47 | 84 | </Style> | 84 | </Style> |
48 | 85 | <Style ss:ID="short_date2"> | 85 | <Style ss:ID="short_date2"> |
50 | 86 | <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" /> | 86 | <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" /> |
51 | 87 | <NumberFormat ss:Format="Short Date" /> | 87 | <NumberFormat ss:Format="Short Date" /> |
52 | 88 | </Style> | 88 | </Style> |
53 | 89 | <Style ss:ID="pop"> | 89 | <Style ss:ID="pop"> |
55 | 90 | <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" /> | 90 | <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1" /> |
56 | 91 | </Style> | 91 | </Style> |
57 | 92 | <Style ss:ID="s25"> | 92 | <Style ss:ID="s25"> |
58 | 93 | <Borders> | 93 | <Borders> |
59 | @@ -101,6 +101,7 @@ | |||
60 | 101 | <Style ss:ID="s25c" /> | 101 | <Style ss:ID="s25c" /> |
61 | 102 | <Style ss:ID="s25b"> | 102 | <Style ss:ID="s25b"> |
62 | 103 | <Font ss:Bold="1" /> | 103 | <Font ss:Bold="1" /> |
63 | 104 | <Alignment ss:Horizontal="Left" ss:Vertical="Center" /> | ||
64 | 104 | </Style> | 105 | </Style> |
65 | 105 | 106 | ||
66 | 106 | <Style ss:ID="s26" > | 107 | <Style ss:ID="s26" > |
67 | @@ -237,7 +238,7 @@ | |||
68 | 237 | </Style> | 238 | </Style> |
69 | 238 | 239 | ||
70 | 239 | <Style ss:ID="s52"> | 240 | <Style ss:ID="s52"> |
72 | 240 | <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/> | 241 | <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/> |
73 | 241 | <Borders> | 242 | <Borders> |
74 | 242 | <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/> | 243 | <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/> |
75 | 243 | <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/> | 244 | <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/> |
76 | @@ -251,21 +252,22 @@ | |||
77 | 251 | 252 | ||
78 | 252 | <Worksheet ss:Name="Liquidity position"> | 253 | <Worksheet ss:Name="Liquidity position"> |
79 | 253 | <Table > | 254 | <Table > |
88 | 254 | <Column ss:AutoFitWidth="0" ss:Width="110.5"/> | 255 | <Column ss:AutoFitWidth="0" ss:Width="161.25"/> |
89 | 255 | <Column ss:AutoFitWidth="0" ss:Width="102.75" ss:Span="1"/> | 256 | <Column ss:AutoFitWidth="0" ss:Width="40.5"/> |
90 | 256 | <Column ss:AutoFitWidth="0" ss:Width="60.5" ss:Span="1"/> | 257 | <Column ss:AutoFitWidth="0" ss:Width="138.75"/> |
91 | 257 | <Column ss:AutoFitWidth="0" ss:Width="75.75"/> | 258 | <Column ss:AutoFitWidth="0" ss:Width="57"/> |
92 | 258 | <Column ss:AutoFitWidth="0" ss:Width="60.5" ss:Span="1"/> | 259 | <Column ss:AutoFitWidth="0" ss:Width="60.75"/> |
93 | 259 | <Column ss:AutoFitWidth="0" ss:Width="75.75"/> | 260 | <Column ss:AutoFitWidth="0" ss:Width="75.75" ss:Span="2"/> |
94 | 260 | <Column ss:AutoFitWidth="0" ss:Width="82" ss:Span="1"/> | 261 | <Column ss:AutoFitWidth="0" ss:Width="57"/> |
95 | 261 | <Column ss:AutoFitWidth="0" ss:Width="75.75"/> | 262 | <Column ss:AutoFitWidth="0" ss:Width="75.75" ss:Span="1"/> |
96 | 263 | <Column ss:AutoFitWidth="0" ss:Width="55.5"/> | ||
97 | 262 | 264 | ||
98 | 263 | <% period = getPeriod() %> | 265 | <% period = getPeriod() %> |
99 | 264 | <Row> | 266 | <Row> |
100 | 265 | <Cell ss:StyleID="s25b" > | 267 | <Cell ss:StyleID="s25b" > |
101 | 266 | <Data ss:Type="String">${_('LIQUIDITY POSITION')|x}</Data> | 268 | <Data ss:Type="String">${_('LIQUIDITY POSITION')|x}</Data> |
102 | 267 | </Cell> | 269 | </Cell> |
104 | 268 | <Cell ss:StyleID="s25b" > | 270 | <Cell ss:StyleID="s25b" ss:MergeAcross="1"> |
105 | 269 | <Data ss:Type="String">${period.name|x}</Data> | 271 | <Data ss:Type="String">${period.name|x}</Data> |
106 | 270 | </Cell> | 272 | </Cell> |
107 | 271 | </Row> | 273 | </Row> |
108 | @@ -275,7 +277,7 @@ | |||
109 | 275 | <Data ss:Type="String">${_('Period end date:')|x}</Data> | 277 | <Data ss:Type="String">${_('Period end date:')|x}</Data> |
110 | 276 | </Cell> | 278 | </Cell> |
111 | 277 | % if isDate(period.date_stop): | 279 | % if isDate(period.date_stop): |
113 | 278 | <Cell ss:StyleID="short_date2"> | 280 | <Cell ss:StyleID="short_date2" ss:MergeAcross="1"> |
114 | 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> |
115 | 280 | </Cell> | 282 | </Cell> |
116 | 281 | % else: | 283 | % else: |
117 | @@ -288,7 +290,7 @@ | |||
118 | 288 | <Cell> | 290 | <Cell> |
119 | 289 | <Data ss:Type="String">${_('Prop Instance: ')|x}</Data> | 291 | <Data ss:Type="String">${_('Prop Instance: ')|x}</Data> |
120 | 290 | </Cell> | 292 | </Cell> |
122 | 291 | <Cell ss:StyleID="pop"> | 293 | <Cell ss:StyleID="pop" ss:MergeAcross="1"> |
123 | 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> |
124 | 293 | </Cell> | 295 | </Cell> |
125 | 294 | </Row> | 296 | </Row> |
126 | @@ -296,7 +298,7 @@ | |||
127 | 296 | <Cell> | 298 | <Cell> |
128 | 297 | <Data ss:Type="String">${_('Report date:')}</Data> | 299 | <Data ss:Type="String">${_('Report date:')}</Data> |
129 | 298 | </Cell> | 300 | </Cell> |
131 | 299 | <Cell ss:StyleID="short_date2"> | 301 | <Cell ss:StyleID="short_date2" ss:MergeAcross="1"> |
132 | 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> |
133 | 301 | </Cell> | 303 | </Cell> |
134 | 302 | </Row> | 304 | </Row> |
135 | @@ -497,7 +499,7 @@ | |||
136 | 497 | </Row> | 499 | </Row> |
137 | 498 | 500 | ||
138 | 499 | <% pending_cheques = getPendingCheques() %> | 501 | <% pending_cheques = getPendingCheques() %> |
140 | 500 | % for journal in pending_cheques['registers']: | 502 | % for journal in getChqJournalCodes(): |
141 | 501 | <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s35"> | 503 | <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s35"> |
142 | 502 | <Cell ss:StyleID="s25"> | 504 | <Cell ss:StyleID="s25"> |
143 | 503 | <Data ss:Type="String">${ pending_cheques['registers'][journal]['instance'] |x }</Data> | 505 | <Data ss:Type="String">${ pending_cheques['registers'][journal]['instance'] |x }</Data> |
144 | @@ -628,7 +630,7 @@ | |||
145 | 628 | <Cell ss:StyleID="s25c"/> | 630 | <Cell ss:StyleID="s25c"/> |
146 | 629 | <Cell ss:StyleID="s25c"/> | 631 | <Cell ss:StyleID="s25c"/> |
147 | 630 | <Cell ss:MergeAcross="1" ss:StyleID="s52"> | 632 | <Cell ss:MergeAcross="1" ss:StyleID="s52"> |
149 | 631 | <Data ss:Type="String">Grand Total Register Currency</Data> | 633 | <Data ss:Type="String">${_('Grand Total Reg. Currency')}</Data> |
150 | 632 | </Cell> | 634 | </Cell> |
151 | 633 | <Cell ss:StyleID="s50"> | 635 | <Cell ss:StyleID="s50"> |
152 | 634 | <!-- total of register balances + pendinq cheque amount in register currency --> | 636 | <!-- total of register balances + pendinq cheque amount in register currency --> |
153 | @@ -651,7 +653,7 @@ | |||
154 | 651 | <Cell ss:StyleID="s25c"/> | 653 | <Cell ss:StyleID="s25c"/> |
155 | 652 | <Cell ss:StyleID="s25c"/> | 654 | <Cell ss:StyleID="s25c"/> |
156 | 653 | <Cell ss:MergeAcross="1" ss:StyleID="s52"> | 655 | <Cell ss:MergeAcross="1" ss:StyleID="s52"> |
158 | 654 | <Data ss:Type="String">Grand Total Functional Currency</Data> | 656 | <Data ss:Type="String">${_('Grand Total Func. Currency')}</Data> |
159 | 655 | </Cell> | 657 | </Cell> |
160 | 656 | <Cell ss:StyleID="s50"> | 658 | <Cell ss:StyleID="s50"> |
161 | 657 | <!-- total of register balances + pendinq cheque amount in func. currency --> | 659 | <!-- total of register balances + pendinq cheque amount in func. currency --> |
162 | 658 | 660 | ||
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 | 49 | 'getConvert': self.getConvert, | 49 | 'getConvert': self.getConvert, |
168 | 50 | 'getOpeningBalance': self.getOpeningBalance, | 50 | 'getOpeningBalance': self.getOpeningBalance, |
169 | 51 | 'getPendingCheques': self.getPendingCheques, | 51 | 'getPendingCheques': self.getPendingCheques, |
170 | 52 | # Cheque Journals to display, in alphabetical order: | ||
171 | 53 | 'getChqJournalCodes': lambda *a: sorted(self.getPendingCheques()['registers']), | ||
172 | 52 | 'getGrandTotalRegCurrency': self.getGrandTotalRegCurrency, | 54 | 'getGrandTotalRegCurrency': self.getGrandTotalRegCurrency, |
173 | 53 | 'getRevaluationLines': self.getRevaluationLines, | 55 | 'getRevaluationLines': self.getRevaluationLines, |
174 | 54 | }) | 56 | }) |
175 | @@ -96,7 +98,7 @@ | |||
176 | 96 | pool = pooler.get_pool(self.cr.dbname) | 98 | pool = pooler.get_pool(self.cr.dbname) |
177 | 97 | reg_obj = pool.get('account.bank.statement') | 99 | reg_obj = pool.get('account.bank.statement') |
178 | 98 | args = [('period_id', '=', self.period_id)] | 100 | args = [('period_id', '=', self.period_id)] |
180 | 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') |
181 | 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')}) |
182 | 101 | 103 | ||
183 | 102 | self.func_currency = regs[0].journal_id.company_id.currency_id.name | 104 | self.func_currency = regs[0].journal_id.company_id.currency_id.name |