Rajesh Prajapati (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons_issue12_sale-rpr into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons_issue12_sale-rpr/+merge/128228
Hello
I have done following changes in sale
- Added particular address type invoice/delivery instead of Default while
creating address on the fly
- Remove the traceback from configuration-sales
- Moved 'group_sale_delivery_address' field to sale_stock module
- Added data of cost price field for sale order lines
Thanks,
Rajesh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons_issue12_sale-rpr/+merge/128228
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons_issue12_sale-rpr.
=== modified file 'sale/res_config.py'
--- sale/res_config.py 2012-09-20 14:36:16 +0000
+++ sale/res_config.py 2012-10-05 11:23:28 +0000
@@ -48,9 +48,6 @@
'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."),
=== modified file 'sale/res_config_view.xml'
--- sale/res_config_view.xml 2012-09-25 10:15:47 +0000
+++ sale/res_config_view.xml 2012-10-05 11:23:28 +0000
@@ -12,6 +12,13 @@
<group>
<label for="id" string="Invoicing Process"/>
<div>
+<<<<<<< TREE
+=======
+ <div name="group_invoice_so_lines">
+ <field name="group_invoice_so_lines" class="oe_inline"/>
+ <label for="group_invoice_so_lines"/>
+ </div>
+>>>>>>> MERGE-SOURCE
<div name="timesheet">
<field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
<label for="timesheet"/>
@@ -30,10 +37,6 @@
</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"/>
</div>
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2012-09-30 14:16:38 +0000
+++ sale/sale_view.xml 2012-10-05 11:23:28 +0000
@@ -174,9 +174,15 @@
</h1>
<group>
<group>
+<<<<<<< TREE
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}"/>
<field name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
<field name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
+=======
+ <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
+ <field name="partner_invoice_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'invoice'}"/>
+ <field name="partner_shipping_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'delivery'}"/>
+>>>>>>> MERGE-SOURCE
<field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
</group>
<group>
=== modified file 'sale_margin/__openerp__.py'
--- sale_margin/__openerp__.py 2012-09-26 12:16:27 +0000
+++ sale_margin/__openerp__.py 2012-10-05 11:23:28 +0000
@@ -32,7 +32,7 @@
'author':'OpenERP SA',
'images':['images/sale_margin.jpeg'],
'depends':['sale_stock'],
- 'demo':[],
+ 'demo':['sale_margin_demo.xml'],
'test': ['test/sale_margin.yml'],
'data':['security/ir.model.access.csv','sale_margin_view.xml'],
'auto_install': False,
=== added file 'sale_margin/sale_margin_demo.xml'
--- sale_margin/sale_margin_demo.xml 1970-01-01 00:00:00 +0000
+++ sale_margin/sale_margin_demo.xml 2012-10-05 11:23:28 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data noupdate="1">
+
+ <record id="sale.sale_order_line_1" model="sale.order.line">
+ <field name="purchase_price">2870.00</field>
+ </record>
+
+ <record id="sale.sale_order_line_2" model="sale.order.line">
+ <field name="purchase_price">126.00</field>
+ </record>
+
+ <record id="sale.sale_order_line_3" model="sale.order.line">
+ <field name="purchase_price">60.00</field>
+ </record>
+
+ <record id="sale.sale_order_line_12" model="sale.order.line">
+ <field name="purchase_price">390.00</field>
+ </record>
+
+ <record id="sale.sale_order_line_13" model="sale.order.line">
+ <field name="purchase_price">21.60</field>
+ </record>
+
+ <record id="sale.sale_order_line_14" model="sale.order.line">
+ <field name="purchase_price">4258.00</field>
+ </record>
+
+ <record id="sale.sale_order_line_16" model="sale.order.line">
+ <field name="purchase_price">2870.00</field>
+ </record>
+
+ <record id="sale.sale_order_line_17" model="sale.order.line">
+ <field name="purchase_price">155.00</field>
+ </record>
+
+ <record id="sale.sale_order_line_18" model="sale.order.line">
+ <field name="purchase_price">35.00</field>
+ </record>
+
+ <record id="sale.sale_order_line_19" model="sale.order.line">
+ <field name="purchase_price">13.00</field>
+ </record>
+
+ </data>
+</openerp>
=== modified file 'sale_stock/res_config.py'
--- sale_stock/res_config.py 2012-09-20 14:36:16 +0000
+++ sale_stock/res_config.py 2012-10-05 11:23:28 +0000
@@ -27,6 +27,9 @@
_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'."),
=== modified file 'sale_stock/res_config_view.xml'
--- sale_stock/res_config_view.xml 2012-09-09 10:11:56 +0000
+++ sale_stock/res_config_view.xml 2012-10-05 11:23:28 +0000
@@ -9,11 +9,19 @@
<field name="inherit_id" ref="sale.view_sales_config"/>
<field name="arch" type="xml">
<data>
- <xpath expr="//div[@name='timesheet']" position="before">
+ <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"/>
<label for="group_invoice_so_lines"/>
</div>
+ </xpath>
+ <xpath expr="//div[@name='timesheet']" position="before">
<div>
<field name="group_invoice_deli_orders" class="oe_inline" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
<label for="group_invoice_deli_orders"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
