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

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
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po 2017-03-09 14:11:37 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po 2017-03-10 15:25:23 +0000
@@ -98124,3 +98124,9 @@
98124#: view:export.report.inconsistencies:098124#: view:export.report.inconsistencies:0
98125msgid "When the report will be ready, you can access to it by the menu Tools / Product Status Inconsistencies"98125msgid "When the report will be ready, you can access to it by the menu Tools / Product Status Inconsistencies"
98126msgstr "Lorsque le rapport sera prêt, vous pouvez y accéder via le menu Outils / Incohérences du statut des produits"98126msgstr "Lorsque le rapport sera prêt, vous pouvez y accéder via le menu Outils / Incohérences du statut des produits"
98127
98128#. module: product_attributes
98129#: model:product.justification.code,description:product_attributes.justification_code_jpa
98130msgid "Article must be used only in a properly designed programme, need a more detailed description."
98131msgstr "L'article doit être uniquement utilisé dans un programme correctement construit, à besoin d'une description plus détaillée."
98132
9812798133
=== modified file 'bin/addons/product_attributes/data/product_justification_code.xml'
--- bin/addons/product_attributes/data/product_justification_code.xml 2016-03-11 14:05:53 +0000
+++ bin/addons/product_attributes/data/product_justification_code.xml 2017-03-10 15:25:23 +0000
@@ -66,6 +66,10 @@
66 <field name="code">PM</field>66 <field name="code">PM</field>
67 <field name="description">Article must be used only in a properly designed programme, it may imply a medical risk if misused.</field>67 <field name="description">Article must be used only in a properly designed programme, it may imply a medical risk if misused.</field>
68 </record>68 </record>
69 <record id="justification_code_pmf" model="product.justification.code">
70 <field name="code">PMF</field>
71 <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>
72 </record>
69 <record id="justification_code_jpme" model="product.justification.code">73 <record id="justification_code_jpme" model="product.justification.code">
70 <field name="code">PME</field>74 <field name="code">PME</field>
71 <field name="description">Article only for a properly designed Programme, it may imply a Medical risk if misused, Expensive.</field>75 <field name="description">Article only for a properly designed Programme, it may imply a Medical risk if misused, Expensive.</field>
7276
=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py 2017-03-03 11:12:53 +0000
+++ bin/addons/product_attributes/product_attributes.py 2017-03-10 15:25:23 +0000
@@ -251,7 +251,7 @@
251 _rec_name = 'code'251 _rec_name = 'code'
252 _columns = {252 _columns = {
253 'code': fields.char('Justification Code', size=32, required=True, translate=True),253 'code': fields.char('Justification Code', size=32, required=True, translate=True),
254 'description': fields.char('Justification Description', size=256, required=True),254 'description': fields.char('Justification Description', size=256, required=True, translate=True),
255 }255 }
256256
257 def name_get(self, cr, user, ids, context=None):257 def name_get(self, cr, user, ids, context=None):

Subscribers

People subscribed via source and target branches

to all changes: