Skip to content

Commit 5e12ace

Browse files
mega-odoomega-odoo
committed
[IMP] condominium: cleanup5
- changes
1 parent 7306b52 commit 5e12ace

17 files changed

+50
-100
lines changed

‎bar_industry/__manifest__.py‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,21 @@
33
'version': '1.1',
44
'category': 'Hospitality',
55
'depends': [
6-
'account_followup',
76
'hr_attendance',
8-
'hr_hourly_cost',
9-
'hr_skills',
107
'knowledge',
118
'loyalty',
129
'planning',
13-
'point_of_sale',
1410
'pos_restaurant',
1511
'pos_self_order',
1612
'project_enterprise',
17-
'purchase_stock',
18-
'stock_account',
13+
'purchase',
1914
],
2015
'data': [
2116
'data/res_config_settings.xml',
22-
'data/res_partner.xml',
23-
'data/hr_department.xml',
24-
'data/hr_employee.xml',
2517
'data/product_category.xml',
2618
'data/product_pricelist.xml',
27-
'data/restaurant_floor.xml',
28-
'data/restaurant_table.xml',
19+
# 'data/restaurant_floor.xml',
20+
# 'data/restaurant_table.xml',
2921
'data/ir_attachment_pre.xml',
3022
'data/project_task_type.xml',
3123
'data/project_project.xml',
@@ -39,10 +31,14 @@
3931
'data/knowledge_article_favorite.xml',
4032
'data/mail_message.xml',
4133
'data/knowledge_tour.xml',
34+
'data/pos_preparation_display_display.xml',
4235
],
4336
'demo': [
44-
'demo/pos_preparation_display_display.xml',
37+
'demo/res_partner.xml',
38+
'demo/hr_department.xml',
39+
'demo/hr_employee.xml',
4540
'demo/planning_slot_template.xml',
41+
'demo/pos_config.xml',
4642
'demo/product_product.xml',
4743
'demo/product_pricelist_item.xml',
4844
'demo/product_supplierinfo.xml',

‎bar_industry/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 Bar &amp; Pub</field>
9+
<field name="subject">🚀 Get started with Odoo For Bar &amp; Pub</field>
1010
<field name="body" model="knowledge.article" eval="
1111
'&lt;span>&#x1F44B; Hi! Follow this &lt;a href=\''
1212
+ obj().env.ref('bar_industry.welcome_article').article_url

‎bar_industry/data/planning_role.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,4 @@
99
<record id="planning_role_3" model="planning.role">
1010
<field name="name">Bar &amp; Service</field>
1111
</record>
12-
<record id="hr_employee_2" model="hr.employee">
13-
<field name="planning_role_ids" eval="[(4, ref('planning_role_1'))]"/>
14-
</record>
15-
<record id="hr_employee_5" model="hr.employee">
16-
<field name="planning_role_ids" eval="[(4, ref('planning_role_2'))]"/>
17-
</record>
18-
<record id="hr_employee_6" model="hr.employee">
19-
<field name="planning_role_ids" eval="[(4, ref('planning_role_3'))]"/>
20-
</record>
2112
</odoo>

‎bar_industry/data/pos_category.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
3-
<record id="pos_restaurant.pos_category_cocktails" model="pos.category" forcecreate="1">
4-
<field name="name">Cocktails</field>
5-
<field name="image_128" type="base64" file="bar_industry/static/src/binary/pos_category/1-image_128"/>
6-
</record>
7-
<record id="pos_restaurant.pos_category_soft_drinks" model="pos.category" forcecreate="1">
8-
<field name="name">Soft drinks</field>
9-
<field name="image_128" type="base64" file="bar_industry/static/src/binary/pos_category/2-image_128"/>
10-
</record>
113
<record id="pos_category_3" model="pos.category">
124
<field name="name">Beers</field>
135
<field name="image_128" type="base64" file="bar_industry/static/src/binary/pos_category/3-image_128"/>

‎bar_industry/data/pos_config.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
<odoo noupdate="1">
33
<function model="pos.config" name="load_onboarding_bar_scenario" />
44

5-
<record id="pos_restaurant.pos_config_main_bar" model="pos.config">
5+
<record id="pos_restaurant.pos_config_main_bar" model="pos.config" forcecreate="1">
66
<field name="name">Bar</field>
77
<field name="iface_tax_included">total</field>
8-
<field name="iface_available_categ_ids" eval="[(6, 0, [ref('pos_restaurant.pos_category_cocktails'), ref('pos_restaurant.pos_category_soft_drinks'), ref('pos_category_3'), ref('pos_category_4')])]"/>
8+
<field name="iface_available_categ_ids" eval="[(6, 0, [
9+
ref('pos_restaurant.pos_category_cocktails', raise_if_not_found=False),
10+
ref('pos_restaurant.pos_category_soft_drinks', raise_if_not_found=False),
11+
ref('pos_category_3'),
12+
ref('pos_category_4'),
13+
])]"/>
914
<field name="tip_product_id" eval="False"/>
1015
<field name="limit_categories" eval="True"/>
1116
<field name="iface_splitbill" eval="True"/>
1217
<field name="iface_printbill" eval="True"/>
13-
<field name="module_pos_restaurant" eval="True"/>
14-
<field name="module_pos_hr" eval="True"/>
15-
<field name="floor_ids" eval="[(6, 0, [ref('pos_restaurant.floor_main'), ref('pos_restaurant.floor_patio')])]"/>
16-
<field name="minimal_employee_ids" eval="[(6, 0, [ref('hr_employee_2')])]" />
17-
<field name="basic_employee_ids" eval="[(6, 0, [ref('hr_employee_5'), ref('hr_employee_6')])]"/>
18-
<field name="advanced_employee_ids" eval="[(6, 0, [ref('hr.employee_admin'), ref('hr_employee_4')])]"/>
18+
<!-- <field name="floor_ids" eval="[(6, 0, [ref('pos_restaurant.floor_main'), ref('pos_restaurant.floor_patio')])]"/> -->
1919
<field name="show_product_images" eval="True"/>
20-
<field name="available_pricelist_ids" eval="[(6, 0, [ref('product_pricelist_1'), ref('product_pricelist_2')])]"/>
21-
<field name="pricelist_id" ref="product_pricelist_1"/>
20+
<field name="available_pricelist_ids" eval="[(6, 0, [ref('product_pricelist_2')])]"/>
21+
<field name="advanced_employee_ids" eval="[(6, 0, [ref('hr.employee_admin')])]"/>
2222
</record>
2323
</odoo>

‎bar_industry/demo/pos_preparation_display_display.xml‎ renamed to ‎bar_industry/data/pos_preparation_display_display.xml‎

File renamed without changes.

‎bar_industry/data/product_pricelist.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
3-
<record id="product_pricelist_1" model="product.pricelist">
4-
<field name="name">Default</field>
5-
</record>
63
<record id="product_pricelist_2" model="product.pricelist">
74
<field name="name">Happy Hour</field>
85
<field name="item_ids" eval="[(0, 0, {

‎bar_industry/data/product_product.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@
6868
<field name="self_order_available" eval="False"/>
6969
<field name="standard_price">12.95</field>
7070
</record>
71-
<record id="point_of_sale.product_product_tip" model="product.product" forcecreate="1">
71+
<record id="point_of_sale.product_product_tip" model="product.product" forcecreate="0">
72+
<field name="name">Tips</field>
7273
<field name="available_in_pos">True</field>
7374
<field name="pos_categ_ids" eval="[(6, 0, [ref('pos_category_4')])]"/>
7475
</record>

‎bar_industry/data/restaurant_floor.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
3-
<record id="restaurant_floor_1" model="restaurant.floor">
4-
<field name="name">My Company</field>
5-
</record>
6-
<record id="restaurant_floor_4" model="restaurant.floor">
7-
<field name="name">My Company (San Francisco)</field>
8-
</record>
9-
<record id="restaurant_floor_5" model="restaurant.floor">
10-
<field name="name">My Company (San Francisco)</field>
11-
</record>
123
<record id="pos_restaurant.floor_main" model="restaurant.floor" forcecreate="1">
134
<field name="name">Main Floor</field>
145
<field name="background_color">white</field>

‎bar_industry/data/restaurant_table.xml‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
3-
<record id="restaurant_table_1" model="restaurant.table">
4-
<field name="floor_id" ref="restaurant_floor_1"/>
5-
<field name="table_number">1</field>
6-
<field name="position_h">100.0</field>
7-
<field name="position_v">100.0</field>
8-
<field name="width">130.0</field>
9-
<field name="height">130.0</field>
10-
</record>
113
<record id="pos_restaurant.table_01" model="restaurant.table" forcecreate="1">
12-
<field name="floor_id" ref="pos_restaurant.floor_main"/>
134
<field name="table_number">1</field>
14-
<field name="position_h">410.0</field>
15-
<field name="position_v">90.0</field>
16-
<field name="width">90.0</field>
17-
<field name="height">90.0</field>
5+
<field name="floor_id" ref="pos_restaurant.floor_main"/>
186
<field name="seats">4</field>
197
<field name="color">rgb(53,211,116)</field>
8+
<field name="width">90.0</field>
9+
<field name="height">90.0</field>
10+
<field name="position_h">410.0</field>
11+
<field name="position_v">90.0</field>
2012
</record>
2113
<record id="pos_restaurant.table_02" model="restaurant.table" forcecreate="1">
2214
<field name="floor_id" ref="pos_restaurant.floor_main"/>
@@ -248,20 +240,4 @@
248240
<field name="seats">4</field>
249241
<field name="color">rgb(235,191,109)</field>
250242
</record>
251-
<record id="restaurant_table_26" model="restaurant.table">
252-
<field name="floor_id" ref="restaurant_floor_4"/>
253-
<field name="table_number">1</field>
254-
<field name="position_h">100.0</field>
255-
<field name="position_v">100.0</field>
256-
<field name="width">130.0</field>
257-
<field name="height">130.0</field>
258-
</record>
259-
<record id="restaurant_table_27" model="restaurant.table">
260-
<field name="floor_id" ref="restaurant_floor_5"/>
261-
<field name="table_number">1</field>
262-
<field name="position_h">100.0</field>
263-
<field name="position_v">100.0</field>
264-
<field name="width">130.0</field>
265-
<field name="height">130.0</field>
266-
</record>
267243
</odoo>

0 commit comments

Comments
 (0)