Skip to content

Commit 2f16b03

Browse files
chga-odoochga-odoo
committed
[FIX] vineyard: fix quality checks
1 parent c1b817b commit 2f16b03

16 files changed

+435
-239
lines changed

‎vineyard/__manifest__.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
'data/res_config_setting.xml',
2727
'data/stock_warehouse.xml',
2828
'data/ir_model.xml',
29+
'data/ir_sequence.xml',
2930
'data/ir_model_fields.xml',
3031
'data/stock_location.xml',
3132
'data/stock_picking_type.xml',
@@ -67,8 +68,10 @@
6768
'demo/mrp_production.xml',
6869
'demo/mrp_eco_stage.xml',
6970
'demo/mrp_eco.xml',
71+
'demo/mrp_eco_bom_change.xml',
7072
'demo/ir_attachment_post.xml',
7173
'demo/project_tags.xml',
74+
'demo/project_task_recurrence.xml',
7275
'demo/project_task.xml',
7376
'demo/quality_point.xml',
7477
'demo/quality_check.xml',

‎vineyard/data/base_automation.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,13 @@
1818
<field name="name">On Harvest Validation</field>
1919
<field name="trigger_field_ids" eval="[(6, 0, [ref('stock.field_stock_picking__state')])]"/>
2020
</record>
21+
<record id="industry_on_harvest_base_automation_3" model="base.automation">
22+
<field name="model_id" ref="stock.model_stock_picking"/>
23+
<field name="action_server_ids" eval="[(6, 0, [ref('industry_create_lot_on_validation_server_action')])]"/>
24+
<field name="trigger">on_write</field>
25+
<field name="filter_domain">[]</field>
26+
<field name="filter_pre_domain">["&amp;", ("picking_type_id.x_is_harvest", "!=", False), ("state", "not in", ["done", "cancel"])]</field>
27+
<field name="name">Auto Assign Serial on Validation</field>
28+
<field name="trigger_field_ids" eval="[(6, 0, [ref('stock.field_stock_picking__state')])]"/>
29+
</record>
2130
</odoo>

‎vineyard/data/ir_actions_act_window.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
]]></field>
5050
</record>
5151
<record id="quality_check_tests_action_window" model="ir.actions.act_window">
52-
<field name="context">{'search_default_x_recipe_iteration': active_id,'default_x_recipe_iteration': active_id}</field>
52+
<!-- <field name="context">{'search_default_x_recipe_iteration': active_id,'default_x_recipe_iteration': active_id}</field> -->
53+
<field name="context">{}</field>
5354
<field name="domain">[('x_recipe_iteration', '=', active_id)]</field>
5455
<field name="name">Tests</field>
5556
<field name="res_model">quality.check</field>

‎vineyard/data/ir_actions_server.xml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,54 @@ picking.button_validate()
5454
<field name="name">Check Harvest Is From Harvest Location</field>
5555
<field name="usage">base_automation</field>
5656
</record>
57+
<record id="industry_create_lot_on_validation_server_action" model="ir.actions.server">
58+
<field name="code"><![CDATA[
59+
for picking in records:
60+
for ml in picking.move_line_ids:
61+
product = ml.product_id
62+
63+
if not product or product.tracking != 'lot':
64+
continue
65+
66+
if not ml.lot_id:
67+
serial = env['ir.sequence'].next_by_code('auto.lot.serial')
68+
lot = env['stock.lot'].create({
69+
'name': serial,
70+
'product_id': product.id,
71+
'company_id': picking.company_id.id,
72+
})
73+
ml.write({'lot_id': lot.id})
74+
]]></field>
75+
<!-- <field name="code"><![CDATA[
76+
generated_serial = env['ir.sequence'].next_by_code('auto.lot.serial')
77+
prefix = generated_serial.split('-')[0] + '-'
78+
existing_lots = set(
79+
env['stock.lot'].search([
80+
('name', 'like', prefix + '%')
81+
]).mapped('name')
82+
)
83+
84+
for picking in records:
85+
for ml in picking.move_line_ids:
86+
product = ml.product_id
87+
if not product or product.tracking != 'lot':
88+
continue
89+
90+
if not ml.lot_id:
91+
serial = generated_serial
92+
while serial in existing_lots:
93+
serial = env['ir.sequence'].next_by_code('auto.lot.serial')
94+
95+
lot = env['stock.lot'].create({
96+
'name': serial,
97+
'product_id': product.id,
98+
'company_id': picking.company_id.id,
99+
})
100+
ml.write({'lot_id': lot.id})
101+
]]></field> -->
102+
<field name="model_id" ref="stock.model_stock_picking"/>
103+
<field name="state">code</field>
104+
<field name="name">Action for Assign Serial</field>
105+
<field name="usage">base_automation</field>
106+
</record>
57107
</odoo>

‎vineyard/data/ir_sequence.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<odoo noupdate="1">
3+
<record id="seq_auto_lot" model="ir.sequence">
4+
<field name="name">Auto Lot Serial</field>
5+
<field name="code">auto.lot.serial</field>
6+
<field name="padding">5</field>
7+
<field name="prefix">%(y)s%(month)s%(day)s-</field>
8+
</record>
9+
</odoo>

‎vineyard/data/ir_ui_view.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@
9797
<xpath expr="//field[@name='user_id']" position="after">
9898
<xpath expr="//field[@name='state']" position="move"/>
9999
</xpath>
100-
<xpath expr="//field[@name='scheduled_date']" position="attributes">
100+
<!-- <xpath expr="//field[@name='scheduled_date']" position="attributes">
101101
<attribute name="invisible"/>
102102
<attribute name="readonly"/>
103103
<attribute name="widget"/>
104-
</xpath>
104+
</xpath> -->
105105
<xpath expr="//field[@name='date_done']" position="attributes">
106106
<attribute name="optional">show</attribute>
107107
</xpath>
@@ -163,7 +163,7 @@
163163
<field name="active" eval="True"/>
164164
<field name="type">list</field>
165165
</record>
166-
<record id="mrp_bom_tree_view_inherit" model="ir.ui.view">
166+
<!-- <record id="mrp_bom_tree_view_inherit" model="ir.ui.view">
167167
<field name="arch" type="xml">
168168
<data>
169169
<xpath expr="//list[1]" position="attributes">
@@ -178,7 +178,7 @@
178178
<field name="priority">99</field>
179179
<field name="active" eval="True"/>
180180
<field name="type">list</field>
181-
</record>
181+
</record> -->
182182
<record id="stock_move_search_view_inherit" model="ir.ui.view">
183183
<field name="arch" type="xml">
184184
<data>
@@ -190,7 +190,7 @@
190190
<xpath expr="//filter[@name='outgoing']" position="replace"/>
191191
<xpath expr="//filter[@name='incoming']" position="replace"/>
192192
<xpath expr="//filter[@name='groupby_date']" position="after">
193-
<filter string="Scheduled Date" name="groupby_date_year" domain="[]" context="{'group_by': 'date:year'}"/>
193+
<filter string="Scheduled Date" name="groupby_date_year" domain="[]" context="{'group_by': 'date:year'}" invisible="True"/>
194194
</xpath>
195195
<xpath expr="//field[@name='partner_id']" position="replace"/>
196196
<xpath expr="//field[@name='location_dest_id']" position="replace"/>
@@ -235,7 +235,7 @@
235235
<field name="location_id" string="Parcel"/>
236236
</xpath>
237237
<xpath expr="//filter[@name='status']" position="before">
238-
<filter name="studio_group_by_7e9_1j2fac0s7" string="Parcels" context="{'group_by': 'location_id'}"/>
238+
<filter name="group_by_location" string="Parcels" context="{'group_by': 'location_id'}"/>
239239
</xpath>
240240
</data>
241241
</field>
@@ -277,7 +277,7 @@
277277
<field name="mode">extension</field>
278278
<field name="model">quality.point</field>
279279
<field name="name">quality.point.view.list</field>
280-
<!-- <field name="priority">160</field> -->
280+
<field name="priority">160</field>
281281
<field name="active" eval="True"/>
282282
<field name="type">list</field>
283283
</record>
@@ -338,7 +338,7 @@
338338
<field name="active" eval="True"/>
339339
<field name="type">list</field>
340340
</record>
341-
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_ui_view_2" model="ir.ui.view" forcecreate="1">
341+
<record id="x_project_task_worksheet_template_1_ir_ui_view_2" model="ir.ui.view" forcecreate="1">
342342
<field name="arch" type="xml">
343343
<list default_order="create_date DESC">
344344
<field name="create_date"/>
@@ -350,7 +350,7 @@
350350
<field name="active" eval="True"/>
351351
<field name="type">list</field>
352352
</record>
353-
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_ui_view_3" model="ir.ui.view" forcecreate="1">
353+
<record id="x_project_task_worksheet_template_1_ir_ui_view_3" model="ir.ui.view" forcecreate="1">
354354
<field name="arch" type="xml">
355355
<search>
356356
<field name="x_name"/>
@@ -363,7 +363,7 @@
363363
<field name="active" eval="True"/>
364364
<field name="type">search</field>
365365
</record>
366-
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_ui_view_1" model="ir.ui.view" forcecreate="1">
366+
<record id="x_project_task_worksheet_template_1_ir_ui_view_1" model="ir.ui.view" forcecreate="1">
367367
<field name="arch" type="xml">
368368
<form create="false" duplicate="false">
369369
<sheet>

‎vineyard/data/mrp_bom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<field name="code">MUSTING Malbec</field>
2020
<field name="product_tmpl_id" ref="product_template_14"/>
2121
<field name="product_uom_id" ref="excise_management.uom_hl"/>
22+
<field name="byproduct_ids" eval="[(6, 0, [ref('mrp_bom_byproduct_2')])]"/>
2223
</record>
2324
<record id="mrp_bom_8" model="mrp.bom">
2425
<field name="code">MUSTING Cabernet Franc</field>
@@ -30,6 +31,7 @@
3031
<field name="code">MUSTING Syrah</field>
3132
<field name="product_tmpl_id" ref="product_template_13"/>
3233
<field name="product_uom_id" ref="excise_management.uom_hl"/>
34+
<field name="byproduct_ids" eval="[(6, 0, [ref('mrp_bom_byproduct_3')])]"/>
3335
</record>
3436
<record id="mrp_bom_13" model="mrp.bom">
3537
<field name="code">BOTTLING Structured &amp; Bold</field>

‎vineyard/data/mrp_bom_byproduct.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,14 @@
55
<field name="product_qty">36.0</field>
66
<field name="product_uom_id" ref="uom.product_uom_kgm"/>
77
</record>
8+
<record id="mrp_bom_byproduct_2" model="mrp.bom.byproduct">
9+
<field name="product_id" ref="product_product_21"/>
10+
<field name="product_qty">37.0</field>
11+
<field name="product_uom_id" ref="uom.product_uom_kgm"/>
12+
</record>
13+
<record id="mrp_bom_byproduct_3" model="mrp.bom.byproduct">
14+
<field name="product_id" ref="product_product_21"/>
15+
<field name="product_qty">47.0</field>
16+
<field name="product_uom_id" ref="uom.product_uom_kgm"/>
17+
</record>
818
</odoo>

‎vineyard/demo/mrp_eco.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<field name="kanban_state">normal</field>
1212
<field name="product_tmpl_id" ref="product_template_15"/>
1313
<field name="bom_id" ref="mrp_bom_4"/>
14+
<!-- <field name="bom_change_ids" eval="[(6, 0, [ref('mrp_eco_bom_change_1'), ref('mrp_eco_bom_change_2'), ref('mrp_eco_bom_change_3'), ref('mrp_eco_bom_change_4')])]"/> -->
15+
<!-- <field name="bom_change_ids_on_line" eval="[(6, 0, [ref('mrp_eco_bom_change_1'), ref('mrp_eco_bom_change_2'), ref('mrp_eco_bom_change_3'), ref('mrp_eco_bom_change_4')])]"/> -->
1416
</record>
1517
<record id="mrp_eco_2" model="mrp.eco">
1618
<field name="name">Trial 2</field>
@@ -22,5 +24,7 @@
2224
<field name="kanban_state">normal</field>
2325
<field name="product_tmpl_id" ref="product_template_15"/>
2426
<field name="bom_id" ref="mrp_bom_4"/>
27+
<!-- <field name="bom_change_ids" eval="[(6, 0, [ref('mrp_eco_bom_change_8'), ref('mrp_eco_bom_change_9'), ref('mrp_eco_bom_change_10')])]"/> -->
28+
<!-- <field name="bom_change_ids_on_line" eval="[(6, 0, [ref('mrp_eco_bom_change_8'), ref('mrp_eco_bom_change_9'), ref('mrp_eco_bom_change_10')])]"/> -->
2529
</record>
2630
</odoo>

‎vineyard/demo/mrp_eco_bom_change.xml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<odoo noupdate="1">
3+
<record id="mrp_eco_bom_change_1" model="mrp.eco.bom.change">
4+
<field name="change_type">update</field>
5+
<field name="product_id" ref="product_product_13"/>
6+
<field name="eco_id" ref="mrp_eco_1"/>
7+
<field name="old_product_qty">0.3</field>
8+
<field name="new_product_qty">0.31</field>
9+
<!-- <field name="upd_product_qty">0.010000000000000009</field> -->
10+
</record>
11+
<record id="mrp_eco_bom_change_2" model="mrp.eco.bom.change">
12+
<field name="change_type">update</field>
13+
<field name="product_id" ref="product_product_14"/>
14+
<field name="eco_id" ref="mrp_eco_1"/>
15+
<field name="old_product_qty">0.2</field>
16+
<field name="new_product_qty">0.19</field>
17+
<!-- <field name="upd_product_qty">-0.010000000000000009</field> -->
18+
</record>
19+
<record id="mrp_eco_bom_change_3" model="mrp.eco.bom.change">
20+
<field name="change_type">update</field>
21+
<field name="product_id" ref="product_product_29"/>
22+
<field name="eco_id" ref="mrp_eco_1"/>
23+
<field name="old_product_qty">150.0</field>
24+
<field name="new_product_qty">140.0</field>
25+
<!-- <field name="upd_product_qty">-10.0</field> -->
26+
</record>
27+
<record id="mrp_eco_bom_change_4" model="mrp.eco.bom.change">
28+
<field name="change_type">update</field>
29+
<field name="product_id" ref="product_product_32"/>
30+
<field name="eco_id" ref="mrp_eco_1"/>
31+
<field name="old_product_qty">25.0</field>
32+
<field name="new_product_qty">22.0</field>
33+
<!-- <field name="upd_product_qty">-3.0</field> -->
34+
</record>
35+
<record id="mrp_eco_bom_change_8" model="mrp.eco.bom.change">
36+
<field name="change_type">update</field>
37+
<field name="product_id" ref="product_product_12"/>
38+
<field name="eco_id" ref="mrp_eco_2"/>
39+
<field name="old_product_qty">0.5</field>
40+
<field name="new_product_qty">0.48</field>
41+
<!-- <field name="upd_product_qty">-0.020000000000000018</field> -->
42+
</record>
43+
<record id="mrp_eco_bom_change_9" model="mrp.eco.bom.change">
44+
<field name="change_type">update</field>
45+
<field name="product_id" ref="product_product_14"/>
46+
<field name="eco_id" ref="mrp_eco_2"/>
47+
<field name="old_product_qty">0.2</field>
48+
<field name="new_product_qty">0.22</field>
49+
<!-- <field name="upd_product_qty">0.01999999999999999</field> -->
50+
</record>
51+
<record id="mrp_eco_bom_change_10" model="mrp.eco.bom.change">
52+
<field name="change_type">update</field>
53+
<field name="product_id" ref="product_product_29"/>
54+
<field name="eco_id" ref="mrp_eco_2"/>
55+
<field name="old_product_qty">150.0</field>
56+
<field name="new_product_qty">140.0</field>
57+
<!-- <field name="upd_product_qty">-10.0</field> -->
58+
</record>
59+
</odoo>

0 commit comments

Comments
 (0)