Merge lp:~openerp-dev/openobject-addons/trunk-decimal-rounding-fix into lp:openobject-addons

[Yogesh Parekh(OpenERP)]

Hello,

    Rename some Decimal Precision and Remove unused Decimal Precision .
    now have this decimal precision list:
                  Price
                  Quantity
                  Weight
                  Percentage
                  Amount

 -> Rename Precision
        Product Price ==> Price
        Product Unit of Measure ==> Quantity
        Product UOS ==> Quantity
        Stock Weight ==> Weight
        Account => for accounting, credit debit amount in journal items

 -> Remove Precision
       Account ==> Amount
       Discount ==> Price
       Payment Term ==> Price
       Payroll ==> Price
       Payroll Rate ==> Percentage.

    Add the new Decimal Precision in required field in the modules.

Thanks,
Yogesh Parekh.

[lp:~openerp-dev/openobject-addons/trunk-decimal-rounding-fix]

8873. By Atul Patel(OpenERP) on 2013-10-29

[MERGE]: Merged with addons

Unmerged revisions

8873. By Atul Patel(OpenERP) on 2013-10-29

[MERGE]: Merged with addons

8872. By Atul Patel(OpenERP) on 2013-10-17

[MERGE]: Merged with trunk

8871. By Atul Patel(OpenERP) on 2013-10-14

[MERGE]: Merged with addons

8870. By Atul Patel(OpenERP) on 2013-09-27

[ADD]: Add decimal precision in pos amount_total field

8869. By Pariket Trivedi(OpenERP) on 2013-09-27

[IMP] : Decimal precision Remove Shipping Delay.

8868. By Yogesh Parekh(OpenERP) on 2013-09-27

[IMP] Create a new Data File in decimal_precision module

8867. By Yogesh Parekh(OpenERP) on 2013-09-27

[IMP] Improvement in Decimal Precision

8866. By Yogesh Parekh(OpenERP) on 2013-09-27

[IMP] Change the Decimal Precision in lunch module

8865. By Yogesh Parekh(OpenERP) on 2013-09-27

[IMP] Change the Decimal Precision in rml report and account module

8864. By Yogesh Parekh(OpenERP) on 2013-09-26

[IMP] Change the Decimal Precision in rml report

=== modified file 'account/account.py'
--- account/account.py	2013-10-09 18:03:37 +0000
+++ account/account.py	2013-10-29 13:27:40 +0000
@@ -76,7 +76,7 @@
         amount = value
         result = []
         obj_precision = self.pool.get('decimal.precision')
-        prec = obj_precision.precision_get(cr, uid, 'Account')
+        prec = obj_precision.precision_get(cr, uid, 'Amount')
         for line in pt.line_ids:
             if line.value == 'fixed':
                 amt = round(line.value_amount, prec)
@@ -109,7 +109,7 @@
                                    ('fixed', 'Fixed Amount')], 'Computation',
                                    required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be treated."""),
 
-        'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."),
+        'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Price'), help="For percent enter a ratio between 0-1."),
         'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
             "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
         'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
@@ -467,14 +467,14 @@
         'child_parent_ids': fields.one2many('account.account','parent_id','Children'),
         'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
         'child_id': fields.function(_get_child_ids, type='many2many', relation="account.account", string="Child Accounts"),
-        'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Balance', multi='balance'),
-        'credit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'),
-        'debit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
-        'foreign_balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Foreign Balance', multi='balance',
+        'balance': fields.function(__compute, digits_compute=dp.get_precision('Amount'), string='Balance', multi='balance'),
+        'credit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Amount'), string='Credit', multi='balance'),
+        'debit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Amount'), string='Debit', multi='balance'),
+        'foreign_balance': fields.function(__compute, digits_compute=dp.get_precision('Amount'), string='Foreign Balance', multi='balance',
                                            help="Total amount (in Secondary currency) for transactions held in secondary currency for this account."),
-        'adjusted_balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Adjusted Balance', multi='balance',
+        'adjusted_balance': fields.function(__compute, digits_compute=dp.get_precision('Amount'), string='Adjusted Balance', multi='balance',
                                             help="Total amount (in Company currency) for transactions held in secondary currency for this account."),
-        'unrealized_gain_loss': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Unrealized Gain or Loss', multi='balance',
+        'unrealized_gain_loss': fields.function(__compute, digits_compute=dp.get_precision('Amount'), string='Unrealized Gain or Loss', multi='balance',
                                                 help="Value of Loss or Gain due to changes in exchange rate when doing multi-currency transactions."),
         'reconcile': fields.boolean('Allow Reconciliation', help="Check this box if this account allows reconciliation of journal items."),
         'exchange_rate': fields.related('currency_id', 'rate', type='float', string='Exchange Rate', digits=(12,6)),
@@ -1280,11 +1280,11 @@
             _name: (lambda self, cr,uid,ids,c: ids, ['line_id'], 10),
             'account.move.line': (_get_move_from_lines, ['partner_id'],10)
             }),
-        'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
+        'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Amount'), type='float', fnct_search=_search_amount),
         'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True),
         'narration':fields.text('Internal Note'),
         'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
-        'balance': fields.float('balance', digits_compute=dp.get_precision('Account'), help="This is a field only used for internal purpose and shouldn't be displayed"),
+        'balance': fields.float('balance', digits_compute=dp.get_precision('Amount'), help="This is a field only used for internal purpose and shouldn't be displayed"),
     }
 
     _defaults = {
@@ -1778,7 +1778,7 @@
                 for rec in record.child_ids:
                     amount += _rec_get(rec) * rec.sign
                 return amount
-            res2[record.id] = round(_rec_get(record), obj_precision.precision_get(cr, uid, 'Account'))
+            res2[record.id] = round(_rec_get(record), obj_precision.precision_get(cr, uid, 'Amount'))
         return res2
 
     def _sum_year(self, cr, uid, ids, name, args, context=None):
@@ -1883,7 +1883,7 @@
 
 def get_precision_tax():
     def change_digit_tax(cr):
-        res = openerp.registry(cr.dbname)['decimal.precision'].precision_get(cr, SUPERUSER_ID, 'Account')
+        res = openerp.registry(cr.dbname)['decimal.precision'].precision_get(cr, SUPERUSER_ID, 'Amount')
         return (16, res+3)
     return change_digit_tax
 
@@ -2129,15 +2129,15 @@
         """
 
         # By default, for each tax, tax amount will first be computed
-        # and rounded at the 'Account' decimal precision for each
+        # and rounded at the 'Amount' decimal precision for each
         # PO/SO/invoice line and then these rounded amounts will be
         # summed, leading to the total amount for that tax. But, if the
         # company has tax_calculation_rounding_method = round_globally,
         # we still follow the same method, but we use a much larger
         # precision when we round the tax amount for each line (we use
-        # the 'Account' decimal precision + 5), and that way it's like
+        # the 'Amount' decimal precision + 5), and that way it's like
         # rounding after the sum of the tax amounts of each line
-        precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+        precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Amount')
         tax_compute_precision = precision
         if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally':
             tax_compute_precision += 5
@@ -2180,7 +2180,7 @@
             one tax for each tax id in IDS and their children
         """
         if not precision:
-            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Amount')
         res = self._unit_compute(cr, uid, taxes, price_unit, product, partner, quantity)
         total = 0.0
         for r in res:
@@ -2276,7 +2276,7 @@
             one tax for each tax id in IDS and their children
         """
         if not precision:
-            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Amount')
         res = self._unit_compute_inv(cr, uid, taxes, price_unit, product, partner=None)
         total = 0.0
         for r in res:
@@ -2405,9 +2405,9 @@
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones."),
-        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries."),
-        'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
-        'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
+        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Quantity'), help="The optional quantity on entries."),
+        'debit': fields.float('Debit', digits_compute=dp.get_precision('Amount')),
+        'credit': fields.float('Credit', digits_compute=dp.get_precision('Amount')),
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade"),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', ondelete="cascade"),
         'model_id': fields.many2one('account.model', 'Model', required=True, ondelete="cascade", select=True),

=== modified file 'account/account_analytic_line.py'
--- account/account_analytic_line.py	2013-04-15 10:23:49 +0000
+++ account/account_analytic_line.py	2013-10-29 13:27:40 +0000
@@ -119,7 +119,7 @@
             # to return a default price for those units
             ctx['uom'] = unit
         amount_unit = prod.price_get(pricetype.field, context=ctx)[prod.id]
-        prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+        prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Amount')
         amount = amount_unit * quantity or 0.0
         result = round(amount, prec)
         if not flag:

=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py	2013-06-14 09:19:24 +0000
+++ account/account_bank_statement.py	2013-10-29 13:27:40 +0000
@@ -103,9 +103,9 @@
             readonly=True, states={'draft':[('readonly',False)]}),
         'period_id': fields.many2one('account.period', 'Period', required=True,
             states={'confirm':[('readonly', True)]}),
-        'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'),
+        'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Amount'),
             states={'confirm':[('readonly',True)]}),
-        'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'),
+        'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Amount'),
             states={'confirm': [('readonly', True)]}),
         'balance_end': fields.function(_end_balance,
             store = {
@@ -548,7 +548,7 @@
     _columns = {
         'name': fields.char('OBI', required=True, help="Originator to Beneficiary Information"),
         'date': fields.date('Date', required=True),
-        'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
+        'amount': fields.float('Amount', digits_compute=dp.get_precision('Amount')),
         'type': fields.selection([
             ('supplier','Supplier'),
             ('customer','Customer'),

=== modified file 'account/account_cash_statement.py'
--- account/account_cash_statement.py	2013-06-14 09:19:24 +0000
+++ account/account_cash_statement.py	2013-10-29 13:27:40 +0000
@@ -58,11 +58,11 @@
         return {'value' : {'subtotal_closing' : (pieces * number) or 0.0 }}
 
     _columns = {
-        'pieces': fields.float('Unit of Currency', digits_compute=dp.get_precision('Account')),
+        'pieces': fields.float('Unit of Currency', digits_compute=dp.get_precision('Amount')),
         'number_opening' : fields.integer('Number of Units', help='Opening Unit Numbers'),
         'number_closing' : fields.integer('Number of Units', help='Closing Unit Numbers'),
-        'subtotal_opening': fields.function(_sub_total, string='Opening Subtotal', type='float', digits_compute=dp.get_precision('Account'), multi='subtotal'),
-        'subtotal_closing': fields.function(_sub_total, string='Closing Subtotal', type='float', digits_compute=dp.get_precision('Account'), multi='subtotal'),
+        'subtotal_opening': fields.function(_sub_total, string='Opening Subtotal', type='float', digits_compute=dp.get_precision('Amount'), multi='subtotal'),
+        'subtotal_closing': fields.function(_sub_total, string='Closing Subtotal', type='float', digits_compute=dp.get_precision('Amount'), multi='subtotal'),
         'bank_statement_id' : fields.many2one('account.bank.statement', ondelete='cascade'),
      }
 
@@ -339,7 +339,7 @@
     _name = 'account.journal.cashbox.line'
     _rec_name = 'pieces'
     _columns = {
-        'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')),
+        'pieces': fields.float('Values', digits_compute=dp.get_precision('Amount')),
         'journal_id' : fields.many2one('account.journal', 'Journal', required=True, select=1, ondelete="cascade"),
     }
 

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-09-23 17:13:10 +0000
+++ account/account_invoice.py	2013-10-29 13:27:40 +0000
@@ -273,21 +273,21 @@
         'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
 
         'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."),
-        'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Subtotal', track_visibility='always',
-            store={
-                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
-                'account.invoice.tax': (_get_invoice_tax, None, 20),
-                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
-            },
-            multi='all'),
-        'amount_tax': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Tax',
-            store={
-                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
-                'account.invoice.tax': (_get_invoice_tax, None, 20),
-                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
-            },
-            multi='all'),
-        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Total',
+        'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Amount'), string='Subtotal', track_visibility='always',
+            store={
+                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
+                'account.invoice.tax': (_get_invoice_tax, None, 20),
+                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
+            },
+            multi='all'),
+        'amount_tax': fields.function(_amount_all, digits_compute=dp.get_precision('Amount'), string='Tax',
+            store={
+                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
+                'account.invoice.tax': (_get_invoice_tax, None, 20),
+                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
+            },
+            multi='all'),
+        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Amount'), string='Total',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
@@ -297,7 +297,7 @@
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}, track_visibility='always'),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
+        'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Amount'), readonly=True, states={'draft':[('readonly',False)]}),
         'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
@@ -307,7 +307,7 @@
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
             help='Bank Account Number to which the invoice will be paid. A Company bank account if this is a Customer Invoice or Supplier Refund, otherwise a Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
         'move_lines':fields.function(_get_lines, type='many2many', relation='account.move.line', string='Entry Lines'),
-        'residual': fields.function(_amount_residual, digits_compute=dp.get_precision('Account'), string='Balance',
+        'residual': fields.function(_amount_residual, digits_compute=dp.get_precision('Amount'), string='Balance',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line','move_id'], 50),
                 'account.invoice.tax': (_get_invoice_tax, None, 50),
@@ -1381,7 +1381,7 @@
                 total += (l.debit or 0.0) - (l.credit or 0.0)
 
         inv_id, name = self.name_get(cr, uid, [invoice.id], context=context)[0]
-        if (not round(total,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))) or writeoff_acc_id:
+        if (not round(total,self.pool.get('decimal.precision').precision_get(cr, uid, 'Amount'))) or writeoff_acc_id:
             self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
         else:
             code = invoice.currency_id.symbol
@@ -1440,11 +1440,11 @@
         'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null', select=True),
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null', select=True),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price')),
         'price_subtotal': fields.function(_amount_line, string='Amount', type="float",
-            digits_compute= dp.get_precision('Account'), store=True),
-        'quantity': fields.float('Quantity', digits_compute= dp.get_precision('Product Unit of Measure'), required=True),
-        'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount')),
+            digits_compute= dp.get_precision('Amount'), store=True),
+        'quantity': fields.float('Quantity', digits_compute= dp.get_precision('Quantity'), required=True),
+        'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Price')),
         'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
         'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
@@ -1682,14 +1682,14 @@
         'name': fields.char('Tax Description', size=64, required=True),
         'account_id': fields.many2one('account.account', 'Tax Account', required=True, domain=[('type','<>','view'),('type','<>','income'), ('type', '<>', 'closed')]),
         'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
-        'base': fields.float('Base', digits_compute=dp.get_precision('Account')),
-        'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
+        'base': fields.float('Base', digits_compute=dp.get_precision('Amount')),
+        'amount': fields.float('Amount', digits_compute=dp.get_precision('Amount')),
         'manual': fields.boolean('Manual'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of invoice tax."),
         'base_code_id': fields.many2one('account.tax.code', 'Base Code', help="The account basis of the tax declaration."),
-        'base_amount': fields.float('Base Code Amount', digits_compute=dp.get_precision('Account')),
+        'base_amount': fields.float('Base Code Amount', digits_compute=dp.get_precision('Amount')),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."),
-        'tax_amount': fields.float('Tax Code Amount', digits_compute=dp.get_precision('Account')),
+        'tax_amount': fields.float('Tax Code Amount', digits_compute=dp.get_precision('Amount')),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
         'factor_base': fields.function(_count_factor, string='Multipication factor for Base code', type='float', multi="all"),
         'factor_tax': fields.function(_count_factor, string='Multipication factor Tax code', type='float', multi="all")

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2013-09-23 17:13:10 +0000
+++ account/account_move_line.py	2013-10-29 13:27:40 +0000
@@ -431,11 +431,11 @@
 
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'quantity': fields.float('Quantity', digits=(16,2), help="The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very useful for some reports."),
+        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Quantity'), help="The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very useful for some reports."),
         'product_uom_id': fields.many2one('product.uom', 'Unit of Measure'),
         'product_id': fields.many2one('product.product', 'Product'),
-        'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
-        'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
+        'debit': fields.float('Debit', digits_compute=dp.get_precision('Amount')),
+        'credit': fields.float('Credit', digits_compute=dp.get_precision('Amount')),
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
         'move_id': fields.many2one('account.move', 'Journal Entry', ondelete="cascade", help="The move of this entry line.", select=2, required=True),
         'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Internal Note'),
@@ -444,7 +444,7 @@
         'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
         'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
         'reconcile': fields.function(_get_reconcile, type='char', string='Reconcile Ref'),
-        'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')),
+        'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Amount')),
         'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount in Currency', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
         'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
         'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
@@ -469,7 +469,7 @@
         'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
         'state': fields.selection([('draft','Unbalanced'), ('valid','Balanced')], 'Status', readonly=True),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
-        'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
+        'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Amount'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
                     "this field will contain the basic amount(without tax)."),
         'invoice': fields.function(_invoice, string='Invoice',
             type='many2one', relation='account.invoice', fnct_search=_invoice_search),

=== modified file 'account/data/account_data.xml'
--- account/data/account_data.xml	2013-03-14 14:53:37 +0000
+++ account/data/account_data.xml	2013-10-29 13:27:40 +0000
@@ -36,11 +36,6 @@
             <field eval="account_payment_term_15days" name="payment_id"/>
         </record>
 
-        <record forcecreate="True" id="decimal_payment" model="decimal.precision">
-            <field name="name">Payment Term</field>
-            <field name="digits">6</field>
-        </record>
-
         <record id="account_payment_term_net" model="account.payment.term">
             <field name="name">30 Net Days</field>
             <field name="note">30 Net Days</field>

=== modified file 'account/report/account_entries_report.py'
--- account/report/account_entries_report.py	2013-04-18 10:39:07 +0000
+++ account/report/account_entries_report.py	2013-10-29 13:27:40 +0000
@@ -41,7 +41,7 @@
         'year': fields.char('Year', size=4, readonly=True),
         'date': fields.date('Date', size=128, readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
-        'amount_currency': fields.float('Amount Currency', digits_compute=dp.get_precision('Account'), readonly=True),
+        'amount_currency': fields.float('Amount Currency', digits_compute=dp.get_precision('Amount'), readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),

=== modified file 'account/report/account_general_ledger.rml'
--- account/report/account_general_ledger.rml	2012-06-13 09:06:00 +0000
+++ account/report/account_general_ledger.rml	2013-10-29 13:27:40 +0000
@@ -470,16 +470,16 @@
             <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Amount')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Amount')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Amount'),currency_obj=company.currency_id) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Amount'),currency_obj=o.currency_id) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -509,13 +509,13 @@
               <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),10) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]] </para>
+              <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Amount')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Amount')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Amount'),currency_obj=company.currency_id) ]] </para>
             </td>
             <td>
               <para style="terp_default_Right_8"><font>[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para>
@@ -566,13 +566,13 @@
             <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Amount')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Amount')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Amount'),currency_obj=company.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -602,13 +602,13 @@
               <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),20) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Amount')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Amount')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Amount'),currency_obj=company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>

=== modified file 'account/report/account_general_ledger_landscape.rml'
--- account/report/account_general_ledger_landscape.rml	2013-06-14 21:36:02 +0000
+++ account/report/account_general_ledger_landscape.rml	2013-10-29 13:27:40 +0000
@@ -500,16 +500,16 @@
             <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency_obj= company.currency_id) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Amount')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Amount')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Amount'), currency_obj= company.currency_id) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Amount'),currency_obj=o.currency_id) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -542,13 +542,13 @@
               <para style="terp_default_7">[[ strip_name(line['line_corresp'],18) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
+              <para style="terp_default_Right_7">[[ formatLang(line['debit'], digits=get_digits(dp='Amount')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_7">[[ formatLang(line['credit'], digits=get_digits(dp='Amount')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Amount'), currency_obj=company.currency_id) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_7">[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</para>
@@ -602,13 +602,13 @@
             <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Amount')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Amount')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Amount'), currency_obj=company.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -641,13 +641,13 @@
               <para style="terp_default_7">[[ strip_name(line['line_corresp'],23) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]] </para>
+              <para style="terp_default_Right_7">[[ formatLang(line['debit'], digits=get_digits(dp='Amount')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_7">[[ formatLang(line['credit'], digits=get_digits(dp='Amount')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Amount'),currency_obj=company.currency_id) ]] </para>
             </td>
           </tr>
         </blockTable>

=== modified file 'account/report/account_invoice_report.py'
--- account/report/account_invoice_report.py	2013-05-14 12:05:18 +0000
+++ account/report/account_invoice_report.py	2013-10-29 13:27:40 +0000
@@ -74,9 +74,9 @@
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'price_total': fields.float('Total Without Tax', readonly=True),
-        'user_currency_price_total': fields.function(_compute_amounts_in_user_currency, string="Total Without Tax", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
+        'user_currency_price_total': fields.function(_compute_amounts_in_user_currency, string="Total Without Tax", type='float', digits_compute=dp.get_precision('Amount'), multi="_compute_amounts"),
         'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
-        'user_currency_price_average': fields.function(_compute_amounts_in_user_currency, string="Average Price", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
+        'user_currency_price_average': fields.function(_compute_amounts_in_user_currency, string="Average Price", type='float', digits_compute=dp.get_precision('Amount'), multi="_compute_amounts"),
         'currency_rate': fields.float('Currency Rate', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
         'type': fields.selection([
@@ -98,7 +98,7 @@
         'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True),
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual': fields.float('Total Residual', readonly=True),
-        'user_currency_residual': fields.function(_compute_amounts_in_user_currency, string="Total Residual", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
+        'user_currency_residual': fields.function(_compute_amounts_in_user_currency, string="Total Residual", type='float', digits_compute=dp.get_precision('Amount'), multi="_compute_amounts"),
         'country_id': fields.many2one('res.country', 'Country of the Partner Company'),
     }
     _order = 'date desc'

=== modified file 'account/report/account_print_invoice.rml'
--- account/report/account_print_invoice.rml	2013-05-27 16:30:46 +0000
+++ account/report/account_print_invoice.rml	2013-10-29 13:27:40 +0000
@@ -253,10 +253,10 @@
             <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ formatLang(l.discount, dp='Account') ]] </para>
+            <para style="terp_default_Centre_9">[[ formatLang(l.discount, dp='Amount') ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, dp='Account', currency_obj=o.currency_id) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, dp='Amount', currency_obj=o.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -272,7 +272,7 @@
           <para style="terp_default_9">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Amount'), currency_obj=o.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -285,7 +285,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.currency_id) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Amount', currency_obj=o.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -298,7 +298,7 @@
           <para style="terp_tblheader_Details"><b>Total:</b></para>
         </td>
         <td>
-          <para style="terp_default_Bold_Right_9"><b>[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</b></para>
+          <para style="terp_default_Bold_Right_9"><b>[[ formatLang(o.amount_total, digits=get_digits(dp='Amount'), currency_obj=o.currency_id) ]]</b></para>
         </td>
       </tr>
     </blockTable>
@@ -331,10 +331,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account', currency_obj=o.currency_id) ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Amount', currency_obj=o.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Amount'), currency_obj=o.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_8">

=== modified file 'account/report/account_treasury_report.py'
--- account/report/account_treasury_report.py	2013-04-15 10:23:49 +0000
+++ account/report/account_treasury_report.py	2013-10-29 13:27:40 +0000
@@ -47,8 +47,8 @@
         'credit': fields.float('Credit', readonly=True),
         'balance': fields.float('Balance', readonly=True),
         'date': fields.date('Beginning of Period Date', readonly=True),
-        'starting_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Account'), string='Starting Balance', multi='balance'),
-        'ending_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Account'), string='Ending Balance', multi='balance'),
+        'starting_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Amount'), string='Starting Balance', multi='balance'),
+        'ending_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Amount'), string='Ending Balance', multi='balance'),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
     }
 

=== modified file 'account/res_config.py'
--- account/res_config.py	2013-09-17 12:38:14 +0000
+++ account/res_config.py	2013-10-29 13:27:40 +0000
@@ -330,12 +330,12 @@
                     fiscalyear.create_period3(cr, uid, [fiscalyear_id])
 
     def get_default_dp(self, cr, uid, fields, context=None):
-        dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_account')
+        dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_amount')
         return {'decimal_precision': dp.digits}
 
     def set_default_dp(self, cr, uid, ids, context=None):
         config = self.browse(cr, uid, ids[0], context)
-        dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_account')
+        dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_amount')
         dp.write({'digits': config.decimal_precision})
 
     def onchange_analytic_accounting(self, cr, uid, ids, analytic_accounting, context=None):

=== modified file 'account/test/price_accuracy00.yml'
--- account/test/price_accuracy00.yml	2012-11-29 22:26:45 +0000
+++ account/test/price_accuracy00.yml	2013-10-29 13:27:40 +0000
@@ -6,7 +6,7 @@
     Given the price accuracy for the account module is configured with two
     digits
 -  
-    !record {model: decimal.precision, id: product.decimal_account}:
+    !record {model: decimal.precision, id: product.decimal_amount}:
       digits: 2
 -  
     And we have a tax defined
@@ -61,7 +61,7 @@
 -  
     Then, I change the precision of numbers to 3 digits.
 -  
-    !record {model: decimal.precision, id: product.decimal_account}:
+    !record {model: decimal.precision, id: product.decimal_amount}:
       digits: 3
 -  
     And I create another invoice with the same content.

=== modified file 'account/wizard/account_reconcile.py'
--- account/wizard/account_reconcile.py	2013-04-18 10:39:07 +0000
+++ account/wizard/account_reconcile.py	2013-10-29 13:27:40 +0000
@@ -33,9 +33,9 @@
     _description = 'Account move line reconcile'
     _columns = {
         'trans_nbr': fields.integer('# of Transaction', readonly=True),
-        'credit': fields.float('Credit amount', readonly=True, digits_compute=dp.get_precision('Account')),
-        'debit': fields.float('Debit amount', readonly=True, digits_compute=dp.get_precision('Account')),
-        'writeoff': fields.float('Write-Off amount', readonly=True, digits_compute=dp.get_precision('Account')),
+        'credit': fields.float('Credit amount', readonly=True, digits_compute=dp.get_precision('Amount')),
+        'debit': fields.float('Debit amount', readonly=True, digits_compute=dp.get_precision('Amount')),
+        'writeoff': fields.float('Write-Off amount', readonly=True, digits_compute=dp.get_precision('Amount')),
     }
 
     def default_get(self, cr, uid, fields, context=None):

=== modified file 'account/wizard/pos_box.py'
--- account/wizard/pos_box.py	2013-06-03 12:18:52 +0000
+++ account/wizard/pos_box.py	2013-10-29 13:27:40 +0000
@@ -9,7 +9,7 @@
         # Attention, we don't set a domain, because there is a journal_type key 
         # in the context of the action
         'amount' : fields.float('Amount',
-                                digits_compute = dp.get_precision('Account'),
+                                digits_compute = dp.get_precision('Amount'),
                                 required=True),
     }
 

=== modified file 'account_analytic_analysis/account_analytic_analysis.py'
--- account_analytic_analysis/account_analytic_analysis.py	2013-10-03 11:12:22 +0000
+++ account_analytic_analysis/account_analytic_analysis.py	2013-10-29 13:27:40 +0000
@@ -48,10 +48,10 @@
         'product_id': fields.many2one('product.product','Product',required=True),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
         'name': fields.text('Description', required=True),
-        'quantity': fields.float('Quantity', required=True),
+        'quantity': fields.float('Quantity', required=True, digits_compute=dp.get_precision('Quantity')),
         'uom_id': fields.many2one('product.uom', 'Unit of Measure',required=True),
-        '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')),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Price')),
+        'price_subtotal': fields.function(_amount_line, string='Sub Total', type="float",digits_compute= dp.get_precision('Amount')),
     }
     _defaults = {
         'quantity' : 1,
@@ -453,16 +453,16 @@
                                                 }),
         'ca_invoiced': fields.function(_ca_invoiced_calc, type='float', string='Invoiced Amount',
             help="Total customer invoiced amount for this account.",
-            digits_compute=dp.get_precision('Account')),
+            digits_compute=dp.get_precision('Amount')),
         'total_cost': fields.function(_total_cost_calc, type='float', string='Total Costs',
             help="Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets.",
-            digits_compute=dp.get_precision('Account')),
+            digits_compute=dp.get_precision('Amount')),
         'ca_to_invoice': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Uninvoiced Amount',
             help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs.",
-            digits_compute=dp.get_precision('Account')),
+            digits_compute=dp.get_precision('Amount')),
         'ca_theorical': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Theoretical Revenue',
             help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.",
-            digits_compute=dp.get_precision('Account')),
+            digits_compute=dp.get_precision('Amount')),
         'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Total Worked Time',
             help="Number of time you spent on the analytic account (from timesheet). It computes quantities on all journal of type 'general'."),
         'last_invoice_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Last Invoice Date',
@@ -485,19 +485,19 @@
             help="Sum of timesheet lines invoiced for this contract."),
         'remaining_ca': fields.function(_remaining_ca_calc, type='float', string='Remaining Revenue',
             help="Computed using the formula: Max Invoice Price - Invoiced Amount.",
-            digits_compute=dp.get_precision('Account')),
+            digits_compute=dp.get_precision('Amount')),
         'revenue_per_hour': fields.function(_revenue_per_hour_calc, type='float', string='Revenue per Time (real)',
             help="Computed using the formula: Invoiced Amount / Total Time",
-            digits_compute=dp.get_precision('Account')),
+            digits_compute=dp.get_precision('Amount')),
         'real_margin': fields.function(_real_margin_calc, type='float', string='Real Margin',
             help="Computed using the formula: Invoiced Amount - Total Costs.",
-            digits_compute=dp.get_precision('Account')),
+            digits_compute=dp.get_precision('Amount')),
         'theorical_margin': fields.function(_theorical_margin_calc, type='float', string='Theoretical Margin',
             help="Computed using the formula: Theoretical Revenue - Total Costs",
-            digits_compute=dp.get_precision('Account')),
+            digits_compute=dp.get_precision('Amount')),
         'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)',
             help="Computes using the formula: (Real Margin / Total Costs) * 100.",
-            digits_compute=dp.get_precision('Account')),
+            digits_compute=dp.get_precision('Amount')),
         'fix_price_invoices' : fields.boolean('Fixed Price'),
         'invoice_on_timesheets' : fields.boolean("On Timesheets"),
         'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2013-04-18 10:39:07 +0000
+++ account_asset/account_asset.py	2013-10-29 13:27:40 +0000
@@ -242,7 +242,7 @@
         'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
         'name': fields.char('Asset Name', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'code': fields.char('Reference', size=32, readonly=True, states={'draft':[('readonly',False)]}),
-        'purchase_value': fields.float('Gross Value', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'purchase_value': fields.float('Gross Value', required=True, digits_compute=dp.get_precision('Amount'), readonly=True, states={'draft':[('readonly',False)]}),
         'currency_id': fields.many2one('res.currency','Currency',required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'note': fields.text('Note'),
@@ -263,7 +263,7 @@
         'method_period': fields.integer('Number of Months in a Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="The amount of time between two depreciations, in months"),
         'method_end': fields.date('Ending Date', readonly=True, states={'draft':[('readonly',False)]}),
         'method_progress_factor': fields.float('Degressive Factor', readonly=True, states={'draft':[('readonly',False)]}),
-        'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'),
+        'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Amount'), string='Residual Value'),
         'method_time': fields.selection([('number','Number of Depreciations'),('end','Ending Date')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]},
                                   help="Choose the method to use to compute the dates and number of depreciation lines.\n"\
                                        "  * Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n" \
@@ -271,7 +271,7 @@
         'prorata':fields.boolean('Prorata Temporis', readonly=True, states={'draft':[('readonly',False)]}, help='Indicates that the first depreciation entry for this asset have to be done from the purchase date instead of the first January'),
         'history_ids': fields.one2many('account.asset.history', 'asset_id', 'History', readonly=True),
         'depreciation_line_ids': fields.one2many('account.asset.depreciation.line', 'asset_id', 'Depreciation Lines', readonly=True, states={'draft':[('readonly',False)],'open':[('readonly',False)]}),
-        'salvage_value': fields.float('Salvage Value', digits_compute=dp.get_precision('Account'), help="It is the amount you plan to have that you cannot depreciate.", readonly=True, states={'draft':[('readonly',False)]}),
+        'salvage_value': fields.float('Salvage Value', digits_compute=dp.get_precision('Amount'), help="It is the amount you plan to have that you cannot depreciate.", readonly=True, states={'draft':[('readonly',False)]}),
     }
     _defaults = {
         'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'account.asset.code'),
@@ -376,9 +376,9 @@
         'sequence': fields.integer('Sequence', required=True),
         'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True, ondelete='cascade'),
         'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
-        'amount': fields.float('Current Depreciation', digits_compute=dp.get_precision('Account'), required=True),
-        'remaining_value': fields.float('Next Period Depreciation', digits_compute=dp.get_precision('Account'),required=True),
-        'depreciated_value': fields.float('Amount Already Depreciated', required=True),
+        'amount': fields.float('Current Depreciation', digits_compute=dp.get_precision('Amount'), required=True),
+        'remaining_value': fields.float('Next Period Depreciation', digits_compute=dp.get_precision('Amount'),required=True),
+        'depreciated_value': fields.float('Amount Already Depreciated', digits_compute=dp.get_precision('Amount'), required=True),
         'depreciation_date': fields.date('Depreciation Date', select=1),
         'move_id': fields.many2one('account.move', 'Depreciation Entry'),
         'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)

=== modified file 'account_bank_statement_extensions/account_bank_statement.py'
--- account_bank_statement_extensions/account_bank_statement.py	2013-04-15 10:23:49 +0000
+++ account_bank_statement_extensions/account_bank_statement.py	2013-10-29 13:27:40 +0000
@@ -71,7 +71,7 @@
             ('coda', 'CODA'),
             ('manual', 'Manual'),
             ], 'Type', required=True),
-        'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
+        'amount': fields.float('Amount', digits_compute=dp.get_precision('Amount')),
         'bank_statement_line_ids': fields.one2many('account.bank.statement.line', 'globalisation_id', 'Bank Statement Lines'),
     }
     _rec_name = 'code'

=== modified file 'account_budget/account_budget.py'
--- account_budget/account_budget.py	2013-04-15 10:23:49 +0000
+++ account_budget/account_budget.py	2013-10-29 13:27:40 +0000
@@ -193,9 +193,9 @@
         'date_from': fields.date('Start Date', required=True),
         'date_to': fields.date('End Date', required=True),
         'paid_date': fields.date('Paid Date'),
-        'planned_amount':fields.float('Planned Amount', required=True, digits_compute=dp.get_precision('Account')),
-        'practical_amount':fields.function(_prac, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')),
-        'theoritical_amount':fields.function(_theo, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Account')),
+        'planned_amount':fields.float('Planned Amount', required=True, digits_compute=dp.get_precision('Amount')),
+        'practical_amount':fields.function(_prac, string='Practical Amount', type='float', digits_compute=dp.get_precision('Amount')),
+        'theoritical_amount':fields.function(_theo, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Amount')),
         'percentage':fields.function(_perc, string='Percentage', type='float'),
         'company_id': fields.related('crossovered_budget_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }

=== modified file 'account_budget/report/budget_report.rml'
--- account_budget/report/budget_report.rml	2011-12-21 09:08:11 +0000
+++ account_budget/report/budget_report.rml	2013-10-29 13:27:40 +0000
@@ -148,13 +148,13 @@
             <para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['pln'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['prac'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Amount'), currency_obj=company.currency_id) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['pln'], digits=get_digits(dp='Amount'), currency_obj=company.currency_id) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['prac'], digits=get_digits(dp='Amount'), currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['perc'], digits=2) ]]%</para>
@@ -168,13 +168,13 @@
           <para style="terp_default_Bold_9"><font face="Helvetica">[[ repeatIn(funct_total(data['form']),'b') ]]</font>Total:</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]] </para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], digits=get_digits(dp='Amount'), currency_obj=company.currency_id) ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], digits=get_digits(dp='Amount'), currency_obj=company.currency_id) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], digits=get_digits(dp='Amount'), currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_perc'], digits=2) ]]%</para>

=== modified file 'account_budget/report/crossovered_budget_report.rml'
--- account_budget/report/crossovered_budget_report.rml	2011-12-21 09:08:11 +0000
+++ account_budget/report/crossovered_budget_report.rml	2013-10-29 13:27:40 +0000
@@ -163,13 +163,13 @@
             <para style="terp_default_9"><font face="Helvetica" size="10.0" color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica" size="8.0">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], dp='Account', currency_obj=company.currency_id) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], dp='Account', currency_obj=company.currency_id) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], dp='Account', currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], dp='Amount', currency_obj=company.currency_id) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], dp='Amount', currency_obj=company.currency_id) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], dp='Amount', currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['perc'],digits=2) ]]%</para>
@@ -183,13 +183,13 @@
           <para style="terp_tblheader_Details">[[ repeatIn(funct_total(data['form']),'b') ]] Total :</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], dp='Account', currency_obj=company.currency_id) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], dp='Account', currency_obj=company.currency_id) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], dp='Account', currency_obj=company.currency_id) ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], dp='Amount', currency_obj=company.currency_id) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], dp='Amount', currency_obj=company.currency_id) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], dp='Amount', currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">[[ formatLang(b['tot_perc'],digits=2) ]]%</para>

=== modified file 'account_followup/account_followup.py'
--- account_followup/account_followup.py	2013-10-08 17:07:14 +0000
+++ account_followup/account_followup.py	2013-10-29 13:27:40 +0000
@@ -274,7 +274,7 @@
                         strbegin = "<TD><B>"
                         strend = "</B></TD>"
                     followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['name'] + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
-                total = rml_parse.formatLang(total, dp='Account', currency_obj=currency)
+                total = rml_parse.formatLang(total, dp='Amount', currency_obj=currency)
                 followup_table += '''<tr> </tr>
                                 </table>
                                 <center>''' + _("Amount due") + ''' : %s </center>''' % (total)

=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py	2013-10-08 17:23:19 +0000
+++ account_followup/wizard/account_followup_print.py	2013-10-29 13:27:40 +0000
@@ -25,6 +25,8 @@
 from openerp import tools
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
+
 
 class account_followup_stat_by_partner(osv.osv):
     _name = "account_followup.stat.by.partner"
@@ -38,7 +40,7 @@
         'date_followup':fields.date('Latest follow-up', readonly=True),
         'max_followup_id': fields.many2one('account_followup.followup.line',
                                     'Max Follow Up Level', readonly=True, ondelete="cascade"),
-        'balance':fields.float('Balance', readonly=True),
+        'balance':fields.float('Balance', readonly=True,  digits_compute=dp.get_precision('Amount')),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
     }
 

=== modified file 'account_payment/account_payment.py'
--- account_payment/account_payment.py	2013-04-15 10:23:49 +0000
+++ account_payment/account_payment.py	2013-10-29 13:27:40 +0000
@@ -23,6 +23,8 @@
 import time
 
 from openerp.osv import fields, osv
+from openerp.addons.decimal_precision import decimal_precision as dp
+
 
 _logger = logging.getLogger(__name__)
 
@@ -96,7 +98,7 @@
             ('done', 'Done')], 'Status', select=True,
             help='When an order is placed the status is \'Draft\'.\n Once the bank is confirmed the status is set to \'Confirmed\'.\n Then the order is paid the status is \'Done\'.'),
         'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
-        'total': fields.function(_total, string="Total", type='float'),
+        'total': fields.function(_total, string="Total", type='float', digits_compute= dp.get_precision('Amount')),
         'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'done': [('readonly', True)]}),
         'date_prefered': fields.selection([
             ('now', 'Directly'),
@@ -307,7 +309,7 @@
         'communication': fields.char('Communication', size=64, required=True, help="Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order ?'"),
         'communication2': fields.char('Communication 2', size=64, help='The successor message of Communication.'),
         'move_line_id': fields.many2one('account.move.line', 'Entry line', domain=[('reconcile_id', '=', False), ('account_id.type', '=', 'payable')], help='This Entry Line will be referred for the information of the ordering customer.'),
-        'amount_currency': fields.float('Amount in Partner Currency', digits=(16, 2),
+        'amount_currency': fields.float('Amount in Partner Currency', digits_compute= dp.get_precision('Amount'),
             required=True, help='Payment amount in the partner currency'),
         'currency': fields.many2one('res.currency','Partner Currency', required=True),
         'company_currency': fields.many2one('res.currency', 'Company Currency', readonly=True),

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2013-08-23 15:46:55 +0000
+++ account_voucher/account_voucher.py	2013-10-29 13:27:40 +0000
@@ -357,8 +357,8 @@
                         \n* The \'Pro-forma\' when voucher is in Pro-forma status,voucher does not have an voucher number. \
                         \n* The \'Posted\' status is used when user create voucher,a voucher number is generated and voucher entries are created in account \
                         \n* The \'Cancelled\' status is used when user cancel voucher.'),
-        'amount': fields.float('Total', digits_compute=dp.get_precision('Account'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'tax_amount':fields.float('Tax Amount', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
+        'amount': fields.float('Total', digits_compute=dp.get_precision('Amount'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'tax_amount':fields.float('Tax Amount', digits_compute=dp.get_precision('Amount'), readonly=True, states={'draft':[('readonly',False)]}),
         'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction reference number."),
         'number': fields.char('Number', size=32, readonly=True,),
         'move_id':fields.many2one('account.move', 'Account Entry'),
@@ -380,7 +380,7 @@
         'writeoff_acc_id': fields.many2one('account.account', 'Counterpart Account', readonly=True, states={'draft': [('readonly', False)]}),
         'comment': fields.char('Counterpart Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
-        'writeoff_amount': fields.function(_get_writeoff_amount, string='Difference Amount', type='float', readonly=True, help="Computed as the difference between the amount stated in the voucher and the sum of allocation on the voucher lines."),
+        'writeoff_amount': fields.function(_get_writeoff_amount, string='Difference Amount', type='float', readonly=True, digits_compute=dp.get_precision('Amount'), help="Computed as the difference between the amount stated in the voucher and the sum of allocation on the voucher lines."),
         'payment_rate_currency_id': fields.many2one('res.currency', 'Payment Rate Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'payment_rate': fields.float('Exchange Rate', digits=(12,6), required=True, readonly=True, states={'draft': [('readonly', False)]},
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
@@ -1182,7 +1182,7 @@
         ctx.update({
             'voucher_special_currency_rate': voucher_currency.rate * voucher.payment_rate ,
             'voucher_special_currency': voucher.payment_rate_currency_id and voucher.payment_rate_currency_id.id or False,})
-        prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+        prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Amount')
         for line in voucher.line_ids:
             #create one move line per voucher line where amount is not 0.0
             # AND (second part of the clause) only if the original move line was not having debit = credit = 0 (which is a legal value)
@@ -1481,16 +1481,16 @@
         'name':fields.char('Description', size=256),
         'account_id':fields.many2one('account.account','Account', required=True),
         'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
-        'untax_amount':fields.float('Untax Amount'),
-        'amount':fields.float('Amount', digits_compute=dp.get_precision('Account')),
+        'untax_amount':fields.float('Untax Amount', digits_compute=dp.get_precision('Amount')),
+        'amount':fields.float('Amount', digits_compute=dp.get_precision('Amount')),
         'reconcile': fields.boolean('Full Reconcile'),
         'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Dr/Cr'),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
         'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
         'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly=1),
         'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1),
-        'amount_original': fields.function(_compute_balance, multi='dc', type='float', string='Original Amount', store=True, digits_compute=dp.get_precision('Account')),
-        'amount_unreconciled': fields.function(_compute_balance, multi='dc', type='float', string='Open Balance', store=True, digits_compute=dp.get_precision('Account')),
+        'amount_original': fields.function(_compute_balance, multi='dc', type='float', string='Original Amount', store=True, digits_compute=dp.get_precision('Amount')),
+        'amount_unreconciled': fields.function(_compute_balance, multi='dc', type='float', string='Open Balance', store=True, digits_compute=dp.get_precision('Amount')),
         'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
         'currency_id': fields.function(_currency_id, string='Currency', type='many2one', relation='res.currency', readonly=True),
     }

=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2013-09-10 12:48:03 +0000
+++ analytic/analytic.py	2013-10-29 13:27:40 +0000
@@ -185,9 +185,9 @@
         'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
         'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', string="Account Hierarchy", type='many2many'),
         'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'),
-        'balance': fields.function(_debit_credit_bal_qtty, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
-        'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
-        'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
+        'balance': fields.function(_debit_credit_bal_qtty, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Amount')),
+        'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Amount')),
+        'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Amount')),
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
         'quantity_max': fields.float('Prepaid Service Units', help='Sets the higher limit of time to work on the contract, based on the timesheet. (for instance, number of hours in a limited support contract.)'),
         'partner_id': fields.many2one('res.partner', 'Customer'),
@@ -315,7 +315,7 @@
     _columns = {
         'name': fields.char('Description', size=256, required=True),
         'date': fields.date('Date', required=True, select=True),
-        'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
+        'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Amount')),
         'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='restrict', select=True, domain=[('type','<>','view')]),
         'user_id': fields.many2one('res.users', 'User'),

=== modified file 'analytic_contract_hr_expense/analytic_contract_hr_expense.py'
--- analytic_contract_hr_expense/analytic_contract_hr_expense.py	2013-04-29 15:14:10 +0000
+++ analytic_contract_hr_expense/analytic_contract_hr_expense.py	2013-10-29 13:27:40 +0000
@@ -112,7 +112,7 @@
         'est_expenses': fields.float('Estimation of Expenses to Invoice'),
         'ca_invoiced': fields.function(_ca_invoiced_calc, type='float', string='Invoiced Amount',
             help="Total customer invoiced amount for this account.",
-            digits_compute=dp.get_precision('Account')),
+            digits_compute=dp.get_precision('Amount')),
     }
 
     def on_change_template(self, cr, uid, id, template_id, context=None):

=== modified file 'analytic_user_function/analytic_user_function.py'
--- analytic_user_function/analytic_user_function.py	2013-08-23 15:46:55 +0000
+++ analytic_user_function/analytic_user_function.py	2013-10-29 13:27:40 +0000
@@ -31,7 +31,7 @@
         'product_id': fields.many2one("product.product", "Service", required=True,),
         'account_id': fields.many2one("account.analytic.account", "Analytic Account", required=True,),
         'uom_id': fields.related("product_id", "uom_id", relation="product.uom", string="Unit of Measure", type="many2one", readonly=True),
-        'price': fields.float('Price', digits_compute=dp.get_precision('Product Price'), help="Price per hour for this user.", required=True),
+        'price': fields.float('Price', digits_compute=dp.get_precision('Price'), help="Price per hour for this user.", required=True),
     }
     def onchange_user_product_id(self, cr, uid, ids, user_id, product_id, context=None):
         if not user_id:

=== modified file 'decimal_precision/__openerp__.py'
--- decimal_precision/__openerp__.py	2012-11-29 22:26:45 +0000
+++ decimal_precision/__openerp__.py	2013-10-29 13:27:40 +0000
@@ -33,6 +33,7 @@
     'category' : 'Hidden/Dependency',
     'data': [
         'decimal_precision_view.xml',
+        'decimal_precision_data.xml',
         'security/ir.model.access.csv',
     ],
     'demo': [],

=== added file 'decimal_precision/decimal_precision_data.xml'
--- decimal_precision/decimal_precision_data.xml	1970-01-01 00:00:00 +0000
+++ decimal_precision/decimal_precision_data.xml	2013-10-29 13:27:40 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- Decimal Precision -->
+        <record forcecreate="True" id="decimal_price" model="decimal.precision">
+            <field name="name">Price</field>
+            <field name="digits">2</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file

=== modified file 'delivery/delivery.py'
--- delivery/delivery.py	2013-04-15 10:23:49 +0000
+++ delivery/delivery.py	2013-10-29 13:27:40 +0000
@@ -236,8 +236,8 @@
         'max_value': fields.float('Maximum Value', required=True),
         'price_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Price Type', required=True),
         'variable_factor': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price')], 'Variable Factor', required=True),
-        'list_price': fields.float('Sale Price', digits_compute= dp.get_precision('Product Price'), required=True),
-        'standard_price': fields.float('Cost Price', digits_compute= dp.get_precision('Product Price'), required=True),
+        'list_price': fields.float('Sale Price', digits_compute= dp.get_precision('Price'), required=True),
+        'standard_price': fields.float('Cost Price', digits_compute= dp.get_precision('Price'), required=True),
     }
     _defaults = {
         'type': lambda *args: 'weight',

=== modified file 'delivery/stock.py'
--- delivery/stock.py	2013-04-15 10:23:49 +0000
+++ delivery/stock.py	2013-10-29 13:27:40 +0000
@@ -54,12 +54,12 @@
     _columns = {
         'carrier_id':fields.many2one("delivery.carrier","Carrier"),
         'volume': fields.float('Volume'),
-        'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+        'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Weight'), multi='_cal_weight',
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                  'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
                  }),
-        'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+        'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Weight'), multi='_cal_weight',
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                  'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
@@ -167,11 +167,11 @@
         return res
 
     _columns = {
-        'weight': fields.function(_cal_move_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
+        'weight': fields.function(_cal_move_weight, type='float', string='Weight', digits_compute= dp.get_precision('Weight'), multi='_cal_move_weight',
                   store={
                  'stock.move': (lambda self, cr, uid, ids, c=None: ids, ['product_id', 'product_qty', 'product_uom'], 20),
                  }),
-        'weight_net': fields.function(_cal_move_weight, type='float', string='Net weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
+        'weight_net': fields.function(_cal_move_weight, type='float', string='Net weight', digits_compute= dp.get_precision('Weight'), multi='_cal_move_weight',
                   store={
                  'stock.move': (lambda self, cr, uid, ids, c=None: ids, ['product_id', 'product_qty', 'product_uom'], 20),
                  }),
@@ -200,12 +200,12 @@
     _columns = {
         'carrier_id':fields.many2one("delivery.carrier","Carrier"),
         'volume': fields.float('Volume'),
-        'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+        'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Weight'), multi='_cal_weight',
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                  'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
                  }),
-        'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+        'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Weight'), multi='_cal_weight',
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                  'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
@@ -224,12 +224,12 @@
         return self.pool.get('stock.picking')._get_picking_line(cr, uid, ids, context=context)
 
     _columns = {
-        'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+        'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Weight'), multi='_cal_weight',
                 store={
                 'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                 'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
                 }),
-        'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+        'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Weight'), multi='_cal_weight',
                 store={
                 'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                 'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),

=== modified file 'hr_contract/hr_contract.py'
--- hr_contract/hr_contract.py	2013-06-27 11:00:29 +0000
+++ hr_contract/hr_contract.py	2013-10-29 13:27:40 +0000
@@ -21,6 +21,7 @@
 import time
 
 from openerp.osv import fields, osv
+import openerp.addons.decimal_precision as dp
 
 class hr_employee(osv.osv):
     _name = "hr.employee"
@@ -71,7 +72,7 @@
         'trial_date_start': fields.date('Trial Start Date'),
         'trial_date_end': fields.date('Trial End Date'),
         'working_hours': fields.many2one('resource.calendar','Working Schedule'),
-        'wage': fields.float('Wage', digits=(16,2), required=True, help="Basic Salary of the employee"),
+        'wage': fields.float('Wage', digits_compute=dp.get_precision('Amount'), required=True, help="Basic Salary of the employee"),
         'advantages': fields.text('Advantages'),
         'notes': fields.text('Notes'),
         'permit_no': fields.char('Work Permit No', size=256, required=False, readonly=False),

=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2013-09-10 12:48:03 +0000
+++ hr_expense/hr_expense.py	2013-10-29 13:27:40 +0000
@@ -77,7 +77,7 @@
         'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
-        'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account'), 
+        'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Amount'), 
             store={
                 'hr.expense.line': (_get_expense_from_line, ['unit_amount','unit_quantity'], 10)
             }),
@@ -414,9 +414,9 @@
         'name': fields.char('Expense Note', size=128, required=True),
         'date_value': fields.date('Date', required=True),
         'expense_id': fields.many2one('hr.expense.expense', 'Expense', ondelete='cascade', select=True),
-        'total_amount': fields.function(_amount, string='Total', digits_compute=dp.get_precision('Account')),
-        'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Product Price')),
-        'unit_quantity': fields.float('Quantities', digits_compute= dp.get_precision('Product Unit of Measure')),
+        'total_amount': fields.function(_amount, string='Total', digits_compute=dp.get_precision('Amount')),
+        'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Price')),
+        'unit_quantity': fields.float('Quantities', digits_compute= dp.get_precision('Quantity')),
         'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
         'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True),
         'description': fields.text('Description'),

=== modified file 'hr_expense/report/hr_expense_report.py'
--- hr_expense/report/hr_expense_report.py	2013-04-15 10:23:49 +0000
+++ hr_expense/report/hr_expense_report.py	2013-10-29 13:27:40 +0000
@@ -47,11 +47,11 @@
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'Validation User', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
-        'price_total':fields.float('Total Price', readonly=True, digits_compute=dp.get_precision('Account')),
+        'price_total':fields.float('Total Price', readonly=True, digits_compute=dp.get_precision('Amount')),
         'delay_valid':fields.float('Delay to Valid', readonly=True),
         'delay_confirm':fields.float('Delay to Confirm', readonly=True),
         'analytic_account': fields.many2one('account.analytic.account','Analytic account',readonly=True),
-        'price_average':fields.float('Average Price', readonly=True, digits_compute=dp.get_precision('Account')),
+        'price_average':fields.float('Average Price', readonly=True, digits_compute=dp.get_precision('Amount')),
         'nbr':fields.integer('# of Lines', readonly=True),
         'no_of_products':fields.integer('# of Products', readonly=True),
         'no_of_account':fields.integer('# of Accounts', readonly=True),

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2013-04-29 15:14:10 +0000
+++ hr_payroll/hr_payroll.py	2013-10-29 13:27:40 +0000
@@ -748,7 +748,7 @@
         'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True, ondelete='cascade', select=True),
         'sequence': fields.integer('Sequence', required=True, select=True),
         'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"),
-        'amount': fields.float('Amount', help="It is used in computation. For e.g. A rule for sales having 1% commission of basic salary for per product can defined in expression like result = inputs.SALEURO.amount * contract.wage*0.01."),
+        'amount': fields.float('Amount', digits_compute=dp.get_precision('Amount'), help="It is used in computation. For e.g. A rule for sales having 1% commission of basic salary for per product can defined in expression like result = inputs.SALEURO.amount * contract.wage*0.01."),
         'contract_id': fields.many2one('hr.contract', 'Contract', required=True, help="The contract for which applied this input"),
     }
     _order = 'payslip_id, sequence'
@@ -781,8 +781,8 @@
             ('fix','Fixed Amount'),
             ('code','Python Code'),
         ],'Amount Type', select=True, required=True, help="The computation method for the rule amount."),
-        'amount_fix': fields.float('Fixed Amount', digits_compute=dp.get_precision('Payroll'),),
-        'amount_percentage': fields.float('Percentage (%)', digits_compute=dp.get_precision('Payroll Rate'), help='For example, enter 50.0 to apply a percentage of 50%'),
+        'amount_fix': fields.float('Fixed Amount', digits_compute=dp.get_precision('Amount')),
+        'amount_percentage': fields.float('Percentage (%)', digits_compute=dp.get_precision('Amount'), help='For example, enter 50.0 to apply a percentage of 50%'),
         'amount_python_compute':fields.text('Python Code'),
         'amount_percentage_base':fields.char('Percentage based on',size=1024, required=False, readonly=False, help='result will be affected to a variable'),
         'child_ids':fields.one2many('hr.salary.rule', 'parent_rule_id', 'Child Salary Rule'),
@@ -931,10 +931,10 @@
         'salary_rule_id':fields.many2one('hr.salary.rule', 'Rule', required=True),
         'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
         'contract_id':fields.many2one('hr.contract', 'Contract', required=True, select=True),
-        'rate': fields.float('Rate (%)', digits_compute=dp.get_precision('Payroll Rate')),
-        'amount': fields.float('Amount', digits_compute=dp.get_precision('Payroll')),
-        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Payroll')),
-        'total': fields.function(_calculate_total, method=True, type='float', string='Total', digits_compute=dp.get_precision('Payroll'),store=True ),
+        'rate': fields.float('Rate (%)', digits_compute=dp.get_precision('Price')),
+        'amount': fields.float('Amount', digits_compute=dp.get_precision('Amount')),
+        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Quantity')),
+        'total': fields.function(_calculate_total, method=True, type='float', string='Total', digits_compute=dp.get_precision('Amount'),store=True ),
     }
 
     _defaults = {
@@ -972,7 +972,7 @@
 
     _columns = {
         'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
-        'total_wage': fields.function(_calculate_total_wage, method=True, type='float', string='Total Basic Salary', digits_compute=dp.get_precision('Payroll'), help="Sum of all current contract's wage of employee."),
+        'total_wage': fields.function(_calculate_total_wage, method=True, type='float', string='Total Basic Salary', digits_compute=dp.get_precision('Amount'), help="Sum of all current contract's wage of employee."),
     }
 
 

=== modified file 'hr_payroll/hr_payroll_data.xml'
--- hr_payroll/hr_payroll_data.xml	2012-06-20 13:04:49 +0000
+++ hr_payroll/hr_payroll_data.xml	2013-10-29 13:27:40 +0000
@@ -77,18 +77,5 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
 
-        <!-- Decimal Precision -->
-
-        <record forcecreate="True" id="decimal_payroll" model="decimal.precision">
-            <field name="name">Payroll</field>
-            <field name="digits">2</field>
-        </record>
-
-        <record forcecreate="True" id="decimal_payroll_rate" model="decimal.precision">
-            <field name="name">Payroll Rate</field>
-            <field name="digits">4</field>
-        </record>
-
-
     </data>
 </openerp>

=== modified file 'hr_recruitment/report/hr_recruitment_report.py'
--- hr_recruitment/report/hr_recruitment_report.py	2013-08-19 09:31:36 +0000
+++ hr_recruitment/report/hr_recruitment_report.py	2013-10-29 13:27:40 +0000
@@ -53,10 +53,10 @@
         'type_id': fields.many2one('hr.recruitment.degree', 'Degree'),
         'department_id': fields.many2one('hr.department','Department',readonly=True),
         'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
-        'salary_prop' : fields.float("Salary Proposed", digits_compute=dp.get_precision('Account')),
-        'salary_prop_avg' : fields.float("Avg. Proposed Salary", group_operator="avg", digits_compute=dp.get_precision('Account')),
-        'salary_exp' : fields.float("Salary Expected", digits_compute=dp.get_precision('Account')),
-        'salary_exp_avg' : fields.float("Avg. Expected Salary", group_operator="avg", digits_compute=dp.get_precision('Account')),
+        'salary_prop' : fields.float("Salary Proposed", digits_compute=dp.get_precision('Amount')),
+        'salary_prop_avg' : fields.float("Avg. Proposed Salary", group_operator="avg", digits_compute=dp.get_precision('Amount')),
+        'salary_exp' : fields.float("Salary Expected", digits_compute=dp.get_precision('Amount')),
+        'salary_exp_avg' : fields.float("Avg. Expected Salary", group_operator="avg", digits_compute=dp.get_precision('Amount')),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
         'available': fields.float("Availability"),
         'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",

=== modified file 'hr_timesheet_invoice/report/report_analytic.py'
--- hr_timesheet_invoice/report/report_analytic.py	2013-04-15 10:23:49 +0000
+++ hr_timesheet_invoice/report/report_analytic.py	2013-10-29 13:27:40 +0000
@@ -71,8 +71,8 @@
         'account_id':fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
         'product_uom_id':fields.many2one('product.uom', 'Unit of Measure', readonly=True),
         'unit_amount': fields.float('Units', readonly=True),
-        'sale_price': fields.float('Sale price', readonly=True, digits_compute=dp.get_precision('Product Price')),
-        'amount': fields.float('Amount', readonly=True, digits_compute=dp.get_precision('Account')),
+        'sale_price': fields.float('Sale price', readonly=True, digits_compute=dp.get_precision('Price')),
+        'amount': fields.float('Amount', readonly=True, digits_compute=dp.get_precision('Amount')),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
     }

=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report.py'
--- hr_timesheet_sheet/report/hr_timesheet_report.py	2013-04-15 10:23:49 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report.py	2013-10-29 13:27:40 +0000
@@ -42,7 +42,7 @@
         'user_id': fields.many2one('res.users', 'User',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
         'company_id': fields.many2one('res.company', 'Company',readonly=True),
-        'cost': fields.float('Cost',readonly=True, digits_compute=dp.get_precision('Account')),
+        'cost': fields.float('Cost',readonly=True, digits_compute=dp.get_precision('Amount')),
         'quantity': fields.float('Time',readonly=True),
     }
 

=== modified file 'l10n_be_hr_payroll/l10n_be_hr_payroll.py'
--- l10n_be_hr_payroll/l10n_be_hr_payroll.py	2013-04-15 10:23:49 +0000
+++ l10n_be_hr_payroll/l10n_be_hr_payroll.py	2013-10-29 13:27:40 +0000
@@ -27,16 +27,16 @@
     _inherit = 'hr.contract'
 
     _columns = {
-        'travel_reimbursement_amount': fields.float('Reimbursement of travel expenses', digits_compute=dp.get_precision('Payroll')),
-        'car_company_amount': fields.float('Company car employer', digits_compute=dp.get_precision('Payroll')),
-        'car_employee_deduction': fields.float('Company Car Deduction for Worker', digits_compute=dp.get_precision('Payroll')),
-        'misc_onss_deduction': fields.float('Miscellaneous exempt ONSS ', digits_compute=dp.get_precision('Payroll')),
-        'meal_voucher_amount': fields.float('Check Value Meal ', digits_compute=dp.get_precision('Payroll')),
-        'meal_voucher_employee_deduction': fields.float('Check Value Meal - by worker ', digits_compute=dp.get_precision('Payroll')),
-        'insurance_employee_deduction': fields.float('Insurance Group - by worker ', digits_compute=dp.get_precision('Payroll')),
-        'misc_advantage_amount': fields.float('Benefits of various nature ', digits_compute=dp.get_precision('Payroll')),
-        'additional_net_amount': fields.float('Net supplements', digits_compute=dp.get_precision('Payroll')),
-        'retained_net_amount': fields.float('Net retained ', digits_compute=dp.get_precision('Payroll')),
+        'travel_reimbursement_amount': fields.float('Reimbursement of travel expenses', digits_compute=dp.get_precision('Price')),
+        'car_company_amount': fields.float('Company car employer', digits_compute=dp.get_precision('Price')),
+        'car_employee_deduction': fields.float('Company Car Deduction for Worker', digits_compute=dp.get_precision('Price')),
+        'misc_onss_deduction': fields.float('Miscellaneous exempt ONSS ', digits_compute=dp.get_precision('Price')),
+        'meal_voucher_amount': fields.float('Check Value Meal ', digits_compute=dp.get_precision('Price')),
+        'meal_voucher_employee_deduction': fields.float('Check Value Meal - by worker ', digits_compute=dp.get_precision('Price')),
+        'insurance_employee_deduction': fields.float('Insurance Group - by worker ', digits_compute=dp.get_precision('Price')),
+        'misc_advantage_amount': fields.float('Benefits of various nature ', digits_compute=dp.get_precision('Price')),
+        'additional_net_amount': fields.float('Net supplements', digits_compute=dp.get_precision('Price')),
+        'retained_net_amount': fields.float('Net retained ', digits_compute=dp.get_precision('Price')),
     }
 
 

=== modified file 'l10n_br/account.py'
--- l10n_br/account.py	2013-03-27 11:49:36 +0000
+++ l10n_br/account.py	2013-10-29 13:27:40 +0000
@@ -93,7 +93,7 @@
 def get_precision_tax():
     def change_digit_tax(cr):
         decimal_precision = openerp.registry(cr.dbname)['decimal.precision']
-        res = decimal_precision.precision_get(cr, 1, 'Account')
+        res = decimal_precision.precision_get(cr, 1, 'Amount')
         return (16, res+2)
     return change_digit_tax
 

=== modified file 'l10n_fr_hr_payroll/l10n_fr_hr_payroll.py'
--- l10n_fr_hr_payroll/l10n_fr_hr_payroll.py	2013-04-15 10:23:49 +0000
+++ l10n_fr_hr_payroll/l10n_fr_hr_payroll.py	2013-10-29 13:27:40 +0000
@@ -27,9 +27,9 @@
     _inherit = 'res.company'
 
     _columns = {
-        'plafond_secu': fields.float('Plafond de la Securite Sociale', digits_compute=dp.get_precision('Payroll')),
+        'plafond_secu': fields.float('Plafond de la Securite Sociale', digits_compute=dp.get_precision('Price')),
         'nombre_employes': fields.integer('Nombre d\'employes'),
-        'cotisation_prevoyance': fields.float('Cotisation Patronale Prevoyance', digits_compute=dp.get_precision('Payroll')),
+        'cotisation_prevoyance': fields.float('Cotisation Patronale Prevoyance', digits_compute=dp.get_precision('Price')),
         'org_ss': fields.char('Organisme de securite sociale', size=64),
         'conv_coll': fields.char('Convention collective', size=64),
     }

=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll.py'
--- l10n_in_hr_payroll/l10n_in_hr_payroll.py	2013-06-27 07:09:42 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll.py	2013-10-29 13:27:40 +0000
@@ -40,12 +40,12 @@
     _description = 'HR Contract'
 
     _columns = {
-        'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll'), help="Amount for Tax Deduction at Source"),
+        'tds': fields.float('TDS', digits_compute=dp.get_precision('Price'), help="Amount for Tax Deduction at Source"),
         'driver_salay': fields.boolean('Driver Salary', help="Check this box if you provide allowance for driver"),
-        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
-        'voluntary_provident_fund': fields.float('Voluntary Provident Fund (%)', digits_compute=dp.get_precision('Payroll'), help="VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government and VPF computed as percentage(%)"),
-        'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance (%)', digits_compute=dp.get_precision('Payroll'), help="HRA is an allowance given by the employer to the employee for taking care of his rental or accommodation expenses for metro city it is 50% and for non metro 40%. \nHRA computed as percentage(%)"),
-        'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll')),
+        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Price'), help="Deduction towards company provided medical insurance"),
+        'voluntary_provident_fund': fields.float('Voluntary Provident Fund (%)', digits_compute=dp.get_precision('Price'), help="VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government and VPF computed as percentage(%)"),
+        'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance (%)', digits_compute=dp.get_precision('Price'), help="HRA is an allowance given by the employer to the employee for taking care of his rental or accommodation expenses for metro city it is 50% and for non metro 40%. \nHRA computed as percentage(%)"),
+        'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Price')),
     }
 
 
@@ -235,7 +235,7 @@
         'name': fields.char('Bank Account No.', size=25, required=True),
         'ifsc_code': fields.char('IFSC Code', size=16),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
-        'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
+        'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Price')),
         'debit_credit': fields.char('C/D', size=3, required=False),
         'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
         'ifsc': fields.related('advice_id', 'neft', type='boolean', string='IFSC'),

=== modified file 'lunch/lunch.py'
--- lunch/lunch.py	2013-08-23 14:31:14 +0000
+++ lunch/lunch.py	2013-10-29 13:27:40 +0000
@@ -435,7 +435,7 @@
         'name': fields.char('Product', required=True, size=64),
         'category_id': fields.many2one('lunch.product.category', 'Category', required=True),
         'description': fields.text('Description', size=256),
-        'price': fields.float('Price', digits=(16,2)), #TODO: use decimal precision of 'Account', move it from product to decimal_precision
+        'price': fields.float('Price', digits=(16,2)), #TODO: use decimal precision of 'Amount', move it from product to decimal_precision
         'supplier': fields.many2one('res.partner', 'Supplier'),
     }
 

=== modified file 'marketing_campaign/marketing_campaign.py'
--- marketing_campaign/marketing_campaign.py	2013-04-15 10:23:49 +0000
+++ marketing_campaign/marketing_campaign.py	2013-10-29 13:27:40 +0000
@@ -119,7 +119,7 @@
                                    'Status',),
         'activity_ids': fields.one2many('marketing.campaign.activity',
                                        'campaign_id', 'Activities'),
-        'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Product Price')),
+        'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Price')),
     }
 
     _defaults = {
@@ -432,8 +432,8 @@
         'from_ids': fields.one2many('marketing.campaign.transition',
                                             'activity_to_id',
                                             'Previous Activities'),
-        'variable_cost': fields.float('Variable Cost', help="Set a variable cost if you consider that every campaign item that has reached this point has entailed a certain cost. You can get cost statistics in the Reporting section", digits_compute=dp.get_precision('Product Price')),
-        'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section", digits_compute=dp.get_precision('Account')),
+        'variable_cost': fields.float('Variable Cost', help="Set a variable cost if you consider that every campaign item that has reached this point has entailed a certain cost. You can get cost statistics in the Reporting section", digits_compute=dp.get_precision('Price')),
+        'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section", digits_compute=dp.get_precision('Amount')),
         'signal': fields.char('Signal', size=128,
                               help='An activity with a signal can be called programmatically. Be careful, the workitem is always created when a signal is sent'),
         'keep_if_condition_not_met': fields.boolean("Don't Delete Workitems",

=== modified file 'marketing_campaign/report/campaign_analysis.py'
--- marketing_campaign/report/campaign_analysis.py	2013-04-15 10:23:49 +0000
+++ marketing_campaign/report/campaign_analysis.py	2013-10-29 13:27:40 +0000
@@ -63,8 +63,8 @@
         'country_id': fields.related('partner_id', 'country_id',
                     type='many2one', relation='res.country',string='Country'),
         'total_cost' : fields.function(_total_cost, string='Cost',
-                                    type="float", digits_compute=dp.get_precision('Account')),
-        'revenue': fields.float('Revenue', readonly=True, digits_compute=dp.get_precision('Account')),
+                                    type="float", digits_compute=dp.get_precision('Amount')),
+        'revenue': fields.float('Revenue', readonly=True, digits_compute=dp.get_precision('Amount')),
         'count' : fields.integer('# of Actions', readonly=True),
         'state': fields.selection([('todo', 'To Do'),
                                    ('exception', 'Exception'), ('done', 'Done'),

=== modified file 'membership/membership.py'
--- membership/membership.py	2013-06-05 07:04:25 +0000
+++ membership/membership.py	2013-10-29 13:27:40 +0000
@@ -146,7 +146,7 @@
         'date_to': fields.date('To', readonly=True),
         'date_cancel': fields.date('Cancel date'),
         'date': fields.date('Join Date', help="Date on which member has joined the membership"),
-        'member_price': fields.float('Membership Fee', digits_compute= dp.get_precision('Product Price'), required=True, help='Amount for the membership'),
+        'member_price': fields.float('Membership Fee', digits_compute= dp.get_precision('Price'), required=True, help='Amount for the membership'),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
         'state': fields.function(_state,

=== modified file 'membership/report/report_membership.py'
--- membership/report/report_membership.py	2013-04-15 10:23:49 +0000
+++ membership/report/report_membership.py	2013-10-29 13:27:40 +0000
@@ -53,8 +53,8 @@
         'num_waiting': fields.integer('# Waiting', readonly=True),
         'num_invoiced': fields.integer('# Invoiced', readonly=True),
         'num_paid': fields.integer('# Paid', readonly=True),
-        'tot_pending': fields.float('Pending Amount', digits_compute= dp.get_precision('Account'), readonly=True),
-        'tot_earned': fields.float('Earned Amount', digits_compute= dp.get_precision('Account'), readonly=True),
+        'tot_pending': fields.float('Pending Amount', digits_compute= dp.get_precision('Amount'), readonly=True),
+        'tot_earned': fields.float('Earned Amount', digits_compute= dp.get_precision('Amount'), readonly=True),
         'partner_id': fields.many2one('res.partner', 'Member', readonly=True),
         'associate_member_id': fields.many2one('res.partner', 'Associate Member', readonly=True),
         'membership_id': fields.many2one('product.product', 'Membership Product', readonly=True),

=== modified file 'membership/wizard/membership_invoice.py'
--- membership/wizard/membership_invoice.py	2013-04-15 10:23:49 +0000
+++ membership/wizard/membership_invoice.py	2013-10-29 13:27:40 +0000
@@ -29,7 +29,7 @@
     _description = "Membership Invoice"
     _columns = {
         'product_id': fields.many2one('product.product','Membership', required=True),
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Product Price'), required=True),
+        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Price'), required=True),
     }
     def onchange_product(self, cr, uid, ids, product_id=False):
         """This function returns value of  product's member price based on product id.

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2013-10-03 11:12:22 +0000
+++ mrp/mrp.py	2013-10-29 13:27:40 +0000
@@ -203,9 +203,9 @@
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bills of material."),
         'position': fields.char('Internal Reference', size=64, help="Reference to a position in an external plan."),
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'product_uos_qty': fields.float('Product UOS Qty'),
+        'product_uos_qty': fields.float('Product UOS Qty', digits_compute= dp.get_precision('Quantity')),
         'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."),
-        'product_qty': fields.float('Product Quantity', required=True, digits_compute=dp.get_precision('Product Unit of Measure')),
+        'product_qty': fields.float('Product Quantity', required=True, digits_compute=dp.get_precision('Quantity')),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control"),
         'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity."),
         'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% within the production process."),
@@ -444,9 +444,9 @@
             select=True, readonly=True, states=dict.fromkeys(['draft', 'confirmed'], [('readonly', False)])),
 
         'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Quantity'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'product_uos_qty': fields.float('Product UoS Quantity', readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uos_qty': fields.float('Product UoS Quantity', digits_compute= dp.get_precision('Quantity'), readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos': fields.many2one('product.uom', 'Product UoS', readonly=True, states={'draft': [('readonly', False)]}),
         'progress': fields.function(_get_progress, type='float',
             string='Production progress'),
@@ -1093,9 +1093,9 @@
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Quantity'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
-        'product_uos_qty': fields.float('Product UOS Quantity'),
+        'product_uos_qty': fields.float('Product UOS Quantity', digits_compute= dp.get_precision('Quantity')),
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
         'production_id': fields.many2one('mrp.production', 'Production Order', select=True),
     }

=== modified file 'mrp/report/price.py'
--- mrp/report/price.py	2013-03-27 13:47:02 +0000
+++ mrp/report/price.py	2013-10-29 13:27:40 +0000
@@ -139,7 +139,7 @@
                 </row>
         """ % (_('Components'), _('Components suppliers'), _('Quantity'),_('Cost Price per Unit of Measure'), _('Supplier Price per Unit of Measure'))
 
-        purchase_price_digits = rml_obj.get_digits(dp='Product Price')
+        purchase_price_digits = rml_obj.get_digits(dp='Price')
 
         for product in product_pool.browse(cr, uid, ids, context=context):
             product_uom_name = to_xml(product.uom_id.name)

=== modified file 'mrp/wizard/change_production_qty.py'
--- mrp/wizard/change_production_qty.py	2013-04-15 10:23:49 +0000
+++ mrp/wizard/change_production_qty.py	2013-10-29 13:27:40 +0000
@@ -28,7 +28,7 @@
     _description = 'Change Quantity of Products'
 
     _columns = {
-        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Quantity'), required=True),
     }
 
     def default_get(self, cr, uid, fields, context=None):

=== modified file 'mrp/wizard/mrp_product_produce.py'
--- mrp/wizard/mrp_product_produce.py	2013-04-15 10:23:49 +0000
+++ mrp/wizard/mrp_product_produce.py	2013-10-29 13:27:40 +0000
@@ -27,7 +27,7 @@
     _description = "Product Produce"
 
     _columns = {
-        'product_qty': fields.float('Select Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'product_qty': fields.float('Select Quantity', digits_compute=dp.get_precision('Quantity'), required=True),
         'mode': fields.selection([('consume_produce', 'Consume & Produce'),
                                   ('consume', 'Consume Only')], 'Mode', required=True,
                                   help="'Consume only' mode will only consume the products with the quantity selected.\n"

=== modified file 'mrp_byproduct/mrp_byproduct.py'
--- mrp_byproduct/mrp_byproduct.py	2013-04-15 10:23:49 +0000
+++ mrp_byproduct/mrp_byproduct.py	2013-10-29 13:27:40 +0000
@@ -29,7 +29,7 @@
     _description = 'Byproduct'
     _columns={
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Quantity'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
         'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Define how the quantity of byproducts will be set on the production orders using this BoM.\
   'Fixed' depicts a situation where the quantity of created byproduct is always equal to the quantity set on the BoM, regardless of how many are created in the production order.\

=== modified file 'mrp_operations/report/mrp_workorder_analysis.py'
--- mrp_operations/report/mrp_workorder_analysis.py	2013-04-15 10:23:49 +0000
+++ mrp_operations/report/mrp_workorder_analysis.py	2013-10-29 13:27:40 +0000
@@ -35,7 +35,7 @@
         'nbr': fields.integer('# of Lines', readonly=True),
         'date': fields.date('Date', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
-        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), readonly=True),
+        'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Quantity'), readonly=True),
         'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')],'Status', readonly=True),
         'total_hours': fields.float('Total Hours', readonly=True),
         'total_cycles': fields.float('Total Cycles', readonly=True),

=== modified file 'mrp_repair/mrp_repair.py'
--- mrp_repair/mrp_repair.py	2013-10-18 12:58:18 +0000
+++ mrp_repair/mrp_repair.py	2013-10-29 13:27:40 +0000
@@ -158,17 +158,17 @@
         'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired and create a picking with selected product. Note that you can select the locations in the Info tab, if you have the extended view.", states={'confirmed':[('readonly',True)]}),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'repaired': fields.boolean('Repaired', readonly=True),
-        'amount_untaxed': fields.function(_amount_untaxed, string='Untaxed Amount',
-            store={
-                'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
-                'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
-            }),
-        'amount_tax': fields.function(_amount_tax, string='Taxes',
-            store={
-                'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
-                'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
-            }),
-        'amount_total': fields.function(_amount_total, string='Total',
+        'amount_untaxed': fields.function(_amount_untaxed, string='Untaxed Amount', digits_compute=dp.get_precision('Amount'),
+            store={
+                'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
+                'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
+            }),
+        'amount_tax': fields.function(_amount_tax, string='Taxes', digits_compute=dp.get_precision('Amount'),
+            store={
+                'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
+                'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
+            }),
+        'amount_total': fields.function(_amount_total, string='Total', digits_compute=dp.get_precision('Amount'),
             store={
                 'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
                 'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
@@ -636,10 +636,10 @@
         'to_invoice': fields.boolean('To Invoice'),
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'invoiced': fields.boolean('Invoiced',readonly=True),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Account')),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Amount')),
         'tax_id': fields.many2many('account.tax', 'repair_operation_line_tax', 'repair_operation_line_id', 'tax_id', 'Taxes'),
-        'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product Unit of Measure'), required=True),
+        'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Quantity'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number',domain="[('product_id','=',product_id)]"),
         'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True),
@@ -729,10 +729,10 @@
         'repair_id': fields.many2one('mrp.repair', 'Repair Order Reference', required=True, ondelete='cascade', select=True),
         'name': fields.char('Description', size=64, select=True,required=True),
         'product_id': fields.many2one('product.product', 'Product'),
-        'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product Unit of Measure'), required=True),
-        'price_unit': fields.float('Unit Price', required=True),
+        'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Quantity'), required=True),
+        'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Price'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Account')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Amount')),
         'tax_id': fields.many2many('account.tax', 'repair_fee_line_tax', 'repair_fee_line_id', 'tax_id', 'Taxes'),
         'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True),
         'to_invoice': fields.boolean('To Invoice'),

=== modified file 'mrp_repair/report/order.rml'
--- mrp_repair/report/order.rml	2012-11-29 22:26:45 +0000
+++ mrp_repair/report/order.rml	2013-10-29 13:27:40 +0000
@@ -367,7 +367,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="P26">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="P26">[[ formatLang(o.amount_tax, dp='Amount', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2013-10-18 12:58:18 +0000
+++ point_of_sale/point_of_sale.py	2013-10-29 13:27:40 +0000
@@ -230,13 +230,13 @@
 
         'cash_register_balance_end_real' : fields.related('cash_register_id', 'balance_end_real',
                 type='float',
-                digits_compute=dp.get_precision('Account'),
+                digits_compute=dp.get_precision('Amount'),
                 string="Ending Balance",
                 help="Computed using the cash control lines",
                 readonly=True),
         'cash_register_balance_start' : fields.related('cash_register_id', 'balance_start',
                 type='float',
-                digits_compute=dp.get_precision('Account'),
+                digits_compute=dp.get_precision('Amount'),
                 string="Starting Balance",
                 help="Computed using the cash control at the opening.",
                 readonly=True),
@@ -245,7 +245,7 @@
                 readonly=True),
         'cash_register_balance_end' : fields.related('cash_register_id', 'balance_end',
                 type='float',
-                digits_compute=dp.get_precision('Account'),
+                digits_compute=dp.get_precision('Amount'),
                 string="Computed Balance",
                 help="Computed with the initial cash control and the sum of all payments.",
                 readonly=True),
@@ -621,10 +621,10 @@
         'warehouse_id': fields.related('session_id', 'config_id', 'warehouse_id', relation='stock.warehouse', type='many2one', string='Warehouse', store=True, readonly=True),
         'date_order': fields.datetime('Order Date', readonly=True, select=True),
         'user_id': fields.many2one('res.users', 'Salesman', help="Person who uses the the cash register. It can be a reliever, a student or an interim employee."),
-        'amount_tax': fields.function(_amount_all, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
-        'amount_total': fields.function(_amount_all, string='Total', multi='all'),
-        'amount_paid': fields.function(_amount_all, string='Paid', states={'draft': [('readonly', False)]}, readonly=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
-        'amount_return': fields.function(_amount_all, 'Returned', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
+        'amount_tax': fields.function(_amount_all, string='Taxes', digits_compute=dp.get_precision('Amount'), multi='all'),
+        'amount_total': fields.function(_amount_all, string='Total', digits_compute=dp.get_precision('Amount'), multi='all'),
+        'amount_paid': fields.function(_amount_all, string='Paid', states={'draft': [('readonly', False)]}, readonly=True, digits_compute=dp.get_precision('Amount'), multi='all'),
+        'amount_return': fields.function(_amount_all, 'Returned', digits_compute=dp.get_precision('Amount'), multi='all'),
         'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
         'statement_ids': fields.one2many('account.bank.statement.line', 'pos_statement_id', 'Payments', states={'draft': [('readonly', False)]}, readonly=True),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
@@ -1229,11 +1229,11 @@
         'name': fields.char('Line No', size=32, required=True),
         'notice': fields.char('Discount Notice', size=128),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
-        'price_unit': fields.float(string='Unit Price', digits=(16, 2)),
-        'qty': fields.float('Quantity', digits=(16, 2)),
+        'price_unit': fields.float(string='Unit Price', digits_compute=dp.get_precision('Price')),
+        'qty': fields.float('Quantity', digits_compute=dp.get_precision('Quantity')),
         'price_subtotal': fields.function(_amount_line_all, multi='pos_order_line_amount', string='Subtotal w/o Tax', store=True),
         'price_subtotal_incl': fields.function(_amount_line_all, multi='pos_order_line_amount', string='Subtotal', store=True),
-        'discount': fields.float('Discount (%)', digits=(16, 2)),
+        'discount': fields.float('Discount (%)', digits_compute=dp.get_precision('Price')),
         'order_id': fields.many2one('pos.order', 'Order Ref', ondelete='cascade'),
         'create_date': fields.datetime('Creation Date', readonly=True),
     }

=== modified file 'point_of_sale/report/account_statement.rml'
--- point_of_sale/report/account_statement.rml	2012-11-29 22:26:45 +0000
+++ point_of_sale/report/account_statement.rml	2013-10-29 13:27:40 +0000
@@ -214,10 +214,10 @@
           <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date_time=True)]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, dp='Account', currency_obj = company.currency_id) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, dp='Amount', currency_obj = company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, dp='Account', currency_obj = company.currency_id) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, dp='Amount', currency_obj = company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -250,7 +250,7 @@
               <para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, dp='Account', currency_obj=company.currency_id) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, dp='Amount', currency_obj=company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -267,7 +267,7 @@
           <para style="terp_tblheader_Details">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids), dp='Account', currency_obj = company.currency_id) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids), dp='Amount', currency_obj = company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'point_of_sale/report/pos_details.rml'
--- point_of_sale/report/pos_details.rml	2012-11-29 22:26:45 +0000
+++ point_of_sale/report/pos_details.rml	2013-10-29 13:27:40 +0000
@@ -320,7 +320,7 @@
             <para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(p['sum'], dp='Account', currency_obj = company.currency_id) or removeParentNode('tr') ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(p['sum'], dp='Amount', currency_obj = company.currency_id) or removeParentNode('tr') ]]</para>
           </td>
         </tr>
       </blockTable>

=== modified file 'portal/acquirer.py'
--- portal/acquirer.py	2012-11-30 09:45:01 +0000
+++ portal/acquirer.py	2013-10-29 13:27:40 +0000
@@ -80,7 +80,7 @@
                 return ''
         else:
             payment_header = _('Pay safely online')
-            amount_str = float_repr(amount, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
+            amount_str = float_repr(amount, self.pool.get('decimal.precision').precision_get(cr, uid, 'Amount'))
             currency_str = currency.symbol or currency.name
             amount = u"%s %s" % ((currency_str, amount_str) if currency.position == 'before' else (amount_str, currency_str))
         result =  """<div class="payment_acquirers">

=== modified file 'procurement/procurement.py'
--- procurement/procurement.py	2013-10-21 14:53:34 +0000
+++ procurement/procurement.py	2013-10-29 13:27:40 +0000
@@ -92,9 +92,9 @@
         'date_planned': fields.datetime('Scheduled date', required=True, select=True),
         'date_close': fields.datetime('Date Closed'),
         'product_id': fields.many2one('product.product', 'Product', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Quantity'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uos_qty': fields.float('UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
+        'product_uos_qty': fields.float('UoS Quantity', digits_compute= dp.get_precision('Quantity'), states={'draft':[('readonly',False)]}, readonly=True),
         'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
         'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'),
         'close_move': fields.boolean('Close Move at end'),
@@ -528,10 +528,10 @@
         'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"),
         'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','!=','service')]),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
-        'product_min_qty': fields.float('Minimum Quantity', required=True,
+        'product_min_qty': fields.float('Minimum Quantity', required=True, digits_compute=dp.get_precision('Quantity'),
             help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\
             "a procurement to bring the forecasted quantity to the Max Quantity."),
-        'product_max_qty': fields.float('Maximum Quantity', required=True,
+        'product_max_qty': fields.float('Maximum Quantity', required=True, digits_compute=dp.get_precision('Quantity'),
             help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
             "a procurement to bring the forecasted quantity to the Quantity specified as Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,

=== modified file 'product/pricelist.py'
--- product/pricelist.py	2013-09-23 17:13:10 +0000
+++ product/pricelist.py	2013-10-29 13:27:40 +0000
@@ -449,18 +449,18 @@
         'base_pricelist_id': fields.many2one('product.pricelist', 'Other Pricelist'),
 
         'price_surcharge': fields.float('Price Surcharge',
-            digits_compute= dp.get_precision('Product Price'), help='Specify the fixed amount to add or substract(if negative) to the amount calculated with the discount.'),
-        'price_discount': fields.float('Price Discount', digits=(16,4)),
+            digits_compute= dp.get_precision('Price'), help='Specify the fixed amount to add or substract(if negative) to the amount calculated with the discount.'),
+        'price_discount': fields.float('Price Discount', digits_compute=dp.get_precision('Price')),
         'price_round': fields.float('Price Rounding',
-            digits_compute= dp.get_precision('Product Price'),
+            digits_compute= dp.get_precision('Price'),
             help="Sets the price so that it is a multiple of this value.\n" \
               "Rounding is applied after the discount and before the surcharge.\n" \
               "To have prices that end in 9.99, set rounding 10, surcharge -0.01" \
             ),
         'price_min_margin': fields.float('Min. Price Margin',
-            digits_compute= dp.get_precision('Product Price'), help='Specify the minimum amount of margin over the base price.'),
+            digits_compute= dp.get_precision('Price'), help='Specify the minimum amount of margin over the base price.'),
         'price_max_margin': fields.float('Max. Price Margin',
-            digits_compute= dp.get_precision('Product Price'), help='Specify the maximum amount of margin over the base price.'),
+            digits_compute= dp.get_precision('Price'), help='Specify the maximum amount of margin over the base price.'),
         'company_id': fields.related('price_version_id','company_id',type='many2one',
             readonly=True, relation='res.company', string='Company', store=True)
     }

=== modified file 'product/product.py'
--- product/product.py	2013-09-10 12:48:03 +0000
+++ product/product.py	2013-10-29 13:27:40 +0000
@@ -138,7 +138,7 @@
             string='Ratio',
             help='How many times this Unit of Measure is bigger than the reference Unit of Measure in this category:\n'\
                     '1 * (this unit) = ratio * (reference unit)', required=True),
-        'rounding': fields.float('Rounding Precision', digits_compute=dp.get_precision('Product Unit of Measure'), required=True,
+        'rounding': fields.float('Rounding Precision', digits_compute=dp.get_precision('Quantity'), required=True,
             help="The computed quantity will be a multiple of this value. "\
                  "Use 1.0 for a Unit of Measure that cannot be further split, such as a piece."),
         'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."),
@@ -304,11 +304,11 @@
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."),
         'rental': fields.boolean('Can be Rent'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
-        'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price to compute the customer price. Sometimes called the catalog price."),
-        'standard_price': fields.float('Cost', digits_compute=dp.get_precision('Product Price'), help="Cost price of the product used for standard stock valuation in accounting and used as a base price on purchase orders.", groups="base.group_user"),
+        'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Price'), help="Base price to compute the customer price. Sometimes called the catalog price."),
+        'standard_price': fields.float('Cost', digits_compute=dp.get_precision('Price'), help="Cost price of the product used for standard stock valuation in accounting and used as a base price on purchase orders.", groups="base.group_user"),
         'volume': fields.float('Volume', help="The volume in m3."),
-        'weight': fields.float('Gross Weight', digits_compute=dp.get_precision('Stock Weight'), help="The gross weight in Kg."),
-        'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
+        'weight': fields.float('Gross Weight', digits_compute=dp.get_precision('Weight'), help="The gross weight in Kg."),
+        'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Weight'), help="The net weight in Kg."),
         'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True,
             help="Standard Price: The cost price is manually updated at the end of a specific period (usually every year). \nAverage Price: The cost price is recomputed at each incoming shipment."),
         'warranty': fields.float('Warranty'),
@@ -322,9 +322,7 @@
         'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."),
         'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
             help='Specify a unit of measure here if invoicing is made in another unit of measure than inventory. Keep empty to use the default unit of measure.'),
-        'uos_coeff': fields.float('Unit of Measure -> UOS Coeff', digits_compute= dp.get_precision('Product UoS'),
-            help='Coefficient to convert default Unit of Measure to Unit of Sale\n'
-            ' uos = uom * coeff'),
+        'uos_coeff': fields.float('Unit of Measure -> UOS Coeff', digits_compute= dp.get_precision('Quantity'), help='Coefficient to convert default Unit of Measure to Unit of Sale\n' ' uos = uom * coeff'),
         'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type'),
         'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Supplier'),
         'company_id': fields.many2one('res.company', 'Company', select=1),
@@ -553,8 +551,8 @@
         'virtual_available': fields.function(_product_virtual_available, type='float', string='Quantity Available'),
         'incoming_qty': fields.function(_product_incoming_qty, type='float', string='Incoming'),
         'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'),
-        'price': fields.function(_product_price, type='float', string='Price', digits_compute=dp.get_precision('Product Price')),
-        'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')),
+        'price': fields.function(_product_price, type='float', string='Price', digits_compute=dp.get_precision('Price')),
+        'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Price')),
         'code': fields.function(_product_code, type='char', string='Internal Reference'),
         'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
         'default_code' : fields.char('Internal Reference', size=64, select=True),
@@ -563,8 +561,8 @@
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade", select=True),
         'ean13': fields.char('EAN13 Barcode', size=13, help="International Article Number used for product identification."),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
-        'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')),
-        'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')),
+        'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Price')),
+        'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Price')),
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
         'name_template': fields.related('product_tmpl_id', 'name', string="Template Name", type='char', size=128, store={
             'product.template': (_get_name_template_ids, ['name'], 10),
@@ -778,8 +776,7 @@
     _columns = {
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of packaging."),
         'name' : fields.text('Description', size=64),
-        'qty' : fields.float('Quantity by Package',
-            help="The total number of products you can put by pallet or box."),
+        'qty' : fields.float('Quantity by Package', digits_compute=dp.get_precision('Quantity'), help="The total number of products you can put by pallet or box."),
         'ul' : fields.many2one('product.ul', 'Type of Package', required=True),
         'ul_qty' : fields.integer('Package by layer', help='The number of packages by layer'),
         'rows' : fields.integer('Number of Layers', required=True,
@@ -789,9 +786,8 @@
             help="The EAN code of the package unit."),
         'code' : fields.char('Code', size=14,
             help="The code of the transport unit."),
-        'weight': fields.float('Total Package Weight',
-            help='The weight of a full package, pallet or box.'),
-        'weight_ul': fields.float('Empty Package Weight'),
+        'weight': fields.float('Total Package Weight', digits_compute=dp.get_precision('Weight'), help='The weight of a full package, pallet or box.'),
+        'weight_ul': fields.float('Empty Package Weight', digits_compute=dp.get_precision('Weight')),
         'height': fields.float('Height', help='The height of the package'),
         'width': fields.float('Width', help='The width of the package'),
         'length': fields.float('Length', help='The length of the package'),
@@ -855,8 +851,8 @@
         'product_code': fields.char('Supplier Product Code', size=64, help="This supplier's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
         'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
         'product_uom': fields.related('product_id', 'uom_po_id', type='many2one', relation='product.uom', string="Supplier Unit of Measure", readonly="1", help="This comes from the product form."),
-        'min_qty': fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the supplier Product Unit of Measure if not empty, in the default unit of measure of the product otherwise."),
-        'qty': fields.function(_calc_qty, store=True, type='float', string='Quantity', multi="qty", help="This is a quantity which is converted into Default Unit of Measure."),
+        'min_qty': fields.float('Minimal Quantity', required=True, digits_compute=dp.get_precision('Quantity'), help="The minimal quantity to purchase to this supplier, expressed in the supplier Product Unit of Measure if not empty, in the default unit of measure of the product otherwise."),
+        'qty': fields.function(_calc_qty, store=True, type='float', string='Quantity', multi="qty", digits_compute=dp.get_precision('Quantity'), help="This is a quantity which is converted into Default Unit of Measure."),
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
         'delay' : fields.integer('Delivery Lead Time', required=True, help="Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."),
         'pricelist_ids': fields.one2many('pricelist.partnerinfo', 'suppinfo_id', 'Supplier Pricelist'),
@@ -914,8 +910,8 @@
     _columns = {
         'name': fields.char('Description', size=64),
         'suppinfo_id': fields.many2one('product.supplierinfo', 'Partner Information', required=True, ondelete='cascade'),
-        'min_quantity': fields.float('Quantity', required=True, help="The minimal quantity to trigger this rule, expressed in the supplier Unit of Measure if any or in the default Unit of Measure of the product otherrwise."),
-        'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Product Price'), help="This price will be considered as a price for the supplier Unit of Measure if any or the default Unit of Measure of the product otherwise"),
+        'min_quantity': fields.float('Quantity', required=True,  digits_compute=dp.get_precision('Quantity'), help="The minimal quantity to trigger this rule, expressed in the supplier Unit of Measure if any or in the default Unit of Measure of the product otherrwise."),
+        'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Price'), help="This price will be considered as a price for the supplier Unit of Measure if any or the default Unit of Measure of the product otherwise"),
     }
     _order = 'min_quantity asc'
 
@@ -923,7 +919,7 @@
     _inherit = 'res.currency'
 
     def _check_main_currency_rounding(self, cr, uid, ids, context=None):
-        cr.execute('SELECT digits FROM decimal_precision WHERE name like %s',('Account',))
+        cr.execute('SELECT digits FROM decimal_precision WHERE name like %s',('Amount',))
         digits = cr.fetchone()
         if digits and len(digits):
             digits = digits[0]
@@ -942,7 +938,7 @@
     _inherit = 'decimal.precision'
 
     def _check_main_currency_rounding(self, cr, uid, ids, context=None):
-        cr.execute('SELECT id, digits FROM decimal_precision WHERE name like %s',('Account',))
+        cr.execute('SELECT id, digits FROM decimal_precision WHERE name like %s',('Amount',))
         res = cr.fetchone()
         if res and len(res):
             account_precision_id, digits = res

=== modified file 'product/product_data.xml'
--- product/product_data.xml	2013-02-01 13:24:54 +0000
+++ product/product_data.xml	2013-10-29 13:27:40 +0000
@@ -161,28 +161,20 @@
             <field eval="'product.pricelist,'+str(ref('list0'))" name="value"/>
         </record>
 
-        <record forcecreate="True" id="decimal_price" model="decimal.precision">
-            <field name="name">Product Price</field>
-            <field name="digits">2</field>
-        </record>
-        <record forcecreate="True" id="decimal_discount" model="decimal.precision">
-            <field name="name">Discount</field>
-            <field name="digits">2</field>
-        </record>
-        <record forcecreate="True" id="decimal_account" model="decimal.precision">
-            <field name="name">Account</field>
-            <field name="digits">2</field>
-        </record>
-        <record forcecreate="True" id="decimal_stock_weight" model="decimal.precision">
-            <field name="name">Stock Weight</field>
-            <field name="digits">2</field>
-        </record>
-        <record forcecreate="True" id="decimal_product_uom" model="decimal.precision">
-            <field name="name">Product Unit of Measure</field>
+        <record forcecreate="True" id="decimal_amount" model="decimal.precision">
+            <field name="name">Amount</field>
+            <field name="digits">2</field>
+        </record>
+        <record forcecreate="True" id="decimal_weight" model="decimal.precision">
+            <field name="name">Weight</field>
+            <field name="digits">2</field>
+        </record>
+        <record forcecreate="True" id="decimal_qty" model="decimal.precision">
+            <field name="name">Quantity</field>
             <field name="digits" eval="3"/>
         </record>
-        <record forcecreate="True" id="decimal_product_uos" model="decimal.precision">
-            <field name="name">Product UoS</field>
+        <record forcecreate="True" id="decimal_percentage" model="decimal.precision">
+            <field name="name">Percentage</field>
             <field name="digits" eval="3"/>
         </record>        
 

=== modified file 'product/report/product_pricelist.py'
--- product/report/product_pricelist.py	2013-03-28 12:10:09 +0000
+++ product/report/product_pricelist.py	2013-10-29 13:27:40 +0000
@@ -110,7 +110,7 @@
         return res
 
     def _get_price(self, pricelist_id, product_id, qty):
-        sale_price_digits = self.get_digits(dp='Product Price')
+        sale_price_digits = self.get_digits(dp='Price')
         pricelist = self.pool.get('product.pricelist').browse(self.cr, self.uid, [pricelist_id], context=self.localcontext)[0]
         price_dict = self.pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, context=self.localcontext)
         if price_dict[pricelist_id]:

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2013-10-18 12:58:18 +0000
+++ purchase/purchase.py	2013-10-29 13:27:40 +0000
@@ -208,15 +208,15 @@
                 'purchase.order.line': (_get_order, ['date_planned'], 10),
             }
         ),
-        'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Amount'), string='Untaxed Amount',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums", help="The amount without tax", track_visibility='always'),
-        'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Taxes',
+        'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Amount'), string='Taxes',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums", help="The tax amount"),
-        'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Total',
+        'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Amount'), string='Total',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums",help="The total amount"),
@@ -853,15 +853,15 @@
 
     _columns = {
         'name': fields.text('Description', required=True),
-        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Quantity'), required=True),
         'date_planned': fields.date('Scheduled Date', required=True, select=True),
         'taxes_id': fields.many2many('account.tax', 'purchase_order_taxe', 'ord_id', 'tax_id', 'Taxes'),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
         'product_id': fields.many2one('product.product', 'Product', domain=[('purchase_ok','=',True)], change_default=True),
         'move_ids': fields.one2many('stock.move', 'purchase_line_id', 'Reservation', readonly=True, ondelete='set null'),
         'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null'),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Amount')),
         'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'),
         'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',),
         'company_id': fields.related('order_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),

=== modified file 'purchase/report/order.rml'
--- purchase/report/order.rml	2013-05-28 08:19:55 +0000
+++ purchase/report/order.rml	2013-10-29 13:27:40 +0000
@@ -252,10 +252,10 @@
             <para style="terp_default_Right_9">[[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price') ) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_unit, digits=get_digits(dp='Price') ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Amount'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -271,7 +271,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Amount'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
         </td>
       </tr>
       <tr>
@@ -284,7 +284,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Amount', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -297,7 +297,7 @@
           <para style="terp_default_Bold_9"><b>Total :</b></para>
         </td>
         <td>
-          <para style="terp_default_Bold_9_Right"><b>[[ formatLang(o.amount_total, digits=get_digits(dp='Account') , currency_obj=o.pricelist_id.currency_id) ]]</b></para>
+          <para style="terp_default_Bold_9_Right"><b>[[ formatLang(o.amount_total, digits=get_digits(dp='Amount') , currency_obj=o.pricelist_id.currency_id) ]]</b></para>
         </td>
       </tr>
     </blockTable>

=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py	2013-06-10 11:41:41 +0000
+++ purchase_requisition/purchase_requisition.py	2013-10-29 13:27:40 +0000
@@ -174,7 +174,7 @@
     _columns = {
         'product_id': fields.many2one('product.product', 'Product' ),
         'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure'),
-        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Quantity')),
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
         'company_id': fields.related('requisition_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
     }

=== modified file 'report_intrastat/report/invoice.rml'
--- report_intrastat/report/invoice.rml	2012-11-29 22:26:45 +0000
+++ report_intrastat/report/invoice.rml	2013-10-29 13:27:40 +0000
@@ -360,10 +360,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account'), currency_obj = o.currency_id) ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Amount'), currency_obj = o.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Amount'), currency_obj=o.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_8">

=== modified file 'report_intrastat/report_intrastat.py'
--- report_intrastat/report_intrastat.py	2013-04-15 10:23:49 +0000
+++ report_intrastat/report_intrastat.py	2013-10-29 13:27:40 +0000
@@ -67,7 +67,7 @@
         'code': fields.char('Country code', size=2, readonly=True),
         'intrastat_id': fields.many2one('report.intrastat.code', 'Intrastat code', readonly=True),
         'weight': fields.float('Weight', readonly=True),
-        'value': fields.float('Value', readonly=True, digits_compute=dp.get_precision('Account')),
+        'value': fields.float('Value', readonly=True, digits_compute=dp.get_precision('Amount')),
         'type': fields.selection([('import', 'Import'), ('export', 'Export')], 'Type'),
         'currency_id': fields.many2one('res.currency', "Currency", readonly=True),
     }

=== modified file 'sale/report/sale_order.rml'
--- sale/report/sale_order.rml	2013-05-27 16:51:33 +0000
+++ sale/report/sale_order.rml	2013-10-29 13:27:40 +0000
@@ -251,13 +251,13 @@
             <para style="terp_default_Right_9">[[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_unit , digits=get_digits(dp='Product Price'))]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_9">[[show_discount(user.id) and formatLang(line.discount, digits=get_digits(dp='Discount')) or '']]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_unit , digits=get_digits(dp='Price'))]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[show_discount(user.id) and formatLang(line.discount, digits=get_digits(dp='Price')) or '']]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Amount'), currency_obj=o.pricelist_id.currency_id) ]] </para>
           </td>
         </tr>
       </blockTable>
@@ -273,7 +273,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Amount', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -286,7 +286,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Amount', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -299,7 +299,7 @@
           <para style="terp_default_Bold_9"><b>Total :</b></para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><b>[[ formatLang(o.amount_total, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</b></para>
+          <para style="terp_default_Right_9_Bold"><b>[[ formatLang(o.amount_total, dp='Amount', currency_obj=o.pricelist_id.currency_id) ]]</b></para>
         </td>
       </tr>
     </blockTable>

=== modified file 'sale/sale.py'
--- sale/sale.py	2013-09-23 17:13:10 +0000
+++ sale/sale.py	2013-10-29 13:27:40 +0000
@@ -198,19 +198,19 @@
             fnct_search=_invoiced_search, type='boolean', help="It indicates that sales order has at least one invoice."),
         'note': fields.text('Terms and conditions'),
 
-        'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Amount'), string='Untaxed Amount',
             store={
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums', help="The amount without tax.", track_visibility='always'),
-        'amount_tax': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Taxes',
+        'amount_tax': fields.function(_amount_all, digits_compute=dp.get_precision('Amount'), string='Taxes',
             store={
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums', help="The tax amount."),
-        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Total',
+        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Amount'), string='Total',
             store={
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
@@ -677,18 +677,18 @@
             store={
                 'account.invoice': (_order_lines_from_invoice, ['state'], 10),
                 'sale.order.line': (lambda self,cr,uid,ids,ctx=None: ids, ['invoice_lines'], 10)}),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price'), readonly=True, states={'draft': [('readonly', False)]}),
         'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]},
          help="From stock: When needed, the product is taken from the stock or we wait for replenishment.\nOn order: When needed, the product is purchased or produced."),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Amount')),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
         'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner',help="A partner to whom the particular product needs to be allotted."),
-        'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Quantity'), required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'product_uos_qty': fields.float('Quantity (UoS)' ,digits_compute= dp.get_precision('Product UoS'), readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uos_qty': fields.float('Quantity (UoS)' ,digits_compute= dp.get_precision('Quantity'), readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos': fields.many2one('product.uom', 'Product UoS'),
-        'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount'), readonly=True, states={'draft': [('readonly', False)]}),
-        'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}),
+        'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Price'), readonly=True, states={'draft': [('readonly', False)]}),
+        'th_weight': fields.float('Weight', readonly=True, digits_compute=dp.get_precision('Weight'), states={'draft': [('readonly', False)]}),
         'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True, readonly=True,
                 help='* The \'Draft\' status is set when the related sales order in draft status. \
                     \n* The \'Confirmed\' status is set when the related sales order is confirmed. \
@@ -755,7 +755,7 @@
             pu = 0.0
             if uosqty:
                 pu = round(line.price_unit * line.product_uom_qty / uosqty,
-                        self.pool.get('decimal.precision').precision_get(cr, uid, 'Product Price'))
+                        self.pool.get('decimal.precision').precision_get(cr, uid, 'Price'))
             fpos = line.order_id.fiscal_position or False
             account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account_id)
             if not account_id:

=== modified file 'sale/wizard/sale_make_invoice_advance.py'
--- sale/wizard/sale_make_invoice_advance.py	2013-06-13 10:59:23 +0000
+++ sale/wizard/sale_make_invoice_advance.py	2013-10-29 13:27:40 +0000
@@ -39,7 +39,7 @@
         'product_id': fields.many2one('product.product', 'Advance Product',
             help="""Select a product of type service which is called 'Advance Product'.
                 You may have to create it and set it as a default value on this field."""),
-        'amount': fields.float('Advance Amount', digits_compute= dp.get_precision('Account'),
+        'amount': fields.float('Advance Amount', digits_compute= dp.get_precision('Amount'),
             help="The amount to be invoiced in advance."),
     }
 

=== modified file 'stock/product.py'
--- stock/product.py	2013-06-26 11:10:29 +0000
+++ stock/product.py	2013-10-29 13:27:40 +0000
@@ -358,7 +358,7 @@
         'reception_count': fields.function(_stock_move_count, string="Reception", type='integer', multi='pickings'),
         'delivery_count': fields.function(_stock_move_count, string="Delivery", type='integer', multi='pickings'),
         'qty_available': fields.function(_product_available, multi='qty_available',
-            type='float',  digits_compute=dp.get_precision('Product Unit of Measure'),
+            type='float',  digits_compute=dp.get_precision('Quantity'),
             string='Quantity On Hand',
             help="Current quantity of products.\n"
                  "In a context with a single Stock Location, this includes "
@@ -371,7 +371,7 @@
                  "Otherwise, this includes goods stored in any Stock Location "
                  "with 'internal' type."),
         'virtual_available': fields.function(_product_available, multi='qty_available',
-            type='float',  digits_compute=dp.get_precision('Product Unit of Measure'),
+            type='float',  digits_compute=dp.get_precision('Quantity'),
             string='Forecasted Quantity',
             help="Forecast quantity (computed as Quantity On Hand "
                  "- Outgoing + Incoming)\n"
@@ -385,7 +385,7 @@
                  "Otherwise, this includes goods stored in any Stock Location "
                  "with 'internal' type."),
         'incoming_qty': fields.function(_product_available, multi='qty_available',
-            type='float',  digits_compute=dp.get_precision('Product Unit of Measure'),
+            type='float',  digits_compute=dp.get_precision('Quantity'),
             string='Incoming',
             help="Quantity of products that are planned to arrive.\n"
                  "In a context with a single Stock Location, this includes "
@@ -399,7 +399,7 @@
                  "Otherwise, this includes goods arriving to any Stock "
                  "Location with 'internal' type."),
         'outgoing_qty': fields.function(_product_available, multi='qty_available',
-            type='float',  digits_compute=dp.get_precision('Product Unit of Measure'),
+            type='float',  digits_compute=dp.get_precision('Quantity'),
             string='Outgoing',
             help="Quantity of products that are planned to leave.\n"
                  "In a context with a single Stock Location, this includes "

=== modified file 'stock/report/lot_overview.rml'
--- stock/report/lot_overview.rml	2012-11-29 22:26:45 +0000
+++ stock/report/lot_overview.rml	2013-10-29 13:27:40 +0000
@@ -181,10 +181,10 @@
                 <para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Amount') ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Amount', currency_obj = o.company_id.currency_id)]]</para>
               </td>
             </tr>
           </blockTable>
@@ -198,7 +198,7 @@
               <para style="terp_default_Bold_9">Total:</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
+              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Amount', currency_obj = o.company_id.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -215,7 +215,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Amount', currency_obj = o.company_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'stock/report/lot_overview_all.rml'
--- stock/report/lot_overview_all.rml	2012-11-29 22:26:45 +0000
+++ stock/report/lot_overview_all.rml	2013-10-29 13:27:40 +0000
@@ -181,10 +181,10 @@
                 <para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Amount') ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Amount', currency_obj = o.company_id.currency_id)]]</para>
               </td>
             </tr>
           </blockTable>
@@ -198,7 +198,7 @@
               <para style="terp_default_Bold_9">Total:</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
+              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Amount', currency_obj = o.company_id.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -215,7 +215,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Amount', currency_obj = o.company_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'stock/report/report_stock_move.py'
--- stock/report/report_stock_move.py	2013-04-15 10:23:49 +0000
+++ stock/report/report_stock_move.py	2013-10-29 13:27:40 +0000
@@ -48,9 +48,9 @@
         'product_qty_in':fields.integer('In Qty',readonly=True),
         'product_qty_out':fields.integer('Out Qty',readonly=True),
         'value' : fields.float('Total Value', required=True),
-        'day_diff2':fields.float('Lag (Days)',readonly=True,  digits_compute=dp.get_precision('Shipping Delay'), group_operator="avg"),
-        'day_diff1':fields.float('Planned Lead Time (Days)',readonly=True, digits_compute=dp.get_precision('Shipping Delay'), group_operator="avg"),
-        'day_diff':fields.float('Execution Lead Time (Days)',readonly=True,  digits_compute=dp.get_precision('Shipping Delay'), group_operator="avg"),
+        'day_diff2':fields.float('Lag (Days)',readonly=True, group_operator="avg"),
+        'day_diff1':fields.float('Planned Lead Time (Days)',readonly=True, group_operator="avg"),
+        'day_diff':fields.float('Execution Lead Time (Days)',readonly=True, group_operator="avg"),
         'stock_journal': fields.many2one('stock.journal','Stock Journal', select=True),
 
 
@@ -160,8 +160,8 @@
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'product_qty':fields.float('Quantity',  digits_compute=dp.get_precision('Product Unit of Measure'), readonly=True),
-        'value' : fields.float('Total Value',  digits_compute=dp.get_precision('Account'), required=True),
+        'product_qty':fields.float('Quantity',  digits_compute=dp.get_precision('Quantity'), readonly=True),
+        'value' : fields.float('Total Value',  digits_compute=dp.get_precision('Amount'), required=True),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),

=== modified file 'stock/res_config.py'
--- stock/res_config.py	2013-09-17 13:08:14 +0000
+++ stock/res_config.py	2013-10-29 13:27:40 +0000
@@ -73,12 +73,12 @@
     }
 
     def get_default_dp(self, cr, uid, fields, context=None):
-        dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product', 'decimal_stock_weight')
+        dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product', 'decimal_weight')
         return {'decimal_precision': dp.digits}
 
     def set_default_dp(self, cr, uid, ids, context=None):
         config = self.browse(cr, uid, ids[0], context)
-        dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product', 'decimal_stock_weight')
+        dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product', 'decimal_weight')
         dp.write({'digits': config.decimal_precision})
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock/stock.py'
--- stock/stock.py	2013-10-18 12:58:18 +0000
+++ stock/stock.py	2013-10-29 13:27:40 +0000
@@ -200,8 +200,8 @@
 
         'parent_left': fields.integer('Left Parent', select=1),
         'parent_right': fields.integer('Right Parent', select=1),
-        'stock_real_value': fields.function(_product_value, type='float', string='Real Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
-        'stock_virtual_value': fields.function(_product_value, type='float', string='Virtual Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
+        'stock_real_value': fields.function(_product_value, type='float', string='Real Stock Value', multi="stock", digits_compute=dp.get_precision('Amount')),
+        'stock_virtual_value': fields.function(_product_value, type='float', string='Virtual Stock Value', multi="stock", digits_compute=dp.get_precision('Amount')),
         'company_id': fields.many2one('res.company', 'Company', select=1, help='Let this field empty if this location is shared between all companies'),
         'scrap_location': fields.boolean('Scrap Location', help='Check this box to allow using this location to put scrapped/damaged goods.'),
         'valuation_in_account_id': fields.many2one('account.account', 'Stock Valuation Account (Incoming)', domain = [('type','=','other')],
@@ -1468,7 +1468,7 @@
         'date': fields.datetime('Creation Date', required=True),
         'stock_available': fields.function(_get_stock, fnct_search=_stock_search, type="float", string="Available", select=True,
             help="Current quantity of products with this Serial Number available in company warehouses",
-            digits_compute=dp.get_precision('Product Unit of Measure')),
+            digits_compute=dp.get_precision('Quantity')),
         'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'),
         'company_id': fields.many2one('res.company', 'Company', select=True),
         'move_ids': fields.one2many('stock.move', 'prodlot_id', 'Moves for this serial number', readonly=True),
@@ -1607,7 +1607,7 @@
         'date_expected': fields.datetime('Scheduled Date', states={'done': [('readonly', True)]},required=True, select=True, help="Scheduled date for the processing of this move"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')],states={'done': [('readonly', True)]}),
 
-        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Quantity'),
             required=True,states={'done': [('readonly', True)]},
             help="This is the quantity of products from an inventory "
                 "point of view. For moves in the state 'done', this is the "
@@ -1618,7 +1618,7 @@
                 "the product reservation, and should be done with care."
         ),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True,states={'done': [('readonly', True)]}),
-        'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Product Unit of Measure'), states={'done': [('readonly', True)]}),
+        'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Quantity'), states={'done': [('readonly', True)]}),
         'product_uos': fields.many2one('product.uom', 'Product UOS', states={'done': [('readonly', True)]}),
         'product_packaging': fields.many2one('product.packaging', 'Packaging', help="It specifies attributes of packaging like type, quantity of packaging,etc."),
 
@@ -1648,7 +1648,7 @@
                        "* Waiting Availability: This state is reached when the procurement resolution is not straight forward. It may need the scheduler to run, a component to me manufactured...\n"\
                        "* Available: When products are reserved, it is set to \'Available\'.\n"\
                        "* Done: When the shipment is processed, the state is \'Done\'."),
-        'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Product Price'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
+        'price_unit': fields.float('Unit Price', digits_compute=dp.get_precision('Amount'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
         'price_currency_id': fields.many2one('res.currency', 'Currency for average price', help="Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)"),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order of", select=True),
@@ -2896,7 +2896,7 @@
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
-        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Quantity')),
         'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True, select=True, readonly=True),
         'prod_lot_id': fields.many2one('stock.production.lot', 'Serial Number', domain="[('product_id','=',product_id)]"),
         'state': fields.related('inventory_id','state',type='char',string='Status',readonly=True),

=== modified file 'stock/stock_data.xml'
--- stock/stock_data.xml	2012-11-29 22:26:45 +0000
+++ stock/stock_data.xml	2013-10-29 13:27:40 +0000
@@ -151,12 +151,6 @@
             <field eval="'stock.location,'+str(location_production)" name="value"/>
         </record>
 
-
-        <record forcecreate="True" id="decimal_shipping_delay" model="decimal.precision">
-            <field name="name">Shipping Delay</field>
-            <field name="digits" eval="2"/>
-        </record>
-
         <!--
     Resource: stock.warehouse
     -->

=== modified file 'stock/wizard/stock_change_product_qty.py'
--- stock/wizard/stock_change_product_qty.py	2013-08-01 14:21:19 +0000
+++ stock/wizard/stock_change_product_qty.py	2013-10-29 13:27:40 +0000
@@ -29,7 +29,7 @@
     _description = "Change Product Quantity"
     _columns = {
         'product_id' : fields.many2one('product.product', 'Product'),
-        'new_quantity': fields.float('New Quantity on Hand', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, help='This quantity is expressed in the Default Unit of Measure of the product.'),
+        'new_quantity': fields.float('New Quantity on Hand', digits_compute=dp.get_precision('Quantity'), required=True, help='This quantity is expressed in the Default Unit of Measure of the product.'),
         'prodlot_id': fields.many2one('stock.production.lot', 'Serial Number', domain="[('product_id','=',product_id)]"),
         'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
     }

=== modified file 'stock/wizard/stock_change_standard_price.py'
--- stock/wizard/stock_change_standard_price.py	2013-09-17 12:21:02 +0000
+++ stock/wizard/stock_change_standard_price.py	2013-10-29 13:27:40 +0000
@@ -27,7 +27,7 @@
     _name = "stock.change.standard.price"
     _description = "Change Standard Price"
     _columns = {
-        'new_price': fields.float('Price', required=True, digits_compute=dp.get_precision('Product Price'),
+        'new_price': fields.float('Price', required=True, digits_compute=dp.get_precision('Amount'),
                                   help="If cost price is increased, stock variation account will be debited "
                                         "and stock output account will be credited with the value = (difference of amount * quantity available).\n"
                                         "If cost price is decreased, stock variation account will be creadited and stock input account will be debited."),

=== modified file 'stock/wizard/stock_move.py'
--- stock/wizard/stock_move.py	2013-04-15 10:23:49 +0000
+++ stock/wizard/stock_move.py	2013-10-29 13:27:40 +0000
@@ -29,7 +29,7 @@
 
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
-        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Quantity'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
         'location_id': fields.many2one('stock.location', 'Location', required=True)
     }
@@ -163,7 +163,7 @@
         return res
 
     _columns = {
-        'qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')),
+        'qty': fields.float('Quantity', digits_compute=dp.get_precision('Quantity')),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure'),
         'line_ids': fields.one2many('stock.move.split.lines', 'wizard_id', 'Serial Numbers'),
@@ -259,7 +259,7 @@
     _description = "Stock move Split lines"
     _columns = {
         'name': fields.char('Serial Number', size=64),
-        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')),
+        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Quantity')),
         'wizard_id': fields.many2one('stock.move.split', 'Parent Wizard'),
         'wizard_exist_id': fields.many2one('stock.move.split', 'Parent Wizard (for existing lines)'),
         'prodlot_id': fields.many2one('stock.production.lot', 'Serial Number'),

=== modified file 'stock/wizard/stock_partial_picking.py'
--- stock/wizard/stock_partial_picking.py	2013-06-14 09:19:24 +0000
+++ stock/wizard/stock_partial_picking.py	2013-10-29 13:27:40 +0000
@@ -43,7 +43,7 @@
     _rec_name = 'product_id'
     _columns = {
         'product_id' : fields.many2one('product.product', string="Product", required=True, ondelete='CASCADE'),
-        'quantity' : fields.float("Quantity", digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'quantity' : fields.float("Quantity", digits_compute=dp.get_precision('Quantity'), required=True),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True, ondelete='CASCADE'),
         'prodlot_id' : fields.many2one('stock.production.lot', 'Serial Number', ondelete='CASCADE'),
         'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete='CASCADE', domain = [('usage','<>','view')]),

=== modified file 'stock/wizard/stock_return_picking.py'
--- stock/wizard/stock_return_picking.py	2013-09-10 12:21:13 +0000
+++ stock/wizard/stock_return_picking.py	2013-10-29 13:27:40 +0000
@@ -31,7 +31,7 @@
 
     _columns = {
         'product_id' : fields.many2one('product.product', string="Product", required=True),
-        'quantity' : fields.float("Quantity", digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'quantity' : fields.float("Quantity", digits_compute=dp.get_precision('Quantity'), required=True),
         'wizard_id' : fields.many2one('stock.return.picking', string="Wizard"),
         'move_id' : fields.many2one('stock.move', "Move"),
         'prodlot_id': fields.related('move_id', 'prodlot_id', type='many2one', relation='stock.production.lot', string='Serial Number', readonly=True),

=== modified file 'stock/wizard/stock_splitinto.py'
--- stock/wizard/stock_splitinto.py	2013-04-15 10:23:49 +0000
+++ stock/wizard/stock_splitinto.py	2013-10-29 13:27:40 +0000
@@ -27,7 +27,7 @@
     _name = "stock.split.into"
     _description = "Split into"
     _columns = {
-        'quantity': fields.float('Quantity',digits_compute=dp.get_precision('Product Unit of Measure')),
+        'quantity': fields.float('Quantity',digits_compute=dp.get_precision('Quantity')),
     }
     _defaults = {
         'quantity': lambda *x: 0,