Unifield Server

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

  1. US-4776
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4975
Proposed branch: lp:~julie-w/unifield-server/US-4776
Merge into: lp:unifield-server
Diff against target: 43 lines (+12/-0) (has conflicts)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+8/-0)
bin/addons/register_accounting/wizard/import_cheque_on_bank_registers.py (+4/-0)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-4776
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+349478@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 2018-07-09 09:51:23 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2018-07-13 15:36:44 +0000
4@@ -101265,6 +101265,7 @@
5 msgid "Not Invoice"
6 msgstr "Pas de Facture"
7
8+<<<<<<< TREE
9 #. module: analytic_distribution
10 #: view:mass.reallocation.wizard:0
11 msgid "- Items booked on accounts set as \"Prevent correction on analytic accounts\""
12@@ -101293,3 +101294,10 @@
13 #, python-format
14 msgid "The account \"%s - %s\" is only compatible with a Partner or an Employee Third Party."
15 msgstr "Le compte \"%s - %s\" n'est compatible qu'avec un Tiers de type Partenaire ou Employé."
16+=======
17+#. module: register_accounting
18+#: code:addons/register_accounting/wizard/import_cheque_on_bank_registers.py:166
19+#, python-format
20+msgid "The Cheque %s has already been imported."
21+msgstr "Le Chèque %s a déjà été importé."
22+>>>>>>> MERGE-SOURCE
23
24=== modified file 'bin/addons/register_accounting/wizard/import_cheque_on_bank_registers.py'
25--- bin/addons/register_accounting/wizard/import_cheque_on_bank_registers.py 2017-05-26 08:40:07 +0000
26+++ bin/addons/register_accounting/wizard/import_cheque_on_bank_registers.py 2018-07-13 15:36:44 +0000
27@@ -161,6 +161,8 @@
28 absl_lines = []
29 for imported_line in wizard.imported_lines_ids:
30 line = imported_line.line_id
31+ if absl_obj.search_exist(cr, uid, [('from_import_cheque_id', '=', line.id)], context=context):
32+ raise osv.except_osv(_('Warning'), _('The Cheque %s has already been imported.') % line.cheque_number or line.name or line.ref or '')
33 total = line.amount_currency
34 if not imported_line.document_date:
35 raise osv.except_osv(_('Warning'), _('Please add a Document Date on imported lines.'))
36@@ -186,6 +188,8 @@
37
38 if not len(absl_lines):
39 raise osv.except_osv(_('Warning'), _('No line created!'))
40+ # set the wizard to "is_imported" at the end of the process only
41+ # (the user must be able to re-click on OK after having fixed the potential errors displayed)
42 self.write(cr, uid, ids, {'is_imported': True}, context=context)
43 return { 'type': 'ir.actions.act_window_close', 'st_line_ids': absl_lines, 'o2m_refresh': 'line_ids'}
44

Subscribers

People subscribed via source and target branches