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

Proposed by jftempo on 2018-04-25
Status: Merged
Merge reported by: jftempo
Merged at revision: not available
Proposed branch: lp:~julie-w/unifield-server/US-4521
Merge into: lp:unifield-server
Diff against target: 25 lines (+7/-0)
2 files modified
bin/addons/account/account_move_line.py (+2/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+5/-0)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-4521
Reviewer Review Type Date Requested Status
UniField Reviewer Team 2018-04-25 Pending
Review via email: mp+344217@code.launchpad.net
To post a comment you must log in.
lp:~julie-w/unifield-server/US-4521 updated on 2018-04-25
4861. By Julie Nuguet on 2018-04-25

US-4521 [IMP] Fix misspelling

Julie Nuguet (julie-w) wrote :

  I have just fixed the misspelling in FR language: enregistement =>
enregistrement.

Le 25/04/2018 à 11:14, jftempo a écrit :
> jftempo has proposed merging lp:~julie-w/unifield-server/US-4521 into lp:unifield-server.
>
> Requested reviews:
> UniField Reviewer Team (unifield-reviewer)
>
> For more details, see:
> https://code.launchpad.net/~julie-w/unifield-server/US-4521/+merge/344217

--
TeMPO Consulting
20, avenue de la Paix
67000 Strasbourg
France

http://www.tempo-consulting.fr

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/account/account_move_line.py'
2--- bin/addons/account/account_move_line.py 2018-03-28 07:36:10 +0000
3+++ bin/addons/account/account_move_line.py 2018-04-25 09:17:44 +0000
4@@ -618,6 +618,8 @@
5 _sql_constraints = [
6 ('credit_debit1', 'CHECK (credit*debit=0)', 'Wrong credit or debit value in accounting entry !'),
7 ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in accounting entry !'),
8+ ('booking_credit_debit1', 'CHECK (credit_currency * debit_currency = 0)', 'Wrong credit or debit value in booking currency!'),
9+ ('booking_credit_debit2', 'CHECK (credit_currency + debit_currency >= 0)', 'Wrong credit or debit value in booking currency!'),
10 ]
11
12 def _auto_init(self, cr, context=None):
13
14=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
15--- bin/addons/msf_profile/i18n/fr_MF.po 2018-04-20 07:09:56 +0000
16+++ bin/addons/msf_profile/i18n/fr_MF.po 2018-04-25 09:17:44 +0000
17@@ -107642,3 +107642,8 @@
18 #: report:addons/account_mcdb/report/combined_journals_report.mako:181
19 msgid "SELECTION"
20 msgstr "SÉLECTION"
21+
22+#. module: account
23+#: sql_constraint:account.move.line:0
24+msgid "Wrong credit or debit value in booking currency!"
25+msgstr "Valeur de crédit ou débit erronée en devise d'enregistrement !"

Subscribers

People subscribed via source and target branches