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
599ef6b960
[FIX] l10n_in_hr_payroll:access for payslip report object
...
bzr revid: mra@tinyerp.com-20120824105441-zpmeznbhwkdznr3e
2012-08-24 16:24:41 +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
9d96cf77b0
[MERGE] l10n_in_hr_payroll: Add payslip analysis report
...
bzr revid: mra@tinyerp.com-20120824103056-x0ag10f4ih6awrcl
2012-08-24 16:00:56 +05:30
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
d690ebdf16
[MERGE] l10n_in_hr_payroll: report improved
...
bzr revid: mra@tinyerp.com-20120823110835-h33lannwn66c5c34
2012-08-23 16:38:35 +05:30
e2e266e9ad
[FIX]l10n_in_hr_payroll:basic,gross and net with amount are bold,removed header
...
bzr revid: kbh@tinyerp.com-20120823091432-irrs4yxn9xir0fz2
2012-08-23 14:44:32 +05:30
5f8de6a93d
[FIX]l10n_in_hr_payroll:basic,gross and net are bold
...
bzr revid: kbh@tinyerp.com-20120823071656-jedj3au7gyv829mq
2012-08-23 12:46:56 +05:30
abbfcc6634
[FIX]l10n_in_hr_payroll:left-right indent added and table width changed in report
...
bzr revid: kbh@tinyerp.com-20120823062120-p8mu9p3wat1xzdf8
2012-08-23 11:51:20 +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
05005a5ff3
[IMP] Typo
...
bzr revid: mra@tinyerp.com-20120823050404-yc5pbt3ezv0gu3li
2012-08-23 10:34:04 +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
bbe0554197
[IMP]l10n_in_hr_payroll:improved pot and po files.
...
bzr revid: kbh@tinyerp.com-20120817071820-jlnk37zxiz3m2aed
2012-08-17 12:48:20 +05:30
53a5c05569
[MERGE] l10n_in_hr_payroll: Payment Advice batch yaml fix
...
hr_payroll_account: Add default journal on Payslip run
bzr revid: mra@tinyerp.com-20120817052701-wiyh2mtrrvwix2mw
2012-08-17 10:57:01 +05:30
298119b0d3
[FIX]error of journal_id fixed and bank record added in yml
...
bzr revid: kbh@tinyerp.com-20120816124407-z0i24fk26k0jltlk
2012-08-16 18:14:07 +05:30
0364cffb0f
[FIX] l10n_in_hr_payroll: YAML Fix
...
bzr revid: mra@tinyerp.com-20120816101547-tahjdcbuocg3727f
2012-08-16 15:45:47 +05:30
d38148abba
[FIX] l10n_in_hr_payroll: YAML Fix
...
bzr revid: mra@tinyerp.com-20120816092010-vq3eqe8prjufd0rc
2012-08-16 14:50:10 +05:30
e283ea49e3
[FIX] l10n_in_hr_payroll: If bank account number not available
...
bzr revid: mra@tinyerp.com-20120816084821-la394tds5ysfgpys
2012-08-16 14:18:21 +05:30
fc4ec216ae
[IMP] l10n_in_hr_payroll: Employee form view for join date
...
bzr revid: mra@tinyerp.com-20120816054512-93cpurza3ykzfvtk
2012-08-16 11:15:12 +05:30
5c47881729
[MERGE] l10n_in_hr_payroll: Add yaml
...
bzr revid: mra@tinyerp.com-20120814094105-xh8g9ni41oc6fh26
2012-08-14 15:11:05 +05:30
8bdf79744b
[IMP]code added for checking advice in yml.
...
bzr revid: kbh@tinyerp.com-20120814053847-hrxby3r1s17l7uwr
2012-08-14 11:08:47 +05:30
08460d4dcd
[IMP]implemented payslip batch yml
...
bzr revid: kbh@tinyerp.com-20120813122117-qlfgnep0z50ko7ql
2012-08-13 17:51:17 +05:30
c590ca43b7
[FIX] l10n_in_hr_payrol: If bank account number not exist for employeereturn empty char instead of null
...
bzr revid: mra@tinyerp.com-20120813093535-eer0jjfye9kvhmo5
2012-08-13 15:05:35 +05:30
e63c4f84e9
[FIX]l10n_in_hr_payroll:underline on date and category
...
bzr revid: kbh@tinyerp.com-20120813084317-2eszak00jfmjukz5
2012-08-13 14:13:17 +05:30
226e281b55
[IMP]l10n_in_hr_payroll:string added
...
bzr revid: kbh@tinyerp.com-20120813073600-g23vkk2h9sviuvr0
2012-08-13 13:06:00 +05:30
d68a21b0f2
[IMP]l10n_in_hr_payroll:category name added in report
...
bzr revid: kbh@tinyerp.com-20120813071530-tsfqlsg08qkjs7s5
2012-08-13 12:45:30 +05:30
6fb5055992
[MERGE] l10n_in_hr_payroll: Improve report of head wise salary of employee
...
bzr revid: mra@tinyerp.com-20120813054230-pvq4vzh0jr338q4u
2012-08-13 11:12:30 +05:30
5fb76192cd
[FIX]l10n_in_hr_payroll:removed list from read
...
bzr revid: kbh@tinyerp.com-20120809111851-9hxicpudhsdj0jvb
2012-08-09 16:48:51 +05:30
4b9b862ea5
[FIX]l10n_in_hr_payroll:category_id removed from res
...
bzr revid: kbh@tinyerp.com-20120809110415-hsu7knpuz2kzx6ya
2012-08-09 16:34:15 +05:30
25e8f30e2d
[FIX]l10n_in_hr_payroll:default category set
...
bzr revid: kbh@tinyerp.com-20120809110010-7v74el735iu6lhe3
2012-08-09 16:30:10 +05:30
9c87c50576
[IMP]l10n_in_hr_payroll:code improved
...
bzr revid: kbh@tinyerp.com-20120809084238-h6vbx225ed3mxlv1
2012-08-09 14:12:38 +05:30
3cef19e555
[IMP/ADD]l10n_in_hr_payroll:added category field on wizard and improved code of report by using this field
...
bzr revid: kbh@tinyerp.com-20120809072235-a7a1cifqsveuu33k
2012-08-09 12:52:35 +05:30
c5c07ee517
[IMP]l10n_in_hr_payroll:update for bank in rml
...
bzr revid: kbh@tinyerp.com-20120808084759-wiyd4hglrpc8ln57
2012-08-08 14:17:59 +05:30
55f9a34a1e
[IMP]l10n_in_hr_payroll:changed bank and designation of employee in report
...
bzr revid: kbh@tinyerp.com-20120808084440-uwyxden2svma5fak
2012-08-08 14:14:40 +05:30
9c6f894e3b
[MERGE]merge with project branch
...
bzr revid: kbh@tinyerp.com-20120808072301-hzle885ufot6rsxo
2012-08-08 12:53:01 +05:30
8131e1062d
[IMP]l10n_in_hr_payroll:improved employees details in report
...
bzr revid: kbh@tinyerp.com-20120808071952-38uom3wvlkgwa1i7
2012-08-08 12:49:52 +05:30
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
eb3f70b645
[MERGE] l10n_in_hr_payroll: Add payroll Register report
...
bzr revid: mra@tinyerp.com-20120808062315-8bzmknkmksk0lh6s
2012-08-08 11:53:15 +05:30
3ace48df64
[FIX]l10n_in_hr_payroll:list added
...
bzr revid: kbh@tinyerp.com-20120808045647-b0sm9nut4kii35j0
2012-08-08 10:26:47 +05:30
b7e50727cc
[IMP]l10n_in_hr_payroll:code improved
...
bzr revid: kbh@tinyerp.com-20120807132905-9cz330v0fmjzyjuq
2012-08-07 18:59:05 +05:30
116191f725
[IMP]l10n_in_hr_payroll:code improved
...
bzr revid: kbh@tinyerp.com-20120807125407-f3jhkju13qru50y0
2012-08-07 18:24:07 +05:30
cdf31cddd3
[MERGE] l10n_in_hr_payroll: Add some contribution register and link them with salary rules
...
bzr revid: mra@tinyerp.com-20120807085528-x3esoi7w1wr07tpp
2012-08-07 14:25:28 +05:30
28a28a425c
[ADD]l10n_in_hr_payroll:batch_id field added in search view
...
bzr revid: kbh@tinyerp.com-20120807084201-sp61nrnqx4bvfcm9
2012-08-07 14:12:01 +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
2a7f04c40c
[IMP]l10n_in_hr_payroll:batch_id field added on advice and use it as batch reference
...
bzr revid: kbh@tinyerp.com-20120807061329-jtrwqgpzs4fg0kir
2012-08-07 11:43:29 +05:30
fb8cedcaf4
[REM]l10n_in_hr_payroll:unnecessary list
...
bzr revid: kbh@tinyerp.com-20120803115218-idsjn31q1wavlsjx
2012-08-03 17:22:18 +05:30
05f7b700de
[FIX]l10n_in_hr_payroll:query updated
...
bzr revid: kbh@tinyerp.com-20120803114853-7ra17yebqim6ct39
2012-08-03 17:18:53 +05:30
6b7fda8d2b
[FIX]l10n_in_hr_payroll:removed unnecesary if condition and rename variable
...
bzr revid: kbh@tinyerp.com-20120803103349-na0dtvidp8tn0u7v
2012-08-03 16:03:49 +05:30
562fb910cd
[FIX]l10n_in_hr_payroll:replace header with footer
...
bzr revid: kbh@tinyerp.com-20120803100843-byyg3x1szmqtc41i
2012-08-03 15:38:43 +05:30
2438b3e7ed
[FIX]l10n_in_hr_payroll:typo
...
bzr revid: kbh@tinyerp.com-20120803092636-po1r5jg1e0bgh8gc
2012-08-03 14:56:36 +05:30
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
498f0ae6ea
[REM]l10n_in_hr_payroll:unnesesary list removed
...
bzr revid: kbh@tinyerp.com-20120803063900-j31qbhjmsecojbke
2012-08-03 12:09:00 +05:30
a7232ac79f
[REM]l10n_in_hr_payroll:unnesesary list removed
...
bzr revid: kbh@tinyerp.com-20120803062930-u2hsy4m8s3nqfy9x
2012-08-03 11:59:30 +05:30
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
fbc07b29a6
[MERGE] l10n_in_hr_payroll: Override copy method for payslip and batch
...
bzr revid: mra@tinyerp.com-20120727081659-axbcwge85u8mzke4
2012-07-27 13:46:59 +05:30
a2a6385516
[IMP]l10n_in_hr_payroll: check box will not make duplicate for made payment order and payslip advice id
...
bzr revid: dsi@tinyerp.com-20120727072627-n79gah7ncve01ecv
2012-07-27 12:56:27 +05:30
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
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
f4ee139ba1
[IMP]l10n_in_hr_payroll: add yaml file for payment advice
...
bzr revid: dsi@tinyerp.com-20120726113110-stmumo4w50usxeo5
2012-07-26 17:01:10 +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
806ddaec0f
[FIX] l10n_in_hr_payroll: Fix payment advice report if the employee is not present
...
bzr revid: mra@tinyerp.com-20120726074034-w9sryg62d4x0no2k
2012-07-26 13:10:34 +05:30
cbde761af6
[IMP]l10n_in_hr_payroll: add yaml file for payment advice
...
bzr revid: dsi@tinyerp.com-20120726065130-xdhi6vnqinwu3i98
2012-07-26 12:21:30 +05:30
533e5d8bdc
[IMP] l10n_in_hr_payroll: Code clean
...
bzr revid: mra@tinyerp.com-20120726063757-mwagbj21a8hg8rc8
2012-07-26 12:07:57 +05:30
e6d0b95665
[IMP] l10n_in_hr_payroll: typo
...
bzr revid: mra@tinyerp.com-20120726063314-67w4cbokejy6eat7
2012-07-26 12:03:14 +05:30
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
c77fecd8f7
[IMP] l10n_in_hr_payroll: Menu name chagne to payroll statement
...
bzr revid: mra@tinyerp.com-20120726055602-ny4ldaoxg1mog2gw
2012-07-26 11:26:02 +05:30
8a9c1618f2
[IMP] l10n_in_hr_payroll: Small improvement
...
bzr revid: mra@tinyerp.com-20120726055406-h3pibgj7fw5r038v
2012-07-26 11:24:06 +05:30
56e10a0ef0
[IMP] l10n_in_hr_payroll: Small improvement
...
bzr revid: mra@tinyerp.com-20120726055237-fe2trv4lispbqx2o
2012-07-26 11:22:37 +05:30
7fa1140ca6
[IMP] l10n_in_hr_payroll: Improve Report of salary register
...
bzr revid: mra@tinyerp.com-20120726054102-w4xqw5u08r3lg0ii
2012-07-26 11:11:02 +05:30
2c8c4e3bec
[IMP]l10n_in_hr_payroll: add yaml file for payment advice
...
bzr revid: dsi@tinyerp.com-20120726050518-ew9n44q0fs4vfze1
2012-07-26 10:35:18 +05:30
bc2ef16941
[MERGE] l10n_in_hr_payroll: Report employee wise yearly salary (Still need to improve query)
...
bzr revid: mra@tinyerp.com-20120726044935-cjmm90uilmq14os8
2012-07-26 10:19:35 +05:30
bf015bbf36
[IMP]l10n_in_hr_payroll: add yaml file for payment advice
...
bzr revid: dsi@tinyerp.com-20120725111451-k7sfc5rj73njvdgr
2012-07-25 16:44:51 +05:30
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
e7288247b6
[FIX]l10n_in_hr_payroll:total of salary
...
bzr revid: kbh@tinyerp.com-20120725060814-jech1omb9vquin7v
2012-07-25 11:38:14 +05:30
7e6d5474f4
[FIX]l10n_in_hr_payroll:variable name changed
...
bzr revid: kbh@tinyerp.com-20120724130149-7foqh69oevgzwd9s
2012-07-24 18:31:49 +05:30
d0827a266b
[FIX]l10n_in_hr_payroll:salary register report of employee improved
...
bzr revid: kbh@tinyerp.com-20120724125458-o5zcve0l3qbq8ubj
2012-07-24 18:24:58 +05:30
f21d970258
[IMP]l10n_in_hr_payroll:file rename
...
bzr revid: kbh@tinyerp.com-20120720111010-2ckdznetj8ykd792
2012-07-20 16:40:10 +05:30
2383591584
[MERGE] l10n_in_hr_payroll: Add functionality if the boolean of neft ticked on advice it wil show to ifsc code on advice lines
...
bzr revid: mra@tinyerp.com-20120720110953-3yjf2blf4ducwyds
2012-07-20 16:39:53 +05:30
a0b08a77a6
[IMP]l10n_in_hr_payroll:typo
...
bzr revid: kbh@tinyerp.com-20120720104051-sjfxjcq0kqegwrnp
2012-07-20 16:10:51 +05:30
c9895afa41
[IMP] l10n_in_hr_payroll: removed tree view for advice lines
...
bzr revid: mtr@tinyerp.com-20120720103911-x4i3250zjo3fpsot
2012-07-20 16:09:11 +05:30
3ae4fd6bf7
[IMP]l10n_in_hr_payroll:typo
...
bzr revid: kbh@tinyerp.com-20120720103610-exq3v9rnwg8xjsdz
2012-07-20 16:06:10 +05:30
921db910e6
[IMP]l10n_in_hr_payroll:typo
...
bzr revid: kbh@tinyerp.com-20120720103401-pzlg0jkcu3lw95aw
2012-07-20 16:04:01 +05:30
a89806dc05
[IMP]l10n_in_hr_payroll:typo
...
bzr revid: kbh@tinyerp.com-20120720102419-axh96q4li89y5qw8
2012-07-20 15:54:19 +05:30
cd203da095
[IMP]l10n_in_hr_payroll:report rml improved
...
bzr revid: kbh@tinyerp.com-20120720101740-07frj5y57h79vx8z
2012-07-20 15:47:40 +05:30
bf57c5b1ed
[IMP] l10n_in_hr_payroll: added related field 'ifsc' to set attrs on 'ifsc_code' and added view for advice lines
...
bzr revid: mtr@tinyerp.com-20120720095749-6z3h3iu2vvoizj4i
2012-07-20 15:27:49 +05:30
2e4fe7dee7
[IMP]l10n_in_hr_payroll:report rml improved
...
bzr revid: kbh@tinyerp.com-20120720095528-rencfiorrdvsh2vi
2012-07-20 15:25:28 +05:30
e43a303093
[IMP]l10n_in_hr_payroll:report improved
...
bzr revid: kbh@tinyerp.com-20120720091634-eyrajix3k2yh9xxg
2012-07-20 14:46:34 +05:30
4b8f5ce491
[FIX]remove unnecessay change
...
bzr revid: kbh@tinyerp.com-20120719131728-f70xb2umme3s8mz6
2012-07-19 18:47:28 +05:30
4a87389f31
[MERGE]merge with project branch and resolve conflicts
...
bzr revid: kbh@tinyerp.com-20120719115638-yd622zv6okdtaxfa
2012-07-19 17:26:38 +05:30
b0508a59a8
[IMP]l10n_in_hr_payroll
...
bzr revid: kbh@tinyerp.com-20120719113957-82wtpw19p9h5ihjv
2012-07-19 17:09:57 +05:30
5fac058f75
[IMP]l10n_in_hr_payroll:report name and id changed
...
bzr revid: kbh@tinyerp.com-20120719113710-5ovwnznclp2j0efd
2012-07-19 17:07:10 +05:30
2e777fa99e
[IMP]l10n_in_hr_payroll:query updated
...
bzr revid: kbh@tinyerp.com-20120719111930-gvuhcf6n5qkg9zk3
2012-07-19 16:49:30 +05:30
df4139ff08
[FIX]reml updated
...
bzr revid: kbh@tinyerp.com-20120719110144-aul91plaakwa6h00
2012-07-19 16:31:44 +05:30
adcd986ebf
[FIX]typo
...
bzr revid: kbh@tinyerp.com-20120719053053-ic63122f6fllw87c
2012-07-19 11:00:53 +05:30
e136fba798
[FIX]remove print
...
bzr revid: kbh@tinyerp.com-20120718131933-mnyg1dpuchzmqb91
2012-07-18 18:49:33 +05:30
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
06d731ebd2
[MERGE] l10n_in_hr_payroll: Report fix
...
bzr revid: mra@tinyerp.com-20120718121139-oplqvkxunbj9i4zj
2012-07-18 17:41:39 +05:30
3ddfbce96e
[IMP]l10n_in_hr_payroll: Set Total Below Bank Account number with Total Amount in rml Report
...
bzr revid: dsi@tinyerp.com-20120718102638-1a1jkjvh5tbtw7ot
2012-07-18 15:56:38 +05:30
c0cbde43f1
[IMP] l10n_in_hr_payroll: typo
...
bzr revid: mra@tinyerp.com-20120718094401-lxe5xava781vddle
2012-07-18 15:14:01 +05:30
897a82a91e
[MERGE] l10n_in_hr_payroll: Advice analyis report added
...
bzr revid: mra@tinyerp.com-20120718093921-2dvnf6pqa79jkrsq
2012-07-18 15:09:21 +05:30
780eac4177
[IMP] l10n_in_hr_payroll: changed menu sequence
...
bzr revid: mtr@tinyerp.com-20120718085218-6kgrkivfg7rgoofe
2012-07-18 14:22:18 +05:30
180b120569
[MERGE] l10n_in_hr_payroll: Advice report with correct format
...
bzr revid: mra@tinyerp.com-20120718061835-ghgyj2qcpnqffwge
2012-07-18 11:48:35 +05:30
8f3156f060
[MERGE] branch merged with trunk-payroll-india-mra
...
bzr revid: mtr@tinyerp.com-20120718055826-1bs9xu2egant55pv
2012-07-18 11:28:26 +05:30
fe95680945
[IMP] l10n_in_hr_payroll: added fields and modified query for NEFT and IFSC code
...
bzr revid: mtr@tinyerp.com-20120718054226-m8m2ubrcmho6p1ui
2012-07-18 11:12:26 +05:30
dfb97e2141
[IMP] l10n_in_hr_payroll: Icon improved
...
bzr revid: mra@tinyerp.com-20120718052454-7qx9zgpl7k7h1xjd
2012-07-18 10:54:54 +05:30
43dadb1c10
[MERGE] l10n_in_hr_payroll: On Batch now User can create advice using separate button
...
bzr revid: mra@tinyerp.com-20120718051617-a5o1gwp2iajjo94w
2012-07-18 10:46:17 +05:30
783128639f
[IMP] l10n_in_hr_payroll: added 'To Advice' button in search view of payslip run
...
bzr revid: mtr@tinyerp.com-20120717132434-r2kvt0yx5ev18msa
2012-07-17 18:54:34 +05:30
5884f6dabe
[IMP] l10n_in_hr_payroll: changed string
...
bzr revid: mtr@tinyerp.com-20120717111934-j6rkorvnaubk7rdm
2012-07-17 16:49:34 +05:30
f6368e13f7
[IMP] l10n_in_hr_payroll: improved string and code for boolean field
...
bzr revid: mtr@tinyerp.com-20120717104856-pd8oox9jm9c25raq
2012-07-17 16:18:56 +05:30
6eca282266
[IMP]l10n_in_hr_payroll: Set Total Under Bank Account number with Total Amount in rml Report
...
bzr revid: dsi@tinyerp.com-20120717103010-3rxeby7fjskvmu3v
2012-07-17 16:00:10 +05:30
be188bedab
[MERGE] branch merged with trunk-payroll-india-mra
...
bzr revid: mtr@tinyerp.com-20120717084325-lr81od3q7x2veltx
2012-07-17 14:13:25 +05:30
c4493dae4b
[IMP] l10n_in_hr_payroll: added boolean field on payslip run to indicate that 'Payment Advice' exist or not.
...
bzr revid: mtr@tinyerp.com-20120717072128-fc9hxxlqnrnh6l6o
2012-07-17 12:51:28 +05:30
b52efe5f85
[MERGE] l10n_in_hr_payroll: Add field on payment advice alled neft if it tick then it should have ifsc code on advice line + Improve the report of advice
...
bzr revid: mra@tinyerp.com-20120716130432-nhuf13z3prdmwt76
2012-07-16 18:34:32 +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
320ae4630d
[MERGE] l10n_in_hr_payroll: Advice create from Payslip batch/run now, Fix error on create_advice button + add workflow action when you create advice it will close/confirm all the payslips
...
bzr revid: mra@tinyerp.com-20120716111244-3r8stz3e77229x35
2012-07-16 16:42:44 +05:30
499b09e466
[IMP]l10n_in_hr_payroll,hr_payroll: remove unnecessary change
...
bzr revid: pat@tinyerp.com-20120716090515-n4e55i7ip5w2vvg4
2012-07-16 14:35:15 +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
aad3669928
[MERGE] branch merged with trunk-payroll-india-mra
...
bzr revid: dsi@tinyerp.com-20120716064339-cpl2uf48nc49yj6m
2012-07-16 12:13:39 +05:30
ed4ca43c69
[IMP]hr_payroll: resolve conflicts
...
bzr revid: pat@tinyerp.com-20120716055914-ps31ejm29hlez34y
2012-07-16 11:29:14 +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
1b4dd5856e
[IMP]hr_payroll: create button
...
bzr revid: pat@tinyerp.com-20120713120927-pnx0qdmsjxgn9som
2012-07-13 17:39:27 +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
037b2d30b6
[IMP]l10n_in_hr_payroll: gives IFSC code with bank account number of conc^Cned person
...
bzr revid: dsi@tinyerp.com-20120713105218-qp1v3w874ahzvpla
2012-07-13 16:22:18 +05:30
87bdb4895d
[IMP]hr_payroll: create button
...
bzr revid: pat@tinyerp.com-20120713104501-kp20pumuiyrwdaip
2012-07-13 16:15:01 +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
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
dcfbcaaaff
[IMP] l10n_in_hr_payroll: minor changes in search view of 'Payment Advices'
...
bzr revid: mtr@tinyerp.com-20120713083846-1qpo7rjxego4012j
2012-07-13 14:08:46 +05:30
b3285b426f
[IMP]l10n_in_hr_payroll: gives IFSC code with bank account number of conc^Cned person
...
bzr revid: dsi@tinyerp.com-20120713063831-djo31ykbr3jve49h
2012-07-13 12:08:31 +05:30
221013aab1
[IMP]l10n_in_hr_payroll: gives bank account number of concerned person
...
bzr revid: dsi@tinyerp.com-20120710054811-j3xqxakm5jsod9ng
2012-07-10 11:18:11 +05:30
3ce1e711c5
[IMP] l10n_in_hr_payroll : improve onchange event
...
bzr revid: pat@tinyerp.com-20120709114112-4vxp86voy9ys106d
2012-07-09 17:11:12 +05:30
a5bfe8212a
[IMP]l10n_in_hr_payroll: add the required field and done some improvement in py,sxw and rml
...
bzr revid: dsi@tinyerp.com-20120709062905-l0c8rk4q7e3bp3mb
2012-07-09 11:59:05 +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
c8741b7680
[IMP] l10n_in_hr_payroll: Confirm advice and Compute advice buttons red in Payment Advice
...
bzr revid: mra@tinyerp.com-20120704043352-vsajq8v1f1lj2bv1
2012-07-04 10:03:52 +05:30
bd0f2d0468
[FIX] l10n_in_hr_payroll: if there is not bank account number on employee raise warning
...
bzr revid: mra@tinyerp.com-20120704042327-qiy2r3xza5xjeykh
2012-07-04 09:53:27 +05:30
d2ee78a0b2
[FIX] l10n_in_hr_payroll: typos
...
bzr revid: mra@tinyerp.com-20120703130049-51f02u2civ1yhmtp
2012-07-03 18:30:49 +05:30
45136ad569
[FIX] l10n_in_hr_payroll: Add default of DA to company with true value
...
bzr revid: mra@tinyerp.com-20120702093815-oowniwkm5yk2n0eq
2012-07-02 15:08:15 +05:30
c97219fbbd
[FIX] l10n_in_hr_payroll: Fix view inhritance
...
bzr revid: mra@tinyerp.com-20120702072432-gdmypy92cx0ila7o
2012-07-02 12:54:32 +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
deb3b1161e
[IMP]field added for calulating salary rule for DA,view for the same
...
bzr revid: kbh@tinyerp.com-20120629054118-4mqwotwzexl4daky
2012-06-29 11:11:18 +05:30
555d9ce0a3
[REM] l10n_in_hr_payroll: Remove group from act window of Payslip on Advice
...
bzr revid: mra@tinyerp.com-20120629053456-eyeiy6gtahddj44z
2012-06-29 11:04:56 +05:30
4bfaeb5e17
[IMP] l10n_in_hr_payroll: Clean
...
bzr revid: mra@tinyerp.com-20120629051711-ql2954rycp5raite
2012-06-29 10:47:11 +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
634646956b
[FIX] l10n_in_hr_payroll: Small fix
...
bzr revid: mra@tinyerp.com-20120628062741-1ob3zfgddl10gexo
2012-06-28 11:57:41 +05:30
f89a0d946c
[IMP]improved advice form view and date field required.
...
bzr revid: kbh@tinyerp.com-20120628053759-k9tdeiubt882fufa
2012-06-28 11:07:59 +05:30
35a9faf9ed
[IMP]improved payroll advice form view
...
bzr revid: kbh@tinyerp.com-20120627105052-i14kz4wz47v5lrnk
2012-06-27 16:20:52 +05:30
4365592320
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120627091101-ljbsd9v8568swar8
2012-06-27 14:41:01 +05:30
cb586e2e4b
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120627091005-b9ojnfiiqs6uavh1
2012-06-27 14:40:05 +05:30
82246cfb09
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120627090004-onw7v1m2lfshfovh
2012-06-27 14:30:04 +05:30
f9eebe87ab
[IMP] l10n_in_hr_payroll: Add store=True for company on advice line
...
bzr revid: mra@tinyerp.com-20120627085447-o3qt1h9a8ka4462m
2012-06-27 14:24:47 +05:30
ac3241ed13
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120627072622-h8vlzlai418y2o7e
2012-06-27 12:56:22 +05:30
9e43d3db91
typo
...
bzr revid: mra@tinyerp.com-20120627061404-et3mugyf2l39xiz9
2012-06-27 11:44:04 +05:30
f30c694150
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120627054441-fw274wtwwua3m2ox
2012-06-27 11:14:41 +05:30
9c9f189d43
[FIX].
...
bzr revid: kbh@tinyerp.com-20120626105140-xj5oz4u5l8cuhms8
2012-06-26 16:21:40 +05:30
1461900731
[IMP]removed . from help,removed select attribute from view and added act window for payslips of advices.
...
bzr revid: kbh@tinyerp.com-20120626104858-z7htwjuid3p6e7mx
2012-06-26 16:18:58 +05:30
f7278c6baf
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120626072858-pcw2dfvblv3pe6ng
2012-06-26 12:58:58 +05:30
f57b58bbd2
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120626071459-ltbasivd1hnpwpr8
2012-06-26 12:44:59 +05:30
f227e6548b
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120626071346-exs4zrnekx5icssq
2012-06-26 12:43:46 +05:30
58f579fff1
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120626071207-6u95sv62ybz4bc33
2012-06-26 12:42:07 +05:30
f7d64e909c
[FIX]
...
bzr revid: mra@tinyerp.com-20120626070918-a0ll1d8277udq9d0
2012-06-26 12:39:18 +05:30
f1b51af5d4
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120626070326-ovs3a42usmrf1rms
2012-06-26 12:33:26 +05:30
f1523e3ab7
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120626070246-v336zy1roe0ekqmr
2012-06-26 12:32:46 +05:30
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
738827e885
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120626063309-qv0thobubn75kjg1
2012-06-26 12:03:09 +05:30
c71ceea1a4
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120626063219-fgaaklh8koi4azii
2012-06-26 12:02:19 +05:30
95a64af19e
[FIX]
...
bzr revid: mra@tinyerp.com-20120626063003-5sh236r4otzgxly6
2012-06-26 12:00:03 +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
1928914825
[IMP] typo
...
bzr revid: mra@tinyerp.com-20120626060354-jyqzuxdi9y30jzr3
2012-06-26 11:33:54 +05:30
b4ee40fb17
[IMP]header added in report
...
bzr revid: kbh@tinyerp.com-20120626052222-3aqu7j8fuquygbny
2012-06-26 10:52:22 +05:30
15d17cc149
[MERGE] merge kbh branch for i18n
...
bzr revid: mra@tinyerp.com-20120625110432-oq8gau00aaxae2ed
2012-06-25 16:34:32 +05:30
a40fa1a25a
[MERGE] improve and merge kbh branch
...
lp:~openerp-dev/openerp-india/payroll-india-trunk-report-payroll-advice-kbh
bzr revid: mra@tinyerp.com-20120625105958-tuxwpe0t35w5e7io
2012-06-25 16:29:58 +05:30
136da17cb3
[FIX]removed duplicate msgid from po and pot file.
...
bzr revid: kbh@tinyerp.com-20120625093752-ekym79961h5f2fbu
2012-06-25 15:07:52 +05:30
02f0cec18c
[FIX]removed wrong translation from msgstr in po and pot file.
...
bzr revid: kbh@tinyerp.com-20120625083923-nlkmdeiw8bl2jfd7
2012-06-25 14:09:23 +05:30
56dbf247d3
[ADD]added doc strings in methods.
...
bzr revid: kbh@tinyerp.com-20120618111022-0mqf7ydd3n08hsgx
2012-06-18 16:40:22 +05:30
07081e4b73
[FIX]report modified.
...
bzr revid: kbh@tinyerp.com-20120618055642-1p2uztplg15ceu03
2012-06-18 11:26:42 +05:30
83ffb793b7
[MERGE] Merge KBH branch after some improvements
...
lp:~openerp-dev/openerp-india/payroll-india-trunk-fix-salary-rule-and-sequence-kbh
bzr revid: mra@tinyerp.com-20120615122901-0stkgknu120r1mk8
2012-06-15 17:59:01 +05:30
c740e3fdf8
[FIX].
...
bzr revid: kbh@tinyerp.com-20120615120341-0paz93bx2luwrqi6
2012-06-15 17:33:41 +05:30
16fc152485
[FIX]dict update.
...
bzr revid: kbh@tinyerp.com-20120615115934-6i5nmzq2jmijvxn9
2012-06-15 17:29:34 +05:30
94059b2cda
[FIX]return added.
...
bzr revid: kbh@tinyerp.com-20120615110656-kuyp9z4swxqcovoq
2012-06-15 16:36:56 +05:30
8c8de36e18
[FIX]prefix of sequence changed.
...
bzr revid: kbh@tinyerp.com-20120615104651-yyrys4pqgfuechly
2012-06-15 16:16:51 +05:30
2f43fd498e
[FIX]sequence number changed,rename security file.
...
bzr revid: kbh@tinyerp.com-20120615095732-869m6lnbrwgax3ec
2012-06-15 15:27:32 +05:30
a0aacb805a
[MERGE]merge with project branch
...
bzr revid: kbh@tinyerp.com-20120615071522-ieb77ejkmdv4b15x
2012-06-15 12:45:22 +05:30
bb4b61a709
[MERGE] Merge KBH Branch
...
lp:~openerp-dev/openerp-india/payroll-india-trunk-payroll-advice-improvements-kbh
bzr revid: mra@tinyerp.com-20120615070820-2psbmzwao2671tgt
2012-06-15 12:38:20 +05:30
bfc3f9774a
[IMP]sequence set on confirm button,company field readonly on confirm,field name set as letter detail.
...
bzr revid: kbh@tinyerp.com-20120614124533-h1jdw9692uj8ptk5
2012-06-14 18:15:33 +05:30
18112a5ee0
[IMP]report improved.
...
bzr revid: kbh@tinyerp.com-20120614122919-sfucseuqr9z94mpg
2012-06-14 17:59:19 +05:30
374c088825
[IMP/ADD]changed msgid and added file for bengali language
...
bzr revid: kbh@tinyerp.com-20120614055209-4hc7kw2rwukc7jv5
2012-06-14 11:22:09 +05:30
1d4fbdeebc
[ADD]added i18n for language translations.
...
bzr revid: kbh@tinyerp.com-20120613131547-vvzj19r5pjcgqok1
2012-06-13 18:45:47 +05:30
Mustufa Rangwala (OpenERP)
Khushboo Bhatt (Open ERP)
Digvijay Singh
Meera Trambadia (OpenERP)
Ankita Patel (OpenERP)
Jagdish Panchal (Open ERP)