Skip to content

Commit d9332f2

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

13 files changed

+65
-44
lines changed

‎bar_industry/__manifest__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
],
2020
'data': [
2121
'data/res_config_settings.xml',
22-
'data/res_partner.xml',
23-
'data/hr_department.xml',
24-
'data/hr_employee.xml',
2522
'data/product_category.xml',
2623
'data/product_pricelist.xml',
2724
'data/restaurant_floor.xml',
@@ -39,10 +36,15 @@
3936
'data/knowledge_article_favorite.xml',
4037
'data/mail_message.xml',
4138
'data/knowledge_tour.xml',
39+
'data/pos_preparation_display_display.xml',
4240
],
4341
'demo': [
44-
'demo/pos_preparation_display_display.xml',
42+
'demo/res_partner.xml',
43+
'demo/hr_department.xml',
44+
'demo/hr_employee.xml',
45+
'demo/planning_role.xml',
4546
'demo/planning_slot_template.xml',
47+
'demo/pos_config.xml',
4648
'demo/product_product.xml',
4749
'demo/product_pricelist_item.xml',
4850
'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: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,25 @@
55
<record id="pos_restaurant.pos_config_main_bar" model="pos.config">
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"/>
18+
<!-- <field name="module_pos_restaurant" eval="True"/>
19+
<field name="module_pos_hr" eval="True"/> -->
1520
<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')])]"/>
1921
<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"/>
22+
23+
24+
<!-- <field name="available_pricelist_ids" eval="[(6, 0, [ref('product_pricelist_1'), ref('product_pricelist_2')])]"/>
25+
<field name="pricelist_id" ref="product_pricelist_1"/> -->
26+
<field name="available_pricelist_ids" eval="[(6, 0, [ref('product_pricelist_2')])]"/>
27+
2228
</record>
2329
</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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<odoo noupdate="1">
3-
<record id="product_pricelist_1" model="product.pricelist">
3+
<!-- <record id="product_pricelist_1" model="product.pricelist">
44
<field name="name">Default</field>
5-
</record>
5+
</record> -->
66
<record id="product_pricelist_2" model="product.pricelist">
77
<field name="name">Happy Hour</field>
88
<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/hr_department.xml renamed to ‎bar_industry/demo/hr_department.xml

File renamed without changes.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<field name="address_id" ref="base.main_partner"/>
88
<field name="work_phone">+1 650-691-3277</field>
99
<field name="work_contact_id" ref="base.partner_admin"/>
10-
<field name="work_email">casey.admin@yourcompany.example.com</field>
10+
<field name="work_email">[email protected]</field>
1111
<field name="user_id" ref="base.user_admin"/>
1212
<field name="pin">3333</field>
1313
</record>
@@ -18,7 +18,7 @@
1818
<field name="address_id" ref="base.main_partner"/>
1919
<field name="work_phone">+1 650-691-3277</field>
2020
<field name="work_contact_id" ref="res_partner_30"/>
21-
<field name="work_email">david.manager@yourcompany.example.com</field>
21+
<field name="work_email">[email protected]</field>
2222
<field name="parent_id" ref="hr.employee_admin"/>
2323
<field name="coach_id" ref="hr.employee_admin"/>
2424
<field name="pin">3333</field>
@@ -31,7 +31,7 @@
3131
<field name="address_id" ref="base.main_partner"/>
3232
<field name="work_phone">+1 650-691-3277</field>
3333
<field name="work_contact_id" ref="res_partner_31"/>
34-
<field name="work_email">jessica.rodriguez@yourcompany.example.com</field>
34+
<field name="work_email">[email protected]</field>
3535
<field name="parent_id" ref="hr.employee_admin"/>
3636
<field name="coach_id" ref="hr.employee_admin"/>
3737
<field name="pin">2222</field>
@@ -44,7 +44,7 @@
4444
<field name="address_id" ref="base.main_partner"/>
4545
<field name="work_phone">+1 650-691-3277</field>
4646
<field name="work_contact_id" ref="res_partner_32"/>
47-
<field name="work_email">robert.wilson@yourcompany.example.com</field>
47+
<field name="work_email">[email protected]</field>
4848
<field name="parent_id" ref="hr.employee_admin"/>
4949
<field name="coach_id" ref="hr.employee_admin"/>
5050
<field name="pin">2222</field>
@@ -57,7 +57,7 @@
5757
<field name="address_id" ref="base.main_partner"/>
5858
<field name="work_phone">+1 650-691-3277</field>
5959
<field name="work_contact_id" ref="res_partner_33"/>
60-
<field name="work_email">sarah.thompson@yourcompany.example.com</field>
60+
<field name="work_email">[email protected]</field>
6161
<field name="parent_id" ref="hr.employee_admin"/>
6262
<field name="coach_id" ref="hr.employee_admin"/>
6363
<field name="pin">1111</field>

0 commit comments

Comments
 (0)