diff --git a/sale_order_line_date/README.rst b/sale_order_line_date/README.rst index fa8ac20a4fb..1bec3576e2a 100644 --- a/sale_order_line_date/README.rst +++ b/sale_order_line_date/README.rst @@ -6,15 +6,15 @@ Sale order line date ==================== -This module adds requested date to a sales order lines and propagate it to +This module adds commitment date to a sales order lines and propagate it to stock moves and procurements. -When the requested date of the whole sale order is modified the requested date +When the commitment date of the whole sale order is modified the commitment date of the lines change to match. Usage ===== -Create a Quotation or a Sales Order and it fills the requested date in the sale +Create a Quotation or a Sales Order and it fills the commitment date in the sale order line .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas diff --git a/sale_order_line_date/__manifest__.py b/sale_order_line_date/__manifest__.py index e45834e2657..dbc8599942b 100644 --- a/sale_order_line_date/__manifest__.py +++ b/sale_order_line_date/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Sale Order Line Date", - "version": "11.0.1.0.0", + "version": "12.0.0.0.0", "author": "OdooMRP team," "AvanzOSC," "Serv. Tecnol. Avanzados - Pedro M. Baeza," @@ -16,7 +16,7 @@ "category": "Sales Management", "license": "AGPL-3", "depends": [ - "sale_order_dates", + "sale", ], "data": [ "views/sale_order_view.xml", diff --git a/sale_order_line_date/models/sale_order.py b/sale_order_line_date/models/sale_order.py index e09a5fcbc06..6d5884bc5e3 100644 --- a/sale_order_line_date/models/sale_order.py +++ b/sale_order_line_date/models/sale_order.py @@ -12,10 +12,10 @@ class SaleOrder(models.Model): _inherit = 'sale.order' @api.multi - @api.onchange('requested_date') - def onchange_requested_date(self): - """Warn if the requested dates is sooner than the commitment date""" - result = super(SaleOrder, self).onchange_requested_date() + @api.onchange('commitment_date') + def _onchange_commitment_date(self): + """Warn if the commitment dates is sooner than the commitment date""" + result = super(SaleOrder, self)._onchange_commitment_date() if not result: result = {} if not self: @@ -24,7 +24,7 @@ def onchange_requested_date(self): if 'warning' not in result: lines = [] for line in self.order_line: - lines.append((1, line.id, {'requested_date': - self.requested_date})) + lines.append((1, line.id, {'commitment_date': + self.commitment_date})) result['value'] = {'order_line': lines} return result diff --git a/sale_order_line_date/models/sale_order_line.py b/sale_order_line_date/models/sale_order_line.py index d18e2263dbc..a4002bc23e6 100644 --- a/sale_order_line_date/models/sale_order_line.py +++ b/sale_order_line_date/models/sale_order_line.py @@ -11,29 +11,29 @@ class SaleOrderLine(models.Model): _inherit = 'sale.order.line' - requested_date = fields.Datetime() + commitment_date = fields.Datetime() @api.multi def write(self, vals): for line in self: - if not line.requested_date and line.order_id.requested_date and\ - 'requested_date' not in vals: + if not line.commitment_date and line.order_id.commitment_date and\ + 'commitment_date' not in vals: vals.update({ - 'requested_date': line.order_id.requested_date + 'commitment_date': line.order_id.commitment_date }) return super(SaleOrderLine, self).write(vals) @api.model def create(self, vals): res = super(SaleOrderLine, self).create(vals) - if res.order_id.requested_date and not res.requested_date: - res.write({'requested_date': res.order_id.requested_date}) + if res.order_id.commitment_date and not res.commitment_date: + res.write({'commitment_date': res.order_id.commitment_date}) return res @api.multi def _prepare_procurement_values(self, group_id=False): vals = super(SaleOrderLine, self).\ _prepare_procurement_values(group_id) - if self.requested_date: - vals.update({'date_planned': self.requested_date}) + if self.commitment_date: + vals.update({'date_planned': self.commitment_date}) return vals diff --git a/sale_order_line_date/tests/test_sale_order_line_date.py b/sale_order_line_date/tests/test_sale_order_line_date.py index bc643f05bdb..1a28ae6e3d5 100644 --- a/sale_order_line_date/tests/test_sale_order_line_date.py +++ b/sale_order_line_date/tests/test_sale_order_line_date.py @@ -30,7 +30,7 @@ def setUp(self): qty, price, dt1) self.sale_line2 = self._create_sale_order_line(self.sale1, product_id, qty, price, dt2) - self.sale_line2.write({'requested_date': dt2}) + self.sale_line2.write({'commitment_date': dt2}) self.sale1.action_confirm() def _create_sale_order(self, customer, date): @@ -38,7 +38,7 @@ def _create_sale_order(self, customer, date): 'partner_id': customer.id, 'partner_invoice_id': customer.id, 'partner_shipping_id': customer.id, - 'requested_date': date + 'commitment_date': date }) return sale @@ -49,14 +49,14 @@ def _create_sale_order_line(self, sale, product, qty, price, date): 'order_id': sale.id, 'price_unit': price, 'product_uom_qty': qty, - 'requested_date': date}) + 'commitment_date': date}) return sale_line - def test_on_change_requested_date(self): - """True when the requested date in the sale_order_line - matches the requested date in the sale order""" + def test_on_change_commitment_date(self): + """True when the commitment date in the sale_order_line + matches the commitment date in the sale order""" req_date = fields.Datetime.to_string(self.dt3) - self.sale1.write({'requested_date': self.dt3}) - result = self.sale1.onchange_requested_date() + self.sale1.write({'commitment_date': self.dt3}) + result = self.sale1.onchange_commitment_date() for line in result['value']['order_line']: - self.assertEqual(line[2]['requested_date'], req_date) + self.assertEqual(line[2]['commitment_date'], req_date) diff --git a/sale_order_line_date/views/sale_order_view.xml b/sale_order_line_date/views/sale_order_view.xml index d6e01111763..9ba68917353 100644 --- a/sale_order_line_date/views/sale_order_view.xml +++ b/sale_order_line_date/views/sale_order_view.xml @@ -1,19 +1,19 @@ - - sale.order.requested.date.form + + sale.order.commitment.date.form sale.order - + - {'default_requested_date':requested_date} + {'default_commitment_date':commitment_date} - + - + @@ -24,7 +24,7 @@ - +