Skip to content

Commit f844dc4

Browse files
trojikmantrojikman
authored
Merge pull request #1233 from yelizariev/13.0-pre-commit-16
💚 pre-commit run --all
2 parents 634768c + 3f393d0 commit f844dc4

File tree

108 files changed

+1592
-1756
lines changed

Some content is hidden

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

108 files changed

+1592
-1756
lines changed

‎pos_cashier_select/static/src/xml/pos.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
<t t-name="CashierSelectionPopupWidget">
66
<div class="modal-dialog cashier">
77
<div class="popup popup-selection cashier">
8-
<p class="title"><t t-esc=" widget.options.title || 'Select' " /></p>
8+
<p class="title">
9+
<t t-esc=" widget.options.title || 'Select' " />
10+
</p>
911
<div class='selection scrollable-y touch-scrollable cashier'>
1012
<div class="selection cashier">
1113
<t t-foreach="widget.list || []" t-as="item">

‎pos_cashier_select/views/views.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,32 @@
44
Copyright 2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>3>
55
License MIT (https://opensource.org/licenses/MIT).-->
66
<odoo>
7-
<template
7+
<template
88
id="assets_backend"
99
name="pos_choosing_cashier assets"
1010
inherit_id="point_of_sale.assets"
1111
>
12-
<xpath expr="." position="inside">
13-
<link
12+
<xpath expr="." position="inside">
13+
<link
1414
rel="stylesheet"
1515
href="/pos_cashier_select/static/src/css/styles.css"
1616
/>
17-
<script
17+
<script
1818
type="text/javascript"
1919
src="/pos_cashier_select/static/src/js/main.js"
2020
/>
21-
</xpath>
22-
</template>
23-
<template
21+
</xpath>
22+
</template>
23+
<template
2424
id="demo_assets_backend"
2525
name="pos_cashier_select demo assets"
2626
inherit_id="web.assets_backend"
2727
>
28-
<xpath expr="." position="inside">
29-
<script
28+
<xpath expr="." position="inside">
29+
<script
3030
type="text/javascript"
3131
src="/pos_cashier_select/static/src/js/tour.js"
3232
/>
33-
</xpath>
34-
</template>
33+
</xpath>
34+
</template>
3535
</odoo>

‎pos_category_multi/template.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
/>
2121
</xpath>
2222
</template>
23-
2423
<template
2524
id="tour_assets_backend"
2625
name="pos_category_multi tour assets"

‎pos_category_multi/view.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" ?>
22
<odoo>
3-
<record id="product_template_form_view" model="ir.ui.view">
4-
<field name="name">product.template.form.inherit.pos_category_ids</field>
5-
<field name="model">product.template</field>
6-
<field name="inherit_id" ref="point_of_sale.product_template_form_view" />
7-
<field name="arch" type="xml">
8-
<field name="pos_categ_id" position="replace">
9-
<field
3+
<record id="product_template_form_view" model="ir.ui.view">
4+
<field name="name">product.template.form.inherit.pos_category_ids</field>
5+
<field name="model">product.template</field>
6+
<field name="inherit_id" ref="point_of_sale.product_template_form_view" />
7+
<field name="arch" type="xml">
8+
<field name="pos_categ_id" position="replace">
9+
<field
1010
name="pos_category_ids"
1111
widget="many2many_tags"
1212
attrs="{'invisible': [('available_in_pos', '=', False)]}"
1313
help="These categories are shared across all Product Variants"
1414
/>
15-
</field>
1615
</field>
17-
</record>
16+
</field>
17+
</record>
1818
</odoo>

‎pos_debranding/views.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<openerp>
3-
<template id="index" inherit_id="point_of_sale.index">
4-
<xpath expr="//title" position="replace">
5-
<title>POS</title>
6-
</xpath>
7-
</template>
3+
<template id="index" inherit_id="point_of_sale.index">
4+
<xpath expr="//title" position="replace">
5+
<title>POS</title>
6+
</xpath>
7+
</template>
88
</openerp>

‎pos_debt_notebook/data.xml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,25 @@
44
Copyright 2016 Stanislav Krotov <https://it-projects.info/team/ufaks>
55
License MIT (https://opensource.org/licenses/MIT). -->
66
<odoo>
7-
8-
<template id="assets" inherit_id="point_of_sale.assets">
9-
<xpath expr="." position="inside">
10-
<script
7+
<template id="assets" inherit_id="point_of_sale.assets">
8+
<xpath expr="." position="inside">
9+
<script
1110
type="text/javascript"
1211
src="/pos_debt_notebook/static/src/js/pos.js"
1312
/>
14-
<link
13+
<link
1514
rel="stylesheet"
1615
href="/pos_debt_notebook/static/src/css/pos.css"
1716
id="pos_debt_notebook-stylesheet"
1817
/>
19-
</xpath>
20-
</template>
21-
22-
<template id="demo_assets_backend" inherit_id="web.assets_backend">
23-
<xpath expr="." position="inside">
24-
<script
18+
</xpath>
19+
</template>
20+
<template id="demo_assets_backend" inherit_id="web.assets_backend">
21+
<xpath expr="." position="inside">
22+
<script
2523
type="text/javascript"
2624
src="/pos_debt_notebook/static/src/js/test_pos_debt.js"
2725
/>
28-
</xpath>
29-
</template>
30-
26+
</xpath>
27+
</template>
3128
</odoo>

‎pos_debt_notebook/data/demo.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
License MIT (https://opensource.org/licenses/MIT). -->
44
<openerp>
55
<data>
6-
76
<!--Set field debt to 'credit' in model pos.config.settings via get_default_debt_type-->
87
<function
98
model="ir.config_parameter"
109
name="set_param"
1110
eval="('pos_debt_notebook.debt_type', 'credit')"
1211
/>
13-
1412
<record id="product_credit_product" model="product.product">
1513
<field name="name">Credits top-up</field>
1614
<field name="default_code">POS-DEBT</field>
@@ -23,6 +21,5 @@
2321
name="description"
2422
>This is a product for purchasing "Credits".</field>
2523
</record>
26-
2724
</data>
2825
</openerp>

‎pos_debt_notebook/data/product.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
License MIT (https://opensource.org/licenses/MIT). -->
44
<openerp>
55
<data noupdate="1">
6-
76
<record id="product_pay_debt" model="product.product">
87
<field name="name">Pay Debt</field>
98
<field name="default_code">POS-DEBT</field>
@@ -16,6 +15,5 @@
1615
name="description"
1716
>This is a dummy product used when a customer pays his debt without ordering new products. This is a workaround to the fact that Odoo needs to have at least one product on the order to validate the transaction.</field>
1817
</record>
19-
2018
</data>
2119
</openerp>

‎pos_debt_notebook/security/pos_debt_notebook_security.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@
22
<!--Copyright 2018 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr>
33
License MIT (https://opensource.org/licenses/MIT). -->
44
<odoo>
5-
65
<record id="group_pos_credit_update_manager" model="res.groups">
76
<field name="name">Credit Updates Manager</field>
87
<field name="implied_ids" eval="[(4, ref('base.group_user'))]" />
98
<field
109
name="comment"
1110
>The user will gain access to update partner credits.</field>
1211
</record>
13-
1412
<record id="point_of_sale.group_pos_manager" model="res.groups">
1513
<field
1614
name="implied_ids"
1715
eval="[(4, ref('group_pos_credit_update_manager'))]"
1816
/>
1917
</record>
20-
2118
</odoo>

0 commit comments

Comments
 (0)