Merge lp:~julie-w/unifield-server/US-4726 into lp:unifield-server
- US-4726
- Merge into trunk
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 5108 |
Proposed branch: | lp:~julie-w/unifield-server/US-4726 |
Merge into: | lp:unifield-server |
Diff against target: |
569 lines (+89/-73) 17 files modified
bin/addons/account/account_view.xml (+4/-4) bin/addons/account/report/account_liquidity_balance.mako (+1/-1) bin/addons/finance/cash_request.py (+1/-1) bin/addons/finance/cash_request_view.xml (+2/-2) bin/addons/msf_profile/i18n/fr_MF.po (+42/-40) bin/addons/register_accounting/account_cash_statement.py (+3/-3) bin/addons/register_accounting/account_view.xml (+5/-4) bin/addons/register_accounting/report/cash_inventory.rml (+2/-2) bin/addons/register_accounting/report/fully_report_xls.mako (+16/-3) bin/addons/register_accounting/report/liquidity_position_pdf.rml (+1/-1) bin/addons/register_accounting/report/liquidity_position_xls.mako (+1/-1) bin/addons/register_accounting/report/report_liquidity_position.py (+1/-1) bin/addons/register_accounting/wizard/register_opening.py (+4/-4) bin/addons/register_accounting/wizard/register_opening.xml (+1/-1) bin/addons/vertical_integration/report/hq_report_ocb.py (+1/-1) bin/addons/vertical_integration/report/hq_report_ocg.py (+2/-2) bin/addons/vertical_integration/report/hq_report_ocp.py (+2/-2) |
To merge this branch: | bzr merge lp:~julie-w/unifield-server/US-4726 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+356383@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/account/account_view.xml' |
2 | --- bin/addons/account/account_view.xml 2018-08-14 16:05:39 +0000 |
3 | +++ bin/addons/account/account_view.xml 2018-10-10 07:25:29 +0000 |
4 | @@ -2650,12 +2650,12 @@ |
5 | <page string="CashBox"> |
6 | <group col="2" colspan="2" expand="1"> |
7 | <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','!=','draft')]}"> |
8 | - <tree string = "Opening Balance" editable="bottom"> |
9 | + <tree string="Starting Balance" editable="bottom"> |
10 | <field name="pieces"/> |
11 | <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/> |
12 | <field name="subtotal" sum="Total"/> |
13 | </tree> |
14 | - <form string = "Opening Balance"> |
15 | + <form string="Starting Balance"> |
16 | <field name="pieces"/> |
17 | <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/> |
18 | <field name="subtotal"/> |
19 | @@ -2688,8 +2688,8 @@ |
20 | <field name="closing_date" select="1" readonly="1"/> |
21 | </group> |
22 | <group col="2" colspan="2"> |
23 | - <separator string="Opening Balance" colspan="4"/> |
24 | - <field name="balance_start" readonly="1" string="Opening Balance"/> |
25 | + <separator string="Starting Balance" colspan="4"/> |
26 | + <field name="balance_start" readonly="1" string="Starting Balance"/> |
27 | <field name="total_entry_encoding"/> |
28 | </group> |
29 | <group col="2" colspan="2"> |
30 | |
31 | === modified file 'bin/addons/account/report/account_liquidity_balance.mako' |
32 | --- bin/addons/account/report/account_liquidity_balance.mako 2017-05-31 13:57:26 +0000 |
33 | +++ bin/addons/account/report/account_liquidity_balance.mako 2018-10-10 07:25:29 +0000 |
34 | @@ -165,7 +165,7 @@ |
35 | <Data ss:Type="String">${_('Period')}</Data> |
36 | </Cell> |
37 | <Cell ss:StyleID="ssHeader"> |
38 | - <Data ss:Type="String">${_('Opening balance')}</Data> |
39 | + <Data ss:Type="String">${_('Starting balance')}</Data> |
40 | </Cell> |
41 | <Cell ss:StyleID="ssHeader"> |
42 | <Data ss:Type="String">${_('Calculated balance')}</Data> |
43 | |
44 | === modified file 'bin/addons/finance/cash_request.py' |
45 | --- bin/addons/finance/cash_request.py 2017-12-14 12:43:52 +0000 |
46 | +++ bin/addons/finance/cash_request.py 2018-10-10 07:25:29 +0000 |
47 | @@ -1241,7 +1241,7 @@ |
48 | readonly=True), # can be "Not Created" if the cheque reg. of the month is not created yet |
49 | 'period_id': fields.function(_period_id_compute, method=True, relation='account.period', |
50 | type='many2one', string='Period', readonly=True, store=False), |
51 | - 'opening_balance': fields.float('Opening Balance in register currency', readonly=True, |
52 | + 'opening_balance': fields.float('Starting Balance in register currency', readonly=True, |
53 | digits_compute=dp.get_precision('Account')), |
54 | 'calculated_balance_booking': fields.float('Calculated Balance in register currency', readonly=True, |
55 | digits_compute=dp.get_precision('Account')), |
56 | |
57 | === modified file 'bin/addons/finance/cash_request_view.xml' |
58 | --- bin/addons/finance/cash_request_view.xml 2017-12-08 14:47:02 +0000 |
59 | +++ bin/addons/finance/cash_request_view.xml 2018-10-10 07:25:29 +0000 |
60 | @@ -325,7 +325,7 @@ |
61 | <field name="journal_name"/> |
62 | <field name="status"/> |
63 | <field name="period_id"/> |
64 | - <field name="opening_balance" sum="Total Opening Balance"/> |
65 | + <field name="opening_balance" sum="Total Starting Balance"/> |
66 | <field name="calculated_balance_booking" sum="Total Calculated Balance Booking"/> |
67 | <field name="cashbox_balance_booking" sum="Total Cashbox Balance Booking"/> |
68 | <field name="booking_currency_id"/> |
69 | @@ -348,7 +348,7 @@ |
70 | <field name="journal_name"/> |
71 | <field name="status"/> |
72 | <field name="period_id"/> |
73 | - <field name="opening_balance" sum="Total Opening Balance"/> |
74 | + <field name="opening_balance" sum="Total Starting Balance"/> |
75 | <field name="calculated_balance_booking" sum="Total Calculated Balance Booking"/> |
76 | <field name="bank_statement_balance_booking" sum="Total Bank Statement Balance Booking"/> |
77 | <field name="booking_currency_id"/> |
78 | |
79 | === modified file 'bin/addons/msf_profile/i18n/fr_MF.po' |
80 | --- bin/addons/msf_profile/i18n/fr_MF.po 2018-09-27 16:17:57 +0000 |
81 | +++ bin/addons/msf_profile/i18n/fr_MF.po 2018-10-10 07:25:29 +0000 |
82 | @@ -4576,8 +4576,8 @@ |
83 | |
84 | #. module: register_accounting |
85 | #: view:wizard.register.opening.confirmation:0 |
86 | -msgid "Register Opening Balance" |
87 | -msgstr "Solde d'Ouverture du Registre" |
88 | +msgid "Register Starting Balance" |
89 | +msgstr "Solde Initial du Registre" |
90 | |
91 | #. module: finance |
92 | #: code:addons/finance/cash_request.py:276 |
93 | @@ -12067,7 +12067,7 @@ |
94 | #. module: register_accounting |
95 | #: report:bank.reconciliation:0 |
96 | msgid "Starting Balance:" |
97 | -msgstr "Solde d'ouverture:" |
98 | +msgstr "Solde Initial :" |
99 | |
100 | #. module: sync_so |
101 | #: field:purchase.order,fo_sync_date:0 |
102 | @@ -13849,8 +13849,8 @@ |
103 | #: field:cash.request.liquidity.cash,opening_balance:0 |
104 | #: field:cash.request.liquidity.cheque,opening_balance:0 |
105 | #: report:addons/register_accounting/report/liquidity_position_xls.mako:330 |
106 | -msgid "Opening Balance in register currency" |
107 | -msgstr "Solde d'Ouverture dans la devise du registre" |
108 | +msgid "Starting Balance in register currency" |
109 | +msgstr "Solde Initial dans la devise du registre" |
110 | |
111 | #. module: kit |
112 | #: model:ir.model,name:kit.model_kit_selection_sale_line |
113 | @@ -14692,7 +14692,7 @@ |
114 | #: view:cash.request:0 |
115 | #: view:cash.request.liquidity.bank:0 |
116 | msgid "Total Bank Statement Balance Functional" |
117 | -msgstr "Solde Total du Relevé Bancaire en Devise Fonc." |
118 | +msgstr "Solde Total Registre de Banque en Devise Fonc." |
119 | |
120 | #. module: sync_client |
121 | #: field:sync.client.rule,owner_field:0 |
122 | @@ -16260,7 +16260,12 @@ |
123 | #. module: register_accounting |
124 | #: report:cash.inventory:0 |
125 | msgid "CashBox Balance:" |
126 | -msgstr "Solde de Caisse " |
127 | +msgstr "Solde de Caisse :" |
128 | + |
129 | +#. module: register_accounting |
130 | +#: report:addons/register_accounting/report/fully_report_xls.mako:508 |
131 | +msgid "Bank Statement balance:" |
132 | +msgstr "Solde Registre de Banque :" |
133 | |
134 | #. modules: msf_outgoing, specific_rules |
135 | #: code:addons/msf_outgoing/wizard/picking_processor.py:952 |
136 | @@ -19629,8 +19634,15 @@ |
137 | |
138 | #. module: register_accounting |
139 | #: report:cash.inventory:0 |
140 | -msgid "Opening balance:" |
141 | -msgstr "Solde d'ouverture: " |
142 | +#: report:addons/register_accounting/report/fully_report_xls.mako:500 |
143 | +msgid "Starting balance:" |
144 | +msgstr "Solde initial :" |
145 | + |
146 | +#. modules: register_accounting, account |
147 | +#: report:cash.inventory:0 |
148 | +#: report:addons/account/report/account_liquidity_balance.mako:168 |
149 | +msgid "Starting balance" |
150 | +msgstr "Solde initial" |
151 | |
152 | #. module: product_attributes |
153 | #: field:product.product,kc_txt:0 |
154 | @@ -26919,7 +26931,7 @@ |
155 | #. module: finance |
156 | #: view:cash.request.liquidity.bank:0 |
157 | msgid "Total Bank Statement Balance Booking" |
158 | -msgstr "Solde Total du Relevé Bancaire en Devise d'Enreg." |
159 | +msgstr "Solde Total Registre de Banque en Devise d'Enreg." |
160 | |
161 | #. module: msf_partner |
162 | #: view:res.partner:0 |
163 | @@ -28248,7 +28260,7 @@ |
164 | #: field:cash.request.liquidity.bank,bank_statement_balance_functional:0 |
165 | #: report:addons/register_accounting/report/liquidity_position_xls.mako:352 |
166 | msgid "Bank Statement Balance in functional currency" |
167 | -msgstr "Solde du Relevé Bancaire en devise fonctionnelle" |
168 | +msgstr "Solde Registre de Banque en devise fonctionnelle" |
169 | |
170 | #. module: msf_instance |
171 | #: help:res.company,instance_id:0 |
172 | @@ -30098,11 +30110,6 @@ |
173 | msgid "Statement" |
174 | msgstr "Relevé" |
175 | |
176 | -#. module: account |
177 | -#: field:account.bank.statement,balance_start:0 |
178 | -msgid "Starting Balance" |
179 | -msgstr "Solde Initial" |
180 | - |
181 | #. module: financing_contract |
182 | #: view:financing.contract.contract:0 |
183 | msgid "Contract information" |
184 | @@ -57373,8 +57380,8 @@ |
185 | |
186 | #. module: register_accounting |
187 | #: help:account.bank.statement,msf_calculated_balance:0 |
188 | -msgid "Opening balance + Cash Transaction" |
189 | -msgstr "Solde initial + Transaction en espèce" |
190 | +msgid "Starting Balance + Cash Transactions" |
191 | +msgstr "Solde Initial + Transactions en espèces" |
192 | |
193 | #. module: msf_doc_import |
194 | #: model:ir.model,name:msf_doc_import.model_purchase_line_import_xml_line |
195 | @@ -61587,8 +61594,8 @@ |
196 | |
197 | #. module: register_accounting |
198 | #: field:wizard.register.opening.confirmation,confirm_opening_balance:0 |
199 | -msgid "Do you want to open the register with the following opening balance?" |
200 | -msgstr "Voulez-vous ouvrir le registre avec le solde d'ouverture suivant ?" |
201 | +msgid "Do you want to open the register with the following starting balance?" |
202 | +msgstr "Voulez-vous ouvrir le registre avec le solde initial suivant ?" |
203 | |
204 | #. module: msf_outgoing |
205 | #: field:stock.move.memory.shipment.create,selected_weight:0 |
206 | @@ -62141,8 +62148,9 @@ |
207 | #: view:account.bank.statement:0 |
208 | #: view:account.bank.statement:0 |
209 | #: field:wizard.register.opening.confirmation,opening_balance:0 |
210 | -msgid "Opening Balance" |
211 | -msgstr "Solde d'ouverture" |
212 | +#: field:account.bank.statement,balance_start:0 |
213 | +msgid "Starting Balance" |
214 | +msgstr "Solde Initial" |
215 | |
216 | #. module: msf_accrual |
217 | #: code:addons/msf_accrual/wizard/wizard_accrual_validation.py:47 |
218 | @@ -68417,7 +68425,7 @@ |
219 | #: report:bank.reconciliation:0 |
220 | #: report:cash.inventory:0 |
221 | msgid "Gap:" |
222 | -msgstr "Écart" |
223 | +msgstr "Écart :" |
224 | |
225 | #. module: product_asset |
226 | #: view:product.asset.event:0 |
227 | @@ -70334,12 +70342,6 @@ |
228 | msgid "Confirmed sale order lines, not yet delivered" |
229 | msgstr "Confirmed sale order lines, not yet delivered" |
230 | |
231 | -#. modules: account, register_accounting |
232 | -#: report:addons/account/report/account_liquidity_balance.mako:168 |
233 | -#: report:cash.inventory:0 |
234 | -msgid "Opening balance" |
235 | -msgstr "Solde d'ouverture" |
236 | - |
237 | #. module: product_attributes |
238 | #: model:product.justification.code,code:product_attributes.justification_code_jme |
239 | msgid "ME" |
240 | @@ -71081,9 +71083,14 @@ |
241 | msgstr "Solde de clôture" |
242 | |
243 | #. module: register_accounting |
244 | -#: report:addons/register_accounting/report/fully_report_xls.mako:508 |
245 | +#: report:addons/register_accounting/report/fully_report_xls.mako:512 |
246 | msgid "Closing balance:" |
247 | -msgstr "Solde de clôture :" |
248 | +msgstr "Solde de Clôture :" |
249 | + |
250 | +#. module: register_accounting |
251 | +#: report:addons/register_accounting/report/fully_report_xls.mako:510 |
252 | +msgid "CashBox balance:" |
253 | +msgstr "Solde de Caisse :" |
254 | |
255 | #. modules: account, finance, account_voucher, account_override, analytic, register_accounting, msf_doc_import |
256 | #: report:account.account.balance:0 |
257 | @@ -84287,7 +84294,7 @@ |
258 | #. module: register_accounting |
259 | #: report:cash.inventory:0 |
260 | msgid "Theoretical balance:" |
261 | -msgstr "Solde théorique" |
262 | +msgstr "Solde théorique :" |
263 | |
264 | #. module: msf_config_locations |
265 | #: model:ir.actions.act_window,name:msf_config_locations.action_configurable_location_setup |
266 | @@ -93156,7 +93163,7 @@ |
267 | #: field:cash.request.liquidity.bank,bank_statement_balance_booking:0 |
268 | #: report:addons/register_accounting/report/liquidity_position_xls.mako:339 |
269 | msgid "Bank Statement Balance in register currency" |
270 | -msgstr "Solde du Relevé Bancaire dans la devise du registre" |
271 | +msgstr "Solde Registre de Banque dans la devise du registre" |
272 | |
273 | #. module: base |
274 | #: selection:res.config.users,context_tz:0 |
275 | @@ -98409,8 +98416,8 @@ |
276 | #. module: finance |
277 | #: view:cash.request.liquidity.bank:0 |
278 | #: view:cash.request.liquidity.cash:0 |
279 | -msgid "Total Opening Balance" |
280 | -msgstr "Total Solde d'Ouverture" |
281 | +msgid "Total Starting Balance" |
282 | +msgstr "Total Solde Initial" |
283 | |
284 | #. module: product_list |
285 | #: field:old.product.list.line,removal_date:0 |
286 | @@ -101091,11 +101098,6 @@ |
287 | msgstr "Cmpt" |
288 | |
289 | #. module: register_accounting |
290 | -#: report:addons/register_accounting/report/fully_report_xls.mako:500 |
291 | -msgid "Starting balance:" |
292 | -msgstr "Solde d'ouverture:" |
293 | - |
294 | -#. module: register_accounting |
295 | #: report:addons/register_accounting/report/fully_report_xls.mako:469 |
296 | msgid "REPORT" |
297 | msgstr "RAPPORT" |
298 | |
299 | === modified file 'bin/addons/register_accounting/account_cash_statement.py' |
300 | --- bin/addons/register_accounting/account_cash_statement.py 2018-06-20 13:17:44 +0000 |
301 | +++ bin/addons/register_accounting/account_cash_statement.py 2018-10-10 07:25:29 +0000 |
302 | @@ -254,7 +254,7 @@ |
303 | |
304 | def _msf_calculated_balance_compute(self, cr, uid, ids, field_name=None, arg=None, context=None): |
305 | """ |
306 | - Sum of opening balance (balance_start) and sum of cash transaction (total_entry_encoding) |
307 | + Sum of starting balance (balance_start) and sum of cash transaction (total_entry_encoding) |
308 | """ |
309 | if context is None: |
310 | context = {} |
311 | @@ -263,7 +263,7 @@ |
312 | for st in self.browse(cr, uid, ids): |
313 | amount = (st.balance_start or 0.0) + (st.total_entry_encoding or 0.0) |
314 | res[st.id] = amount |
315 | - # Update next register opening balance |
316 | + # Update next register starting balance |
317 | if st.journal_id and st.journal_id.type == 'cash': |
318 | next_st_ids = self.search(cr, uid, [('prev_reg_id', '=', st.id)]) |
319 | context.update({'update_next_reg_balance_start': True}) |
320 | @@ -306,7 +306,7 @@ |
321 | 'closing_gap': fields.function(_gap_compute, method=True, string='Gap'), |
322 | 'comments': fields.char('Comments', size=64, required=False, readonly=False), |
323 | 'msf_calculated_balance': fields.function(_msf_calculated_balance_compute, method=True, readonly=True, string='Calculated Balance', |
324 | - help="Opening balance + Cash Transaction"), |
325 | + help="Starting Balance + Cash Transactions"), |
326 | # Because of UTP-382, need to change store=True to FALSE for total_entry_encoding (which do not update fields at register line deletion/copy) |
327 | 'total_entry_encoding': fields.function(_get_sum_entry_encoding, method=True, store=False, string="Cash Transaction", help="Total cash transactions"), |
328 | } |
329 | |
330 | === modified file 'bin/addons/register_accounting/account_view.xml' |
331 | --- bin/addons/register_accounting/account_view.xml 2018-03-14 08:57:47 +0000 |
332 | +++ bin/addons/register_accounting/account_view.xml 2018-10-10 07:25:29 +0000 |
333 | @@ -342,12 +342,12 @@ |
334 | <field name="prev_reg_id" invisible="1"/> |
335 | <group col="4" colspan="4"> |
336 | <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'invisible':['|',('state','!=','draft'),('prev_reg_id','!=',False)], 'readonly':['|',('state','!=','draft'),('prev_reg_id','!=',False)]}"> |
337 | - <tree string = "Opening Balance" editable="bottom"> |
338 | + <tree string="Starting Balance" editable="bottom"> |
339 | <field name="pieces"/> |
340 | <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/> |
341 | <field name="subtotal" sum="Total"/> |
342 | </tree> |
343 | - <form string = "Opening Balance"> |
344 | + <form string="Starting Balance"> |
345 | <field name="pieces"/> |
346 | <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/> |
347 | <field name="subtotal"/> |
348 | @@ -382,8 +382,8 @@ |
349 | <field name="closing_date" select="1" readonly="1"/> |
350 | </group> |
351 | <group col="2" colspan="2"> |
352 | - <separator string="Opening Balance" colspan="4"/> |
353 | - <field name="balance_start" string="Opening Balance" readonly="True"/> |
354 | + <separator string="Starting Balance" colspan="4"/> |
355 | + <field name="balance_start" readonly="True"/> |
356 | <field name="total_entry_encoding"/> |
357 | <field name="msf_calculated_balance"/> |
358 | <field name="open_advance_amount" attrs="{'readonly': [('state', 'not in',('draft', 'open'))]}"/> |
359 | @@ -798,6 +798,7 @@ |
360 | <field name="date" select="1" on_change="onchange_date(date)" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('prev_reg_id', '!=', False)]}"/> |
361 | <field name="period_id" domain="[('state', '=', 'draft'),('special', '!=', True)]" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('prev_reg_id', '!=', False)]}"/> |
362 | <field name="currency" readonly="1"/> |
363 | + <field name="balance_end" string="Calculated Balance" readonly="1"/> |
364 | <field name='company_id' widget="selection" groups="base.group_multi_company" invisible="1"/> |
365 | <field name="virtual_id" invisible="1" readonly="1"/> |
366 | <field name="prev_reg_id" invisible="1"/> |
367 | |
368 | === modified file 'bin/addons/register_accounting/report/cash_inventory.rml' |
369 | --- bin/addons/register_accounting/report/cash_inventory.rml 2018-03-14 08:57:47 +0000 |
370 | +++ bin/addons/register_accounting/report/cash_inventory.rml 2018-10-10 07:25:29 +0000 |
371 | @@ -83,7 +83,7 @@ |
372 | <para style="text"><b>Cashbox</b></para> |
373 | <blockTable colWidths="30mm,30mm,30mm,30mm,30mm,30mm" style="table_reconciliation_balance"> |
374 | <tr> |
375 | - <td><para style="center"><b>Opening balance</b></para></td> |
376 | + <td><para style="center"><b>Starting balance</b></para></td> |
377 | <td></td> |
378 | <td></td> |
379 | <td><para style="center"><b>Closing balance</b></para></td> |
380 | @@ -134,7 +134,7 @@ |
381 | <blockTable colWidths="90mm, 90mm" style="table_reconciliation"> |
382 | <tr> |
383 | <td> |
384 | - <para>Opening balance: <b>[[ o.balance_start and o.balance_start or '0.0' ]]</b> [[ o.currency and o.currency.name or '' ]]</para> |
385 | + <para>Starting balance: <b>[[ o.balance_start and o.balance_start or '0.0' ]]</b> [[ o.currency and o.currency.name or '' ]]</para> |
386 | <para>Cash Transaction: <b>[[ o.total_entry_encoding and o.total_entry_encoding or '0.0' ]]</b> [[ o.currency and o.currency.name or '' ]]</para> |
387 | <para>Calculated Balance: <b>[[ o.msf_calculated_balance and o.msf_calculated_balance or '0.0' ]]</b> [[ o.currency and o.currency.name or '' ]]</para> |
388 | <para>Unrecorded Advances: <b>[[ o.open_advance_amount and o.open_advance_amount or '0.0' ]]</b> [[ o.currency and o.currency.name or '' ]]</para> |
389 | |
390 | === modified file 'bin/addons/register_accounting/report/fully_report_xls.mako' |
391 | --- bin/addons/register_accounting/report/fully_report_xls.mako 2018-07-17 12:20:07 +0000 |
392 | +++ bin/addons/register_accounting/report/fully_report_xls.mako 2018-10-10 07:25:29 +0000 |
393 | @@ -503,12 +503,25 @@ |
394 | <Data ss:Type="Number">${o.balance_start or 0.0|x}</Data> |
395 | </Cell> |
396 | </Row> |
397 | + <% |
398 | + if o.journal_id.type == 'cash': |
399 | + closing_bal_title = _('CashBox balance:') |
400 | + closing_bal = o.balance_end_cash or 0.0 |
401 | + calculated_bal = o.msf_calculated_balance or 0.0 |
402 | + else: |
403 | + if o.journal_id.type == 'bank': |
404 | + closing_bal_title = _('Bank Statement balance:') |
405 | + else: |
406 | + closing_bal_title = _('Closing balance:') |
407 | + closing_bal = o.balance_end_real or 0.0 |
408 | + calculated_bal = o.balance_end or 0.0 |
409 | + %> |
410 | <Row ss:Height="14.5134"> |
411 | <Cell ss:StyleID="header_part"> |
412 | - <Data ss:Type="String">${_('Closing balance:')|x} </Data> |
413 | + <Data ss:Type="String">${closing_bal_title|x} </Data> |
414 | </Cell> |
415 | <Cell ss:StyleID="header_part_number"> |
416 | - <Data ss:Type="Number">${o.balance_end_real or 0.0|x}</Data> |
417 | + <Data ss:Type="Number">${closing_bal|x}</Data> |
418 | </Cell> |
419 | </Row> |
420 | <Row ss:Height="14.5134"> |
421 | @@ -516,7 +529,7 @@ |
422 | <Data ss:Type="String">${_('Calculated balance:')|x} </Data> |
423 | </Cell> |
424 | <Cell ss:StyleID="header_part_number"> |
425 | - <Data ss:Type="Number">${o.balance_end or 0.0|x}</Data> |
426 | + <Data ss:Type="Number">${calculated_bal|x}</Data> |
427 | </Cell> |
428 | </Row> |
429 | <Row ss:Height="14.5134"> |
430 | |
431 | === modified file 'bin/addons/register_accounting/report/liquidity_position_pdf.rml' |
432 | --- bin/addons/register_accounting/report/liquidity_position_pdf.rml 2018-04-23 09:58:08 +0000 |
433 | +++ bin/addons/register_accounting/report/liquidity_position_pdf.rml 2018-10-10 07:25:29 +0000 |
434 | @@ -60,7 +60,7 @@ |
435 | <td><para style="text">Instance</para></td> |
436 | <td><para style="text">Journal Code - Journal Name</para></td> |
437 | <td><para style="text">State</para></td> |
438 | - <td><para style="text">Opening Balance</para></td> |
439 | + <td><para style="text">Starting Balance</para></td> |
440 | <td><para style="text">Calculated Balance</para></td> |
441 | <td><para style="text">[[ reg_type == 'cash' and 'Cash Box Balance' or 'Bank Statement Balance']]</para></td> |
442 | <td><para style="text">Reg. ccy</para></td> |
443 | |
444 | === modified file 'bin/addons/register_accounting/report/liquidity_position_xls.mako' |
445 | --- bin/addons/register_accounting/report/liquidity_position_xls.mako 2018-04-23 09:58:08 +0000 |
446 | +++ bin/addons/register_accounting/report/liquidity_position_xls.mako 2018-10-10 07:25:29 +0000 |
447 | @@ -327,7 +327,7 @@ |
448 | <Data ss:Type="String">${_('Period')|x}</Data> |
449 | </Cell> |
450 | <Cell ss:StyleID="s34"> |
451 | - <Data ss:Type="String">${_('Opening Balance in register currency')|x}</Data> |
452 | + <Data ss:Type="String">${_('Starting Balance in register currency')|x}</Data> |
453 | </Cell> |
454 | <Cell ss:StyleID="s34"> |
455 | <Data ss:Type="String">${_('Calculated Balance in register currency')|x}</Data> |
456 | |
457 | === modified file 'bin/addons/register_accounting/report/report_liquidity_position.py' |
458 | --- bin/addons/register_accounting/report/report_liquidity_position.py 2018-04-23 10:09:26 +0000 |
459 | +++ bin/addons/register_accounting/report/report_liquidity_position.py 2018-10-10 07:25:29 +0000 |
460 | @@ -187,7 +187,7 @@ |
461 | |
462 | def getOpeningBalance(self, reg_type, cur): |
463 | ''' |
464 | - Returns the TOTAL of opening balance for the register type and the currency in parameters |
465 | + Returns the TOTAL of starting balance for the register type and the currency in parameters |
466 | ''' |
467 | reg_data = self.getRegisters()[reg_type]['registers'] |
468 | return sum([line['opening_balance'] or 0.0 for line in reg_data if line['currency'] == cur]) |
469 | |
470 | === modified file 'bin/addons/register_accounting/wizard/register_opening.py' |
471 | --- bin/addons/register_accounting/wizard/register_opening.py 2017-10-16 09:07:48 +0000 |
472 | +++ bin/addons/register_accounting/wizard/register_opening.py 2018-10-10 07:25:29 +0000 |
473 | @@ -31,8 +31,8 @@ |
474 | |
475 | def _get_opening_balance(self, cr, uid, ids, name, arg, context=None): |
476 | """ |
477 | - Returns a dict with key = id of the wizard, and value = amount of the opening balance of the related register |
478 | - The Opening Balance is: |
479 | + Returns a dict with key = id of the wizard, and value = amount of the starting balance of the related register |
480 | + The Starting Balance is: |
481 | - equal to the value of "balance_start" for Bank Registers |
482 | - based on the Cashbox lines for Cash Registers |
483 | - always equal to 0.00 for Cheque Registers |
484 | @@ -60,13 +60,13 @@ |
485 | return self.pool.get('account.journal').get_journal_type(cr, uid, context=context) |
486 | |
487 | _columns = { |
488 | - 'confirm_opening_balance': fields.boolean(string='Do you want to open the register with the following opening balance?', |
489 | + 'confirm_opening_balance': fields.boolean(string='Do you want to open the register with the following starting balance?', |
490 | required=False), |
491 | 'register_id': fields.many2one('account.bank.statement', 'Register', required=True, readonly=True), |
492 | 'register_type': fields.related('register_id', 'journal_id', 'type', string='Register Type', type='selection', |
493 | selection=_get_journal_type, readonly=True), |
494 | 'opening_balance': fields.function(_get_opening_balance, method=True, type='float', readonly=True, |
495 | - string='Opening Balance'), |
496 | + string='Starting Balance'), |
497 | 'confirm_opening_period': fields.boolean(string='Do you want to open the register on the following period?', |
498 | required=False), |
499 | 'opening_period': fields.related('register_id', 'period_id', string='Opening Period', type='many2one', |
500 | |
501 | === modified file 'bin/addons/register_accounting/wizard/register_opening.xml' |
502 | --- bin/addons/register_accounting/wizard/register_opening.xml 2017-10-13 08:20:44 +0000 |
503 | +++ bin/addons/register_accounting/wizard/register_opening.xml 2018-10-10 07:25:29 +0000 |
504 | @@ -8,7 +8,7 @@ |
505 | <field name='arch' type='xml'> |
506 | <form string="Open Register Confirmation"> |
507 | <group colspan="4" attrs="{'invisible': [('register_type', '=', 'cheque')]}"> |
508 | - <separator string="Register Opening Balance"/> |
509 | + <separator string="Register Starting Balance"/> |
510 | <field name="register_type" invisible="1"/> |
511 | <field name="confirm_opening_balance"/> |
512 | <field name="opening_balance"/> |
513 | |
514 | === modified file 'bin/addons/vertical_integration/report/hq_report_ocb.py' |
515 | --- bin/addons/vertical_integration/report/hq_report_ocb.py 2018-09-18 07:25:26 +0000 |
516 | +++ bin/addons/vertical_integration/report/hq_report_ocb.py 2018-10-10 07:25:29 +0000 |
517 | @@ -678,7 +678,7 @@ |
518 | 'query_params': (first_day_of_last_fy, last_day_of_period), |
519 | }, |
520 | { |
521 | - 'headers': ['Instance', 'Code', 'Name', 'Period', 'Opening balance', 'Calculated balance', 'Closing balance', 'Currency'], |
522 | + 'headers': ['Instance', 'Code', 'Name', 'Period', 'Starting balance', 'Calculated balance', 'Closing balance', 'Currency'], |
523 | 'filename': instance_name + '_' + year + month + '_Liquidity Balances.csv', |
524 | 'key': 'liquidity', |
525 | 'query_params': (tuple([period_yyyymm]), reg_types, first_day_of_period, reg_types, period.id, reg_types, last_day_of_period, tuple(instance_ids)), |
526 | |
527 | === modified file 'bin/addons/vertical_integration/report/hq_report_ocg.py' |
528 | --- bin/addons/vertical_integration/report/hq_report_ocg.py 2018-09-18 07:25:26 +0000 |
529 | +++ bin/addons/vertical_integration/report/hq_report_ocg.py 2018-10-10 07:25:29 +0000 |
530 | @@ -103,7 +103,7 @@ |
531 | 'Code', |
532 | 'Name', |
533 | 'Period', |
534 | - 'Opening balance', |
535 | + 'Starting balance', |
536 | 'Calculated balance', |
537 | 'Closing balance', |
538 | 'Currency'] |
539 | @@ -123,7 +123,7 @@ |
540 | 'Account', |
541 | 'Account Name', |
542 | 'Period', |
543 | - 'Opening balance', |
544 | + 'Starting balance', |
545 | 'Calculated balance', |
546 | 'Closing balance', |
547 | 'Booking Currency'] |
548 | |
549 | === modified file 'bin/addons/vertical_integration/report/hq_report_ocp.py' |
550 | --- bin/addons/vertical_integration/report/hq_report_ocp.py 2018-09-18 07:25:26 +0000 |
551 | +++ bin/addons/vertical_integration/report/hq_report_ocp.py 2018-10-10 07:25:29 +0000 |
552 | @@ -510,7 +510,7 @@ |
553 | 'object': 'account.move.line', |
554 | }, |
555 | { |
556 | - 'headers': ['Instance', 'Code', 'Name', 'Period', 'Opening balance', 'Calculated balance', |
557 | + 'headers': ['Instance', 'Code', 'Name', 'Period', 'Starting balance', 'Calculated balance', |
558 | 'Closing balance', 'Currency'], |
559 | 'filename': liquidity_balance_filename, |
560 | 'key': 'liquidity', |
561 | @@ -520,7 +520,7 @@ |
562 | 'fnct_params': context, |
563 | }, |
564 | { |
565 | - 'headers': ['Instance', 'Account', 'Account Name', 'Period', 'Opening balance', 'Calculated balance', |
566 | + 'headers': ['Instance', 'Account', 'Account Name', 'Period', 'Starting balance', 'Calculated balance', |
567 | 'Closing balance', 'Booking Currency'], |
568 | 'filename': account_balance_filename, |
569 | 'key': 'account_balances_per_currency', |