[MERGE] Merge the branch and clean the code lp:~openerp-dev/openobject-addons/trunk-usability-unit_of_measure-han
bzr revid: stw@openerp.com-20110915085454-pn35o2p6at78au5j
This commit is contained in:
commit
dfc46d1f15
|
@ -612,6 +612,14 @@ class purchase_order_line(osv.osv):
|
||||||
res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
|
res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
def _get_uom_id(self, cr, uid, context=None):
|
||||||
|
try:
|
||||||
|
proxy = self.pool.get('ir.model.data')
|
||||||
|
result = proxy.get_object_reference(cr, uid, 'product', 'product_uom_unit')
|
||||||
|
return result[1]
|
||||||
|
except Exception, ex:
|
||||||
|
return False
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'name': fields.char('Description', size=256, required=True),
|
'name': fields.char('Description', size=256, required=True),
|
||||||
'product_qty': fields.float('Quantity', required=True, digits=(16,2)),
|
'product_qty': fields.float('Quantity', required=True, digits=(16,2)),
|
||||||
|
@ -639,6 +647,7 @@ class purchase_order_line(osv.osv):
|
||||||
|
|
||||||
}
|
}
|
||||||
_defaults = {
|
_defaults = {
|
||||||
|
'product_uom' : _get_uom_id,
|
||||||
'product_qty': lambda *a: 1.0,
|
'product_qty': lambda *a: 1.0,
|
||||||
'state': lambda *args: 'draft',
|
'state': lambda *args: 'draft',
|
||||||
'invoiced': lambda *a: 0,
|
'invoiced': lambda *a: 0,
|
||||||
|
|
|
@ -838,6 +838,14 @@ class sale_order_line(osv.osv):
|
||||||
res[line.id] = 1
|
res[line.id] = 1
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
def _get_uom_id(self, cr, uid, *args):
|
||||||
|
try:
|
||||||
|
proxy = self.pool.get('ir.model.data')
|
||||||
|
result = proxy.get_object_reference(cr, uid, 'product', 'product_uom_unit')
|
||||||
|
return result[1]
|
||||||
|
except Exception, ex:
|
||||||
|
return False
|
||||||
|
|
||||||
_name = 'sale.order.line'
|
_name = 'sale.order.line'
|
||||||
_description = 'Sales Order Line'
|
_description = 'Sales Order Line'
|
||||||
_columns = {
|
_columns = {
|
||||||
|
@ -877,6 +885,7 @@ class sale_order_line(osv.osv):
|
||||||
}
|
}
|
||||||
_order = 'sequence, id'
|
_order = 'sequence, id'
|
||||||
_defaults = {
|
_defaults = {
|
||||||
|
'product_uom' : _get_uom_id,
|
||||||
'discount': 0.0,
|
'discount': 0.0,
|
||||||
'delay': 0.0,
|
'delay': 0.0,
|
||||||
'product_uom_qty': 1,
|
'product_uom_qty': 1,
|
||||||
|
|
Loading…
Reference in New Issue