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

[jftempo]

[lp:~julie-w/unifield-server/US-4521]

4861. By Julie Nuguet on 2018-04-25

US-4521 [IMP] Fix misspelling

[Julie Nuguet (julie-w)]

  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

=== modified file 'bin/addons/account/account_move_line.py'
--- bin/addons/account/account_move_line.py	2018-03-28 07:36:10 +0000
+++ bin/addons/account/account_move_line.py	2018-04-25 09:17:44 +0000
@@ -618,6 +618,8 @@
     _sql_constraints = [
         ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in accounting entry !'),
         ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in accounting entry !'),
+        ('booking_credit_debit1', 'CHECK (credit_currency * debit_currency = 0)', 'Wrong credit or debit value in booking currency!'),
+        ('booking_credit_debit2', 'CHECK (credit_currency + debit_currency >= 0)', 'Wrong credit or debit value in booking currency!'),
     ]
 
     def _auto_init(self, cr, context=None):

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-04-20 07:09:56 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-04-25 09:17:44 +0000
@@ -107642,3 +107642,8 @@
 #: report:addons/account_mcdb/report/combined_journals_report.mako:181
 msgid "SELECTION"
 msgstr "SÉLECTION"
+
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in booking currency!"
+msgstr "Valeur de crédit ou débit erronée en devise d'enregistrement !"