Hardik Ansodariya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability-delivery_pricelist-han into
lp:~openerp-dev/openobject-addons/trunk-usability.
Requested reviews:
Amit (Open ERP) (apa-tiny)
Hardik Ansodariya (OpenERP) (han-tinyerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-delivery_pricelist-han/+merge/76953
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-delivery_pricelist-han/+merge/76953
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-usability.
=== modified file 'delivery/delivery.py'
--- delivery/delivery.py 2011-07-06 14:56:44 +0000
+++ delivery/delivery.py 2011-09-26 10:04:36 +0000
@@ -60,6 +60,12 @@
res[carrier.id]=price
return res
+ def _get_product_id(self, cr, uid, *args):
+ model_data = self.pool.get('ir.model.data')
+ res = model_data.search(cr,uid, [('name', '=', 'delivery_product')])
+ if res:return model_data.browse(cr,uid,res[0]).res_id
+ return False
+
_columns = {
'name': fields.char('Carrier', size=64, required=True),
'partner_id': fields.many2one('res.partner', 'Carrier Partner', required=True),
@@ -71,12 +77,13 @@
'free_if_more_than': fields.boolean('Free If More Than'),
'amount': fields.float('Amount'),
'use_detailed_pricelist': fields.boolean('Use Detailed Pricelist'),
- 'pricelist_ids': fields.one2many('delivery.grid', 'carrier_id', 'Price List'),
+ 'pricelist_ids': fields.one2many('delivery.grid', 'carrier_id', 'Advanced Pricing'),
}
_defaults = {
'active': 1,
'free_if_more_than': False,
+ 'product_id': _get_product_id,
}
def grid_get(self, cr, uid, ids, contact_id, context=None):
=== modified file 'delivery/delivery_data.xml'
--- delivery/delivery_data.xml 2011-01-14 00:11:01 +0000
+++ delivery/delivery_data.xml 2011-09-26 10:04:36 +0000
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
- <data noupdate="True">
+ <data noupdate="1">
<record forcecreate="True" id="property_delivery_carrier" model="ir.property">
- <field name="name">property_delivery_carrier</field>
- <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier')]"/>
- </record>
+ <field name="name">property_delivery_carrier</field>
+ <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier')]"/>
+ </record>
</data>
</openerp>
=== modified file 'delivery/delivery_view.xml'
--- delivery/delivery_view.xml 2011-07-29 14:03:24 +0000
+++ delivery/delivery_view.xml 2011-09-26 10:04:36 +0000
@@ -37,12 +37,12 @@
<field name="use_detailed_pricelist"/>
</group>
<field name="pricelist_ids" nolabel="1" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
- <tree string="Delivery grids">
+ <tree string="Advance pricing">
<field name="sequence"/>
<field name="carrier_id"/>
<field name="name"/>
</tree>
- <form string="Delivery grids">
+ <form string="Advance pricing">
<field name="name" select="1"/>
<field name="active" select="1"/>
<field name="sequence" groups="base.group_extended" select="1"/>
@@ -82,7 +82,7 @@
<field name="help">Define the delivery methods you are using and their pricing in order to reinvoice the delivery costs when you are doing invoicing based on delivery orders</field>
</record>
- <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery" groups="base.group_extended"/>
+ <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery"/>
<!-- Delivery Grids -->
<record id="view_delivery_grid_tree" model="ir.ui.view">
@@ -132,7 +132,7 @@
<field name="view_mode">tree,form</field>
<field name="help">The delivery price list allows you to compute the cost and sales price of the delivery according to the weight of the products and other criteria. You can define several price lists for one delivery method, per country or a zone in a specific country defined by a postal code range.</field>
</record>
- <menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery"/>
+ <menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery" groups="base.group_extended"/>
<record id="view_delivery_grid_line_form" model="ir.ui.view">
<field name="name">delivery.grid.line.form</field>
_______________________________________________
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
