odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merged hsa's branch lp:~openerp-dev/openobject-addons/trunk-en-us-police-improvements-bde-warn-notify-hsa 

bzr revid: bde@tinyerp.com-20121106061047-5190u1ceylj17w3h
This commit is contained in:
Bharat Devnani (OpenERP) 2012-11-06 11:40:47 +05:30
parent 4af7fc1cf0 d3605367dc
commit 7c33b5861f
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/analytic/analytic_view.xml
View File

@ -40,7 +40,7 @@
Once the end date of the contract is
passed or the maximum number of service
units (e.g. support contract) is
reached, the account manager is warned
reached, the account manager is notified
by email to renew the contract with the
customer.
</p>

7
addons/purchase/res_config.py
View File

@ -47,10 +47,9 @@ class purchase_config_settings(osv.osv_memory):
implied_group='purchase.group_delivery_invoice_address',
help="Allows you to specify different delivery and invoice addresses on a purchase order."),
'module_warning': fields.boolean("Alerts by products or supplier",
help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier.
Example: Product: this product is deprecated, do not purchase more than 5.
Supplier: don't forget to ask for an express delivery."""),
help="""Allow to configure notification on products and trigger them when a user wants to purchase a given product or a given supplier.
Example: Product: this product is deprecated, do not purchase more than 5.
Supplier: don't forget to ask for an express delivery."""),
'module_purchase_double_validation': fields.boolean("Force two levels of approvals",
help="""Provide a double validation mechanism for purchases exceeding minimum amount.
This installs the module purchase_double_validation."""),

6
addons/sale/res_config.py
View File

@ -52,9 +52,9 @@ Example: 10% for retailers, promotion of 5 USD on this product, etc."""),
implied_group='sale.group_discount_per_so_line',
help="Allows you to apply some discount per sale order line."),
'module_warning': fields.boolean("Allow configuring alerts by customer or products",
help="""Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer.
Example: Product: this product is deprecated, do not purchase more than 5.
Supplier: don't forget to ask for an express delivery."""),
help="""Allow to configure notification on products and trigger them when a user wants to sale a given product or a given customer.
Example: Product: this product is deprecated, do not purchase more than 5.
Supplier: don't forget to ask for an express delivery."""),
'module_sale_margin': fields.boolean("Display margins on sales orders",
help="""This adds the 'Margin' on sales order.
This gives the profitability by calculating the difference between the Unit Price and Cost Price.