openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06697
lp:~openerp-dev/openobject-addons/trunk-configuration-rework-delivery-improvement-rha into lp:~openerp-dev/openobject-addons/trunk-configuration-rework
Rifakat Haradwala (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-configuration-rework-delivery-improvement-rha into lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
Requested reviews:
Rucha (Open ERP) (rpa-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-delivery-improvement-rha/+merge/60782
Delivery: added in configuration wizard and improvements
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-delivery-improvement-rha/+merge/60782
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
=== modified file 'delivery/delivery.py'
--- delivery/delivery.py 2011-01-14 00:11:01 +0000
+++ delivery/delivery.py 2011-05-12 13:32:31 +0000
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -23,6 +23,20 @@
from osv import fields,osv
from tools.translate import _
+class delivery_carrier_country(osv.osv):
+ _name = "delivery.carrier.country"
+ _description = "Delivery Carrier Country"
+
+ _columns = {
+ 'country' : fields.many2many('res.country', 'delivery_country_rel',\
+ 'delivery_id', 'country_id', 'Country'),
+ 'price': fields.float('Price'),
+ 'delivery_carrier_id': fields.many2one('delivery.carrier', 'Carrier'),
+ }
+
+
+delivery_carrier_country()
+
class delivery_carrier(osv.osv):
_name = "delivery.carrier"
_description = "Carrier"
@@ -64,10 +78,19 @@
'product_id': fields.many2one('product.product', 'Delivery Product', required=True),
'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'),
'price' : fields.function(get_price, method=True,string='Price'),
- 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the delivery carrier without removing it.")
+ 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the delivery carrier without removing it."),
+ 'normal_price': fields.float('Normal Price'),
+ 'international_price': fields.boolean('International Price'),
+ 'free_if_more_than': fields.boolean('Free If More Than'),
+ 'delivery_country_ids': fields.one2many('delivery.carrier.country',\
+ 'delivery_carrier_id', 'Delivery Country'),
+ 'amount': fields.float('Amount'),
+
}
_defaults = {
- 'active': lambda *args:1
+ 'active': lambda *args:1,
+ 'international_price': lambda *args: False,
+ 'free_if_more_than': lambda *args: False
}
def grid_get(self, cr, uid, ids, contact_id, context=None):
contact = self.pool.get('res.partner.address').browse(cr, uid, contact_id, context=context)
@@ -86,6 +109,100 @@
continue
return grid.id
return False
+
+ def create_grid_lines(self, cr, uid, ids, vals, context=None):
+ if context == None:
+ context = {}
+ grid_line_pool = self.pool.get('delivery.grid.line')
+ grid_pool = self.pool.get('delivery.grid')
+ for record in self.browse(cr, uid, ids, context=context):
+ grid_id = grid_pool.search(cr, uid, [('carrier_id', '=', record.id)])
+ if not grid_id:
+ record_data = {
+ 'name': vals.get('name', False),
+ 'carrier_id': record.id,
+ 'seqeunce': 10,
+ }
+ new_grid_id = grid_pool.create(cr, uid, record_data)
+ grid_id = [new_grid_id]
+
+ if record.free_if_more_than:
+ grid_lines = []
+ for line in grid_pool.browse(cr, uid, grid_id[0]).line_ids:
+ if line.type == 'price':
+ grid_lines.append(line.id)
+ grid_line_pool.unlink(cr, uid, grid_lines)
+ data = {
+ 'grid_id': grid_id and grid_id[0],
+ 'name': _('Free if more than %d') % record.amount,
+ 'type': 'price',
+ 'operator': '>=',
+ 'max_value': record.amount,
+ 'standard_price': 0.0,
+ 'list_price': 0.0,
+ }
+ grid_line_pool.create(cr, uid, data)
+ else:
+ _lines = []
+ for line in grid_pool.browse(cr, uid, grid_id[0]).line_ids:
+ if line.type == 'price':
+ _lines.append(line.id)
+ grid_line_pool.unlink(cr, uid, _lines)
+
+ if record.international_price:
+ lines = []
+ for line in grid_pool.browse(cr, uid, grid_id[0]).line_ids:
+ if line.type == 'country':
+ lines.append(line.id)
+ grid_line_pool.unlink(cr, uid, lines)
+ for country_rec in record.delivery_country_ids:
+ for country in country_rec.country:
+ values = {
+ 'grid_id': grid_id[0],
+ 'name': _('Country is %s') %country.name,
+ 'country_id': country.id,
+ 'type': 'country',
+ 'standard_price': country_rec.price,
+ 'list_price': 0.0,
+ 'operator': '==',
+ 'max_value': 0.0
+ }
+ grid_line_pool.create(cr, uid, values)
+ else:
+ l = []
+ for line in grid_pool.browse(cr, uid, grid_id[0]).line_ids:
+ if line.type == 'country':
+ l.append(line.id)
+ grid_line_pool.unlink(cr, uid, l)
+
+ if record.normal_price:
+ default_data = {
+ 'grid_id': grid_id and grid_id[0],
+ 'name': _('Default price'),
+ 'type': 'price',
+ 'operator': '==',
+ 'max_value': record.normal_price,
+ 'standard_price': record.normal_price,
+ 'list_price': record.normal_price,
+ }
+ grid_line_pool.create(cr, uid, default_data)
+
+ return True
+
+ def write(self, cr, uid, ids, vals, context=None):
+ if context == None:
+ context = {}
+ res_id = super(delivery_carrier, self).write(cr, uid, ids, vals, context=context)
+ self.create_grid_lines(cr, uid, ids, vals, context=context)
+ return res_id
+
+ def create(self, cr, uid, vals, context=None):
+ if context == None:
+ context = {}
+ res_id = super(delivery_carrier, self).create(cr, uid, vals, context)
+ self.create_grid_lines(cr, uid, [res_id], vals, context=context)
+ return res_id
+
delivery_carrier()
class delivery_grid(osv.osv):
@@ -151,13 +268,17 @@
_columns = {
'name': fields.char('Name', size=32, required=True),
'grid_id': fields.many2one('delivery.grid', 'Grid',required=True),
- 'type': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price')], 'Variable', required=True),
+ 'type': fields.selection([('weight','Weight'),('volume','Volume'),\
+ ('wv','Weight * Volume'), ('price','Price'),\
+ ('country', 'Country')],\
+ 'Variable', required=True),
'operator': fields.selection([('==','='),('<=','<='),('>=','>=')], 'Operator', required=True),
'max_value': fields.float('Maximum Value', required=True),
'price_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Price Type', required=True),
'variable_factor': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price')], 'Variable Factor', required=True),
'list_price': fields.float('Sale Price', required=True),
'standard_price': fields.float('Cost Price', required=True),
+ 'country_id': fields.many2one('res.country', 'Country'),
}
_defaults = {
'type': lambda *args: 'weight',
@@ -167,6 +288,11 @@
}
_order = 'list_price'
+ def on_change_type(self, cr, uid, ids, type):
+ if type == 'country':
+ return {'value': {'operator': '=='}}
+ return True
+
delivery_grid_line()
=== modified file 'delivery/delivery_view.xml'
--- delivery/delivery_view.xml 2011-01-14 00:11:01 +0000
+++ delivery/delivery_view.xml 2011-05-12 13:32:31 +0000
@@ -4,8 +4,20 @@
<!-- Delivery Carriers -->
<menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_configuration" sequence="4"/>
-
-
+ <record id="view_delivery_country_form" model="ir.ui.view">
+ <field name="name">delivery.carrier.country.form</field>
+ <field name="model">delivery.carrier.country</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Carrier Country">
+ <group colspan="4" col="2">
+ <field name="price" colspan="2"/>
+ <newline/>
+ <field name="country" nolabel="1"/>
+ </group>
+ </form>
+ </field>
+ </record>
<record id="view_delivery_carrier_tree" model="ir.ui.view">
<field name="name">delivery.carrier.tree</field>
@@ -25,10 +37,29 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Carrier">
- <field name="name" select="1"/>
- <field name="active" select="1"/>
- <field name="partner_id" select="1"/>
- <field name="product_id" select="1"/>
+ <group colspan="4" col="4" name="general">
+ <field name="name" select="1"/>
+ <field name="active" select="1"/>
+ <field name="partner_id" select="1"/>
+ <field name="product_id" select="1"/>
+ <separator string="Pricing Information" colspan="6"/>
+ <group colspan="2" col="4">
+ <field name="normal_price" select="1" colspan="4"/>
+ <newline/>
+ <field name="free_if_more_than"/>
+ <field name="amount" attrs="{'invisible':[('free_if_more_than','=',False)]}"/>
+ </group>
+ </group>
+ <group colspan="4" col="4" name="inter">
+ <field name="international_price"/>
+ <field name="delivery_country_ids" nolabel="1" attrs="{'invisible':[('international_price','=',False)]}" mode="tree,form" colspan="6">
+ <tree string="Delivery countries">
+ <field name="price"/>
+ <field name="country"/>
+ <field name="delivery_carrier_id" invisible="1"/>
+ </tree>
+ </field>
+ </group>
</form>
</field>
</record>
@@ -98,13 +129,17 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Grid Lines">
- <field colspan="4" name="name" select="1"/>
- <field name="type" string="Condition"/>
- <field name="operator" nolabel="1"/>
- <field name="max_value" nolabel="1"/>
+ <group colspan="4" col="4">
+ <field colspan="4" name="name" select="1"/>
+ <field name="type" string="Condition" on_change="on_change_type(type)"/>
+ <field name="operator" nolabel="1"/>
+ <field name="max_value" nolabel="1" attrs="{'invisible':[('type','=','country')]}"/>
+ <field name="country_id" attrs="{'invisible':[('type','!=','country')]}" colspan="2"/>
+ </group>
+ <newline/>
<field name="list_price"/>
<field name="standard_price" groups="base.group_extended"/>
- <field name="price_type" />
+ <field name="price_type"/>
<field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
</form>
</field>
@@ -118,7 +153,8 @@
<field name="name"/>
<field name="type"/>
<field name="operator"/>
- <field name="max_value"/>
+ <field name="country_id" nolabel="1" attrs="{'invisible':[('type','!=','country')]}"/>
+ <field name="max_value" nolabel="1" attrs="{'invisible':[('type','=','country')]}"/>
<field name="list_price"/>
<field name="standard_price" groups="base.group_extended"/>
</tree>
@@ -286,6 +322,12 @@
</field>
</record>
+ <record id="delivery_method_form_view_todo" model="ir.actions.todo">
+ <field name="action_id" ref="action_delivery_carrier_form"/>
+ <field name="sequence">10</field>
+ <field name="type">normal</field>
+ <field name="state">skip</field>
+ </record>
</data>
</openerp>
Follow ups
