odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Analytic accounts with budgets 

bzr revid: rde-047ada3e1c01d8d3900c0916c99d3de72a8ef8c2
This commit is contained in:
rde 2007-01-08 11:30:46 +00:00
parent cc9ca29257
commit 5deb416c89
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/account/__terp__.py
View File

@ -32,6 +32,7 @@
"data/account_minimal.xml", "data/account_minimal.xml",
"data/account_data2.xml", "data/account_data2.xml",
"account_invoice_workflow.xml", "account_invoice_workflow.xml",
"project/project_wizard.xml",
"project/project_view.xml", "project/project_view.xml",
"project/project_report.xml", "project/project_report.xml",
"product_data.xml", "product_data.xml",
@ -40,6 +41,6 @@
# "translations" : { # "translations" : {
# "fr": "i18n/french_fr.csv" # "fr": "i18n/french_fr.csv"
# }, # },
"active": False, "active": True,
"installable": True "installable": True
} }

16
addons/account/account.py
View File

@ -829,7 +829,7 @@ class account_tax(osv.osv):
'include_base_amount': fields.boolean('Include in base amount', help="Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"), 'include_base_amount': fields.boolean('Include in base amount', help="Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"),
} }
_defaults = { _defaults = {
'python_compute': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or False\n\nresult = price_unit * 0.10''', 'python_compute': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n\nresult = price_unit * 0.10''',
'applicable_type': lambda *a: 'true', 'applicable_type': lambda *a: 'true',
'type': lambda *a: 'percent', 'type': lambda *a: 'percent',
'amount': lambda *a: 0.196, 'amount': lambda *a: 0.196,
@ -844,11 +844,11 @@ class account_tax(osv.osv):
} }
_order = 'sequence' _order = 'sequence'
def _applicable(self, cr, uid, taxes, price_unit, address_id=None, product=None): def _applicable(self, cr, uid, taxes, price_unit, address_id=None):
res = [] res = []
for tax in taxes: for tax in taxes:
if tax.applicable_type=='code': if tax.applicable_type=='code':
localdict = {'price_unit':price_unit, 'address':self.pool.get('res.partner.address').browse(cr, uid, address_id), 'product':product,} localdict = {'price_unit':price_unit, 'address':self.pool.get('res.partner.address').browse(cr, uid, address_id)}
exec tax.python_applicable in localdict exec tax.python_applicable in localdict
if localdict.get('result', False): if localdict.get('result', False):
res.append(tax) res.append(tax)
@ -856,8 +856,8 @@ class account_tax(osv.osv):
res.append(tax) res.append(tax)
return res return res
def _unit_compute(self, cr, uid, taxes, price_unit, address_id=None, product=None): def _unit_compute(self, cr, uid, taxes, price_unit, address_id=None):
taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product) taxes = self._applicable(cr, uid, taxes, price_unit, address_id)
res = [] res = []
cur_price_unit=price_unit cur_price_unit=price_unit
@ -870,7 +870,7 @@ class account_tax(osv.osv):
res.append({'id':tax.id, 'name':tax.name, 'amount':tax.amount, 'account_collected_id':tax.account_collected_id.id, 'account_paid_id':tax.account_paid_id.id, 'base_code_id': tax.base_code_id.id, 'ref_base_code_id': tax.ref_base_code_id.id, 'sequence': tax.sequence, 'base_sign': tax.base_sign, 'ref_base_sign': tax.ref_base_sign, 'price_unit': 1, 'tax_code_id': tax.tax_code_id.id,}) res.append({'id':tax.id, 'name':tax.name, 'amount':tax.amount, 'account_collected_id':tax.account_collected_id.id, 'account_paid_id':tax.account_paid_id.id, 'base_code_id': tax.base_code_id.id, 'ref_base_code_id': tax.ref_base_code_id.id, 'sequence': tax.sequence, 'base_sign': tax.base_sign, 'ref_base_sign': tax.ref_base_sign, 'price_unit': 1, 'tax_code_id': tax.tax_code_id.id,})
elif tax.type=='code': elif tax.type=='code':
address = address_id and self.pool.get('res.partner.address').browse(cr, uid, address_id) or None address = address_id and self.pool.get('res.partner.address').browse(cr, uid, address_id) or None
localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product,} localdict = {'price_unit':cur_price_unit, 'address':address}
exec tax.python_compute in localdict exec tax.python_compute in localdict
amount = localdict['result'] amount = localdict['result']
res.append({ res.append({
@ -901,7 +901,7 @@ class account_tax(osv.osv):
cur_price_unit+=amount2 cur_price_unit+=amount2
return res return res
def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None): def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None):
""" """
Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID. Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
@ -910,7 +910,7 @@ class account_tax(osv.osv):
tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2} tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
one tax for each tax id in IDS and their childs one tax for each tax id in IDS and their childs
""" """
res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product) res = self._unit_compute(cr, uid, taxes, price_unit, address_id)
for r in res: for r in res:
r['amount'] *= quantity r['amount'] *= quantity
return res return res