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

Proposed by jftempo on 2019-03-20
Status: Merged
Merged at revision: 5310
Proposed branch: lp:~dorian-kemps/unifield-server/US-5795
Merge into: lp:unifield-server
Diff against target: 27 lines (+3/-3)
2 files modified
bin/addons/specific_rules/specific_rules_view.xml (+1/-1)
bin/addons/stock/stock.py (+2/-2)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-5795
Reviewer Review Type Date Requested Status
UniField Reviewer Team 2019-03-20 Pending
Review via email: mp+364804@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/specific_rules/specific_rules_view.xml'
2--- bin/addons/specific_rules/specific_rules_view.xml 2018-10-30 10:56:14 +0000
3+++ bin/addons/specific_rules/specific_rules_view.xml 2019-03-20 14:43:44 +0000
4@@ -187,7 +187,7 @@
5 context="{'location_id':location_id, 'product_id':product_id, 'hidden_perishable_mandatory': hidden_perishable_mandatory}"
6 domain="[('product_id','=?',product_id), ('check_type','=', True)]"
7 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"
8- attrs="{'readonly': [('hidden_batch_management_mandatory','=',False), ('hidden_perishable_mandatory','=',False)]}" />
9+ attrs="{'readonly': ['|', ('state', 'in', ['done', 'cancel']), '&', ('hidden_batch_management_mandatory','=',False), ('hidden_perishable_mandatory','=',False)]}" />
10 <field name="hidden_batch_management_mandatory" invisible="True" />
11 <field name="hidden_perishable_mandatory" invisible="True" />
12 <field name="expired_date" attrs="{'readonly': [('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned'])]}" />
13
14=== modified file 'bin/addons/stock/stock.py'
15--- bin/addons/stock/stock.py 2018-11-30 08:53:00 +0000
16+++ bin/addons/stock/stock.py 2019-03-20 14:43:44 +0000
17@@ -2010,8 +2010,8 @@
18
19 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True,states={'done': [('readonly', True)]}, related_uom='product_uom'),
20 'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True,states={'done': [('readonly', True)]}),
21- 'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Product UoM'), related_uom='product_uos_qty'),
22- 'product_uos': fields.many2one('product.uom', 'Product UOS'),
23+ 'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Product UoM'), states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}, related_uom='product_uos_qty'),
24+ 'product_uos': fields.many2one('product.uom', 'Product UOS', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
25 'product_packaging': fields.many2one('product.packaging', 'Packaging', help="It specifies attributes of packaging like type, quantity of packaging,etc."),
26
27 'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True,states={'done': [('readonly', True)]}, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),

Subscribers

People subscribed via source and target branches