diff options
| author | amoyaux <arm@odoo.com> | 2017-07-18 12:29:10 +0200 |
|---|---|---|
| committer | Simon Lejeune <sle@openerp.com> | 2017-07-19 17:27:48 +0200 |
| commit | a8a25cb8c90b4bca367e2811aec68d998d186b0c (patch) | |
| tree | d52847f46edff8bb83ff36d29e6000ac67a197b0 | |
| parent | e297a7d54114e183c336c4189dd5ed8c0a447cac (diff) | |
[FIX] stock : consignment update views
Consignment worked in backend but there was no
tools in front end in order to use it.
This commit update the views and add consignment in picking
and stock move lines
| -rw-r--r-- | addons/stock/models/stock_move.py | 3 | ||||
| -rw-r--r-- | addons/stock/views/stock_move_views.xml | 2 | ||||
| -rw-r--r-- | addons/stock/views/stock_picking_views.xml | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py index 056e259b1a0..d5633a7889c 100644 --- a/addons/stock/models/stock_move.py +++ b/addons/stock/models/stock_move.py @@ -179,9 +179,10 @@ class StockMove(models.Model): if self.user_has_groups('stock.group_stock_multi_locations'): multi_locations_enabled = move.location_id.child_ids or move.location_dest_id.child_ids has_package = move.move_line_ids.mapped('package_id') | move.move_line_ids.mapped('result_package_id') + consignment_enabled = self.user_has_groups('stock.group_tracking_owner') if move.picking_id.picking_type_id.show_operations is False\ and move.state not in ['cancel', 'draft', 'confirmed']\ - and (multi_locations_enabled or move.has_tracking != 'none' or len(move.move_line_ids) > 1 or has_package): + and (multi_locations_enabled or move.has_tracking != 'none' or len(move.move_line_ids) > 1 or has_package or consignment_enabled): move.show_details_visible = True else: move.show_details_visible = False diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml index 3908dd89520..337a9b287eb 100644 --- a/addons/stock/views/stock_move_views.xml +++ b/addons/stock/views/stock_move_views.xml @@ -175,6 +175,7 @@ <field name="lot_name" invisible="not context.get('show_lots_text')" groups="stock.group_production_lot"/> <field name="package_id" invisible="not context.get('show_package')" groups="stock.group_tracking_lot"/> <field name="result_package_id" groups="stock.group_tracking_lot"/> + <field name="owner_id" groups="stock.group_tracking_owner"/> <field name="product_uom_qty" readonly="1"/> <field name="qty_done"/> <field name="product_uom_id" options="{'no_open': True, 'no_create': True}" attrs="{'readonly': [('product_uom_qty', '!=', 0.0)]}" string="Unit of Measure" groups="product.group_uom"/> @@ -211,6 +212,7 @@ <field name="qty_done"/> <field name="product_uom_id" options="{'no_open': True, 'no_create': True}" attrs="{'readonly': [('product_uom_qty', '!=', 0.0)]}" string="Unit of Measure" groups="product.group_uom"/> <field name="result_package_id" groups="stock.group_tracking_lot"/> + <field name="owner_id" groups="stock.group_tracking_owner"/> <field name="picking_id" invisible="1"/> <field name="product_id" invisible="1"/> </tree> diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml index 84a2d637ff7..79aa4ed3c73 100644 --- a/addons/stock/views/stock_picking_views.xml +++ b/addons/stock/views/stock_picking_views.xml @@ -244,11 +244,10 @@ <group> <field name="min_date"/> <field name="origin" placeholder="e.g. PO0032" class="oe_inline"/> - <!--<label for="owner_id" groups="stock.group_tracking_owner"/>--> - <div groups="stock.group_tracking_owner"> - <!--<field name="owner_id"/>--> + <field name="owner_id" groups="stock.group_tracking_owner"/> + <div groups="stock.group_tracking_owner" colspan="2" col="2"> <button name="action_assign_owner" string="Assign Owner" type="object" attrs="{'invisible': ['|',('move_line_exist', '=', False),('state', 'not in', ('draft','assigned','confirmed'))]}" - class="oe_link oe_edit_only"/> + class="oe_link"/> </div> </group> </group> |