From df40cfa40099bd05afc268f4ec5e54df4081e243 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Fri, 4 Jun 2010 15:43:08 +0530 Subject: [PATCH] [IMP] product_price_unit: Improved methods by overriding super methods. Uncommented demo files. bzr revid: uco@tinyerp.com-20100604101308-2ps8m02nrtn2aw39 --- addons/account/__openerp__.py | 2 +- .../product_price_unit/product_price_unit.py | 239 +++++++++++++++--- .../product_price_unit_view.xml | 4 +- addons/purchase/__openerp__.py | 4 +- addons/sale/__openerp__.py | 2 +- 5 files changed, 210 insertions(+), 41 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index b921828f47d..51724f47d33 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -119,7 +119,7 @@ module named account_voucherss 'project/project_demo.xml', 'project/analytic_account_demo.xml', 'demo/account_minimal.xml', -# 'account_unit_test.xml', + 'account_unit_test.xml', ], 'test': [ 'test/account_customer_invoice.yml', diff --git a/addons/product_price_unit/product_price_unit.py b/addons/product_price_unit/product_price_unit.py index 87e793211e3..64439056aca 100644 --- a/addons/product_price_unit/product_price_unit.py +++ b/addons/product_price_unit/product_price_unit.py @@ -272,9 +272,9 @@ class account_invoice_line(osv.osv): res = cr.fetchone() return res and res[0] or False - def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict): - res = {} - cur_obj=self.pool.get('res.currency') + def _amount_line(self, cr, uid, ids, prop, unknow_none, unknow_dict): + res = super(account_invoice_line,self)._amount_line(cr, uid, ids, prop, unknow_none, unknow_dict) + cur_obj = self.pool.get('res.currency') for line in self.browse(cr, uid, ids): if line.price_unit_id: if line.invoice_id: @@ -332,13 +332,14 @@ class account_invoice_tax(osv.osv): t['base'] = 0.0 t['base_amount'] = 0.0 for line in inv.invoice_line: - for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0/line.price_unit_id.coefficient)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id): - for t in tax_grouped.values(): - t['base'] += tax['price_unit'] * line['quantity'] / line['price_unit_id'].coefficient - if inv.type in ('out_invoice','in_invoice'): - t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False) - else: - t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False) + if line.price_unit_id: + for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0/line.price_unit_id.coefficient)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id): + for t in tax_grouped.values(): + t['base'] += tax['price_unit'] * line['quantity'] / line['price_unit_id'].coefficient + if inv.type in ('out_invoice','in_invoice'): + t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False) + else: + t['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, t['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False) return tax_grouped account_invoice_tax() @@ -467,9 +468,10 @@ class sale_order(osv.osv): _inherit = 'sale.order' def _amount_line_tax(self, cr, uid, line, context={}): - val = 0.0 - for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0)/ line.price_unit_id.coefficient, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id): - val+= c['amount'] + val = super(sale_order,self)._amount_line_tax(cr, uid, line, context) + if line.price_unit_id: + for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0)/ line.price_unit_id.coefficient, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id): + val+= c['amount'] return val def action_ship_create(self, cr, uid, ids, *args): @@ -526,7 +528,7 @@ class sale_order_line(osv.osv): return res _columns = { - 'price_unit_id': fields.many2one('product.price.unit','Price Unit', required=True), + 'price_unit_id': fields.many2one('product.price.unit','Price Unit'), } _defaults = { @@ -581,7 +583,7 @@ class purchase_order(osv.osv): return res def _amount_all(self, cr, uid, ids, field_name, arg, context): - res = {} + res = super(purchase_order,self)._amount_all(cr, uid, ids, field_name, arg, context) cur_obj=self.pool.get('res.currency') for order in self.browse(cr, uid, ids): res[order.id] = { @@ -590,10 +592,11 @@ class purchase_order(osv.osv): 'amount_total': 0.0, } val = val1 = 0.0 - cur=order.pricelist_id.currency_id + cur = order.pricelist_id.currency_id for line in order.order_line: for c in self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id): - val+= c['amount'] / line.price_unit_id.coefficient + if line.price_unit_id: + val+= c['amount'] / line.price_unit_id.coefficient val1 += line.price_subtotal res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val) res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1) @@ -649,15 +652,16 @@ class purchase_order_line(osv.osv): return res and res[0] or False def _amount_line(self, cr, uid, ids, prop, unknow_none, unknow_dict): - res = {} + res = super(purchase_order_line,self)._amount_line(cr, uid, ids, prop, unknow_none, unknow_dict) cur_obj=self.pool.get('res.currency') for line in self.browse(cr, uid, ids): cur = line.order_id.pricelist_id.currency_id - res[line.id] = cur_obj.round(cr, uid, cur, line.price_unit * line.product_qty / line.price_unit_id.coefficient) + if line.price_unit_id: + res[line.id] = cur_obj.round(cr, uid, cur, line.price_unit * line.product_qty / line.price_unit_id.coefficient) return res _columns = { - 'price_unit_id' : fields.many2one('product.price.unit','Price Unit', required=True), + 'price_unit_id' : fields.many2one('product.price.unit','Price Unit'), 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')), } _defaults = { @@ -677,6 +681,185 @@ class purchase_order_line(osv.osv): purchase_order_line() +class stock_partial_move(osv.osv_memory): + _inherit = "stock.partial.move" + + def view_init(self, cr, uid, fields_list, context=None): + res = super(stock_partial_move, self).view_init(cr, uid, fields_list, context=context) + move_obj = self.pool.get('stock.move') + if not context: + context={} + moveids = [] + for m in move_obj.browse(cr, uid, context.get('active_ids', [])): + if m.state in ('done', 'cancel'): + continue + if 'move%s_product_id'%(m.id) not in self._columns: + self._columns['move%s_product_id'%(m.id)] = fields.many2one('product.product',string="Product") + if 'move%s_product_qty'%(m.id) not in self._columns: + self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity") + if 'move%s_product_uom'%(m.id) not in self._columns: + self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM") + + if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'): + if 'move%s_product_price'%(m.id) not in self._columns: + self._columns['move%s_product_price'%(m.id)] = fields.float("Price") + if 'move%s_product_currency'%(m.id) not in self._columns: + self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency") + if 'move%s_product_price_unit_id'%(m.id) not in self._columns: + self._columns['move%s_product_price_unit_id'%(m.id)] = fields.float("Price Unit") + return res + + def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False): + result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu) + move_obj = self.pool.get('stock.move') + move_ids = context.get('active_ids', False) + move_ids = move_obj.search(cr, uid, [('id','in',move_ids)]) + _moves_arch_lst = """
+ + + + + """ + _moves_fields = result['fields'] + if move_ids and view_type in ['form']: + for m in move_obj.browse(cr, uid, move_ids, context): + if m.state in ('done', 'cancel'): + continue + _moves_fields.update({ + 'move%s_product_id'%(m.id) : { + 'string': _('Product'), + 'type' : 'many2one', + 'relation': 'product.product', + 'required' : True, + 'readonly' : True, + }, + 'move%s_product_qty'%(m.id) : { + 'string': _('Quantity'), + 'type' : 'float', + 'required': True, + }, + 'move%s_product_uom'%(m.id) : { + 'string': _('Product UOM'), + 'type' : 'many2one', + 'relation': 'product.uom', + 'required' : True, + 'readonly' : True, + } + }) + + _moves_arch_lst += """ + + + + + """%(m.id, m.id, m.id) + if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'): + _moves_fields.update({ + 'move%s_product_price'%(m.id) : { + 'string': _('Price'), + 'type' : 'float', + }, + 'move%s_product_currency'%(m.id): { + 'string': _('Currency'), + 'type' : 'float', + 'type' : 'many2one', + 'relation': 'res.currency', + }, + 'move%s_product_price_unit_id'%(m.id): { + 'string': _('Price Unit'), + 'type' : 'float', + 'type' : 'many2one', + 'relation': 'product.price.unit', + }, + }) + _moves_arch_lst += """ + + + + """%(m.id, m.id, m.id) + _moves_arch_lst += """ + + """ + _moves_arch_lst += """ + +