Merge lp:~anybox/account-analytic/decimal_precision into lp:account-analytic/6.1

Proposed by Georges Racinet
Status: Merged
Merged at revision: 12
Proposed branch: lp:~anybox/account-analytic/decimal_precision
Merge into: lp:account-analytic/6.1
Diff against target: 27 lines (+3/-2)
1 file modified
analytic_multicurrency/account_analytic_line.py (+3/-2)
To merge this branch: bzr merge lp:~anybox/account-analytic/decimal_precision
Reviewer Review Type Date Requested Status
Joël Grand-Guillaume @ camptocamp Approve
Review via email: mp+141041@code.launchpad.net

Description of the change

Branch made to fix the problem in tests (which it does) by switching to the now standard decimal_precision.

Not tested in real life, though.

To post a comment you must log in.
Revision history for this message
Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote :

Hi Georges,

Thanks for the contrib. It' looks good to me, though we should use : import openerp.addons.decimal_precision as dp now.

I merge it.

Have a nice Christmas,

Joël

review: Approve
Revision history for this message
Georges Racinet (gracinet) wrote :

Thanks, and import idiom noted !

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'analytic_multicurrency/account_analytic_line.py'
--- analytic_multicurrency/account_analytic_line.py 2011-08-12 13:27:15 +0000
+++ analytic_multicurrency/account_analytic_line.py 2012-12-21 09:42:21 +0000
@@ -35,6 +35,7 @@
35from tools.translate import _35from tools.translate import _
3636
37from tools import config37from tools import config
38import decimal_precision as dp
3839
39class account_analytic_line(osv.osv):40class account_analytic_line(osv.osv):
40 _inherit = 'account.analytic.line'41 _inherit = 'account.analytic.line'
@@ -82,7 +83,7 @@
82 'account.analytic.line': (lambda self,cr,uid,ids,c={}: ids, ['amount','unit_amount','product_uom_id'],10),83 'account.analytic.line': (lambda self,cr,uid,ids,c={}: ids, ['amount','unit_amount','product_uom_id'],10),
83 },84 },
84 help="The related analytic account currency."),85 help="The related analytic account currency."),
85 'aa_amount_currency': fields.function(_amount_currency, method=True, digits=(16, int(config['price_accuracy'])), string='Amount currency',86 'aa_amount_currency': fields.function(_amount_currency, method=True, digits_compute=dp.get_precision('Account'), string='Amount currency',
86 store={87 store={
87 'account.analytic.account': (_get_account_line, ['currency_id','company_id'], 50),88 'account.analytic.account': (_get_account_line, ['currency_id','company_id'], 50),
88 'account.analytic.line': (lambda self,cr,uid,ids,c={}: ids, ['amount','unit_amount','product_uom_id'],10),89 'account.analytic.line': (lambda self,cr,uid,ids,c={}: ids, ['amount','unit_amount','product_uom_id'],10),
@@ -103,4 +104,4 @@
103 return res104 return res
104 105
105 106
106account_analytic_line()
107\ No newline at end of file107\ No newline at end of file
108account_analytic_line()

Subscribers

People subscribed via source and target branches

to status/vote changes: