diff options
| author | Arnaud Baes <arb@odoo.com> | 2019-08-06 12:31:34 +0000 |
|---|---|---|
| committer | Arnaud Baes <arb@odoo.com> | 2019-08-14 12:27:05 +0000 |
| commit | 689dab3f26d56b97082921e0f3a4a675ff4ef999 (patch) | |
| tree | 2b3113eef7fb43c61002ea7736e326006a46acd9 | |
| parent | ced76bddabc71a3e082d0010a1fea6a40c8f7c22 (diff) | |
[IMP] stock,product_expiry: lot views cleanup
| -rw-r--r-- | addons/product_expiry/models/production_lot.py | 2 | ||||
| -rw-r--r-- | addons/product_expiry/views/production_lot_views.xml | 20 | ||||
| -rw-r--r-- | addons/stock/views/stock_production_lot_views.xml | 2 |
3 files changed, 13 insertions, 11 deletions
diff --git a/addons/product_expiry/models/production_lot.py b/addons/product_expiry/models/production_lot.py index a37f44de93c..7855f0eee05 100644 --- a/addons/product_expiry/models/production_lot.py +++ b/addons/product_expiry/models/production_lot.py @@ -12,7 +12,7 @@ class StockProductionLot(models.Model): use_date = fields.Datetime(string='Best before Date', help='This is the date on which the goods with this Serial Number start deteriorating, without being dangerous yet.') removal_date = fields.Datetime(string='Removal Date', - help='This is the date on which the goods with this Serial Number should be removed from the stock.') + help='This is the date on which the goods with this Serial Number should be removed from the stock. This date will be used in FEFO removal strategy.') alert_date = fields.Datetime(string='Alert Date', help='Date to determine the expired lots and serial numbers using the filter "Expiration Alerts".') product_expiry_alert = fields.Boolean(compute='_compute_product_expiry_alert', help="The Alert Date has been reached.") diff --git a/addons/product_expiry/views/production_lot_views.xml b/addons/product_expiry/views/production_lot_views.xml index 3fb7e3981c2..b32bcff8c49 100644 --- a/addons/product_expiry/views/production_lot_views.xml +++ b/addons/product_expiry/views/production_lot_views.xml @@ -5,17 +5,19 @@ <field name="model">stock.production.lot</field> <field name="inherit_id" ref="stock.view_production_lot_form" /> <field name="arch" type="xml"> - <xpath expr="//group[@name='main_group']" position="after"> - <group string="Dates"> + <xpath expr="//page[@name='description']" position="before"> + <page string="Dates"> <group> - <field name="use_date" /> - <field name="removal_date" /> + <group> + <field name="use_date" /> + <field name="removal_date" /> + </group> + <group> + <field name="life_date" /> + <field name="alert_date" /> + </group> </group> - <group> - <field name="life_date" /> - <field name="alert_date" /> - </group> - </group> + </page> </xpath> <xpath expr="//div[hasclass('oe_title')]" position="inside"> <field name="product_expiry_alert" invisible="1"/> diff --git a/addons/stock/views/stock_production_lot_views.xml b/addons/stock/views/stock_production_lot_views.xml index b03bc97f163..f6a095b0528 100644 --- a/addons/stock/views/stock_production_lot_views.xml +++ b/addons/stock/views/stock_production_lot_views.xml @@ -33,7 +33,7 @@ </group> </group> <notebook attrs="{'invisible': [('display_complete', '=', False)]}"> - <page string="Description"> + <page string="Description" name="description"> <field name="note"/> </page> </notebook> |