Unifield Server

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

  1. US-10923
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6431
Proposed branch: lp:~dorian-kemps/unifield-server/US-10923
Merge into: lp:unifield-server
Diff against target: 26 lines (+8/-0)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+6/-0)
bin/addons/product_attributes/product_attributes.py (+2/-0)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-10923
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+439696@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 2023-03-10 09:18:31 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2023-03-27 07:59:21 +0000
4@@ -118756,3 +118756,9 @@
5 #, python-format
6 msgid "AD splits on numbers longer than 10 digits will be rounded to the nearest unit."
7 msgstr "Les fractionnements analytiques des nombres de plus 10 chiffres seront arrondis à l'unité."
8+
9+#. module: product_attributes
10+#: code:addons/product_attributes/product_attributes.py:1924
11+#, python-format
12+msgid "Product activation is not allowed on Non-Standard Local Products which are not OC Subscribed"
13+msgstr "Les Produits Non-Standard Locaux ne peuvent pas être activés si ils ne sont pas Abonnés OC"
14
15=== modified file 'bin/addons/product_attributes/product_attributes.py'
16--- bin/addons/product_attributes/product_attributes.py 2023-02-09 09:42:44 +0000
17+++ bin/addons/product_attributes/product_attributes.py 2023-03-27 07:59:21 +0000
18@@ -1920,6 +1920,8 @@
19 if product.active:
20 raise osv.except_osv(_('Error'), _('The product [%s] %s is already active.') % (product.default_code, product.name))
21 if product.standard_ok == 'non_standard_local':
22+ if not product.oc_subscription:
23+ raise osv.except_osv(_('Error'), _('Product activation is not allowed on Non-Standard Local Products which are not OC Subscribed'))
24 if instance_level == 'coordo':
25 return {
26 'type': 'ir.actions.act_window',

Subscribers

People subscribed via source and target branches