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

[IMP] Sale : Moved field group_sale_delivery_address in sale_stock configuration 

bzr revid: rpr@tinyerp.com-20120928093759-6wkr6mwns2p8h9ic
This commit is contained in:
Rajesh Prajapati (OpenERP) 2012-09-28 15:07:59 +05:30
parent d9ad8eb8ad
commit 787c165eb5
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/sale/res_config.py
View File

@ -48,9 +48,6 @@ class sale_configuration(osv.osv_memory):
'group_uom':fields.boolean("Allow using different units of measures",
implied_group='product.group_uom',
help="""Allows you to select and maintain different units of measure for products."""),
'group_sale_delivery_address': fields.boolean("Allow a different address for delivery and invoicing ",
implied_group='sale.group_delivery_invoice_address',
help="Allows you to specify different delivery and invoice addresses on a sale order."),
'group_discount_per_so_line': fields.boolean("Allow setting a discount on the sale order lines",
implied_group='sale.group_discount_per_so_line',
help="Allows you to apply some discount per sale order line."),

4
addons/sale/res_config_view.xml
View File

@ -33,10 +33,6 @@
</group>
</div>
<div name="Customer Features" position="inside">
<div>
<field name="group_sale_delivery_address" class="oe_inline"/>
<label for="group_sale_delivery_address"/>
</div>
<div>
<field name="group_sale_pricelist" class="oe_inline"/>
<label for="group_sale_pricelist"/>

3
addons/sale_stock/res_config.py
View File

@ -27,6 +27,9 @@ class sale_configuration(osv.osv_memory):
_inherit = 'sale.config.settings'
_columns = {
'group_sale_delivery_address': fields.boolean("Allow a different address for delivery and invoicing ",
implied_group='sale.group_delivery_invoice_address',
help="Allows you to specify different delivery and invoice addresses on a sale order."),
'group_invoice_deli_orders': fields.boolean('Generate invoices after and based on delivery orders',
implied_group='sale_stock.group_invoice_deli_orders',
help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."),

6
addons/sale_stock/res_config_view.xml
View File

@ -9,6 +9,12 @@
<field name="inherit_id" ref="sale.view_sales_config"/>
<field name="arch" type="xml">
<data>
<xpath expr="//div[@name='Customer Features']" position="inside">
<div>
<field name="group_sale_delivery_address" class="oe_inline"/>
<label for="group_sale_delivery_address"/>
</div>
</xpath>
<xpath expr="//div[@name='group_invoice_so_lines']" position="replace">
<div>
<field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>