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

Proposed by jftempo
Status: Merged
Merged at revision: 4725
Proposed branch: lp:~julie-w/unifield-server/US-3376
Merge into: lp:unifield-server
Diff against target: 30 lines (+4/-4)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+3/-3)
bin/addons/register_accounting/account_bank_statement.py (+1/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-3376
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+336994@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 2017-12-12 10:23:48 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2018-02-01 15:09:21 +0000
4@@ -24720,10 +24720,10 @@
5 msgstr "Missouri"
6
7 #. module: register_accounting
8-#: code:addons/register_accounting/account_bank_statement.py:2239
9+#: code:addons/register_accounting/account_bank_statement.py:2355
10 #, python-format
11-msgid "You can not hard post with an amount greater than total of imported invoices"
12-msgstr "You can not hard post with an amount greater than total of imported invoices"
13+msgid "You can not hard post with an amount greater than total of imported invoices: Entry %s"
14+msgstr "Vous ne pouvez pas comptabiliser définitivement avec un montant supérieur au total des factures importées : Ecriture %s"
15
16 #. module: account_hq_entries
17 #: view:hq.entries:0
18
19=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
20--- bin/addons/register_accounting/account_bank_statement.py 2017-12-01 08:29:27 +0000
21+++ bin/addons/register_accounting/account_bank_statement.py 2018-02-01 15:09:21 +0000
22@@ -2353,7 +2353,7 @@
23 absl.amount_in - abs(imported_total_amount) > 0.001:
24 raise osv.except_osv(_('Warning'),
25 _('You can not hard post with an amount greater'
26- ' than total of imported invoices'))
27+ ' than total of imported invoices: Entry %s') % absl.sequence_for_reference or '')
28
29 # Update analytic lines
30 if absl.account_id.is_analytic_addicted:

Subscribers

People subscribed via source and target branches