Merge lp:~dorian-kemps/unifield-server/US-8689 into lp:unifield-server

Proposed by jftempo
Status: Needs review
Proposed branch: lp:~dorian-kemps/unifield-server/US-8689
Merge into: lp:unifield-server
Diff against target: 29 lines (+10/-1)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+6/-0)
bin/addons/specific_rules/specific_rules.py (+4/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-8689
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+409200@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
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po 2021-08-25 14:50:30 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po 2021-09-27 10:27:21 +0000
@@ -112785,3 +112785,9 @@
112785#: view:account.commitment.line:0112785#: view:account.commitment.line:0
112786msgid "Do you really want to delete this line?"112786msgid "Do you really want to delete this line?"
112787msgstr "Voulez-vous vraiment supprimer cette ligne ?"112787msgstr "Voulez-vous vraiment supprimer cette ligne ?"
112788
112789#. module: specific_rules
112790#: code:addons/specific_rules/specific_rules.py:1252
112791#, python-format
112792msgid "Several products have been selected (ticked). This report can only be displayed for one product"
112793msgstr "Plusieurs produits ont été sélectionnés (cochés). Ce rapport est uniquement utilisable avec un seul produit"
112788112794
=== modified file 'bin/addons/specific_rules/specific_rules.py'
--- bin/addons/specific_rules/specific_rules.py 2021-07-19 15:52:15 +0000
+++ bin/addons/specific_rules/specific_rules.py 2021-09-27 10:27:21 +0000
@@ -1248,7 +1248,10 @@
1248 if context is None:1248 if context is None:
1249 context = {}1249 context = {}
12501250
1251 ctx = {'product_id': context.get('active_id') , 'compute_child': False}1251 if context.get('active_ids', False) and len(context['active_ids']) > 1:
1252 raise osv.except_osv(_('Warning !'), _('Several products have been selected (ticked). This report can only be displayed for one product'))
1253
1254 ctx = {'product_id': context.get('active_id'), 'compute_child': False}
1252 if context.get('lang'):1255 if context.get('lang'):
1253 ctx['lang'] = context['lang']1256 ctx['lang'] = context['lang']
1254 ctx['default_tree_sort'] = 'posz,name'1257 ctx['default_tree_sort'] = 'posz,name'

Subscribers

People subscribed via source and target branches