Commit Graph

36 Commits

Author SHA1 Message Date
Atul Patel (OpenERP) ae858f4d68 [IMP]: Rename report name report_hryearly salary
bzr revid: atp@tinyerp.com-20140425175230-sctyfvvn87c6exm9
2014-04-25 23:22:30 +05:30
Atul Patel (OpenERP) 1c1d9eee50 [ADD]: Add payroll advice report
bzr revid: atp@tinyerp.com-20140425163022-q4fw9zcx0f7n35ox
2014-04-25 22:00:22 +05:30
Atul Patel (OpenERP) be912b1d46 [FIX]: Add qweb xml into openerp.py file
bzr revid: atp@tinyerp.com-20140425042148-jkldr55vvxfrxnmy
2014-04-25 09:51:48 +05:30
Sunil Sharma (OpenERP) 1c6b63a96e [MERGE]: Merged with qweb-report branch.
bzr revid: atp@tinyerp.com-20140424154553-3yk05u7chmc94odd
2014-04-24 21:15:53 +05:30
Rakesh Sindhav (OpenERP) 504385cbc7 [MERGE]: Merged with qwebreport-l10n_in
bzr revid: rsi@tinyerp.com-20140424064445-8tnf5sn1tjo91buq
2014-04-24 12:14:45 +05:30
Rakesh Sindhav (OpenERP) 7932140dd1 [IMP]: convert rml to qweb report of Payslip Details
bzr revid: rsi@tinyerp.com-20140423133032-l1wxnoyytdakdnpx
2014-04-23 19:00:32 +05:30
Sunil Sharma 5fdb6292b1 [imp]:add qweb report and remove rml report
bzr revid: ssh@tinyerp.com-20140422123757-6wskvlwyltlyjvp0
2014-04-22 18:07:57 +05:30
Rakesh Sindhav (OpenERP) 166f735ce5 [IMP]: Remove the inline CSS
bzr revid: rsi@tinyerp.com-20140422120915-wpkrw1v1zmjugx5d
2014-04-22 17:39:15 +05:30
Rakesh Sindhav (OpenERP) a491127ab9 [IMP]: l10n_in_hr_payroll: Convert Yearly Salary by Head report from RML report to QWEB
bzr revid: rsi@tinyerp.com-20140421091311-9ymvwu2g4nn3h630
2014-04-21 14:43:11 +05:30
Fabien Meghazi f58b15af48 [IMP] Remove deprecated manifest keys
bzr revid: fme@openerp.com-20130909110330-kl71n1km00gew1oo
2013-09-09 13:03:30 +02:00
Khushboo Bhatt (Open ERP) d3eac6d18a [ADD]l10n_in_hr_payroll:added postgres report for payslip and palyslip lines
bzr revid: kbh@tinyerp.com-20120824093657-dlw1d0bh39cg7h79
2012-08-24 15:06:57 +05:30
Mustufa Rangwala (OpenERP) 05005a5ff3 [IMP] Typo
bzr revid: mra@tinyerp.com-20120823050404-yc5pbt3ezv0gu3li
2012-08-23 10:34:04 +05:30
Mustufa Rangwala (OpenERP) 51441df034 [IMP] l10n_in_hr_payroll: Rename reports and change the strings add lable
bzr revid: mra@tinyerp.com-20120808070414-6cl8gi7cdh3fdpib
2012-08-08 12:34:14 +05:30
Khushboo Bhatt (Open ERP) 2386cb96c9 [FIX]l10n_in_hr_payroll:report name changed,file name changed,rml improved
bzr revid: kbh@tinyerp.com-20120803091729-sal3w4dltoxbxu5w
2012-08-03 14:47:29 +05:30
Khushboo Bhatt (Open ERP) 3e28c5fb00 [ADD]l10n_in_hr_payroll:added report for employee salary details by categories
bzr revid: kbh@tinyerp.com-20120803061902-msvh29tr3fnog9tr
2012-08-03 11:49:02 +05:30
Mustufa Rangwala (OpenERP) 3ccd26a21b [ADD] l10n_in_hr_payroll: Template for yml advice from batch
bzr revid: mra@tinyerp.com-20120727060019-508eayln49i2c7qs
2012-07-27 11:30:19 +05:30
Mustufa Rangwala (OpenERP) e8cb9709d7 [MERGE] l10n_in_hr_payroll: Add yaml for payment advice (Made some improvements on requsted merge proposal)
bzr revid: mra@tinyerp.com-20120727054728-37x98vwmnc6mm9x0
2012-07-27 11:17:28 +05:30
Mustufa Rangwala (OpenERP) 286cb1fdb9 [FIX] l10n_in_hr_payroll: Fix access rights
[IMP] l10n_in_hr_payroll: Code clean

bzr revid: mra@tinyerp.com-20120726062917-2l6hb3y0nh9svda1
2012-07-26 11:59:17 +05:30
Digvijay Singh a6e272a5e7 [IMP]l10n_in_hr_payroll: add yaml file for payment advice
bzr revid: dsi@tinyerp.com-20120725110520-w3rmgy0kbwa5kmdg
2012-07-25 16:35:20 +05:30
Khushboo Bhatt (Open ERP) f21d970258 [IMP]l10n_in_hr_payroll:file rename
bzr revid: kbh@tinyerp.com-20120720111010-2ckdznetj8ykd792
2012-07-20 16:40:10 +05:30
Khushboo Bhatt (Open ERP) e43a303093 [IMP]l10n_in_hr_payroll:report improved
bzr revid: kbh@tinyerp.com-20120720091634-eyrajix3k2yh9xxg
2012-07-20 14:46:34 +05:30
Khushboo Bhatt (Open ERP) 4a87389f31 [MERGE]merge with project branch and resolve conflicts
bzr revid: kbh@tinyerp.com-20120719115638-yd622zv6okdtaxfa
2012-07-19 17:26:38 +05:30
Khushboo Bhatt (Open ERP) 5f91b11c1c [ADD]l10n_in_hr_payroll:added report for salary rule by months
bzr revid: kbh@tinyerp.com-20120718131502-csfajf5yeqjsby07
2012-07-18 18:45:02 +05:30
Meera Trambadia (OpenERP) 771c0322c9 [ADD] l10n_in_hr_payroll:-added Reporting(Analysis) for Payment Advices
bzr revid: mtr@tinyerp.com-20120713084755-b43bdg85rs7pzn28
2012-07-13 14:17:55 +05:30
Mustufa Rangwala (OpenERP) d2ee78a0b2 [FIX] l10n_in_hr_payroll: typos
bzr revid: mra@tinyerp.com-20120703130049-51f02u2civ1yhmtp
2012-07-03 18:30:49 +05:30
Mustufa Rangwala (OpenERP) ac3241ed13 [IMP] typo
bzr revid: mra@tinyerp.com-20120627072622-h8vlzlai418y2o7e
2012-06-27 12:56:22 +05:30
Mustufa Rangwala (OpenERP) 2c60eedc43 [MERGE] Merge kbh branch lp:~openerp-dev/openerp-india/payroll-india-trunk-demo_data-kbh
bzr revid: mra@tinyerp.com-20120626065034-luebnogr0g9nxfio
2012-06-26 12:20:34 +05:30
Mustufa Rangwala (OpenERP) c71ceea1a4 [IMP] typo
bzr revid: mra@tinyerp.com-20120626063219-fgaaklh8koi4azii
2012-06-26 12:02:19 +05:30
Khushboo Bhatt (Open ERP) bddac9565b [IMP]improved demo data for salary structure,data xml file is moved in data folder
bzr revid: kbh@tinyerp.com-20120626062852-iwkeubxywadnbqvf
2012-06-26 11:58:52 +05:30
Khushboo Bhatt (Open ERP) 8c8de36e18 [FIX]prefix of sequence changed.
bzr revid: kbh@tinyerp.com-20120615104651-yyrys4pqgfuechly
2012-06-15 16:16:51 +05:30
Khushboo Bhatt (Open ERP) 71003a5aa0 [ADD]sequence file added for payroll advice.
bzr revid: kbh@tinyerp.com-20120613063845-1qiuuasfim19f94r
2012-06-13 12:08:45 +05:30
Mustufa Rangwala (OpenERP) 9aafa87818 [MERGE] l10n_in_hr_payroll: Merge KBH branch
lp:~openerp-dev/openerp-india/payroll-india-trunk-payment-advice-kbh + FIX and Improve manually some change

bzr revid: mra@tinyerp.com-20120612055710-ldwm5db9wskfrbr8
2012-06-12 11:27:10 +05:30
Khushboo Bhatt (Open ERP) 16f49c83c8 [IMP]sequence file removed.
bzr revid: kbh@tinyerp.com-20120611112225-v7wcbozqyvyxhmfg
2012-06-11 16:52:25 +05:30
Khushboo Bhatt (Open ERP) 8827fee542 [IMP]compute advice method improved,state workflow changed and place of states are changed.
bzr revid: kbh@tinyerp.com-20120606095508-3rubur9xhrbsxw6u
2012-06-06 15:25:08 +05:30
Khushboo Bhatt (Open ERP) 034a85428f [IMP]sequence changed for rules,update module descriptor,improved rule of gratuity and VPF.
bzr revid: kbh@tinyerp.com-20120524112412-8142nscbm8zl7zzr
2012-05-24 16:54:12 +05:30
Khushboo Bhatt (Open ERP) 2c935c1c56 [IMP/ADD]added l10_in_hr_payroll.changes in module descrpition and added notes in salary rules.
bzr revid: kbh@tinyerp.com-20120515084129-uu7aroc0izfb0zk5
2012-05-15 14:11:29 +05:30