Skip to content

Commit a60e217

Browse files
committed
[ADD] vineyard: fix website
1 parent d633302 commit a60e217

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+600
-901
lines changed

.weblate.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,11 @@
451451
"filemask": "toy_store/i18n/*.po",
452452
"new_base": "toy_store/i18n/toy_store.pot"
453453
},
454+
{
455+
"name": "vineyard",
456+
"filemask": "vineyard/i18n/*.po",
457+
"new_base": "vineyard/i18n/vineyard.pot"
458+
},
454459
{
455460
"name": "wedding_planner",
456461
"filemask": "wedding_planner/i18n/*.po",

vineyard/__manifest__.py

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,98 +8,80 @@
88
'appointment_google_calendar',
99
'appointment_hr',
1010
'base_industry_data',
11-
# 'crm_enterprise',
12-
# 'hr_homeworking',
11+
'excise_management',
1312
'hr_sign',
14-
# 'hr_skills',
1513
'industry_fsm_sale_report',
1614
'industry_fsm_stock',
1715
'knowledge',
18-
# 'l10n_be_reports',
1916
'mrp_plm',
2017
'pos_enterprise',
21-
# 'pos_hr',
22-
# 'pos_online_payment',
2318
'product_expiry',
24-
# 'project_mrp_workorder_account',
2519
'project_purchase',
26-
# 'purchase_mrp',
2720
'quality_mrp',
28-
# 'quality_mrp_workorder',
29-
# 'sale_crm',
30-
# 'sale_mrp',
3121
'sale_planning',
32-
# 'sale_purchase_stock',
33-
# 'stock_barcode',
34-
# 'survey',
35-
'website_appointment_sale_project',
36-
# 'website_crm',
37-
# 'website_sale_stock',
3822
'web_studio',
23+
'website_appointment_sale_project',
3924
],
4025
'data': [
41-
'data/res_groups.xml',
26+
'data/res_config_setting.xml',
27+
'data/stock_warehouse.xml',
4228
'data/ir_model.xml',
4329
'data/ir_model_fields.xml',
44-
'data/ir_ui_view.xml',
4530
'data/ir_actions_act_window.xml',
31+
'data/ir_ui_view.xml',
4632
'data/ir_actions_server.xml',
4733
'data/ir_ui_menu.xml',
4834
'data/base_automation.xml',
4935
'data/ir_model_access.xml',
5036
'data/ir_rule.xml',
51-
# 'data/crm_stage.xml',
5237
'data/knowledge_article.xml',
38+
'data/stock_location.xml',
39+
'data/stock_picking_type.xml',
5340
'data/pos_category.xml',
5441
'data/pos_payment_method.xml',
5542
'data/uom_uom.xml',
56-
'data/project_task_type.xml',
5743
'data/worksheet_template.xml',
58-
'data/project_project_stage.xml',
5944
'data/project_project.xml',
6045
'data/product_category.xml',
6146
'data/product_template.xml',
6247
'data/product_product.xml',
6348
'data/pos_config.xml',
64-
'data/product_attribute.xml',
65-
'data/quality_point.xml',
49+
# 'data/product_attribute.xml',
50+
'data/mrp_bom.xml',
6651
'data/mail_message.xml',
6752
'data/knowledge_article_favorite.xml',
53+
'data/website_menu.xml',
6854
],
6955
'demo': [
7056
'demo/product_template.xml',
7157
'demo/appointment_type.xml',
7258
'demo/crm_tag.xml',
7359
'demo/res_partner.xml',
7460
'demo/purchase_order.xml',
75-
'demo/hr_employee.xml',
76-
'demo/pos_config.xml',
7761
'demo/account_analytic_account.xml',
78-
'demo/website_view.xml',
7962
'demo/crm_lead.xml',
80-
'demo/hr_department.xml',
8163
'demo/project_project.xml',
82-
'demo/pos_session.xml',
8364
'demo/purchase_order_line.xml',
84-
'demo/mrp_bom.xml',
8565
'demo/stock_lot.xml',
8666
'demo/mrp_production.xml',
8767
'demo/mrp_bom_line.xml',
68+
'demo/mrp_eco.xml',
8869
'demo/ir_attachment_post.xml',
8970
'demo/project_task.xml',
9071
'demo/stock_quant.xml',
91-
'demo/website_page.xml',
92-
'demo/website_menu.xml',
72+
'demo/quality_point.xml',
9373
'demo/quality_check.xml',
94-
'demo/website_theme_apply.xml',
9574
'demo/product_supplierinfo.xml',
9675
'demo/payment_provider_demo.xml',
76+
'demo/website_theme_apply.xml',
77+
'demo/website_view.xml',
9778
'demo/website.xml',
9879
],
9980
'license': 'OPL-1',
10081
'cloc_exclude': [
10182
'data/knowledge_article.xml',
102-
'data/ir_action_server.xml',
83+
'data/ir_actions_server.xml',
84+
'demo/website_view.xml',
10385
],
10486
'images': [
10587
'images/main.png',

vineyard/data/crm_stage.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

vineyard/data/ir_actions_act_window.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<field name="res_model">stock.move</field>
8484
<field name="view_mode">graph,pivot,list,form</field>
8585
</record>
86-
<record id="tests_4ac65ed9-2993-48f5-850a-6b0384c46c98" model="ir.actions.act_window">
86+
<record id="quality_check_tests_action_window" model="ir.actions.act_window">
8787
<field name="context">{'search_default_x_recipe_iteration': active_id,'default_x_recipe_iteration': active_id}</field>
8888
<field name="domain">[('x_recipe_iteration', '=', active_id)]</field>
8989
<field name="name">Tests</field>

vineyard/data/ir_ui_view.xml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@
196196
<xpath expr="//filter[@name='inventory']" position="replace"/>
197197
<xpath expr="//filter[@name='outgoing']" position="replace"/>
198198
<xpath expr="//filter[@name='incoming']" position="replace"/>
199-
<xpath expr="//filter[@name='done']" position="replace"/>
199+
<!-- <xpath expr="//filter[@name='done']" position="replace"/>
200200
<xpath expr="//filter[@name='future']" position="replace"/>
201-
<xpath expr="//filter[@name='ready']" position="replace"/>
201+
<xpath expr="//filter[@name='ready']" position="replace"/> -->
202202
<xpath expr="//field[@name='partner_id']" position="replace"/>
203203
<xpath expr="//field[@name='location_dest_id']" position="replace"/>
204204
<xpath expr="//field[@name='origin']" position="replace"/>
@@ -213,10 +213,10 @@
213213
<field name="active" eval="True"/>
214214
<field name="type">search</field>
215215
</record>
216-
<!-- <record id="odoo_studio_stock_mo_f6168e04-59fe-4817-b198-b64b887b0c00" model="ir.ui.view">
216+
<record id="odoo_studio_stock_mo_f6168e04-59fe-4817-b198-b64b887b0c00" model="ir.ui.view">
217217
<field name="arch" type="xml">
218218
<data>
219-
<xpath expr="//field[@name='product_qty']" position="replace">
219+
<xpath expr="//field[@name='date']" position="after">
220220
<field name="quantity" type="measure"/>
221221
</xpath>
222222
</data>
@@ -228,7 +228,7 @@
228228
<field name="priority">99</field>
229229
<field name="active" eval="True"/>
230230
<field name="type">pivot</field>
231-
</record> -->
231+
</record>
232232
<record id="odoo_studio_stock_pi_f32a105e-ed20-4bc8-8b46-e71332e7ed4c" model="ir.ui.view">
233233
<field name="arch" type="xml">
234234
<data>
@@ -254,11 +254,11 @@
254254
<field name="active" eval="True"/>
255255
<field name="type">search</field>
256256
</record>
257-
<!-- <record id="odoo_studio_mrp_eco__12be8bf7-6f40-4e8f-8e98-bfd77ee3b7e4" model="ir.ui.view">
257+
<record id="odoo_studio_mrp_eco__12be8bf7-6f40-4e8f-8e98-bfd77ee3b7e4" model="ir.ui.view">
258258
<field name="arch" type="xml">
259259
<data>
260260
<xpath expr="//button[@name='open_new_bom']" position="after">
261-
<button class="oe_stat_button" icon="fa-eyedropper" type="action" name="tests_4ac65ed9-2993-48f5-850a-6b0384c46c98">
261+
<button class="oe_stat_button" icon="fa-eyedropper" type="action" name="vineyard.quality_check_tests_action_window">
262262
<field widget="statinfo" name="x_x_recipe_iteration_quality_check_count" string="Tests"/>
263263
</button>
264264
</xpath>
@@ -279,7 +279,7 @@
279279
<field name="priority">160</field>
280280
<field name="active" eval="True"/>
281281
<field name="type">form</field>
282-
</record> -->
282+
</record>
283283
<record id="odoo_studio_quality__9eef4775-24c8-4f36-85c0-37699730a29b" model="ir.ui.view">
284284
<field name="arch" type="xml">
285285
<data>
@@ -296,19 +296,18 @@
296296
<field name="active" eval="True"/>
297297
<field name="type">list</field>
298298
</record>
299-
<!-- <record id="odoo_studio_quality__640cb452-6efe-40b1-a52d-d6c06c8f0441" model="ir.ui.view">
299+
<record id="odoo_studio_quality__640cb452-6efe-40b1-a52d-d6c06c8f0441" model="ir.ui.view">
300300
<field name="arch" type="xml">
301301
<data>
302-
<xpath expr="//form[1]/sheet[1]/group[1]/group[1]/field[@name='lot_id']" position="after">
302+
<xpath expr="//field[@name='lot_ids']" position="after">
303303
<field name="x_recipe_iteration" domain="[(&quot;stage_id&quot;, &quot;not in&quot;, [9])]"/>
304304
</xpath>
305-
<xpath expr="//form[1]/sheet[1]/group[1]/group[2]/field[@name='production_id']" position="after">
305+
<xpath expr="//field[@name='production_id']" position="after">
306306
<label for="point_id"/>
307-
<div class="d-flex" name="point_id_div"/>
308-
</xpath>
309-
<xpath expr="//div[@name='point_id_div']" position="inside">
310-
<xpath expr="//field[@name='point_id']" position="move"/>
311-
<field name="x_control_point_title"/>
307+
<div class="d-flex" name="point_id_div">
308+
<xpath expr="//field[@name='point_id']" position="move"/>
309+
<field name="x_control_point_title"/>
310+
</div>
312311
</xpath>
313312
<xpath expr="//field[@name='point_id']" position="attributes">
314313
<attribute name="class">oe_inline</attribute>
@@ -322,37 +321,38 @@
322321
<field name="priority">160</field>
323322
<field name="active" eval="True"/>
324323
<field name="type">form</field>
325-
</record> -->
326-
<!-- <record id="mrp_production_form_view" model="ir.ui.view">
324+
</record>
325+
<record id="mrp_production_form_view" model="ir.ui.view">
327326
<field name="arch" type="xml">
328327
<data>
329-
<xpath expr="//button[@name='766']" position="after">
330-
<button class="oe_stat_button" icon="fa-check" type="action" name="quality_checks_4f5af6bc-ab55-495c-a6a4-b7637547f754">
328+
<xpath expr="//button[@name='%(mrp.action_report_mo_overview)d']" position="after">
329+
<button class="oe_stat_button" icon="fa-check" type="action" name="%(quality_checks_4f5af6bc-ab55-495c-a6a4-b7637547f754)d">
331330
<field widget="statinfo" name="x_production_id_quality_check_count" string="Quality Checks"/>
332331
</button>
333332
</xpath>
334333
</data>
335334
</field>
335+
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
336336
<field name="mode">extension</field>
337337
<field name="model">mrp.production</field>
338338
<field name="name">Odoo Studio: Industry mrp.production.form harvest customization</field>
339339
<field name="priority">99</field>
340340
<field name="active" eval="True"/>
341341
<field name="type">form</field>
342-
</record> -->
343-
<!-- <record id="odoo_studio_quality__9d7785a2-7575-42e2-9143-fa441123638e" model="ir.ui.view">
342+
</record>
343+
<record id="odoo_studio_quality__9d7785a2-7575-42e2-9143-fa441123638e" model="ir.ui.view">
344344
<field name="arch" type="xml">
345345
<data>
346-
<xpath expr="//list[1]/field[@name='name']" position="after">
346+
<xpath expr="//field[@name='name']" position="after">
347347
<field name="x_control_point_title" optional="show"/>
348348
</xpath>
349-
<xpath expr="//field[@name='lot_id']" position="attributes">
349+
<xpath expr="//field[@name='lot_ids']" position="attributes">
350350
<attribute name="optional">hide</attribute>
351351
</xpath>
352-
<xpath expr="//field[@name='finished_lot_id']" position="attributes">
352+
<!-- <xpath expr="//field[@name='finished_lot_id']" position="attributes">
353353
<attribute name="optional">show</attribute>
354-
</xpath>
355-
<xpath expr="//field[@name='finished_lot_id']" position="after">
354+
</xpath> -->
355+
<xpath expr="//field[@name='user_id']" position="after">
356356
<field name="x_recipe_iteration" optional="show"/>
357357
</xpath>
358358
<xpath expr="//field[@name='user_id']" position="attributes">
@@ -367,7 +367,7 @@
367367
<field name="priority">160</field>
368368
<field name="active" eval="True"/>
369369
<field name="type">list</field>
370-
</record> -->
370+
</record>
371371
<record id="industry_fsm_report.x_project_task_worksheet_template_1_ir_ui_view_2" model="ir.ui.view" forcecreate="1">
372372
<field name="arch" type="xml">
373373
<list default_order="create_date DESC">

vineyard/data/mail_message.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<field name="message_type">email</field>
77
<field name="author_id" ref="base.partner_root"/>
88
<field name="subtype_id" ref="mail.mt_comment"/>
9-
<field name="subject">🚀 Get started with Odoo Vineyard</field>
9+
<field name="subject">🚀 Get started with Odoo for Vineyard</field>
1010
<field name="body" model="knowledge.article" eval="
1111
'&lt;span>&#x1F44B; Hi! Follow this &lt;a href=\''
1212
+ obj().env.ref('vineyard.welcome_article').article_url
File renamed without changes.

vineyard/data/pos_config.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<record id="pos_config_1" model="pos.config">
44
<field name="name">Shop</field>
55
<field name="tip_product_id" eval="False"/>
6-
<field name="payment_method_ids" eval="[(6, 0, [ref('pos_payment_method_2'), ref('pos_payment_method_3'), ref('pos_payment_method_1')])]"/>
6+
<field name="advanced_employee_ids" eval="[(6, 0, [ref('hr.employee_admin')])]"/>
7+
<!-- <field name="payment_method_ids" eval="[(6, 0, [ref('pos_payment_method_2'), ref('pos_payment_method_3'), ref('pos_payment_method_1')])]"/> -->
78
</record>
89
</odoo>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo auto_sequence="1" noupdate="1">
3-
<record id="pos_payment_method_2" model="pos.payment.method">
3+
<!-- <record id="pos_payment_method_2" model="pos.payment.method">
44
<field name="name">Card</field>
55
</record>
66
<record id="pos_payment_method_3" model="pos.payment.method">
@@ -9,5 +9,5 @@
99
</record>
1010
<record id="pos_payment_method_1" model="pos.payment.method">
1111
<field name="name">Cash</field>
12-
</record>
12+
</record> -->
1313
</odoo>

vineyard/data/product_attribute.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<record id="product_barcodelookup.product_attribute_lookup_4" model="product.attribute" forcecreate="1">
1313
<field name="name">pattern</field>
1414
</record> -->
15-
<record id="product_barcodelookup.product_attribute_lookup_5" model="product.attribute" forcecreate="1">
15+
<!-- <record id="product_barcodelookup.product_attribute_lookup_5" model="product.attribute" forcecreate="1">
1616
<field name="name">manufacturer</field>
1717
<field name="visibility">hidden</field>
1818
</record>
1919
<record id="product_barcodelookup.product_attribute_lookup_6" model="product.attribute" forcecreate="1">
2020
<field name="name">brand</field>
2121
<field name="visibility">hidden</field>
22-
</record>
22+
</record> -->
2323
<!-- <record id="product_barcodelookup.product_attribute_lookup_7" model="product.attribute" forcecreate="1">
2424
<field name="name">size</field>
2525
</record>

0 commit comments

Comments
 (0)