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
1=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2021-08-25 14:50:30 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2021-09-27 10:27:21 +0000
4@@ -112785,3 +112785,9 @@
5 #: view:account.commitment.line:0
6 msgid "Do you really want to delete this line?"
7 msgstr "Voulez-vous vraiment supprimer cette ligne ?"
8+
9+#. module: specific_rules
10+#: code:addons/specific_rules/specific_rules.py:1252
11+#, python-format
12+msgid "Several products have been selected (ticked). This report can only be displayed for one product"
13+msgstr "Plusieurs produits ont été sélectionnés (cochés). Ce rapport est uniquement utilisable avec un seul produit"
14
15=== modified file 'bin/addons/specific_rules/specific_rules.py'
16--- bin/addons/specific_rules/specific_rules.py 2021-07-19 15:52:15 +0000
17+++ bin/addons/specific_rules/specific_rules.py 2021-09-27 10:27:21 +0000
18@@ -1248,7 +1248,10 @@
19 if context is None:
20 context = {}
21
22- ctx = {'product_id': context.get('active_id') , 'compute_child': False}
23+ if context.get('active_ids', False) and len(context['active_ids']) > 1:
24+ raise osv.except_osv(_('Warning !'), _('Several products have been selected (ticked). This report can only be displayed for one product'))
25+
26+ ctx = {'product_id': context.get('active_id'), 'compute_child': False}
27 if context.get('lang'):
28 ctx['lang'] = context['lang']
29 ctx['default_tree_sort'] = 'posz,name'

Subscribers

People subscribed via source and target branches