pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] *: see pricelists when enabled

Browse Source 
Since 
https://github.com/odoo/odoo/commit/e88fe6f380ed5682f2cedad16ba13ca43a3828c2 
, the groups to have access to pricelists is `group_product_pricelist`, 
not `group_sale_pricelist` anymore.

`group_sale_pricelist` is now a technical group enabling access to 
advanced pricelist rules (percentage/discount).
This commit is contained in:
Victor Feyens
2019-08-22 15:27:59 +00:00
parent 3fdb6b6a71
commit 088de4f1eb
11 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/views/pos_config_view.xml
+2 -2
View File
@@ -249,7 +249,7 @@
</div>
<h2>Pricing</h2>
<div class="row mt16 o_settings_container" id="pricing">
<div class="col-12 col-lg-6 o_setting_box" id="default_pricelist_setting" groups="base.group_multi_currency,product.group_sale_pricelist">
<div class="col-12 col-lg-6 o_setting_box" id="default_pricelist_setting" groups="base.group_multi_currency,product.group_product_pricelist">
<div class="o_setting_right_pane">
<span class="o_form_label">Default Pricelist</span>
<div class="content-group mt16">
@@ -260,7 +260,7 @@
</div>
</div>
</div>
<div class="col-12 col-lg-6 o_setting_box" id="pricelist_setting" groups="product.group_sale_pricelist">
<div class="col-12 col-lg-6 o_setting_box" id="pricelist_setting" groups="product.group_product_pricelist">
<div class="o_setting_left_pane">
<field name="use_pricelist"/>
</div>
addons/point_of_sale/views/pos_order_view.xml
+1 -1
View File
@@ -104,7 +104,7 @@
<group string="Other Information">
<field name="pos_reference"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="pricelist_id" groups="product.group_sale_pricelist"/>
<field name="pricelist_id" groups="product.group_product_pricelist"/>
</group>
</group>
</page>
addons/point_of_sale/views/product_view.xml
+1 -1
View File
@@ -83,7 +83,7 @@
<menuitem id="pos_config_menu_action_product_pricelist"
parent="point_of_sale.pos_config_menu_catalog"
action="product.product_pricelist_action2"
groups="product.group_sale_pricelist"
groups="product.group_product_pricelist"
sequence="20"/>
<record id="product_uom_categ_form_view" model="ir.ui.view">
addons/point_of_sale/views/res_config_settings_views.xml
+1 -1
View File
@@ -44,7 +44,7 @@
<field name="product_pricelist_setting" widget="radio" class="o_light_label"/>
</div>
<div class="mt8">
<button name="%(product.product_pricelist_action2)d" icon="fa-arrow-right" type="action" string="Pricelists" groups="product.group_sale_pricelist" class="btn-link"/>
<button name="%(product.product_pricelist_action2)d" icon="fa-arrow-right" type="action" string="Pricelists" groups="product.group_product_pricelist" class="btn-link"/>
</div>
</div>
</div>
addons/product/security/product_security.xml
+2 -2
View File
@@ -3,12 +3,12 @@
<data noupdate="0">
<record id="group_sale_pricelist" model="res.groups">
<field name="name">Sales Pricelists</field>
<field name="name">Advanced Pricelists</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="group_product_pricelist" model="res.groups">
<field name="name">Pricelists On Product</field>
<field name="name">Basic Pricelists</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
addons/product/views/product_pricelist_views.xml
+1 -1
View File
@@ -25,7 +25,7 @@
name="groupby_vendor"
domain="[]"
context="{'group_by': 'pricelist_id'}"
groups="product.group_sale_pricelist"/>
groups="product.group_product_pricelist"/>
</group>
</search>
</field>
addons/product/views/product_views.xml
+1 -1
View File
@@ -142,7 +142,7 @@
<separator/>
<filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
<field string="Attributes" name="attribute_line_ids" groups="product.group_product_variant"/>
<field name="pricelist_id" context="{'pricelist': self}" filter_domain="[]" groups="product.group_sale_pricelist"/>
<field name="pricelist_id" context="{'pricelist': self}" filter_domain="[]" groups="product.group_product_pricelist"/>
<filter invisible="1" string="Late Activities" name="activities_overdue"
domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
help="Show all records which has next action date is before today"/>
addons/product/views/res_partner_views.xml
+5 -5
View File
@@ -4,14 +4,14 @@
<field name="name">res.partner.product.property.form.inherit</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="groups_id" eval="[(4, ref('product.group_sale_pricelist'))]"/>
<field name="arch" type="xml">
<field name="groups_id" eval="[(4, ref('product.group_product_pricelist'))]"/>
<field name="arch" type="xml">
<group name="sale">
<field name="property_product_pricelist" groups="product.group_sale_pricelist" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}"/>
<div name="parent_pricelists" groups="product.group_sale_pricelist" colspan="2" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
<field name="property_product_pricelist" groups="product.group_product_pricelist" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}"/>
<div name="parent_pricelists" groups="product.group_product_pricelist" colspan="2" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
<p>Pricelists are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
</div>
</group>
</field>
</record>
</odoo>
</odoo>
addons/product/wizard/product_price_list_views.xml
+1 -1
View File
@@ -28,6 +28,6 @@
res_model="product.price_list"
binding_model="product.product"
binding_type="report"
groups="product.group_sale_pricelist"
groups="product.group_product_pricelist"
view_mode="form" target="new" />
</odoo>
addons/repair/views/repair_views.xml
+1 -1
View File
@@ -79,7 +79,7 @@
<field name="guarantee_limit"/>
<field name="invoice_method"/>
<field name="partner_invoice_id" attrs="{'invisible':[('invoice_method','=', 'none')],'required':[('invoice_method','!=','none')]}" groups="sale.group_delivery_invoice_address"/>
<field name="pricelist_id" groups="product.group_sale_pricelist" context="{'product_id':product_id}" attrs="{'invisible':[('invoice_method','=', 'none')]}"/>
<field name="pricelist_id" groups="product.group_product_pricelist" context="{'product_id':product_id}" attrs="{'invisible':[('invoice_method','=', 'none')]}"/>
<field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/>
</group>
</group>
addons/website_sale/views/sale_order_views.xml
+1 -1
View File
@@ -233,7 +233,7 @@
parent="menu_catalog" groups="product.group_product_variant" sequence="2"/>
<menuitem id="menu_catalog_pricelists" name="Pricelists"
action="product.product_pricelist_action2"
parent="menu_catalog" groups="product.group_sale_pricelist" sequence="4"/>
parent="menu_catalog" groups="product.group_product_pricelist" sequence="4"/>
<!-- Reporting sub-menus -->
<menuitem id="menu_report_sales" name="Online Sales"