diff options
| author | Victor Feyens <vfe@odoo.com> | 2020-07-17 13:20:24 +0000 |
|---|---|---|
| committer | Victor Feyens <vfe@odoo.com> | 2020-07-31 10:13:08 +0000 |
| commit | 8acfc6b9656f4870c1e503cc396940da6f14da16 (patch) | |
| tree | 7d2ec31211ee0bd9827d53671b3941c71ec36717 /addons | |
| parent | 78bef3e08c04a45bdf9122e595160e42bf7af8e1 (diff) | |
[FIX] stock_picking_batch: wrong sanity check on picking creation.
1) Wrong use of self.batch_id in an api.model method.
2) Fix demo datas which didn't pass the sanity check (after the fix)
Avoid to put draft picking into non-draft batch picking and use batch's
actions instead of picking's actions for confirmation and reservation.
closes odoo/odoo#55254
X-original-commit: 9e9f50169ba4d4698ce64b0865db4cc6b4833b0e
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
Co-authored-by: Steve Van Essche <svs@odoo.com>
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/stock_picking_batch/data/stock_picking_batch_demo.xml | 29 | ||||
| -rw-r--r-- | addons/stock_picking_batch/models/stock_picking.py | 2 |
2 files changed, 13 insertions, 18 deletions
diff --git a/addons/stock_picking_batch/data/stock_picking_batch_demo.xml b/addons/stock_picking_batch/data/stock_picking_batch_demo.xml index 66afeb1bfef..fe2d8bfe191 100644 --- a/addons/stock_picking_batch/data/stock_picking_batch_demo.xml +++ b/addons/stock_picking_batch/data/stock_picking_batch_demo.xml @@ -3,12 +3,10 @@ <!-- Add batch picking --> <record id="stock_picking_batch_dry_1" model="stock.picking.batch"> - <field name="state">in_progress</field> <field name="picking_type_id" ref="stock.picking_type_internal"/> <field name="company_id" ref="base.main_company"/> </record> <record id="stock_picking_batch_freeze_1" model="stock.picking.batch"> - <field name="state">in_progress</field> <field name="picking_type_id" ref="stock.picking_type_internal"/> <field name="company_id" ref="base.main_company"/> </record> @@ -65,7 +63,6 @@ </record> <record id="Picking_B" model="stock.picking"> <field name="move_type">one</field> - <field name="state">assigned</field> <field name="priority">1</field> <field name="user_id" eval="False"/> <field name="picking_type_id" ref="stock.picking_type_internal"/> @@ -76,7 +73,6 @@ </record> <record id="Picking_C" model="stock.picking"> <field name="move_type">one</field> - <field name="state">assigned</field> <field name="priority">1</field> <field name="user_id" eval="False"/> <field name="picking_type_id" ref="stock.picking_type_internal"/> @@ -128,19 +124,18 @@ <field name="product_id" ref="product.consu_delivery_03"/> </record> - <!-- Confirm Pickings --> - <function model="stock.picking" name="action_confirm"> - <value eval="[ - ref('stock_picking_batch.Picking_A'), - ref('stock_picking_batch.Picking_B'), - ref('stock_picking_batch.Picking_C')]"/> + <!-- Confirm Batch Pickings --> + <function model="stock.picking.batch" name="action_confirm"> + <value eval="ref('stock_picking_batch_dry_1')"/> </function> - - <!-- Check Availability Pickings --> - <function model="stock.picking" name="action_assign"> - <value eval="[ - ref('stock_picking_batch.Picking_A'), - ref('stock_picking_batch.Picking_B'), - ref('stock_picking_batch.Picking_C')]"/> + <function model="stock.picking.batch" name="action_confirm"> + <value eval="ref('stock_picking_batch_freeze_1')"/> + </function> + <!-- Check Availability --> + <function model="stock.picking.batch" name="action_assign"> + <value eval="ref('stock_picking_batch_dry_1')"/> + </function> + <function model="stock.picking.batch" name="action_assign"> + <value eval="ref('stock_picking_batch_freeze_1')"/> </function> </odoo> diff --git a/addons/stock_picking_batch/models/stock_picking.py b/addons/stock_picking_batch/models/stock_picking.py index dd8470bee70..be5bb59f290 100644 --- a/addons/stock_picking_batch/models/stock_picking.py +++ b/addons/stock_picking_batch/models/stock_picking.py @@ -17,7 +17,7 @@ class StockPicking(models.Model): def create(self, vals): res = super().create(vals) if vals.get('batch_id'): - self.batch_id._sanity_check() + res.batch_id._sanity_check() return res def write(self, vals): |