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

Proposed by jftempo
Status: Merged
Merged at revision: 4118
Proposed branch: lp:~julie-w/unifield-server/US-1773
Merge into: lp:unifield-server
Diff against target: 35 lines (+10/-0) (has conflicts)
2 files modified
bin/addons/account_reconciliation/wizard/account_reconcile.py (+2/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+8/-0)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-1773
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+313320@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/account_reconciliation/wizard/account_reconcile.py'
2--- bin/addons/account_reconciliation/wizard/account_reconcile.py 2016-10-04 10:11:04 +0000
3+++ bin/addons/account_reconciliation/wizard/account_reconcile.py 2016-12-15 08:33:00 +0000
4@@ -186,6 +186,8 @@
5 debit += line.debit_currency
6 fcredit += line.credit
7 fdebit += line.debit
8+ if debit <= 10**-3 or credit <= 10**-3:
9+ raise osv.except_osv(_('Error'), _('Both Debit and Credit lines are required for reconciliation.'))
10 # Adapt state value
11 if abs(debit - credit) <= 10**-3:
12 state = 'total'
13
14=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
15--- bin/addons/msf_profile/i18n/fr_MF.po 2016-12-07 06:47:50 +0000
16+++ bin/addons/msf_profile/i18n/fr_MF.po 2016-12-15 08:33:00 +0000
17@@ -75713,6 +75713,7 @@
18 msgid "There is no stopped products to report"
19 msgstr "Il n'y a aucun produit stoppé à afficher"
20
21+<<<<<<< TREE
22 #. module: msf_doc_import
23 #: code:addons/msf_doc_import/check_line.py:626
24 #: code:addons/msf_doc_import/check_line.py:628
25@@ -75769,3 +75770,10 @@
26 msgid "Partner Created on this instance"
27 msgstr "Partenaire créé sur cette instance"
28
29+=======
30+#. module: account_reconciliation
31+#: code:addons/account_reconciliation/wizard/account_reconcile.py:190
32+#, python-format
33+msgid "Both Debit and Credit lines are required for reconciliation."
34+msgstr "Un lettrage requiert à la fois des lignes en débit et en crédit."
35+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches