Skip to content

Commit bc8aa37

Browse files
chga-odoochga-odoo
committed
[ADD] vineyard: add costumization
1 parent a60e217 commit bc8aa37

40 files changed

+2840
-1208
lines changed

‎vineyard/__manifest__.py‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@
2727
'data/stock_warehouse.xml',
2828
'data/ir_model.xml',
2929
'data/ir_model_fields.xml',
30+
'data/stock_location.xml',
31+
'data/stock_picking_type.xml',
3032
'data/ir_actions_act_window.xml',
3133
'data/ir_ui_view.xml',
3234
'data/ir_actions_server.xml',
3335
'data/ir_ui_menu.xml',
34-
'data/base_automation.xml',
3536
'data/ir_model_access.xml',
3637
'data/ir_rule.xml',
3738
'data/knowledge_article.xml',
38-
'data/stock_location.xml',
39-
'data/stock_picking_type.xml',
4039
'data/pos_category.xml',
41-
'data/pos_payment_method.xml',
4240
'data/uom_uom.xml',
4341
'data/worksheet_template.xml',
4442
'data/project_project.xml',
4543
'data/product_category.xml',
4644
'data/product_template.xml',
4745
'data/product_product.xml',
46+
'data/product_tag.xml',
4847
'data/pos_config.xml',
49-
# 'data/product_attribute.xml',
5048
'data/mrp_bom.xml',
49+
'data/mrp_bom_line.xml',
50+
'data/base_automation.xml',
5151
'data/mail_message.xml',
5252
'data/knowledge_article_favorite.xml',
5353
'data/website_menu.xml',
@@ -57,18 +57,21 @@
5757
'demo/appointment_type.xml',
5858
'demo/crm_tag.xml',
5959
'demo/res_partner.xml',
60+
'demo/stock_lot.xml',
6061
'demo/purchase_order.xml',
62+
'demo/purchase_order_line.xml',
63+
'demo/purchase_order_post.xml',
6164
'demo/account_analytic_account.xml',
6265
'demo/crm_lead.xml',
6366
'demo/project_project.xml',
64-
'demo/purchase_order_line.xml',
65-
'demo/stock_lot.xml',
67+
'demo/stock_picking.xml',
68+
'demo/stock_move.xml',
69+
'demo/stock_picking_post.xml',
6670
'demo/mrp_production.xml',
67-
'demo/mrp_bom_line.xml',
6871
'demo/mrp_eco.xml',
6972
'demo/ir_attachment_post.xml',
73+
'demo/project_tags.xml',
7074
'demo/project_task.xml',
71-
'demo/stock_quant.xml',
7275
'demo/quality_point.xml',
7376
'demo/quality_check.xml',
7477
'demo/product_supplierinfo.xml',

‎vineyard/data/base_automation.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo>
3-
<record id="industry_on_harvest_c49e5fbd-d0b4-427c-80d2-679edf97a9f5" model="base.automation">
3+
<record id="industry_on_harvest_base_automation_1" model="base.automation">
44
<field name="model_id" ref="mrp.model_mrp_production"/>
5-
<field name="action_server_ids" eval="[(6, 0, [ref('industry__harvest_and_transfer_server_action')])]"/>
5+
<field name="action_server_ids" eval="[(6, 0, [ref('industry_harvest_and_transfer_server_action')])]"/>
66
<field name="trigger">on_create_or_write</field>
77
<field name="filter_domain">[("state", "=", "done")]</field>
8-
<field name="filter_pre_domain">["&amp;", ("picking_type_id", "in", [13]), ("state", "=", "confirmed")]</field>
9-
<field name="name">Industry: On harvest</field>
8+
<!-- <field name="filter_pre_domain">["&amp;", ("picking_type_id", "in", [13]), ("state", "=", "confirmed")]</field> -->
9+
<field name="filter_pre_domain" eval="[('picking_type_id', 'in', [ref('vineyard.stock_picking_type_27')]), ('state', 'in', ['confirmed'])]"/>
10+
<field name="name">On harvest</field>
1011
<field name="trigger_field_ids" eval="[(6, 0, [ref('mrp.field_mrp_production__state')])]"/>
1112
</record>
12-
<record id="industry_on_harvest__8cf801c4-ce7c-4ea4-860a-b572251e3f2c" model="base.automation">
13+
<record id="industry_on_harvest_base_automation_2" model="base.automation">
1314
<field name="model_id" ref="stock.model_stock_picking"/>
14-
<field name="action_server_ids" eval="[(6, 0, [ref('industry__check_harvest_is_from_harvest_location_server_action')])]"/>
15+
<field name="action_server_ids" eval="[(6, 0, [ref('industry_check_harvest_is_from_harvest_location_server_action')])]"/>
1516
<field name="trigger">on_create_or_write</field>
1617
<field name="filter_domain">[]</field>
1718
<field name="filter_pre_domain">["&amp;", ("picking_type_id.x_is_harvest", "!=", False), ("state", "not in", ["done", "cancel"])]</field>
18-
<field name="name">Industry: On Harvest Validation</field>
19+
<field name="name">On Harvest Validation</field>
1920
<field name="trigger_field_ids" eval="[(6, 0, [ref('stock.field_stock_picking__state')])]"/>
2021
</record>
2122
</odoo>

‎vineyard/data/ir_actions_act_window.xml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo>
3-
<record id="harvests_5faa925f-bbfe-4e35-bc16-81ad96cc6faf" model="ir.actions.act_window">
4-
<field name="domain">[("picking_type_id", "in", [13])]</field>
3+
<!-- <record id="harvests_5faa925f-bbfe-4e35-bc16-81ad96cc6faf" model="ir.actions.act_window">
4+
<field name="domain">[("picking_type_id", "in", [ref('vineyard.stock_picking_type_27')])]</field>
55
<field name="help"><![CDATA[<p class="o_view_nocontent_smiling_face">
66
This is your new action.
77
</p>
@@ -16,8 +16,8 @@
1616
<field name="name">Harvests</field>
1717
<field name="res_model">mrp.production</field>
1818
<field name="view_mode">list,form,calendar,pivot,graph</field>
19-
</record>
20-
<record id="harvests_ecaf8e35-ced9-4cf3-bdde-fdd168700320" model="ir.actions.act_window">
19+
</record> -->
20+
<!-- <record id="harvests_ecaf8e35-ced9-4cf3-bdde-fdd168700320" model="ir.actions.act_window">
2121
<field name="domain">[("picking_type_id.x_is_harvest", "=", True)]</field>
2222
<field name="help"><![CDATA[<p class="o_view_nocontent_smiling_face">
2323
This is your new action.
@@ -33,9 +33,13 @@
3333
<field name="name">Harvests</field>
3434
<field name="res_model">mrp.production</field>
3535
<field name="view_mode">kanban,list,form,calendar,pivot,graph,activity</field>
36-
</record>
37-
<record id="harvests_a3d096ee-38dd-4630-a753-a227d79a456f" model="ir.actions.act_window">
36+
</record> -->
37+
<record id="harvests_action_act_window_1" model="ir.actions.act_window">
3838
<field name="domain">[("x_is_harvest", "!=", False)]</field>
39+
<field name="context" eval="{
40+
'default_picking_type_id': ref('vineyard.stock_picking_type_27'),
41+
'default_x_is_harvest': True
42+
}"/>
3943
<field name="help"><![CDATA[<p class="o_view_nocontent_smiling_face">
4044
This is your new action.
4145
</p>
@@ -49,8 +53,9 @@
4953
]]></field>
5054
<field name="name">Harvests</field>
5155
<field name="res_model">stock.picking</field>
56+
<field name="view_mode">list,form</field>
5257
</record>
53-
<record id="harvests_quants_5f38ea30-7f8b-4947-9779-8a785d6f5151" model="ir.actions.act_window">
58+
<!-- <record id="harvests_quants_5f38ea30-7f8b-4947-9779-8a785d6f5151" model="ir.actions.act_window">
5459
<field name="help"><![CDATA[<p class="o_view_nocontent_smiling_face">
5560
This is your new action.
5661
</p>
@@ -65,8 +70,8 @@
6570
<field name="name">Harvests (Quants)</field>
6671
<field name="res_model">stock.quant</field>
6772
<field name="view_mode">kanban,list,form,pivot,graph</field>
68-
</record>
69-
<record id="harvets_21a71920-9ad2-4713-8d42-953b6038d16c" model="ir.actions.act_window">
73+
</record> -->
74+
<record id="harvests_action_act_window_2" model="ir.actions.act_window">
7075
<field name="domain">["&amp;", ("location_id.x_harvest_location", "!=", False), ("picking_id.x_is_harvest", "!=", False),("state", "=", "done")]</field>
7176
<field name="help"><![CDATA[<p class="o_view_nocontent_smiling_face">
7277
This is your new action.

‎vineyard/data/ir_actions_server.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo>
3-
<record id="industry__harvest_and_transfer_server_action" model="ir.actions.server">
3+
<record id="industry_harvest_and_transfer_server_action" model="ir.actions.server">
44
<field name="code"><![CDATA[dest_location = env['stock.location'].search([('complete_name', '=', 'WH/Stock')], limit=1)
55
if not dest_location:
66
raise UserError("Destination location not found (WH/Stock).")
@@ -43,15 +43,15 @@ picking.button_validate()
4343
]]></field>
4444
<field name="model_id" ref="mrp.model_mrp_production"/>
4545
<field name="state">code</field>
46-
<field name="name">Industry: Harvest and transfer</field>
46+
<field name="name">Harvest and transfer</field>
4747
<field name="usage">base_automation</field>
4848
</record>
49-
<record id="industry__check_harvest_is_from_harvest_location_server_action" model="ir.actions.server">
49+
<record id="industry_check_harvest_is_from_harvest_location_server_action" model="ir.actions.server">
5050
<field name="code"><![CDATA[if record.picking_type_id.x_is_harvest and not record.location_id.x_harvest_location:
5151
raise UserError ("Source location shall be eligible for harvest.")]]></field>
5252
<field name="model_id" ref="stock.model_stock_picking"/>
5353
<field name="state">code</field>
54-
<field name="name">Industry: Check Harvest Is From Harvest Location</field>
54+
<field name="name">Check Harvest Is From Harvest Location</field>
5555
<field name="usage">base_automation</field>
5656
</record>
5757
</odoo>

‎vineyard/data/ir_model_fields.xml‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@
3131
<field name="name">x_recipe_iteration</field>
3232
<field name="relation">mrp.eco</field>
3333
</record>
34-
<record id="mrp_plm_model_mrp_eco_x_x_recipe_iteration_quality_check_count_field" model="ir.model.fields">
34+
<record id="mrp_plm_model_mrp_eco_x_recipe_iteration_quality_check_count_field" model="ir.model.fields">
3535
<field name="compute"><![CDATA[
36-
for record in self: record['x_x_recipe_iteration_quality_check_count'] = self.env['quality.check'].search_count([('x_recipe_iteration', '=', record.id)])
36+
for record in self: record['x_recipe_iteration_quality_check_count'] = self.env['quality.check'].search_count([('x_recipe_iteration', '=', record.id)])
3737
]]></field>
3838
<field name="ttype">integer</field>
3939
<field name="field_description">Recipe Iteration count</field>
4040
<field name="model_id" ref="mrp_plm.model_mrp_eco"/>
41-
<field name="name">x_x_recipe_iteration_quality_check_count</field>
41+
<field name="name">x_recipe_iteration_quality_check_count</field>
4242
<field name="selectable" eval="False"/>
4343
<field name="store" eval="False"/>
4444
</record>
45-
<record id="mrp_model_mrp_production_x_production_id_quality_check_count_field" model="ir.model.fields">
45+
<!-- <record id="mrp_model_mrp_production_x_production_id_quality_check_count_field" model="ir.model.fields">
4646
<field name="compute"><![CDATA[
4747
for record in self: record['x_production_id_quality_check_count'] = self.env['quality.check'].search_count([('production_id', '=', record.id)])
4848
]]></field>
@@ -52,7 +52,35 @@ for record in self: record['x_production_id_quality_check_count'] = self.env['qu
5252
<field name="name">x_production_id_quality_check_count</field>
5353
<field name="selectable" eval="False"/>
5454
<field name="store" eval="False"/>
55+
</record> -->
56+
<!-- <record id="mrp_model_mrp_production_x_production_id_quality_check_all_pass_field" model="ir.model.fields">
57+
<field name="compute"><![CDATA[
58+
self.x_production_id_quality_check_pass = all(
59+
qc.quality_state == 'pass'
60+
for qc in self.env['quality.check'].search([('production_id', '=', self.id)])
61+
)
62+
]]></field>
63+
<field name="ttype">boolean</field>
64+
<field name="field_description">Production Order Quality Checks all passed</field>
65+
<field name="model_id" ref="mrp.model_mrp_production"/>
66+
<field name="name">x_production_id_quality_check_all_pass</field>
67+
<field name="selectable" eval="False"/>
68+
<field name="store" eval="False"/>
5569
</record>
70+
<record id="mrp_model_mrp_production_x_production_id_quality_check_any_failed_field" model="ir.model.fields">
71+
<field name="compute"><![CDATA[
72+
self.x_production_id_quality_check_any_failed = any(
73+
qc.quality_state == 'fail'
74+
for qc in self.env['quality.check'].search([('production_id', '=', self.id)])
75+
)
76+
]]></field>
77+
<field name="ttype">boolean</field>
78+
<field name="field_description">Production Order Quality Checks Any Failed</field>
79+
<field name="model_id" ref="mrp.model_mrp_production"/>
80+
<field name="name">x_production_id_quality_check_any_failed</field>
81+
<field name="selectable" eval="False"/>
82+
<field name="store" eval="False"/>
83+
</record> -->
5684
<record id="quality_model_quality_check_x_control_point_title_field" model="ir.model.fields">
5785
<field name="ttype">char</field>
5886
<field name="related">point_id.title</field>

‎vineyard/data/ir_ui_menu.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo auto_sequence="1">
3-
<record id="inventory_harvests_7c1087c9-e68b-42de-9582-ffa2977338c7" model="ir.ui.menu">
4-
<field name="action" ref="harvests_a3d096ee-38dd-4630-a753-a227d79a456f"/>
3+
<record id="inventory_harvests_ir_ui_menu_1" model="ir.ui.menu">
4+
<field name="action" ref="harvests_action_act_window_1"/>
55
<field name="name">Harvests</field>
66
<field name="parent_id" ref="stock.menu_stock_transfers"/>
77
</record>
8-
<record id="inventory_harvets_8e8c5185-5d80-408b-bcde-64b40aadbdb3" model="ir.ui.menu">
9-
<field name="action" ref="harvets_21a71920-9ad2-4713-8d42-953b6038d16c"/>
8+
<record id="inventory_harvests_ir_ui_menu_2" model="ir.ui.menu">
9+
<field name="action" ref="harvests_action_act_window_2"/>
1010
<field name="name">Harvests</field>
1111
<field name="parent_id" ref="stock.menu_warehouse_report"/>
1212
</record>

0 commit comments

Comments
 (0)