[MERGE] hr_payroll: changed field 'quantity' into 'amount' in input lines

bzr revid: qdp-launchpad@openerp.com-20110524124908-hzgk4vhegmynonsc

diff --cc addons/hr_payroll/hr_payroll.py
index 70bac2a,4fd1d0a..45d6855
--- 1/addons/hr_payroll/hr_payroll.py
--- 2/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@@ -728,7 -727,7 +728,7 @@@ class hr_payslip_input(osv.osv)
          'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True),
          'sequence': fields.integer('Sequence', required=True,),
          'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"),
-         'quantity': fields.float('Quantity', 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.SASUS.qunatity * contract.wage*0.01."),
 -        '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.SASUS.amount * contract.wage*0.01."),
++        '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."),
          'contract_id': fields.many2one('hr.contract', 'Contract', required=True, help="The contract for which applied this input"),
      }
      _order = 'payslip_id, sequence'

diff --cc addons/hr_payroll/hr_payroll_view.xml
Simple merge