da00eab39a
[FIX] l10n_in_hr_payroll: use xmlid instead of name searching salary rule categories (they may have been renamed, forbidding upgrade)
...
bzr revid: chs@openerp.com-20131120100623-ip33s4upffu1a52h
2013-11-20 11:06:23 +01:00
eb57fb1503
[FIX]l10n_in_hr_payroll:python code for rules
...
bzr revid: kbh@tinyerp.com-20120830054908-7j6vydmwwfzsoned
2012-08-30 11:19:08 +05:30
95c0fec699
[MERGE] l10n_in_hr_payroll: Improve salary rules
...
bzr revid: mra@tinyerp.com-20120829121912-rhsuygls3ot6yn9s
2012-08-29 17:49:12 +05:30
699720066b
[FIX]l10n_in_hr_payroll:description added
...
bzr revid: kbh@tinyerp.com-20120829110528-mcvijjnfzt5xj594
2012-08-29 16:35:28 +05:30
c42ba7020b
[FIX]l10n_in_hr_payroll:All company contribution will not appear on the payslip excepts if company deduction from employee salary
...
bzr revid: kbh@tinyerp.com-20120829102834-o52m2hyq69783ao1
2012-08-29 15:58:34 +05:30
b1724905d4
[FIX]l10n_in_hr_payroll:rules improved,help updated
...
bzr revid: kbh@tinyerp.com-20120829094252-wzdygt5muwcuochl
2012-08-29 15:12:52 +05:30
6aa5ea647f
[IMP] l10n_in_hr_payroll: typo
...
bzr revid: mra@tinyerp.com-20120827052843-tx702vetryimkldk
2012-08-27 10:58:43 +05:30
239012ff9d
[FIX] l10n_in_hr_payroll: small fix
...
bzr revid: mra@tinyerp.com-20120824114341-cah1258419d439ge
2012-08-24 17:13:41 +05:30
47e33a1d70
[FIX] l10n_in_hr_payroll: small fix
...
bzr revid: mra@tinyerp.com-20120824110146-n70knsb0c1fn5sfe
2012-08-24 16:31:46 +05:30
76bbd83c30
[MERGE] l10n_in_hr_payrol: typo
...
bzr revid: mra@tinyerp.com-20120824105120-vzp8avej8tyofwx5
2012-08-24 16:21:20 +05:30
8335b55e87
[FIX] l10n_in_hr_payrol: Remove food coupan register for dedcution
...
bzr revid: mra@tinyerp.com-20120824104031-0je3kogotvsh7i64
2012-08-24 16:10:31 +05:30
bcf9ef416e
[FIX]l10n_in_hr_payroll:changed name of inputs
...
bzr revid: kbh@tinyerp.com-20120824103410-lvecrt1ov2szsjvw
2012-08-24 16:04:10 +05:30
62070621f6
[MERGE] l10n_in_hr_payroll: Changes on salary rules
...
bzr revid: mra@tinyerp.com-20120823053548-ty3d6mgxcpdlo9wr
2012-08-23 11:05:48 +05:30
8ad4dd41c8
[IMP]l10n_in_hr_payroll:note added
...
bzr revid: kbh@tinyerp.com-20120822132229-abjrha00701xbyd3
2012-08-22 18:52:29 +05:30
55ec89f7ee
[IMP]l10n_in_hr_payroll:added rule for labour walfare fund.
...
bzr revid: kbh@tinyerp.com-20120822130945-xvwjnpf86eba0j1b
2012-08-22 18:39:45 +05:30
13485fd6b0
[IMP]l10n_in_hr_payroll:HRA rule improved,removed field.
...
bzr revid: kbh@tinyerp.com-20120822125933-bsiky3e4ttawry7a
2012-08-22 18:29:33 +05:30
f958f6f064
[IMP/ADD]l10n_in_hr_payroll:improved salary rules and added inputs of salary rules
...
bzr revid: kbh@tinyerp.com-20120822123223-zlx1lhd06lnluqnz
2012-08-22 18:02:23 +05:30
83ec6f517b
[IMP/REM]l10n_in_hr_payroll:removed gratuity rules and all calculations for that rule,improved performance,bonus and supplementary rules
...
bzr revid: kbh@tinyerp.com-20120822112153-l3zlveq0afuu40mx
2012-08-22 16:51:53 +05:30
0015c913f5
[IMP]l10n_in_hr_payroll:register added for all deduction
...
bzr revid: kbh@tinyerp.com-20120822101110-3zv091wj2m7dmvu7
2012-08-22 15:41:10 +05:30
184385fd7c
[IMP]l10n_in_hr_payroll:improved rule for LTA and HRA
...
bzr revid: kbh@tinyerp.com-20120822095244-8atrqgov0i3abj0l
2012-08-22 15:22:44 +05:30
6694495343
[FIX]l10n_in_hr_payroll:register name changed
...
bzr revid: kbh@tinyerp.com-20120807083734-yhob146pybjykuex
2012-08-07 14:07:34 +05:30
77cb23551b
[ADD/IMP]l10n_in_hr_payroll:added data for contribution register and used its reference in rules
...
bzr revid: kbh@tinyerp.com-20120807061555-n8s44w4crx2gh9pa
2012-08-07 11:45:55 +05:30
5206fc9527
[FIX] l10n_in_hr_payroll: Removed unnecessary empty line
...
bzr revid: mra@tinyerp.com-20120726090018-mbnjl1t4oglgdrqx
2012-07-26 14:30:18 +05:30
0a06bda8fe
[MERGE] l10n_in_hr-payroll: One field added on contract type of city which will be used in House rent allowances rule
...
bzr revid: mra@tinyerp.com-20120716122438-l68c02q4ohdf6xf9
2012-07-16 17:54:38 +05:30
feacc599ec
[IMP] l10n_in_hr_payroll: improved string of a note field
...
bzr revid: mtr@tinyerp.com-20120716085430-ko319y2c4ou56dpe
2012-07-16 14:24:30 +05:30
08a411a680
[IMP] l10n_in_hr_payroll: merged salary rules of 'HRAM' and 'HRANM'
...
bzr revid: mtr@tinyerp.com-20120713132304-21dy22w9ytdbyt8g
2012-07-13 18:53:04 +05:30
8d94232e0a
[IMP] l10n_in_hr_payroll: added field on hr.contract object and modified salary rules of 'HRAM' and 'HRANM'
...
bzr revid: mtr@tinyerp.com-20120713115544-bc9sdi7so47j65t6
2012-07-13 17:25:44 +05:30
ae6346f895
[MERGE] l10n_in_hr_payroll:
...
Remove Allowances from Gift from non relatives to Long term gain and loss
Remove related amount field from contact too
Remove dedection from contract only
PT, Company Provided Transportm, Leave Availed Deduction
Salary rule for Prof Tax: Up to Rs. 3000 Nil | 3000 to 5999 20| 6000 to 9999 80 | 9000 to 11999 150 | 12000 to 200
Company Provided Transportm, Leave Availed Deduction: change it to fixed amount
bzr revid: mra@tinyerp.com-20120713091251-ug895wzsz57wrq0r
2012-07-13 14:42:51 +05:30
f8cd704e89
[IMP] l10n_in_hr_payroll: Imp PT salary rule
...
bzr revid: jap@tinyerp.com-20120706052836-lhizhiqy9nbpnimi
2012-07-06 10:58:36 +05:30
4768c23336
[IMP] l10n_in_hr_payroll: Improve PT salary rule
...
bzr revid: jap@tinyerp.com-20120706052201-d6v1rp9bulfxvchk
2012-07-06 10:52:01 +05:30
73cbeb50e2
[IMP] l10n_in_hr_payroll: Remove Allowances from Gift from non relatives to Long term gain and loss and Remove deduction from contract and change the salary rule
...
bzr revid: jap@tinyerp.com-20120705133541-zkfrnugrun6hjywt
2012-07-05 19:05:41 +05:30
c06b2854f7
[REM]: l10n_in_hr_payroll: Remove food coupan amount from contact it will work with qty now
...
bzr revid: mra@tinyerp.com-20120704051741-v5ab5xws4x8acsah
2012-07-04 10:47:41 +05:30
d2ee78a0b2
[FIX] l10n_in_hr_payroll: typos
...
bzr revid: mra@tinyerp.com-20120703130049-51f02u2civ1yhmtp
2012-07-03 18:30:49 +05:30
06676feb49
[MERGE]merge with project branch and remove conflicts.
...
bzr revid: kbh@tinyerp.com-20120629090731-ex7nxbepw8tzydjo
2012-06-29 14:37:31 +05:30
48000ffc05
[IMP]salary rules changed which are based on DA.,help added.
...
bzr revid: kbh@tinyerp.com-20120629084636-b7kc4ys46c4gouu2
2012-06-29 14:16:36 +05:30
bef07b18af
[ADD] l10n_in_hr_payroll: Add dedution rule for food coupans
...
bzr revid: mra@tinyerp.com-20120628064525-exuxtyv2ix8xf99e
2012-06-28 12:15:25 +05:30
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
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
48e4dd20ce
[IMP]removed unnecessary category of salary rule,changed category_id for child allowance.
...
bzr revid: kbh@tinyerp.com-20120523065447-cl7f1xuav7z9p1uj
2012-05-23 12:24:47 +05:30
5f3e8f9c92
[IMP]improved salary rule for child hostel allowance.
...
bzr revid: kbh@tinyerp.com-20120523061203-rwgfx6opd07t1r9g
2012-05-23 11:42:03 +05:30
cf28ac1918
[IMP]improved salary rules for allowance and deduction.
...
bzr revid: kbh@tinyerp.com-20120521132703-m1q4s1ccxyp3nr0p
2012-05-21 18:57:03 +05:30
0752cc0fe9
[IMP]improved child allowance rule for employee.
...
bzr revid: kbh@tinyerp.com-20120516050716-kprn03ib238h5tua
2012-05-16 10:37:16 +05:30
c34e57aaf6
[IMP]improved child allowance rule for employee.
...
bzr revid: kbh@tinyerp.com-20120515112443-h79ixtb311xs7sdt
2012-05-15 16:54:43 +05:30
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
Christophe Simonis
Khushboo Bhatt (Open ERP)
Mustufa Rangwala (OpenERP)
Meera Trambadia (OpenERP)
Jagdish Panchal (Open ERP)