diff --git a/addons/point_of_sale/models/res_config.py b/addons/point_of_sale/models/res_config.py index 415d1c75876..89539d6156c 100644 --- a/addons/point_of_sale/models/res_config.py +++ b/addons/point_of_sale/models/res_config.py @@ -21,7 +21,7 @@ class PosConfiguration(models.TransientModel): default_pricelist_setting = fields.Selection([ ('percentage', 'Multiple prices per product (e.g. quantity, shop-specific)'), ('formula', 'Price computed from formulas (discounts, margins, rounding)') - ], string="Pricelists", default_model='pos.config.settings') + ], string="Multiple Prices per Products", default_model='pos.config.settings') module_pos_restaurant = fields.Boolean(string="Restaurant") module_pos_loyalty = fields.Boolean(string="Loyalty Program") module_pos_discount = fields.Boolean(string="Global Discounts") diff --git a/addons/point_of_sale/views/account_journal_view.xml b/addons/point_of_sale/views/account_journal_view.xml index 6e62407dc61..7f165917e8a 100644 --- a/addons/point_of_sale/views/account_journal_view.xml +++ b/addons/point_of_sale/views/account_journal_view.xml @@ -21,6 +21,6 @@ + parent="point_of_sale.pos_config_menu_configuration" + sequence="30"/> diff --git a/addons/point_of_sale/views/point_of_sale_view.xml b/addons/point_of_sale/views/point_of_sale_view.xml index 86041773dda..a1bd791b638 100644 --- a/addons/point_of_sale/views/point_of_sale_view.xml +++ b/addons/point_of_sale/views/point_of_sale_view.xml @@ -9,11 +9,34 @@ web_icon="point_of_sale,static/description/icon.png" sequence="20"/> - + + - + + + + + + + + + - - diff --git a/addons/point_of_sale/views/pos_category_view.xml b/addons/point_of_sale/views/pos_category_view.xml index 54fc236d25e..2554047f0fc 100644 --- a/addons/point_of_sale/views/pos_category_view.xml +++ b/addons/point_of_sale/views/pos_category_view.xml @@ -30,7 +30,7 @@ - Pos Product Categories + PoS Categories ir.actions.act_window pos.category form @@ -50,5 +50,8 @@ - + diff --git a/addons/point_of_sale/views/pos_config_view.xml b/addons/point_of_sale/views/pos_config_view.xml index defa489bdc9..f404907fd83 100644 --- a/addons/point_of_sale/views/pos_config_view.xml +++ b/addons/point_of_sale/views/pos_config_view.xml @@ -119,9 +119,9 @@ + groups="group_pos_manager" sequence="5"/> Point of Sale @@ -141,7 +141,10 @@ - + diff --git a/addons/point_of_sale/views/product_view.xml b/addons/point_of_sale/views/product_view.xml index 667c45425f4..8c06471cc32 100644 --- a/addons/point_of_sale/views/product_view.xml +++ b/addons/point_of_sale/views/product_view.xml @@ -11,16 +11,24 @@ - + Products ir.actions.act_window + product.template + form + kanban,tree,form + + + + Product Variants + ir.actions.act_window product.product form kanban,tree,form - +

Click to add a new product. @@ -35,10 +43,14 @@

- + + Internal Categories + ir.actions.act_window + product.category + form + + + product.template.form.inherit @@ -54,4 +66,41 @@ + + + + + + + + + + + diff --git a/addons/point_of_sale/views/res_config_view.xml b/addons/point_of_sale/views/res_config_view.xml index 3e736489ee0..1a16886e973 100644 --- a/addons/point_of_sale/views/res_config_view.xml +++ b/addons/point_of_sale/views/res_config_view.xml @@ -96,7 +96,7 @@ -

Products

+

Product Catalog

@@ -165,6 +165,6 @@ inline - + diff --git a/addons/pos_mercury/views/pos_mercury_views.xml b/addons/pos_mercury/views/pos_mercury_views.xml index d2c62f33122..8765eb71fb3 100644 --- a/addons/pos_mercury/views/pos_mercury_views.xml +++ b/addons/pos_mercury/views/pos_mercury_views.xml @@ -92,7 +92,6 @@ - + diff --git a/addons/pos_restaurant/views/pos_restaurant_views.xml b/addons/pos_restaurant/views/pos_restaurant_views.xml index 766be861b3a..096b1d380c9 100644 --- a/addons/pos_restaurant/views/pos_restaurant_views.xml +++ b/addons/pos_restaurant/views/pos_restaurant_views.xml @@ -74,11 +74,10 @@ - @@ -130,11 +129,10 @@ -