pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]Improve yml

Browse Source 
bzr revid: dbr@tinyerp.com-20130305123016-kaj6aoebxpes5c0w
This commit is contained in:
DBR (OpenERP)
2013-03-05 18:00:16 +05:30
parent aef9a2686a
commit a94403f274
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_analytic_analysis/account_analytic_analysis.py
+4 -3
View File
@@ -59,7 +59,7 @@ class account_analytic_invoice_line(osv.osv):
'name': fields.char('Description', size=64, required=True),
'quantity': fields.float('Quantity', required=True),
'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The account related to the selected product."),
'account_id': fields.many2one('account.account', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The account related to the selected product."),
'price_unit': fields.float('Unit Price', required=True),
'price_subtotal': fields.function(_amount_line, string='Sub Total', type="float",digits_compute= dp.get_precision('Account')),
'tax_ids':fields.many2many('account.tax', 'analytic_account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
@@ -146,7 +146,7 @@ class account_analytic_account(osv.osv):
partner = self.browse(cr, uid, id, context=ctx).partner_id
if partner.lang:
ctx.update({'lang': partner.lang})
for taxe in self.compute_tax(cr, uid, id, context=ctx).values():
for taxe in self.compute_tax(cr, uid, [id], context=ctx).values():
total_tax_amount += taxe["tax_amount"]
return total_tax_amount
@@ -154,7 +154,7 @@ class account_analytic_account(osv.osv):
tax_grouped = {}
tax_obj = self.pool.get('account.tax')
cur_obj = self.pool.get('res.currency')
inv = self.browse(cr, uid, ids, context=context)
inv = self.browse(cr, uid, ids, context=context)[0]
cur = inv.currency_id
company_currency = inv.company_id.currency_id.id
@@ -709,6 +709,7 @@ class account_analytic_account(osv.osv):
for analytic_account in self.browse(cr, uid, ids):
if analytic_account.invoice_line_ids:
obj_analytic_line.unlink(cr, uid, [x.id for x in analytic_account.invoice_line_ids])
template = self.browse(cr, uid, template_id, context=context)
invoice_line_ids = []
for x in template.invoice_line_ids:
addons/account_analytic_analysis/test/account_analytic_analysis.yml
+1 -1
View File
@@ -35,7 +35,7 @@
self._amount_all(cr, uid, [contract_id], '', {}, {})
template = self.browse(cr, uid, ref('account_analytic_account_0'))
res = self.on_change_template(cr, uid, contract_id, template.id, {})
res = self.on_change_template(cr, uid, [contract_id], template.id, {})
self.write(cr, uid, [contract_id], res['value'])
line_obj = self.pool.get('account.analytic.invoice.line')
contract = self.browse(cr, uid, contract_id)