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

2011-05-12 Thread Mustufa Rangwala (Open ERP)
fix this: 1. if line.name == 'Net' or line.name == 'Gross' or line.name == 'Basic': = use line.code instead of line.name 2. line.category_id.name = use line.category_id.code every where. thanks, mra --

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

2011-05-12 Thread Meera Trambadia (OpenERP)
Hello sir, I have made changes as described above. Thanks mtr -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-account-mtr/+merge/60740 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-account-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-12 Thread Mustufa Rangwala (Open ERP)
Review: Needs Fixing Conflicts detected in your merge proposal. -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-account-mtr/+merge/60740 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-account-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

2011-05-12 Thread Mustufa Rangwala (Open ERP)
Review: Approve Whatever done in the merge seems ok. I approve the branch an i let the Quentin (qdp) to review it completely. thanks, mra -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-account-mtr/+merge/60740 Your team OpenERP RD Team is subscribed to branch

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

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

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

2011-05-12 Thread qdp (OpenERP)
i merged another branch that i made but which is based on this one. so i'm rejecting this merge proposal to clear my pending merge to do list Thanks -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-account-mtr/+merge/60745 Your team OpenERP RD Team is subscribed to

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

2011-05-12 Thread qdp (OpenERP)
The proposal to merge lp:~openerp-dev/openobject-addons/trunk-payroll-account-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll has been updated. Status: Needs review = Rejected For more details, see: