Skip to content

Commit 53a4c83

Browse files
chga-odoochga-odoo
committed
[IMP] vineyard: clean code
1 parent 5d148f0 commit 53a4c83

14 files changed

+20
-70
lines changed

‎vineyard/data/base_automation.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<field name="action_server_ids" eval="[(6, 0, [ref('industry_check_harvest_is_from_harvest_location_server_action')])]"/>
66
<field name="trigger">on_create_or_write</field>
77
<field name="filter_pre_domain">["&amp;", ("picking_type_id.x_is_harvest", "!=", False), ("state", "not in", ["done", "cancel"])]</field>
8-
<field name="name">On Harvest Validation</field>
8+
<field name="name">Vineyard: Harvest Validation</field>
99
<field name="trigger_field_ids" eval="[(6, 0, [ref('stock.field_stock_picking__state')])]"/>
1010
</record>
1111
</odoo>

‎vineyard/data/ir_actions_act_window.xml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,6 @@
99
'default_picking_type_id': ref('vineyard.stock_picking_type_27'),
1010
'default_x_is_harvest': True
1111
}" />
12-
<field name="help"><![CDATA[<p class="o_view_nocontent_smiling_face">
13-
This is your new action.
14-
</p>
15-
<p>By default, it contains a list and a form view and possibly
16-
other view types depending on the options you chose for your model.
17-
</p>
18-
<p>
19-
You can start customizing these screens by clicking on the Studio icon on the
20-
top right corner (you can also customize this help message there).
21-
</p>
22-
]]></field>
2312
</record>
2413
<record id="harvests_action_act_window_2" model="ir.actions.act_window">
2514
<field name="name">Harvests</field>
@@ -36,17 +25,6 @@
3625
'graph_cumulated': False
3726
}</field>
3827
<field name="domain">["&amp;", ("location_id.x_is_harvest", "!=", False), ("picking_id.x_is_harvest", "!=", False),("state", "=", "done")]</field>
39-
<field name="help"><![CDATA[<p class="o_view_nocontent_smiling_face">
40-
This is your new action.
41-
</p>
42-
<p>By default, it contains a list and a form view and possibly
43-
other view types depending on the options you chose for your model.
44-
</p>
45-
<p>
46-
You can start customizing these screens by clicking on the Studio icon on the
47-
top right corner (you can also customize this help message there).
48-
</p>
49-
]]></field>
5028
</record>
5129
<record id="quality_check_tests_action_window" model="ir.actions.act_window">
5230
<field name="context">{}</field>

‎vineyard/data/stock_warehouse.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<value eval="[ref('stock.warehouse0')]"/>
55
<value eval="{'name': 'vineyard', 'manufacture_steps': 'mrp_one_step', 'x_is_fiscal_deposit': True}"/>
66
</function>
7-
<record id="excise_management.stock_warehouse_fiscal_deposit" model="stock.warehouse" forcecreate="1">
7+
<record id="excise_management.stock_warehouse_fiscal_deposit" model="stock.warehouse" forcecreate="0">
88
<field name="active" eval="False"/>
99
</record>
1010
</odoo>

‎vineyard/demo/appointment_type.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<field name="image_1920" type="base64" file="vineyard/static/src/binary/appointment_type/2-image_1920.jpg"/>
66
<field name="name">Winery Tour</field>
77
<field name="location_id" ref="base.main_partner"/>
8-
<field name="event_videocall_source" eval="False"/>
98
<field name="allow_guests" eval="True"/>
109
<field name="manage_capacity" eval="True"/>
1110
<field name="category">recurring</field>

‎vineyard/demo/mrp_eco.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
<field name="user_id" ref="base.user_admin"/>
66
<field name="type_id" ref="mrp_plm.ecotype_bom_update"/>
77
<field name="stage_id" ref="mrp_eco_stage_9"/>
8-
<field name="note"><![CDATA[<div data-oe-version="2.0"><strong>Next</strong></div>
9-
<ul>
10-
<li>Increase Syrah or Malbec fraction for rounder mid-palate and darker fruit perception.</li>
11-
</ul>]]></field>
8+
<field name="note"><![CDATA[<div><strong>Next</strong></div><ul><li>Increase Syrah or Malbec fraction for rounder mid-palate and darker fruit perception.</li></ul>]]></field>
129
<field name="effectivity">asap</field>
1310
<field name="state">progress</field>
1411
<field name="kanban_state">normal</field>

‎vineyard/demo/mrp_production.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<field name="product_qty">6.0</field>
77
<field name="product_uom_id" ref="excise_management.uom_hl"/>
88
<field name="location_src_id" ref="stock.stock_location_stock"/>
9-
<field name="location_dest_id" ref="stock.stock_location_stock"/>
109
<field name="lot_producing_ids" eval="[(6, 0, [ref('stock_lot_24')])]"/>
1110
<field name="date_start" eval="(DateTime.now() - relativedelta(years=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
1211
<field name="consumption">warning</field>
@@ -17,7 +16,6 @@
1716
<field name="product_qty">3.0</field>
1817
<field name="product_uom_id" ref="excise_management.uom_hl"/>
1918
<field name="location_src_id" ref="stock.stock_location_stock"/>
20-
<field name="location_dest_id" ref="stock.stock_location_stock"/>
2119
<field name="lot_producing_ids" eval="[(6, 0, [ref('stock_lot_25')])]"/>
2220
<field name="date_start" eval="(DateTime.now() - relativedelta(years=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
2321
<field name="consumption">warning</field>
@@ -28,7 +26,6 @@
2826
<field name="product_qty">4.0</field>
2927
<field name="product_uom_id" ref="excise_management.uom_hl"/>
3028
<field name="location_src_id" ref="stock.stock_location_stock"/>
31-
<field name="location_dest_id" ref="stock.stock_location_stock"/>
3229
<field name="lot_producing_ids" eval="[(6, 0, [ref('stock_lot_26')])]"/>
3330
<field name="date_start" eval="(DateTime.now() - relativedelta(years=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
3431
<field name="consumption">warning</field>
@@ -39,7 +36,6 @@
3936
<field name="product_qty">3.0</field>
4037
<field name="product_uom_id" ref="excise_management.uom_hl"/>
4138
<field name="location_src_id" ref="stock.stock_location_stock"/>
42-
<field name="location_dest_id" ref="stock.stock_location_stock"/>
4339
<field name="lot_producing_ids" eval="[(6, 0, [ref('stock_lot_27')])]"/>
4440
<field name="date_start" eval="(DateTime.now() - relativedelta(years=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
4541
<field name="consumption">warning</field>
@@ -50,7 +46,6 @@
5046
<field name="product_qty">2.5</field>
5147
<field name="product_uom_id" ref="excise_management.uom_hl"/>
5248
<field name="location_src_id" ref="stock.stock_location_stock"/>
53-
<field name="location_dest_id" ref="stock.stock_location_stock"/>
5449
<field name="lot_producing_ids" eval="[(6, 0, [ref('stock_lot_28')])]"/>
5550
<field name="date_start" eval="(DateTime.now() - relativedelta(years=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
5651
<field name="consumption">warning</field>
@@ -61,7 +56,6 @@
6156
<field name="product_qty">3.0</field>
6257
<field name="product_uom_id" ref="excise_management.uom_hl"/>
6358
<field name="location_src_id" ref="stock.stock_location_stock"/>
64-
<field name="location_dest_id" ref="stock.stock_location_stock"/>
6559
<field name="lot_producing_ids" eval="[(6, 0, [ref('stock_lot_29')])]"/>
6660
<field name="date_start" eval="(DateTime.now() - relativedelta(years=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
6761
<field name="consumption">warning</field>
@@ -72,7 +66,6 @@
7266
<field name="product_qty">225.0</field>
7367
<field name="product_uom_id" ref="uom.product_uom_unit"/>
7468
<field name="location_src_id" ref="stock.stock_location_stock"/>
75-
<field name="location_dest_id" ref="stock.stock_location_stock"/>
7669
<field name="lot_producing_ids" eval="[(6, 0, [ref('stock_lot_30')])]"/>
7770
<field name="date_start" eval="(DateTime.now() - relativedelta(years=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
7871
<field name="consumption">warning</field>
@@ -83,7 +76,6 @@
8376
<field name="product_qty">150.0</field>
8477
<field name="product_uom_id" ref="uom.product_uom_unit"/>
8578
<field name="location_src_id" ref="stock.stock_location_stock"/>
86-
<field name="location_dest_id" ref="stock.stock_location_stock"/>
8779
<field name="lot_producing_ids" eval="[(6, 0, [ref('stock_lot_31')])]"/>
8880
<field name="date_start" eval="(DateTime.now() - relativedelta(years=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
8981
<field name="consumption">warning</field>
@@ -94,7 +86,6 @@
9486
<field name="product_qty">187.5</field>
9587
<field name="product_uom_id" ref="uom.product_uom_unit"/>
9688
<field name="location_src_id" ref="stock.stock_location_stock"/>
97-
<field name="location_dest_id" ref="stock.stock_location_stock"/>
9889
<field name="lot_producing_ids" eval="[(6, 0, [ref('stock_lot_32')])]"/>
9990
<field name="date_start" eval="(DateTime.now() - relativedelta(years=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
10091
<field name="consumption">warning</field>
@@ -105,7 +96,6 @@
10596
<field name="product_qty">6.0</field>
10697
<field name="product_uom_id" ref="excise_management.uom_hl"/>
10798
<field name="location_src_id" ref="stock.stock_location_stock"/>
108-
<field name="location_dest_id" ref="stock.stock_location_stock"/>
10999
<field name="lot_producing_ids" eval="[(6, 0, [ref('stock_lot_37')])]"/>
110100
<field name="date_start" eval="DateTime.now().strftime('%Y-%m-%d %H:%M:%S')"/>
111101
<field name="consumption">warning</field>
@@ -116,7 +106,6 @@
116106
<field name="product_qty">4.5</field>
117107
<field name="product_uom_id" ref="excise_management.uom_hl"/>
118108
<field name="location_src_id" ref="stock.stock_location_stock"/>
119-
<field name="location_dest_id" ref="stock.stock_location_stock"/>
120109
<field name="lot_producing_ids" eval="[(6, 0, [ref('stock_lot_39')])]"/>
121110
<field name="date_start" eval="DateTime.now().strftime('%Y-%m-%d %H:%M:%S')"/>
122111
<field name="consumption">warning</field>
@@ -127,7 +116,6 @@
127116
<field name="product_qty">4.0</field>
128117
<field name="product_uom_id" ref="excise_management.uom_hl"/>
129118
<field name="location_src_id" ref="stock.stock_location_stock"/>
130-
<field name="location_dest_id" ref="stock.stock_location_stock"/>
131119
<field name="lot_producing_ids" eval="[(6, 0, [ref('stock_lot_38')])]"/>
132120
<field name="date_start" eval="DateTime.now().strftime('%Y-%m-%d %H:%M:%S')"/>
133121
<field name="consumption">warning</field>

‎vineyard/demo/product_supplierinfo.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,35 @@
55
<field name="product_id" ref="product_product_31"/>
66
<field name="min_qty">1.0</field>
77
<field name="price">2.0</field>
8-
<field name="delay" eval="False"/>
98
</record>
109
<record id="product_supplierinfo_5" model="product.supplierinfo">
1110
<field name="partner_id" ref="base_industry_data.res_partner_35"/>
1211
<field name="product_id" ref="product_product_29"/>
1312
<field name="min_qty">1.0</field>
1413
<field name="price">5.0</field>
15-
<field name="delay" eval="False"/>
1614
</record>
1715
<record id="product_supplierinfo_6" model="product.supplierinfo">
1816
<field name="partner_id" ref="base_industry_data.res_partner_35"/>
1917
<field name="product_id" ref="product_product_18"/>
2018
<field name="min_qty">1.0</field>
2119
<field name="price">7.0</field>
22-
<field name="delay" eval="False"/>
2320
</record>
2421
<record id="product_supplierinfo_1" model="product.supplierinfo">
2522
<field name="partner_id" ref="base_industry_data.res_partner_35"/>
2623
<field name="product_id" ref="product_product_32"/>
2724
<field name="min_qty">1.0</field>
2825
<field name="price">15.0</field>
29-
<field name="delay" eval="False"/>
3026
</record>
3127
<record id="product_supplierinfo_2" model="product.supplierinfo">
3228
<field name="partner_id" ref="base_industry_data.res_partner_35"/>
3329
<field name="product_id" ref="product_product_19"/>
3430
<field name="min_qty">1.0</field>
3531
<field name="price">30.0</field>
36-
<field name="delay" eval="False"/>
3732
</record>
3833
<record id="product_supplierinfo_4" model="product.supplierinfo">
3934
<field name="partner_id" ref="base_industry_data.res_partner_35"/>
4035
<field name="product_id" ref="product_product_20"/>
4136
<field name="min_qty">1.0</field>
4237
<field name="price">85.0</field>
43-
<field name="delay" eval="False"/>
4438
</record>
4539
</odoo>

‎vineyard/demo/quality_check.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
<?xml version='1.0' encoding='UTF-8'?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<odoo noupdate="1">
33
<record id="quality_check_1" model="quality.check">
4-
<field name="point_id" ref="quality_point_8"/>
5-
<field name="x_recipe_iteration" ref="mrp_eco_1"/>
6-
<field name="test_type_id" ref="quality_control.test_type_passfail"/>
74
<field name="title">Sensory Evaluation</field>
5+
<field name="point_id" ref="quality_point_8"/>
86
<field name="quality_state">fail</field>
9-
<field name="user_id" ref="base.user_admin"/>
107
<field name="team_id" ref="quality.quality_alert_team0"/>
8+
<field name="test_type_id" ref="quality_control.test_type_passfail"/>
9+
<field name="x_recipe_iteration" ref="mrp_eco_1"/>
1110
</record>
1211
<record id="quality_check_5" model="quality.check">
13-
<field name="point_id" ref="quality_point_8"/>
14-
<field name="x_recipe_iteration" ref="mrp_eco_2"/>
15-
<field name="test_type_id" ref="quality_control.test_type_passfail"/>
1612
<field name="title">Sensory Evaluation</field>
13+
<field name="point_id" ref="quality_point_8"/>
1714
<field name="team_id" ref="quality.quality_alert_team0"/>
15+
<field name="test_type_id" ref="quality_control.test_type_passfail"/>
16+
<field name="x_recipe_iteration" ref="mrp_eco_2"/>
1817
</record>
1918
</odoo>

‎vineyard/demo/res_partner.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<field name="parent_id" ref="base_industry_data.res_partner_19"/>
2727
<field name="country_id" ref="base.be"/>
2828
<field name="type">delivery</field>
29-
<field name="street">Avenue des déportés 48</field>
29+
<field name="street">Chaussée de Namur 87</field>
3030
<field name="zip">1367</field>
3131
<field name="city">Ramillies</field>
3232
</record>
@@ -35,7 +35,7 @@
3535
<field name="parent_id" ref="base_industry_data.res_partner_19"/>
3636
<field name="country_id" ref="base.be"/>
3737
<field name="type">delivery</field>
38-
<field name="street">Avenue des déportés 48</field>
38+
<field name="street">Rue des Vignes 5</field>
3939
<field name="zip">1367</field>
4040
<field name="city">Ramillies</field>
4141
</record>

‎vineyard/demo/stock_move.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<field name="description_picking_manual"><![CDATA[Cabernet Franc Grapes]]></field>
77
<field name="product_uom" ref="uom.product_uom_kgm"/>
88
<field name="product_uom_qty">1300.0</field>
9-
<field name="to_refund" eval="False"/>
109
<field name="date" eval="datetime.today().date() + relativedelta(years=-1)"/>
1110
</record>
1211
<record id="stock_move_58" model="stock.move">
@@ -15,7 +14,6 @@
1514
<field name="description_picking_manual"><![CDATA[Malbec Grapes]]></field>
1615
<field name="product_uom" ref="uom.product_uom_kgm"/>
1716
<field name="product_uom_qty">2100.0</field>
18-
<field name="to_refund" eval="False"/>
1917
<field name="date" eval="datetime.today().date() + relativedelta(years=-1)"/>
2018
</record>
2119
<record id="stock_move_59" model="stock.move">
@@ -24,7 +22,6 @@
2422
<field name="description_picking_manual"><![CDATA[Syrah Grapes]]></field>
2523
<field name="product_uom" ref="uom.product_uom_kgm"/>
2624
<field name="product_uom_qty">950.0</field>
27-
<field name="to_refund" eval="False"/>
2825
<field name="date" eval="datetime.today().date() + relativedelta(years=-1)"/>
2926
</record>
3027
<record id="stock_move_127" model="stock.move">
@@ -33,7 +30,6 @@
3330
<field name="description_picking_manual"><![CDATA[Cabernet Franc Grapes]]></field>
3431
<field name="product_uom" ref="uom.product_uom_kgm"/>
3532
<field name="product_uom_qty">1450.0</field>
36-
<field name="to_refund" eval="False"/>
3733
<field name="date" eval="datetime.today().date()"/>
3834
</record>
3935
<record id="stock_move_128" model="stock.move">
@@ -42,7 +38,6 @@
4238
<field name="description_picking_manual"><![CDATA[Malbec Grapes]]></field>
4339
<field name="product_uom" ref="uom.product_uom_kgm"/>
4440
<field name="product_uom_qty">2550.0</field>
45-
<field name="to_refund" eval="False"/>
4641
<field name="date" eval="datetime.today().date()"/>
4742
</record>
4843
<record id="stock_move_129" model="stock.move">
@@ -51,7 +46,6 @@
5146
<field name="description_picking_manual"><![CDATA[Syrah Grapes]]></field>
5247
<field name="product_uom" ref="uom.product_uom_kgm"/>
5348
<field name="product_uom_qty">1650.0</field>
54-
<field name="to_refund" eval="False"/>
5549
<field name="date" eval="datetime.today().date()"/>
5650
</record>
5751
</odoo>

0 commit comments

Comments
 (0)