Skip to content

Commit a7d5cc2

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

33 files changed

+177
-852
lines changed

‎vineyard/__manifest__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@
3535
'data/ir_ui_menu.xml',
3636
'data/ir_model_access.xml',
3737
'data/ir_rule.xml',
38+
'data/ir_sequence.xml',
3839
'data/knowledge_article.xml',
3940
'data/pos_category.xml',
4041
'data/uom_uom.xml',
41-
'data/worksheet_template.xml',
42-
'data/project_project.xml',
4342
'data/product_category.xml',
4443
'data/product_template.xml',
4544
'data/product_product.xml',
@@ -75,6 +74,7 @@
7574
'demo/quality_point.xml',
7675
'demo/quality_check.xml',
7776
'demo/product_supplierinfo.xml',
77+
'demo/spreadsheet_dashboard.xml',
7878
'demo/payment_provider_demo.xml',
7979
'demo/website_theme_apply.xml',
8080
'demo/website_view.xml',

‎vineyard/data/base_automation.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<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> -->
98
<field name="filter_pre_domain" eval="[('picking_type_id', 'in', [ref('vineyard.stock_picking_type_27')]), ('state', 'in', ['confirmed'])]"/>
109
<field name="name">On harvest</field>
1110
<field name="trigger_field_ids" eval="[(6, 0, [ref('mrp.field_mrp_production__state')])]"/>

‎vineyard/data/ir_actions_act_window.xml‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,5 @@
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", [ref('vineyard.stock_picking_type_27')])]</field>
5-
<field name="help"><![CDATA[<p class="o_view_nocontent_smiling_face">
6-
This is your new action.
7-
</p>
8-
<p>By default, it contains a list and a form view and possibly
9-
other view types depending on the options you chose for your model.
10-
</p>
11-
<p>
12-
You can start customizing these screens by clicking on the Studio icon on the
13-
top right corner (you can also customize this help message there).
14-
</p>
15-
]]></field>
16-
<field name="name">Harvests</field>
17-
<field name="res_model">mrp.production</field>
18-
<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">
21-
<field name="domain">[("picking_type_id.x_is_harvest", "=", True)]</field>
22-
<field name="help"><![CDATA[<p class="o_view_nocontent_smiling_face">
23-
This is your new action.
24-
</p>
25-
<p>By default, it contains a list and a form view and possibly
26-
other view types depending on the options you chose for your model.
27-
</p>
28-
<p>
29-
You can start customizing these screens by clicking on the Studio icon on the
30-
top right corner (you can also customize this help message there).
31-
</p>
32-
]]></field>
33-
<field name="name">Harvests</field>
34-
<field name="res_model">mrp.production</field>
35-
<field name="view_mode">kanban,list,form,calendar,pivot,graph,activity</field>
36-
</record> -->
373
<record id="harvests_action_act_window_1" model="ir.actions.act_window">
384
<field name="domain">[("x_is_harvest", "!=", False)]</field>
395
<field name="context" eval="{
@@ -55,22 +21,6 @@
5521
<field name="res_model">stock.picking</field>
5622
<field name="view_mode">list,form</field>
5723
</record>
58-
<!-- <record id="harvests_quants_5f38ea30-7f8b-4947-9779-8a785d6f5151" model="ir.actions.act_window">
59-
<field name="help"><![CDATA[<p class="o_view_nocontent_smiling_face">
60-
This is your new action.
61-
</p>
62-
<p>By default, it contains a list and a form view and possibly
63-
other view types depending on the options you chose for your model.
64-
</p>
65-
<p>
66-
You can start customizing these screens by clicking on the Studio icon on the
67-
top right corner (you can also customize this help message there).
68-
</p>
69-
]]></field>
70-
<field name="name">Harvests (Quants)</field>
71-
<field name="res_model">stock.quant</field>
72-
<field name="view_mode">kanban,list,form,pivot,graph</field>
73-
</record> -->
7424
<record id="harvests_action_act_window_2" model="ir.actions.act_window">
7525
<field name="domain">["&amp;", ("location_id.x_harvest_location", "!=", False), ("picking_id.x_is_harvest", "!=", False),("state", "=", "done")]</field>
7626
<field name="help"><![CDATA[<p class="o_view_nocontent_smiling_face">
@@ -94,16 +44,4 @@
9444
<field name="name">Tests</field>
9545
<field name="res_model">quality.check</field>
9646
</record>
97-
<record id="quality_checks_4f5af6bc-ab55-495c-a6a4-b7637547f754" model="ir.actions.act_window">
98-
<field name="context">{'search_default_production_id': active_id,'default_production_id': active_id}</field>
99-
<field name="domain">[('production_id', '=', active_id)]</field>
100-
<field name="name">Quality Checks</field>
101-
<field name="res_model">quality.check</field>
102-
</record>
103-
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_actions_act_window_1" model="ir.actions.act_window" forcecreate="1">
104-
<field name="context">{'edit': False, 'create': False, 'delete': False, 'duplicate': False, 'action_xml_id': 'industry_fsm_report.fsm_worksheets_action_settings', 'worksheet_template_id': 1}</field>
105-
<field name="name">Worksheets</field>
106-
<field name="res_model">x_project_task_worksheet_template_1</field>
107-
<field name="search_view_id" ref="industry_fsm_report.x_project_task_worksheet_template_1_ir_ui_view_3"/>
108-
</record>
10947
</odoo>

‎vineyard/data/ir_model.xml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo>
3-
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_1" model="ir.model" forcecreate="1">
4-
<field name="info"><![CDATA[ Main super-class for regular database-persisted Odoo models.
5-
6-
Odoo models are created by inheriting from this class::
7-
8-
class ResUsers(Model):
9-
...
10-
11-
The system will later instantiate the class once per database (on
12-
which the class' module is installed).
13-
]]></field>
14-
<field name="model">x_project_task_worksheet_template_1</field>
3+
<record id="x_project_task_worksheet_template_1_ir_model_1" model="ir.model" forcecreate="1">
4+
<field name="model">x_project_task_worksheet_template_1_studio</field>
155
<field name="name">Default Worksheet</field>
166
</record>
177
</odoo>

‎vineyard/data/ir_model_access.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo>
3-
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_access_2" model="ir.model.access" forcecreate="1">
3+
<record id="x_project_task_worksheet_template_1_ir_model_access_2" model="ir.model.access" forcecreate="1">
44
<field name="group_id" ref="project.group_project_user"/>
5-
<field name="model_id" ref="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_1"/>
5+
<field name="model_id" ref="x_project_task_worksheet_template_1_ir_model_1"/>
66
<field name="name">x_project_task_worksheet_template_1_user_access</field>
77
<field name="perm_create" eval="True"/>
88
<field name="perm_read" eval="True"/>
99
<field name="perm_unlink" eval="True"/>
1010
<field name="perm_write" eval="True"/>
1111
</record>
12-
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_access_1" model="ir.model.access" forcecreate="1">
12+
<record id="x_project_task_worksheet_template_1_ir_model_access_1" model="ir.model.access" forcecreate="1">
1313
<field name="group_id" ref="project.group_project_manager"/>
14-
<field name="model_id" ref="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_1"/>
14+
<field name="model_id" ref="x_project_task_worksheet_template_1_ir_model_1"/>
1515
<field name="name">x_project_task_worksheet_template_1_manager_access</field>
1616
<field name="perm_create" eval="True"/>
1717
<field name="perm_read" eval="True"/>

‎vineyard/data/ir_model_fields.xml‎

Lines changed: 7 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</record>
3434
<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_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([('production_id', '=', record.id)])
3737
]]></field>
3838
<field name="ttype">integer</field>
3939
<field name="field_description">Recipe Iteration count</field>
@@ -42,45 +42,6 @@ for record in self: record['x_recipe_iteration_quality_check_count'] = self.env[
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">
46-
<field name="compute"><![CDATA[
47-
for record in self: record['x_production_id_quality_check_count'] = self.env['quality.check'].search_count([('production_id', '=', record.id)])
48-
]]></field>
49-
<field name="ttype">integer</field>
50-
<field name="field_description">Production Order count</field>
51-
<field name="model_id" ref="mrp.model_mrp_production"/>
52-
<field name="name">x_production_id_quality_check_count</field>
53-
<field name="selectable" eval="False"/>
54-
<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"/>
69-
</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> -->
8445
<record id="quality_model_quality_check_x_control_point_title_field" model="ir.model.fields">
8546
<field name="ttype">char</field>
8647
<field name="related">point_id.title</field>
@@ -90,28 +51,28 @@ self.x_production_id_quality_check_any_failed = any(
9051
<field name="readonly" eval="True"/>
9152
<field name="store" eval="False"/>
9253
</record>
93-
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_fields_7" model="ir.model.fields" forcecreate="1">
54+
<record id="x_project_task_worksheet_template_1_ir_model_fields_7" model="ir.model.fields" forcecreate="1">
9455
<field name="ttype">html</field>
9556
<field name="copied" eval="True"/>
9657
<field name="field_description">Comments</field>
97-
<field name="model_id" ref="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_1"/>
58+
<field name="model_id" ref="x_project_task_worksheet_template_1_ir_model_1"/>
9859
<field name="name">x_comments</field>
9960
</record>
100-
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_fields_9" model="ir.model.fields" forcecreate="1">
61+
<record id="x_project_task_worksheet_template_1_ir_model_fields_9" model="ir.model.fields" forcecreate="1">
10162
<field name="ttype">many2one</field>
10263
<field name="copied" eval="True"/>
10364
<field name="field_description">Task</field>
104-
<field name="model_id" ref="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_1"/>
65+
<field name="model_id" ref="x_project_task_worksheet_template_1_ir_model_1"/>
10566
<field name="name">x_project_task_id</field>
10667
<field name="on_delete">cascade</field>
10768
<field name="relation">project.task</field>
10869
<field name="required" eval="True"/>
10970
</record>
110-
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_fields_8" model="ir.model.fields" forcecreate="1">
71+
<record id="x_project_task_worksheet_template_1_ir_model_fields_8" model="ir.model.fields" forcecreate="1">
11172
<field name="ttype">char</field>
11273
<field name="related">x_project_task_id.name</field>
11374
<field name="field_description">Name</field>
114-
<field name="model_id" ref="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_1"/>
75+
<field name="model_id" ref="x_project_task_worksheet_template_1_ir_model_1"/>
11576
<field name="name">x_name</field>
11677
</record>
11778
</odoo>

‎vineyard/data/ir_rule.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
3-
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_rule_1" model="ir.rule" forcecreate="1">
3+
<record id="x_project_task_worksheet_template_1_ir_rule_1" model="ir.rule" forcecreate="1">
44
<field name="domain_force"><![CDATA[[('create_uid', '=', user.id)]]]></field>
55
<field name="groups" eval="[(6, 0, [ref('project.group_project_user')])]"/>
6-
<field name="model_id" ref="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_1"/>
6+
<field name="model_id" ref="x_project_task_worksheet_template_1_ir_model_1"/>
77
<field name="name">x_project_task_worksheet_template_1_own</field>
88
</record>
9-
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_rule_2" model="ir.rule" forcecreate="1">
9+
<record id="x_project_task_worksheet_template_1_ir_rule_2" model="ir.rule" forcecreate="1">
1010
<field name="domain_force"><![CDATA[[(1, '=', 1)]]]></field>
1111
<field name="groups" eval="[(6, 0, [ref('project.group_project_manager'), ref('industry_fsm.group_fsm_user')])]"/>
12-
<field name="model_id" ref="industry_fsm_report.x_project_task_worksheet_template_1_ir_model_1"/>
12+
<field name="model_id" ref="x_project_task_worksheet_template_1_ir_model_1"/>
1313
<field name="name">x_project_task_worksheet_template_1_all</field>
1414
</record>
1515
</odoo>

‎vineyard/data/ir_sequence.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<odoo noupdate="1">
3+
<record id="ir_sequence_46" model="ir.sequence">
4+
<field name="name">Cabernet Franc Grapes Serial Sequence</field>
5+
<field name="code">stock.lot.serial</field>
6+
<field name="prefix">%(y)s%(month)s%(day)s-</field>
7+
<field name="number_next">37</field>
8+
<field name="padding">7</field>
9+
<field name="company_id" eval="False"/>
10+
</record>
11+
</odoo>

‎vineyard/data/ir_ui_view.xml‎

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,13 @@
119119
<field name="arch" type="xml">
120120
<data>
121121
<xpath expr="//field[@name='product_id']" position="replace">
122-
<field name="date_deadline" type="col"/>
122+
<field name="date" type="col"/>
123123
</xpath>
124124
<xpath expr="//graph[1]" position="attributes">
125125
<attribute name="order">asc</attribute>
126126
<attribute name="stacked">0</attribute>
127127
<attribute name="type">line</attribute>
128128
</xpath>
129-
<xpath expr="//field[@name='date_deadline'][not(ancestor::field)]" position="replace">
130-
<field name="date" type="col" interval="year"/>
131-
</xpath>
132129
<xpath expr="//field[@name='location_dest_id'][not(ancestor::field)]" position="replace">
133130
<field name="location_id" type="col"/>
134131
</xpath>
@@ -189,9 +186,6 @@
189186
<xpath expr="//filter[@name='inventory']" position="replace"/>
190187
<xpath expr="//filter[@name='outgoing']" position="replace"/>
191188
<xpath expr="//filter[@name='incoming']" position="replace"/>
192-
<!-- <xpath expr="//filter[@name='done']" position="replace"/>
193-
<xpath expr="//filter[@name='future']" position="replace"/>
194-
<xpath expr="//filter[@name='ready']" position="replace"/> -->
195189
<xpath expr="//field[@name='partner_id']" position="replace"/>
196190
<xpath expr="//field[@name='location_dest_id']" position="replace"/>
197191
<xpath expr="//field[@name='origin']" position="replace"/>
@@ -315,37 +309,6 @@
315309
<field name="active" eval="True"/>
316310
<field name="type">form</field>
317311
</record>
318-
<!-- <record id="mrp_production_view_form_inherit_quality_with_count" model="ir.ui.view">
319-
<field name="arch" type="xml">
320-
<data>
321-
<xpath expr="//button[@name='%(quality_mrp.quality_check_action_mo)d'][1]/span" position="replace">
322-
<div class="o_field_widget o_stat_info">
323-
<span class="o_stat_value"><field name="x_production_id_quality_check_count"/></span>
324-
<span class="o_stat_text">Quality Checks</span>
325-
</div>
326-
</xpath>
327-
<xpath expr="//button[@name='%(quality_mrp.quality_check_action_mo)d'][2]/span" position="replace">
328-
<div class="o_field_widget o_stat_info">
329-
<span class="o_stat_value"><field name="x_production_id_quality_check_count"/></span>
330-
<span class="o_stat_text text-success">Quality Checks</span>
331-
</div>
332-
</xpath>
333-
<xpath expr="//button[@name='%(quality_mrp.quality_check_action_mo)d'][3]/span" position="replace">
334-
<div class="o_field_widget o_stat_info">
335-
<span class="o_stat_value"><field name="x_production_id_quality_check_count"/></span>
336-
<span class="o_stat_text text-danger">Quality Checks</span>
337-
</div>
338-
</xpath>
339-
</data>
340-
</field>
341-
<field name="inherit_id" ref="quality_mrp.mrp_production_view_form_inherit_quality"/>
342-
<field name="mode">extension</field>
343-
<field name="model">mrp.production</field>
344-
<field name="name">mrp.production.view.form.quality.check.count</field>
345-
<field name="priority">99</field>
346-
<field name="active" eval="True"/>
347-
<field name="type">form</field>
348-
</record> -->
349312
<record id="quality_check_view_tree_inherit" model="ir.ui.view">
350313
<field name="arch" type="xml">
351314
<data>
@@ -355,9 +318,6 @@
355318
<xpath expr="//field[@name='lot_ids']" position="attributes">
356319
<attribute name="optional">hide</attribute>
357320
</xpath>
358-
<!-- <xpath expr="//field[@name='finished_lot_id']" position="attributes">
359-
<attribute name="optional">show</attribute>
360-
</xpath> -->
361321
<xpath expr="//field[@name='user_id']" position="after">
362322
<field name="x_recipe_iteration" optional="show"/>
363323
</xpath>
@@ -381,7 +341,7 @@
381341
<field name="x_name"/>
382342
</list>
383343
</field>
384-
<field name="model">x_project_task_worksheet_template_1</field>
344+
<field name="model">x_project_task_worksheet_template_1_studio</field>
385345
<field name="name">list_view_Default_Worksheet</field>
386346
<field name="active" eval="True"/>
387347
<field name="type">list</field>
@@ -394,7 +354,7 @@
394354
<filter name="group_by_month" string="Created on" context="{'group_by': 'create_date:month'}"/>
395355
</search>
396356
</field>
397-
<field name="model">x_project_task_worksheet_template_1</field>
357+
<field name="model">x_project_task_worksheet_template_1_studio</field>
398358
<field name="name">search_view_Default_Worksheet</field>
399359
<field name="active" eval="True"/>
400360
<field name="type">search</field>
@@ -412,7 +372,7 @@
412372
</sheet>
413373
</form>
414374
</field>
415-
<field name="model">x_project_task_worksheet_template_1</field>
375+
<field name="model">x_project_task_worksheet_template_1_studio</field>
416376
<field name="name">template_view_Default_Worksheet</field>
417377
<field name="active" eval="True"/>
418378
<field name="type">form</field>

0 commit comments

Comments
 (0)