diff --git a/addons/purchase_requisition/tests/test_purchase_requisition.py b/addons/purchase_requisition/tests/test_purchase_requisition.py index e18a6d78cfe..77db789ee8e 100644 --- a/addons/purchase_requisition/tests/test_purchase_requisition.py +++ b/addons/purchase_requisition/tests/test_purchase_requisition.py @@ -224,7 +224,8 @@ class TestPurchaseRequisition(TestPurchaseRequisitionCommon): action = orig_po.button_confirm() warning_wiz = Form(self.env['purchase.requisition.alternative.warning'].with_context(**action['context'])) warning_wiz = warning_wiz.save() - self.assertEqual(warning_wiz.alternative_po_count, 1, "POs not in a RFQ status should not be listed as possible to cancel") + self.assertEqual(len(warning_wiz.alternative_po_ids), 1, + "POs not in a RFQ status should not be listed as possible to cancel") warning_wiz.action_cancel_alternatives() self.assertEqual(alt_po_1.state, 'cancel', "Alternative PO should have been cancelled") self.assertEqual(orig_po.state, 'purchase', "Original PO should have been confirmed") diff --git a/addons/purchase_requisition/wizard/purchase_requisition_alternative_warning.py b/addons/purchase_requisition/wizard/purchase_requisition_alternative_warning.py index 3b13d9ce707..b82d377621f 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_alternative_warning.py +++ b/addons/purchase_requisition/wizard/purchase_requisition_alternative_warning.py @@ -10,12 +10,6 @@ class PurchaseRequisitionAlternativeWarning(models.TransientModel): po_ids = fields.Many2many('purchase.order', 'warning_purchase_order_rel', string="POs to Confirm") alternative_po_ids = fields.Many2many('purchase.order', 'warning_purchase_order_alternative_rel', string="Alternative POs") - alternative_po_count = fields.Integer(compute="_compute_alternative_po_count") - - @api.depends("alternative_po_ids") - def _compute_alternative_po_count(self): - for wizard in self: - wizard.alternative_po_count = len(wizard.alternative_po_ids) def action_keep_alternatives(self): return self._action_done() diff --git a/addons/purchase_requisition/wizard/purchase_requisition_alternative_warning.xml b/addons/purchase_requisition/wizard/purchase_requisition_alternative_warning.xml index f5507e4d962..90cd4274a4a 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_alternative_warning.xml +++ b/addons/purchase_requisition/wizard/purchase_requisition_alternative_warning.xml @@ -6,10 +6,6 @@ purchase.requisition.alternative.warning
-
- - alternative requests for quotation are still open, do you want to cancel them? -
diff --git a/addons/purchase_requisition_stock/tests/test_purchase_requisition_stock.py b/addons/purchase_requisition_stock/tests/test_purchase_requisition_stock.py index 893c05fde72..57d360ad465 100644 --- a/addons/purchase_requisition_stock/tests/test_purchase_requisition_stock.py +++ b/addons/purchase_requisition_stock/tests/test_purchase_requisition_stock.py @@ -240,7 +240,7 @@ class TestPurchaseRequisitionStock(TestPurchaseRequisitionCommon): warning_wiz = Form( self.env['purchase.requisition.alternative.warning'].with_context(**action['context'])) warning_wiz = warning_wiz.save() - self.assertEqual(warning_wiz.alternative_po_count, 1, + self.assertEqual(len(warning_wiz.alternative_po_ids), 1, "POs not in a RFQ status should not be listed as possible to cancel") warning_wiz.action_cancel_alternatives() self.assertEqual(orig_po.state, 'cancel', "Original PO should have been cancelled") diff --git a/addons/stock/wizard/stock_inventory_adjustment_name.py b/addons/stock/wizard/stock_inventory_adjustment_name.py index 1aa365741a6..9e53cf646fd 100644 --- a/addons/stock/wizard/stock_inventory_adjustment_name.py +++ b/addons/stock/wizard/stock_inventory_adjustment_name.py @@ -8,16 +8,8 @@ class StockInventoryAdjustmentName(models.TransientModel): _name = 'stock.inventory.adjustment.name' _description = 'Inventory Adjustment Reference / Reason' - def default_get(self, fields_list): - res = super().default_get(fields_list) - if self.env.context.get('default_quant_ids'): - quants = self.env['stock.quant'].browse(self.env.context['default_quant_ids']) - res['show_info'] = any(not quant.inventory_quantity_set for quant in quants) - return res - quant_ids = fields.Many2many('stock.quant') inventory_adjustment_name = fields.Char(default="Quantity Updated", string="Inventory Reason") - show_info = fields.Boolean('Show warning') def action_apply(self): quants = self.quant_ids.filtered('inventory_quantity_set') diff --git a/addons/stock/wizard/stock_inventory_adjustment_name.xml b/addons/stock/wizard/stock_inventory_adjustment_name.xml index 4a793e39811..40b9999e184 100644 --- a/addons/stock/wizard/stock_inventory_adjustment_name.xml +++ b/addons/stock/wizard/stock_inventory_adjustment_name.xml @@ -7,12 +7,8 @@
-
- Some selected lines don't have any quantities set, they will be ignored. -
-