Unifield Server

Merge lp:~unifield-team/unifield-server/us-2574 into lp:unifield-server

  1. us-2574
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4277
Proposed branch: lp:~unifield-team/unifield-server/us-2574
Merge into: lp:unifield-server
Diff against target: 41 lines (+11/-1)
3 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+6/-0)
bin/addons/product_attributes/data/product_justification_code.xml (+4/-0)
bin/addons/product_attributes/product_attributes.py (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-2574
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+319590@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 2017-03-09 14:11:37 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2017-03-10 15:25:23 +0000
4@@ -98124,3 +98124,9 @@
5 #: view:export.report.inconsistencies:0
6 msgid "When the report will be ready, you can access to it by the menu Tools / Product Status Inconsistencies"
7 msgstr "Lorsque le rapport sera prêt, vous pouvez y accéder via le menu Outils / Incohérences du statut des produits"
8+
9+#. module: product_attributes
10+#: model:product.justification.code,description:product_attributes.justification_code_jpa
11+msgid "Article must be used only in a properly designed programme, need a more detailed description."
12+msgstr "L'article doit être uniquement utilisé dans un programme correctement construit, à besoin d'une description plus détaillée."
13+
14
15=== modified file 'bin/addons/product_attributes/data/product_justification_code.xml'
16--- bin/addons/product_attributes/data/product_justification_code.xml 2016-03-11 14:05:53 +0000
17+++ bin/addons/product_attributes/data/product_justification_code.xml 2017-03-10 15:25:23 +0000
18@@ -66,6 +66,10 @@
19 <field name="code">PM</field>
20 <field name="description">Article must be used only in a properly designed programme, it may imply a medical risk if misused.</field>
21 </record>
22+ <record id="justification_code_pmf" model="product.justification.code">
23+ <field name="code">PMF</field>
24+ <field name="description">Article must be used only in a properly designed programme, it may imply a medical risk if misused. Monitor the use, efficacy for at least one year after the introduction of new drugs</field>
25+ </record>
26 <record id="justification_code_jpme" model="product.justification.code">
27 <field name="code">PME</field>
28 <field name="description">Article only for a properly designed Programme, it may imply a Medical risk if misused, Expensive.</field>
29
30=== modified file 'bin/addons/product_attributes/product_attributes.py'
31--- bin/addons/product_attributes/product_attributes.py 2017-03-03 11:12:53 +0000
32+++ bin/addons/product_attributes/product_attributes.py 2017-03-10 15:25:23 +0000
33@@ -251,7 +251,7 @@
34 _rec_name = 'code'
35 _columns = {
36 'code': fields.char('Justification Code', size=32, required=True, translate=True),
37- 'description': fields.char('Justification Description', size=256, required=True),
38+ 'description': fields.char('Justification Description', size=256, required=True, translate=True),
39 }
40
41 def name_get(self, cr, user, ids, context=None):

Subscribers

People subscribed via source and target branches

to all changes: