Skip to content

Commit

Permalink
[MIG] sale_order_line_date: Migration to 12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dga-opennet committed Jun 13, 2019
1 parent 6609680 commit 00cb65d
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 35 deletions.
6 changes: 3 additions & 3 deletions sale_order_line_date/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions sale_order_line_date/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,"
Expand All @@ -16,7 +16,7 @@
"category": "Sales Management",
"license": "AGPL-3",
"depends": [
"sale_order_dates",
"sale",
],
"data": [
"views/sale_order_view.xml",
Expand Down
12 changes: 6 additions & 6 deletions sale_order_line_date/models/sale_order.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
16 changes: 8 additions & 8 deletions sale_order_line_date/models/sale_order_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions sale_order_line_date/tests/test_sale_order_line_date.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ 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):
sale = self.env['sale.order'].create({
'partner_id': customer.id,
'partner_invoice_id': customer.id,
'partner_shipping_id': customer.id,
'requested_date': date
'commitment_date': date
})
return sale

Expand All @@ -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)
14 changes: 7 additions & 7 deletions sale_order_line_date/views/sale_order_view.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<odoo>

<record model="ir.ui.view" id="sale_order_requested_date_form_view">
<field name="name">sale.order.requested.date.form</field>
<record model="ir.ui.view" id="sale_order_commitment_date_form_view">
<field name="name">sale.order.commitment.date.form</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale_order_dates.view_order_form_inherit_sale_stock_inherit_sale_order_dates"/>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<field name="order_line" position="attributes">
<attribute name="context">{'default_requested_date':requested_date}</attribute>
<attribute name="context">{'default_commitment_date':commitment_date}</attribute>
</field>
<xpath expr="//field[@name='order_line']/form//field[@name='tax_id']" position="after">
<field name="requested_date" />
<field name="commitment_date"/>
</xpath>
<xpath expr="//field[@name='order_line']/tree/field[@name='price_unit']" position="after">
<field name="requested_date"/>
<field name="commitment_date"/>
</xpath>
</field>
</record>
Expand All @@ -24,7 +24,7 @@
<field name="inherit_id" ref="sale.view_order_line_tree" />
<field name="arch" type="xml">
<field name="name" position="after">
<field name="requested_date"/>
<field name="commitment_date"/>
</field>
</field>
</record>
Expand Down

0 comments on commit 00cb65d

Please sign in to comment.