Unifield Server

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

  1. us-780
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3679
Proposed branch: lp:~unifield-team/unifield-server/us-780
Merge into: lp:unifield-server
Diff against target: 33 lines (+12/-0)
2 files modified
bin/addons/product_attributes/product_attributes.py (+11/-0)
bin/addons/product_attributes/product_attributes_view.xml (+1/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-780
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+289470@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/product_attributes/product_attributes.py'
2--- bin/addons/product_attributes/product_attributes.py 2016-01-25 10:53:51 +0000
3+++ bin/addons/product_attributes/product_attributes.py 2016-03-18 10:38:51 +0000
4@@ -406,6 +406,17 @@
5 'dangerous_goods': fields.boolean('Dangerous Goods'),
6 'restricted_country': fields.boolean('Restricted in the Country'),
7 'country_restriction': fields.many2one('res.country.restriction', 'Country Restriction'),
8+ 'state_ud': fields.selection(
9+ selection=[
10+ ('valid', 'Valid'),
11+ ('phase_out', 'Phase Out'),
12+ ('stopped', 'Stopped'),
13+ ('archived', 'Archived'),
14+ ],
15+ string='UniData Status',
16+ readonly=True,
17+ help="Automatically filled with UniData information.",
18+ ),
19 # TODO: validation on 'un_code' field
20 'un_code': fields.char('UN Code', size=7),
21 'gmdn_code' : fields.char('GMDN Code', size=5),
22
23=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
24--- bin/addons/product_attributes/product_attributes_view.xml 2015-05-29 15:33:12 +0000
25+++ bin/addons/product_attributes/product_attributes_view.xml 2016-03-18 10:38:51 +0000
26@@ -107,6 +107,7 @@
27 <field name="categ_id" readonly="1" colspan="3"/>
28 <field name="international_status" required="1" widget="selection" colspan="3" />
29 <field name="state" colspan="3" widget="selection" />
30+ <field name="state_ud" colspan="3" />
31 <field name="active" readonly="1"/>
32 <group colspan="1" col="1">
33 <button name="deactivate_product" icon="gtk-execute" string="De-activate product" type="object" attrs="{'invisible': [('active', '=', False)]}" />

Subscribers

People subscribed via source and target branches

to all changes: