Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-add-field-batch_id-kbh
into lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-mra-add-field-batch_id-kbh/+merge/118479
Hello,
l10n_in_hr_payroll::
I have added batch_id field on advice and use it as reference of batch on
advice.
Thank you,
KBH
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-mra-add-field-batch_id-kbh/+merge/118479
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-add-field-batch_id-kbh
into lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll.py'
--- l10n_in_hr_payroll/l10n_in_hr_payroll.py 2012-07-27 08:16:59 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll.py 2012-08-07 06:22:29 +0000
@@ -122,6 +122,7 @@
'neft': fields.boolean('NEFT Transaction', help="Check this box if your company use online transfer for salary"),
'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank from which the salary is going to be paid"),
+ 'batch_id': fields.many2one('hr.payslip.run', 'Batch', readonly=True)
}
_defaults = {
@@ -238,6 +239,7 @@
if run.available_advice:
raise osv.except_osv(_('Error !'), _("Payment advice already exists for %s, 'Set to Draft' to create a new advice.") %(run.name))
advice_data = {
+ 'batch_id': run.id,
'company_id': users[0].company_id.id,
'name': run.name,
'date': run.date_end,
=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml'
--- l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml 2012-07-20 10:39:11 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml 2012-08-07 06:22:29 +0000
@@ -136,6 +136,7 @@
<field name="chaque_nos"/>
<newline/>
<field name="neft"/>
+ <field name="batch_id"/>
</group>
<separator colspan="4" string="Letter Details"/>
<field name="note" colspan="4" nolabel="1"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
