Goffin Simon
0fd773a486
Unify and refactor exception handling in framework and addons. The generic `except_osv` is now deprecated, and replaced by more specialized exception subtypes: - `UserError` (renamed from Warning, as it conflicts with the built-in `Warning`) raised when a non-technical error occurs during a business operation. It could be a missing information in the data provided by the user, or a misconfiguration. - `AccessError`: raised when any operation is denied because the user conducting it does not have the required access rights. - `AccessDenied`: raised when an operation that requires authenticated access is attempted via an unauthenticated request. - `MissingError`: raised when an operation is attempted on a record that does not exist. - `ValidationError`: raised when an operation violates a SQL or Python constraint. - All other exceptions are internal errors due to a system problem or bug, and raised untouched to the client-side, which should display a traceback. All exceptions take a single message argument. The `test_exceptions` module has been updated to showcase both new and old (deprecated) exceptions. A great many old `except_osv` had a useless title with "Error!" or "Warning", those have been removed, as this is handled by the client-side widget that displays the messages. This commit introduces a more consistent policy for logging errors and warnings: - All messages that do not require administrator attention should be logged at INFO level or lower. This includes all errors that are notified to the user in a friendly manner, even for access right problems or validation errors during business operations. - All messages that indicate a likely misconfiguration or malicious use by the users should be logged at WARNING level, as they typically require administrator attention. - All other unhandled internal errors cannot typically be handled by the user and should be logged at ERROR or higher level, as they require immediate administrator attention.
269 lines
13 KiB
Python
269 lines
13 KiB
Python
# -*- coding: utf-8 -*-
|
|
##############################################################################
|
|
#
|
|
# OpenERP, Open Source Management Solution
|
|
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Affero General Public License as
|
|
# published by the Free Software Foundation, either version 3 of the
|
|
# License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# 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/>.
|
|
#
|
|
##############################################################################
|
|
|
|
import logging
|
|
import time
|
|
from openerp.osv import fields,osv
|
|
from openerp.tools.translate import _
|
|
import openerp.addons.decimal_precision as dp
|
|
from openerp.exceptions import UserError
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
class delivery_carrier(osv.osv):
|
|
_name = "delivery.carrier"
|
|
_description = "Carrier"
|
|
|
|
def name_get(self, cr, uid, ids, context=None):
|
|
if not len(ids):
|
|
return []
|
|
if context is None:
|
|
context = {}
|
|
order_id = context.get('order_id',False)
|
|
if not order_id:
|
|
res = super(delivery_carrier, self).name_get(cr, uid, ids, context=context)
|
|
else:
|
|
order = self.pool.get('sale.order').browse(cr, uid, order_id, context=context)
|
|
currency = order.pricelist_id.currency_id.name or ''
|
|
res = [(r['id'], r['name']+' ('+(str(r['price']))+' '+currency+')') for r in self.read(cr, uid, ids, ['name', 'price'], context)]
|
|
return res
|
|
|
|
def get_price(self, cr, uid, ids, field_name, arg=None, context=None):
|
|
res={}
|
|
if context is None:
|
|
context = {}
|
|
sale_obj=self.pool.get('sale.order')
|
|
grid_obj=self.pool.get('delivery.grid')
|
|
for carrier in self.browse(cr, uid, ids, context=context):
|
|
order_id=context.get('order_id',False)
|
|
price=False
|
|
available = False
|
|
if order_id:
|
|
order = sale_obj.browse(cr, uid, order_id, context=context)
|
|
carrier_grid=self.grid_get(cr,uid,[carrier.id],order.partner_shipping_id.id,context)
|
|
if carrier_grid:
|
|
try:
|
|
price=grid_obj.get_price(cr, uid, carrier_grid, order, time.strftime('%Y-%m-%d'), context)
|
|
available = True
|
|
except UserError, e:
|
|
# no suitable delivery method found, probably configuration error
|
|
_logger.info("Carrier %s: %s", carrier.name, e.name)
|
|
price = 0.0
|
|
else:
|
|
price = 0.0
|
|
res[carrier.id] = {
|
|
'price': price,
|
|
'available': available
|
|
}
|
|
return res
|
|
|
|
_columns = {
|
|
'name': fields.char('Delivery Method', required=True),
|
|
'partner_id': fields.many2one('res.partner', 'Transport Company', required=True, help="The partner that is doing the delivery service."),
|
|
'product_id': fields.many2one('product.product', 'Delivery Product', required=True),
|
|
'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'),
|
|
'available' : fields.function(get_price, string='Available',type='boolean', multi='price',
|
|
help="Is the carrier method possible with the current order."),
|
|
'price' : fields.function(get_price, string='Price', multi='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."),
|
|
'normal_price': fields.float('Normal Price', help="Keep empty if the pricing depends on the advanced pricing per destination"),
|
|
'free_if_more_than': fields.boolean('Free If Order Total Amount Is More Than', help="If the order is more expensive than a certain amount, the customer can benefit from a free shipping"),
|
|
'amount': fields.float('Amount', help="Amount of the order to benefit from a free shipping, expressed in the company currency"),
|
|
'use_detailed_pricelist': fields.boolean('Advanced Pricing per Destination', help="Check this box if you want to manage delivery prices that depends on the destination, the weight, the total of the order, etc."),
|
|
'pricelist_ids': fields.one2many('delivery.grid', 'carrier_id', 'Advanced Pricing'),
|
|
}
|
|
|
|
_defaults = {
|
|
'active': 1,
|
|
'free_if_more_than': False,
|
|
}
|
|
|
|
def grid_get(self, cr, uid, ids, contact_id, context=None):
|
|
contact = self.pool.get('res.partner').browse(cr, uid, contact_id, context=context)
|
|
for carrier in self.browse(cr, uid, ids, context=context):
|
|
for grid in carrier.grids_id:
|
|
get_id = lambda x: x.id
|
|
country_ids = map(get_id, grid.country_ids)
|
|
state_ids = map(get_id, grid.state_ids)
|
|
if country_ids and not contact.country_id.id in country_ids:
|
|
continue
|
|
if state_ids and not contact.state_id.id in state_ids:
|
|
continue
|
|
if grid.zip_from and (contact.zip or '')< grid.zip_from:
|
|
continue
|
|
if grid.zip_to and (contact.zip or '')> grid.zip_to:
|
|
continue
|
|
return grid.id
|
|
return False
|
|
|
|
def create_grid_lines(self, cr, uid, ids, vals, context=None):
|
|
if context is 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):
|
|
# if using advanced pricing per destination: do not change
|
|
if record.use_detailed_pricelist:
|
|
continue
|
|
|
|
# not using advanced pricing per destination: override grid
|
|
grid_id = grid_pool.search(cr, uid, [('carrier_id', '=', record.id)], context=context)
|
|
if grid_id and not (record.normal_price or record.free_if_more_than):
|
|
grid_pool.unlink(cr, uid, grid_id, context=context)
|
|
|
|
# Check that float, else 0.0 is False
|
|
if not (isinstance(record.normal_price,float) or record.free_if_more_than):
|
|
continue
|
|
|
|
if not grid_id:
|
|
grid_data = {
|
|
'name': record.name,
|
|
'carrier_id': record.id,
|
|
'sequence': 10,
|
|
}
|
|
grid_id = [grid_pool.create(cr, uid, grid_data, context=context)]
|
|
|
|
lines = grid_line_pool.search(cr, uid, [('grid_id','in',grid_id)], context=context)
|
|
if lines:
|
|
grid_line_pool.unlink(cr, uid, lines, context=context)
|
|
|
|
#create the grid lines
|
|
if record.free_if_more_than:
|
|
line_data = {
|
|
'grid_id': grid_id and grid_id[0],
|
|
'name': _('Free if more than %.2f') % record.amount,
|
|
'type': 'price',
|
|
'operator': '>=',
|
|
'max_value': record.amount,
|
|
'standard_price': 0.0,
|
|
'list_price': 0.0,
|
|
}
|
|
grid_line_pool.create(cr, uid, line_data, context=context)
|
|
if isinstance(record.normal_price,float):
|
|
line_data = {
|
|
'grid_id': grid_id and grid_id[0],
|
|
'name': _('Default price'),
|
|
'type': 'price',
|
|
'operator': '>=',
|
|
'max_value': 0.0,
|
|
'standard_price': record.normal_price,
|
|
'list_price': record.normal_price,
|
|
}
|
|
grid_line_pool.create(cr, uid, line_data, context=context)
|
|
return True
|
|
|
|
def write(self, cr, uid, ids, vals, context=None):
|
|
if isinstance(ids, (int,long)):
|
|
ids = [ids]
|
|
res = super(delivery_carrier, self).write(cr, uid, ids, vals, context=context)
|
|
self.create_grid_lines(cr, uid, ids, vals, context=context)
|
|
return res
|
|
|
|
def create(self, cr, uid, vals, context=None):
|
|
res_id = super(delivery_carrier, self).create(cr, uid, vals, context=context)
|
|
self.create_grid_lines(cr, uid, [res_id], vals, context=context)
|
|
return res_id
|
|
|
|
|
|
class delivery_grid(osv.osv):
|
|
_name = "delivery.grid"
|
|
_description = "Delivery Grid"
|
|
_columns = {
|
|
'name': fields.char('Grid Name', required=True),
|
|
'sequence': fields.integer('Sequence', required=True, help="Gives the sequence order when displaying a list of delivery grid."),
|
|
'carrier_id': fields.many2one('delivery.carrier', 'Carrier', required=True, ondelete='cascade'),
|
|
'country_ids': fields.many2many('res.country', 'delivery_grid_country_rel', 'grid_id', 'country_id', 'Countries'),
|
|
'state_ids': fields.many2many('res.country.state', 'delivery_grid_state_rel', 'grid_id', 'state_id', 'States'),
|
|
'zip_from': fields.char('Start Zip', size=12),
|
|
'zip_to': fields.char('To Zip', size=12),
|
|
'line_ids': fields.one2many('delivery.grid.line', 'grid_id', 'Grid Line', copy=True),
|
|
'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the delivery grid without removing it."),
|
|
}
|
|
_defaults = {
|
|
'active': lambda *a: 1,
|
|
'sequence': lambda *a: 1,
|
|
}
|
|
_order = 'sequence'
|
|
|
|
def get_price(self, cr, uid, id, order, dt, context=None):
|
|
total = 0
|
|
weight = 0
|
|
volume = 0
|
|
quantity = 0
|
|
product_uom_obj = self.pool.get('product.uom')
|
|
for line in order.order_line:
|
|
if not line.product_id or line.is_delivery:
|
|
continue
|
|
q = product_uom_obj._compute_qty(cr, uid, line.product_uom.id, line.product_uom_qty, line.product_id.uom_id.id)
|
|
weight += (line.product_id.weight or 0.0) * q
|
|
volume += (line.product_id.volume or 0.0) * q
|
|
quantity += q
|
|
total = order.amount_total or 0.0
|
|
|
|
return self.get_price_from_picking(cr, uid, id, total,weight, volume, quantity, context=context)
|
|
|
|
def get_price_from_picking(self, cr, uid, id, total, weight, volume, quantity, context=None):
|
|
grid = self.browse(cr, uid, id, context=context)
|
|
price = 0.0
|
|
ok = False
|
|
price_dict = {'price': total, 'volume':volume, 'weight': weight, 'wv':volume*weight, 'quantity': quantity}
|
|
for line in grid.line_ids:
|
|
test = eval(line.type+line.operator+str(line.max_value), price_dict)
|
|
if test:
|
|
if line.price_type=='variable':
|
|
price = line.list_price * price_dict[line.variable_factor]
|
|
else:
|
|
price = line.list_price
|
|
ok = True
|
|
break
|
|
if not ok:
|
|
raise UserError(_("Selected product in the delivery method doesn't fulfill any of the delivery grid(s) criteria."))
|
|
|
|
return price
|
|
|
|
|
|
|
|
class delivery_grid_line(osv.osv):
|
|
_name = "delivery.grid.line"
|
|
_description = "Delivery Grid Line"
|
|
_columns = {
|
|
'name': fields.char('Name', required=True),
|
|
'sequence': fields.integer('Sequence', required=True, help="Gives the sequence order when calculating delivery grid."),
|
|
'grid_id': fields.many2one('delivery.grid', 'Grid',required=True, ondelete='cascade'),
|
|
'type': fields.selection([('weight','Weight'),('volume','Volume'),\
|
|
('wv','Weight * Volume'), ('price','Price'), ('quantity','Quantity')],\
|
|
'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'), ('quantity','Quantity')], 'Variable Factor', required=True),
|
|
'list_price': fields.float('Sale Price', digits_compute= dp.get_precision('Product Price'), required=True),
|
|
'standard_price': fields.float('Cost Price', digits_compute= dp.get_precision('Product Price'), required=True),
|
|
}
|
|
_defaults = {
|
|
'sequence': lambda *args: 10,
|
|
'type': lambda *args: 'weight',
|
|
'operator': lambda *args: '<=',
|
|
'price_type': lambda *args: 'fixed',
|
|
'variable_factor': lambda *args: 'weight',
|
|
}
|
|
_order = 'sequence, list_price'
|