Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-23 Thread Mustufa Rangwala (Open ERP)
Review: Needs Fixing Meal voucher: increase the fixed amount in demo -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr/+merge/60793 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-payroll.

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-23 Thread Meera Trambadia (OpenERP)
Hello sir, I have increased the amount in the demo data for 'Meal Voucher' rule. Thanks mtr -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr/+merge/61921 Your team OpenERP RD Team is subscribed to branch

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-23 Thread noreply
The proposal to merge lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll has been updated. Status: Needs review = Merged For more details, see:

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-13 Thread Mustufa Rangwala (Open ERP)
Review: Needs Fixing we should merge the computation of sum in query only for payslip and Payslips class should be inhertated from payslip osv class. thanks to quentin for suggestion. mra --

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-13 Thread Meera Trambadia (OpenERP)
Hello, I have improved the computation of sum in query for Payslips. Thanks mtr -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr/+merge/60793 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-payroll.

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-12 Thread Meera Trambadia (OpenERP)
The proposal to merge lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll has been updated. Status: Needs review = Work in progress For more details, see:

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-12 Thread Mustufa Rangwala (Open ERP)
Review: Needs Fixing you have to update the localdict with {slip:self.pool.get('hr.payslip')} it will not work with payslip key because its browse record we can not call like payslip.sum() --

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-12 Thread Meera Trambadia (OpenERP)
Meera Trambadia (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll. Requested reviews: qdp (OpenERP) (qdp) Mustufa Rangwala (Open ERP) (mra-tinyerp) For more details, see:

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-12 Thread Meera Trambadia (OpenERP)
Meera Trambadia (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll. Requested reviews: qdp (OpenERP) (qdp) Mustufa Rangwala (Open ERP) (mra-tinyerp) For more details, see:

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-11 Thread Meera Trambadia (OpenERP)
Meera Trambadia (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll. Requested reviews: Mustufa Rangwala (Open ERP) (mra-tinyerp) qdp (OpenERP) (qdp) For more details, see:

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-11 Thread Mustufa Rangwala (Open ERP)
Review: Needs Fixing 1. if r['credit_note'] == False: = if not r['credit_note'] 2. ids argument is required in both the sum functions because, result = payslip.sum('GROSS', '05/01/2011', False, 3) if i write this in python code of my salary rule it does not work as it takes code with ids of

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-10 Thread qdp (OpenERP)
Review: Needs Fixing no, it needs fixing: we need to take into account also if the payslip is a credite note or not: in that case it should subtract pl.total so i didn't merged it, and thus you will be very nice to include in your next try the change i proposed above. ;-) Thanks, Quentin --

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-06 Thread Mustufa Rangwala (Open ERP)
Review: Resubmit i have improve little code and commited in the branch. Note: we have not create worked_days object with python code so for now we can not test worked_days.sum() .. But function seems ok so it will work :) Thanks, mra --

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-06 Thread Mustufa Rangwala (Open ERP)
Review: Approve -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr/+merge/60055 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-payroll. ___ Mailing list:

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-05 Thread Meera Trambadia (OpenERP)
Meera Trambadia (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll. Requested reviews: OpenERP RD Team (openerp-dev) For more details, see:

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-05 Thread Mustufa Rangwala (Open ERP)
Review: Needs Fixing 1. rename both the function to sum] 2. def worked_days_sum = move this method to work days object. 3. if not employee: = return 0.0 not 0 4. browse in for loop ? 5. This should be improve: if field == 'number_of_days': result +=

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-05 Thread Meera Trambadia (OpenERP)
Meera Trambadia (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll. Requested reviews: Mustufa Rangwala (Open ERP) (mra-tinyerp) qdp (OpenERP) (qdp) For more details, see:

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-05 Thread Meera Trambadia (OpenERP)
Hello sir, I have made the changes as described above. Thanks mtr -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr/+merge/60055 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-payroll.