summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYannick Tivisse <yti@odoo.com>2016-04-07 08:53:36 +0200
committerYannick Tivisse <yti@odoo.com>2016-04-07 10:08:20 +0200
commit536dbc50dbb0a0d37b4f7afea20b9ae281a829df (patch)
treea98e436eb3f29927d8924f52198558d099e688bb
parent78e0313f3e8c2ef3de6b643b4fcff0ca40f06edc (diff)
[IMP] account,sale,purchase,stock: Add groups to activate warnings
-rw-r--r--addons/account/models/res_config.py4
-rw-r--r--addons/account/security/account_security.xml4
-rw-r--r--addons/account/views/partner_view.xml2
-rw-r--r--addons/account/views/res_config_view.xml1
-rw-r--r--addons/purchase/partner_view.xml2
-rw-r--r--addons/purchase/purchase_view.xml2
-rw-r--r--addons/purchase/res_config.py4
-rw-r--r--addons/purchase/res_config_view.xml1
-rw-r--r--addons/purchase/security/purchase_security.xml4
-rw-r--r--addons/sale/res_config.py4
-rw-r--r--addons/sale/res_config_view.xml1
-rw-r--r--addons/sale/res_partner_view.xml2
-rw-r--r--addons/sale/sale_view.xml2
-rw-r--r--addons/sale/security/sale_security.xml4
-rw-r--r--addons/stock/partner_view.xml2
-rw-r--r--addons/stock/res_config.py5
-rw-r--r--addons/stock/res_config_view.xml1
-rw-r--r--addons/stock/security/stock_security.xml4
18 files changed, 43 insertions, 6 deletions
diff --git a/addons/account/models/res_config.py b/addons/account/models/res_config.py
index cde64b03a52..2b1a91e773c 100644
--- a/addons/account/models/res_config.py
+++ b/addons/account/models/res_config.py
@@ -85,6 +85,10 @@ class AccountConfigSettings(models.TransientModel):
group_analytic_accounting = fields.Boolean(string='Analytic accounting',
implied_group='analytic.group_analytic_accounting',
help="Allows you to use the analytic accounting.")
+ group_warning = fields.Selection([
+ (0, 'All the partners can be used in invoices'),
+ (1, 'An informative or blocking warning can be set on a partner')
+ ], "Warning", implied_group='account.group_warning')
currency_exchange_journal_id = fields.Many2one('account.journal',
related='company_id.currency_exchange_journal_id',
string="Rate Difference Journal",)
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 1bd9765d455..cd6369c2207 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -30,6 +30,10 @@
<field name="category_id" ref="base.module_category_hidden"/>
</record>
+ <record id="group_warning" model="res.groups">
+ <field name="name">An informative or blocking warning can be set on a partner</field>
+ </record>
+
</data>
<data noupdate="1">
diff --git a/addons/account/views/partner_view.xml b/addons/account/views/partner_view.xml
index 748994dac60..20253d0a7d2 100644
--- a/addons/account/views/partner_view.xml
+++ b/addons/account/views/partner_view.xml
@@ -120,7 +120,7 @@
</group>
</group>
<page name="warnings" position="inside">
- <group colspan="2" col="2">
+ <group colspan="2" col="2" groups="account.group_warning">
<separator string="Warning on the Invoice" colspan="4"/>
<field name="invoice_warn" nolabel="1" />
<field name="invoice_warn_msg" colspan="3" nolabel="1"
diff --git a/addons/account/views/res_config_view.xml b/addons/account/views/res_config_view.xml
index 0772a2a5794..18acebf138c 100644
--- a/addons/account/views/res_config_view.xml
+++ b/addons/account/views/res_config_view.xml
@@ -220,6 +220,7 @@
<a href="https://www.odoo.com/page/accounting-features" target="_blank"> More Info</a>
</div>
</div>
+ <field name="group_warning" widget="radio"/>
</group>
<group attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
<label for="id" string="Taxes"/>
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index d344d3abbc7..55b7e9fd5f4 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -80,7 +80,7 @@
</button>
</div>
<page name="warnings" position="inside">
- <group colspan="2" col="2">
+ <group colspan="2" col="2" groups="purchase.group_warning">
<separator string="Warning on the Purchase Order" colspan="4"/>
<field name="purchase_warn" nolabel="1" />
<field name="purchase_warn_msg" colspan="3" nolabel="1"
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 39103797e33..c73892d2279 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -537,7 +537,7 @@
<field name="purchase_method" widget="radio" groups="purchase.group_purchase_manager"/>
</field>
<group name="description" position="after">
- <group string="Warning when Purchasing this Product" colspan="2">
+ <group string="Warning when Purchasing this Product" colspan="2" groups="purchase.group_warning">
<field name="purchase_line_warn" nolabel="1"/>
<field name="purchase_line_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('purchase_line_warn','!=','no-message')],'readonly':[('purchase_line_warn','=','no-message')]}"/>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 51f9e19b879..fb959e1d2fe 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -40,6 +40,10 @@ class purchase_config_settings(osv.osv_memory):
], "Advanced Calls for Tenders",
implied_group='purchase.group_advance_bidding',
help="""In the process of a public tendering, you can compare the tender lines and choose for each requested product which quantity you will buy from each bid."""),
+ 'group_warning': fields.selection([
+ (0, 'All the products and the customers can be used in purchase orders'),
+ (1, 'An informative or blocking warning can be set on a product or a customer')
+ ], "Warning", implied_group='purchase.group_warning'),
'module_stock_dropshipping': fields.selection([
(0, 'Suppliers always deliver to your warehouse(s)'),
(1, "Allow suppliers to deliver directly to your customers")
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 71a78f7b118..d29aa70a348 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -18,6 +18,7 @@
<field name="group_advance_purchase_requisition" widget="radio"
attrs="{'invisible': [('module_purchase_requisition', '=', 0)]}"/>
<field name="group_manage_vendor_price" widget="radio"/>
+ <field name="group_warning" widget="radio"/>
</group>
<group string="Location &amp; Warehouse">
<field name="module_stock_dropshipping" widget="radio"/>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index edccd9afd73..52d95abf237 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -35,6 +35,10 @@
<field name="category_id" ref="base.module_category_hidden"/>
</record>
+ <record id="group_warning" model="res.groups">
+ <field name="name">An informative or blocking warning can be set on a product or a customer</field>
+ </record>
+
</data>
<data noupdate="1">
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 6d79308833d..87153c22252 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -49,6 +49,10 @@ class sale_configuration(osv.TransientModel):
(0, 'Do not personalize sale orders and invoice reports'),
(1, 'Personalize the sale orders and invoice report with categories, subtotals and page-breaks')
], "Sale Reports Layout", implied_group='sale.group_sale_layout'),
+ 'group_warning': fields.selection([
+ (0, 'All the products and the customers can be used in sale orders'),
+ (1, 'An informative or blocking warning can be set on a product or a customer')
+ ], "Warning", implied_group='sale.group_warning'),
'module_website_quote': fields.selection([
(0, 'Print quotes or send by email'),
(1, 'Send online quotations based on templates (advanced)')
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index c19acf8ce67..e2552348f9d 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -20,6 +20,7 @@
<field name="module_sale_margin" widget="radio"/>
<field name="group_sale_layout" widget="radio"/>
<field name="auto_done_setting" widget="radio"/>
+ <field name="group_warning" widget="radio"/>
<label for="sale_pricelist_setting" string="Sale Price"/>
<div>
<field name="sale_pricelist_setting" class="oe_inline" widget="radio" on_change="onchange_sale_price(sale_pricelist_setting)"/>
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 42761445cbd..43a99d12310 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -51,7 +51,7 @@
</div>
<page name="warnings" position="inside">
<group colspan="2" col="2">
- <separator string="Warning on the Sales Order" colspan="4"/>
+ <separator string="Warning on the Sales Order" colspan="4" groups="sale.group_warning"/>
<field name="sale_warn" nolabel="1" />
<field name="sale_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('sale_warn','!=','no-message')],'readonly':[('sale_warn','=','no-message')]}"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 53a6021aee1..96c6f556174 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -581,7 +581,7 @@
</button>
</div>
<group name="description" position="after">
- <group string="Warning when Selling this Product" colspan="2">
+ <group string="Warning when Selling this Product" colspan="2" groups="sale.group_warning">
<field name="sale_line_warn" nolabel="1"/>
<field name="sale_line_warn_msg" colspan="3" nolabel="1"
attrs="{'required':[('sale_line_warn','!=','no-message')],'readonly':[('sale_line_warn','=','no-message')]}"/>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index a98716383f5..b53319e2196 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -50,6 +50,10 @@
<field name="category_id" ref="base.module_category_hidden"/>
</record>
+ <record id="group_warning" model="res.groups">
+ <field name="name">An informative or blocking warning can be set on a product or a customer</field>
+ </record>
+
<record id="group_analytic_accounting" model="res.groups">
<field name="name">Analytic Accounting for Sales</field>
<field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 750f64c7dd2..efb615bc3ef 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -27,7 +27,7 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<page name="warnings" position="inside">
- <group colspan="2" col="2">
+ <group colspan="2" col="2" groups="stock.group_warning">
<separator string="Warning on the Picking" colspan="4"/>
<field name="picking_warn" nolabel="1" />
<field name="picking_warn_msg" colspan="3" nolabel="1"
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 96aef14a04d..6999c569ebb 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -97,6 +97,11 @@ class stock_config_settings(osv.osv_memory):
], "Packages",
implied_group='stock.group_tracking_lot',
help="""This allows to manipulate packages. You can put something in, take something from a package, but also move entire packages and put them even in another package. """),
+ 'group_warning': fields.selection([
+ (0, 'All the partners can be used in pickings'),
+ (1, 'An informative or blocking warning can be set on a partner')
+ ], "Warning", implied_group='stock.group_warning'),
+
'group_stock_tracking_owner': fields.selection([
(0, 'All products in your warehouse belong to your company'),
(1, 'Manage consignee stocks (advanced)')
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index a87a5867420..62e46f9f5f8 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -74,6 +74,7 @@
<field name="module_stock_dropshipping" widget="radio"/>
<field name="module_stock_picking_wave" widget="radio"/>
<field name="module_stock_calendar" widget="radio"/>
+ <field name="group_warning" widget="radio"/>
</group>
<group string="Products">
<field name="group_uom" widget="radio"/>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index cd8dcb90162..d5fadcc9474 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -47,6 +47,10 @@
<field name="name">Manage Different Stock Owners</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
+
+ <record id="group_warning" model="res.groups">
+ <field name="name">An informative or blocking warning can be set on a partner</field>
+ </record>
</data>
<data noupdate="1">
<!-- multi -->