Vo Minh Thu
713ff5c65d
[FIX] use openerp namespace.
...
bzr revid: vmt@openerp.com-20130219084255-m8kxcsejob64hh72
2013-02-19 09:42:55 +01:00
Raphael Collet
5f855a1ddb
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20130213083519-3nbg40h5em0gfeu3
2013-02-13 09:35:19 +01:00
Vo Minh Thu
02a114fe3b
[FIX] import openerp.{netsvc,tools} instead of {netsvc,tools} in YML tests.
...
bzr revid: vmt@openerp.com-20130209062929-g85yauw92vj9wqpb
2013-02-09 07:29:29 +01:00
Launchpad Translations on behalf of openerp
81a9933636
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130207045357-zi501udzkv6jgk72
bzr revid: launchpad_translations_on_behalf_of_openerp-20130208043624-wlpf8azwrbwi930l
2013-02-08 04:36:24 +00:00
Launchpad Translations on behalf of openerp
b64db1c007
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130207054227-fy00xo21liqcoqz8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130207054231-c558abx56zwr0mg2
2013-02-07 05:42:31 +00:00
Launchpad Translations on behalf of openerp
996746634f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130205052331-pkjgm8c2lnxld0x6
2013-02-05 05:23:31 +00:00
Ajay Chauhan (OpenERP)
82ecabb0f5
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20130201130659-buvkd7lq4xp5nu1d
2013-02-01 18:36:59 +05:30
Ajay Chauhan (OpenERP)
d43fa72736
[FIX] l10n_in_hr_payroll: removed unused imports.
...
bzr revid: cha@tinyerp.com-20130131093901-423rr2g3h5ke0vpb
2013-01-31 15:09:01 +05:30
Launchpad Translations on behalf of openerp
b390a5697c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130126050355-xxot322zn826zr96
bzr revid: launchpad_translations_on_behalf_of_openerp-20130127043627-b85ckledrtpdd73m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130128051345-a31wsrx74u1w228d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130129052015-doewhw7byebeeijs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130130043841-h15p02at1d6o2clr
2013-01-30 04:38:41 +00:00
Launchpad Translations on behalf of openerp
39951ce27c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130125060526-1sardheh24y8unc0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130126053740-34a73mqkdg04j9s4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130127051008-60htke4mkwclnqfk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130128055849-swluxyrhgvpbmrg2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130129061824-peffot06nnwkgdkp
2013-01-29 06:18:24 +00:00
Vo Minh Thu
752649aa77
[IMP] l10n_in_hr_payroll: use the new signal_xxx methods instead of trg_validate.
...
bzr revid: vmt@openerp.com-20130128152916-kt23l68420hkg49y
2013-01-28 16:29:16 +01:00
Launchpad Translations on behalf of openerp
7a49719d46
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130118071051-e8wytix67wlb17yd
2013-01-18 07:10:51 +00:00
Launchpad Translations on behalf of openerp
7212971359
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222062604-dkriii8eozvsup5y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044904-96hdn6ba6yrv4f9j
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226044702-qvjpmsxaacy1cg43
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050621-bg925wq3m04p2g71
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050125-ezgc0pyinpf7cjpa
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231044027-9ufahl14z8fnhu6p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101044603-wg53ihk00q2059zn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103044748-vijpm6xa5a4wkx8s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104044725-gnjicg5umjgca6x4
bzr revid: launchpad_translations_on_behalf_of_openerp-20121227052240-6m8i7kropwavbcnh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121228051144-leldhj31i0soxbew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050213-cxzd31aqqltp6q2x
bzr revid: launchpad_translations_on_behalf_of_openerp-20121230052006-x87nblyyoe179wg8
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231044049-m31tcl22nog279qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101044622-7p5h1mf14m4tlue5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102043722-j7bk1uojgtgsz7u1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103044815-xswvowa7jeizv4jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104044801-0v8fmmv0jl7itv9b
2013-01-04 04:48:01 +00:00
Launchpad Translations on behalf of openerp
fca02afad3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101051924-2q3t0sbo83ti3ooe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102052612-z5wooakbv4fnww9x
2013-01-02 05:26:12 +00:00
Launchpad Translations on behalf of openerp
5c360f7327
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121225044840-forvhhdzu8wfuw2y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226043938-300zdp9oob5hc6e6
2012-12-26 04:39:38 +00:00
Launchpad Translations on behalf of openerp
f49cf3ad50
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222073731-s1qift4p97f9s1zf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223050857-vzu6pl7ttzy10603
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224051043-oxj4lz3tpjhai7hn
2012-12-24 05:10:43 +00:00
Launchpad Translations on behalf of openerp
2315050bab
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220044654-aygk0cmaxl26bs0f
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220045947-8j22pe4nm62kzq22
2012-12-20 04:59:47 +00:00
Cecile Tonglet
a3939acfa5
[FIX] replace from/import decimal_precision by from/import openerp.addons.decimal_precision
...
bzr revid: cto@openerp.com-20121217152303-8e3b1x30rlw9cb0d
2012-12-17 16:23:03 +01:00
Cecile Tonglet
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Launchpad Translations on behalf of openerp
a7ddf7c689
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217044754-0kl222skaeva43lx
bzr revid: launchpad_translations_on_behalf_of_openerp-20121216050743-iza21869j5keaqi5
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217045834-1f6wbi5gkmzotgsl
2012-12-17 04:58:34 +00:00
Launchpad Translations on behalf of openerp
cc8025387b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053905-mac64ijay9566opr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214054902-12ndwftreb4g1964
2012-12-14 05:49:02 +00:00
Launchpad Translations on behalf of openerp
d6ea61789f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213044507-t1hpxi43gks88w2e
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213050131-3r9t674ehhnkneky
2012-12-13 05:01:31 +00:00
Vo Minh Thu
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Launchpad Translations on behalf of openerp
828cce9be0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125063324-fjz8k77annh364u7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126044235-u20vi1440dgppikf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125064209-s515ia18188hl147
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126045508-rm6d2mx71a0sjqh9
2012-11-26 04:55:08 +00:00
Launchpad Translations on behalf of openerp
117bf937b9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124055830-p04ni2o2ogsch9zc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124065500-zwtkurcb1ic9ktqb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124070752-itto1xb6r6oao3z5
2012-11-24 07:07:52 +00:00
Olivier Dony
771b216118
[I18N] Update translation templates in preparation for 7.0 release
...
bzr revid: odo@openerp.com-20121124030804-9dvr1qwec830p8fc
2012-11-24 04:08:04 +01:00
Launchpad Translations on behalf of openerp
7113965a6d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121113051721-ejf86rj1g6qkdbo9
2012-11-13 05:17:21 +00:00
Launchpad Translations on behalf of openerp
87d3caa50f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
Fabien Pinckaers
a7368145ca
[MERGE] typo
...
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
Launchpad Translations on behalf of openerp
5bfa3c5a7d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
Mayur Maheshwari (OpenERP)
8346293d72
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121015090200-irfaskfn9i1p68j9
bzr revid: mma@tinyerp.com-20121016052513-vl56jxtp7xbpa2ry
2012-10-16 10:55:13 +05:30
Mayur Maheshwari (OpenERP)
0b87880029
[IMP]all: imporve string state to status
...
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Quentin (OpenERP)
00f3dfc6d8
[MERGE] use of formatLAng(amount, currency_obj=...) and use of display_address() in reports
...
bzr revid: qdp-launchpad@openerp.com-20121012071640-sxhy9xnat65r8158
2012-10-12 09:16:40 +02:00
Fabien Pinckaers
914498d2ff
[MERGE] trunk
...
bzr revid: fp@tinyerp.com-20121011081908-fu1don49seb3loro
2012-10-11 10:19:08 +02:00
Quentin (OpenERP)
ce440f16d3
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121011075658-bf5ax000j74vi6ro
2012-10-11 09:56:58 +02:00
Launchpad Translations on behalf of openerp
fc94df2af5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121011050045-qe3vhe34wrjw1xb8
2012-10-11 05:00:45 +00:00
pankita shah (Open ERP)
9b01d91679
[IMP] currency in l10_in_hr_payroll
...
bzr revid: shp@tinyerp.com-20121003071421-c5kd08mhiumoh6fv
2012-10-03 12:44:21 +05:30
Atul Patel (OpenERP)
8d3086df28
[IMP]: Use display_address()
...
bzr revid: atp@tinyerp.com-20121002144547-kpbo8wv694qipvm0
2012-10-02 20:15:47 +05:30
Nimesh (Open ERP)
a9676cfd8c
[IMP] amout with currency.
...
bzr revid: nco@tinyerp.com-20121001110802-r3l169i2ka73t2rh
2012-10-01 16:38:02 +05:30
Nimesh (Open ERP)
8c42299413
[REMOVE] remove create button form all posgress report.
...
bzr revid: nco@tinyerp.com-20120927083839-ruhpxzwgdyasodfe
2012-09-27 14:08:39 +05:30
Twinkle Christian (OpenERP)
3795da5211
[IMP]Remove type field from the l10n_in_hr_payroll
...
bzr revid: tch@tinyerp.com-20120910111501-aj9g177cvhnw2whp
2012-09-10 16:45:01 +05:30
Fabien Pinckaers
bce12722a3
[MERGE] l10n_india_payroll
...
bzr revid: fp@tinyerp.com-20120907153158-3fa4aebapki0fhw9
2012-09-07 17:31:58 +02:00
Khushboo Bhatt (Open ERP)
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
Mustufa Rangwala (OpenERP)
95c0fec699
[MERGE] l10n_in_hr_payroll: Improve salary rules
...
bzr revid: mra@tinyerp.com-20120829121912-rhsuygls3ot6yn9s
2012-08-29 17:49:12 +05:30
Khushboo Bhatt (Open ERP)
699720066b
[FIX]l10n_in_hr_payroll:description added
...
bzr revid: kbh@tinyerp.com-20120829110528-mcvijjnfzt5xj594
2012-08-29 16:35:28 +05:30
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Mustufa Rangwala (OpenERP)
6aa5ea647f
[IMP] l10n_in_hr_payroll: typo
...
bzr revid: mra@tinyerp.com-20120827052843-tx702vetryimkldk
2012-08-27 10:58:43 +05:30
Mustufa Rangwala (OpenERP)
ee80611902
[IMP] l10n_in_hr_payroll: typo
...
bzr revid: mra@tinyerp.com-20120827051507-d6jpql116j7s8q3k
2012-08-27 10:45:07 +05:30
Mustufa Rangwala (OpenERP)
239012ff9d
[FIX] l10n_in_hr_payroll: small fix
...
bzr revid: mra@tinyerp.com-20120824114341-cah1258419d439ge
2012-08-24 17:13:41 +05:30
Mustufa Rangwala (OpenERP)
47e33a1d70
[FIX] l10n_in_hr_payroll: small fix
...
bzr revid: mra@tinyerp.com-20120824110146-n70knsb0c1fn5sfe
2012-08-24 16:31:46 +05:30
Mustufa Rangwala (OpenERP)
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
Mustufa Rangwala (OpenERP)
76bbd83c30
[MERGE] l10n_in_hr_payrol: typo
...
bzr revid: mra@tinyerp.com-20120824105120-vzp8avej8tyofwx5
2012-08-24 16:21:20 +05:30
Mustufa Rangwala (OpenERP)
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
Khushboo Bhatt (Open ERP)
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
Mustufa Rangwala (OpenERP)
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
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)
d690ebdf16
[MERGE] l10n_in_hr_payroll: report improved
...
bzr revid: mra@tinyerp.com-20120823110835-h33lannwn66c5c34
2012-08-23 16:38:35 +05:30
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Mustufa Rangwala (OpenERP)
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
Mustufa Rangwala (OpenERP)
05005a5ff3
[IMP] Typo
...
bzr revid: mra@tinyerp.com-20120823050404-yc5pbt3ezv0gu3li
2012-08-23 10:34:04 +05:30
Khushboo Bhatt (Open ERP)
8ad4dd41c8
[IMP]l10n_in_hr_payroll:note added
...
bzr revid: kbh@tinyerp.com-20120822132229-abjrha00701xbyd3
2012-08-22 18:52:29 +05:30
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Mustufa Rangwala (OpenERP)
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
Khushboo Bhatt (Open ERP)
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
Mustufa Rangwala (OpenERP)
0364cffb0f
[FIX] l10n_in_hr_payroll: YAML Fix
...
bzr revid: mra@tinyerp.com-20120816101547-tahjdcbuocg3727f
2012-08-16 15:45:47 +05:30
Mustufa Rangwala (OpenERP)
d38148abba
[FIX] l10n_in_hr_payroll: YAML Fix
...
bzr revid: mra@tinyerp.com-20120816092010-vq3eqe8prjufd0rc
2012-08-16 14:50:10 +05:30
Mustufa Rangwala (OpenERP)
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
Mustufa Rangwala (OpenERP)
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
Mustufa Rangwala (OpenERP)
5c47881729
[MERGE] l10n_in_hr_payroll: Add yaml
...
bzr revid: mra@tinyerp.com-20120814094105-xh8g9ni41oc6fh26
2012-08-14 15:11:05 +05:30
Khushboo Bhatt (Open ERP)
8bdf79744b
[IMP]code added for checking advice in yml.
...
bzr revid: kbh@tinyerp.com-20120814053847-hrxby3r1s17l7uwr
2012-08-14 11:08:47 +05:30
Khushboo Bhatt (Open ERP)
08460d4dcd
[IMP]implemented payslip batch yml
...
bzr revid: kbh@tinyerp.com-20120813122117-qlfgnep0z50ko7ql
2012-08-13 17:51:17 +05:30
Mustufa Rangwala (OpenERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
226e281b55
[IMP]l10n_in_hr_payroll:string added
...
bzr revid: kbh@tinyerp.com-20120813073600-g23vkk2h9sviuvr0
2012-08-13 13:06:00 +05:30
Khushboo Bhatt (Open ERP)
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
Mustufa Rangwala (OpenERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
25e8f30e2d
[FIX]l10n_in_hr_payroll:default category set
...
bzr revid: kbh@tinyerp.com-20120809110010-7v74el735iu6lhe3
2012-08-09 16:30:10 +05:30
Khushboo Bhatt (Open ERP)
9c87c50576
[IMP]l10n_in_hr_payroll:code improved
...
bzr revid: kbh@tinyerp.com-20120809084238-h6vbx225ed3mxlv1
2012-08-09 14:12:38 +05:30
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
9c6f894e3b
[MERGE]merge with project branch
...
bzr revid: kbh@tinyerp.com-20120808072301-hzle885ufot6rsxo
2012-08-08 12:53:01 +05:30
Khushboo Bhatt (Open ERP)
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
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
Mustufa Rangwala (OpenERP)
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
Khushboo Bhatt (Open ERP)
3ace48df64
[FIX]l10n_in_hr_payroll:list added
...
bzr revid: kbh@tinyerp.com-20120808045647-b0sm9nut4kii35j0
2012-08-08 10:26:47 +05:30
Khushboo Bhatt (Open ERP)
b7e50727cc
[IMP]l10n_in_hr_payroll:code improved
...
bzr revid: kbh@tinyerp.com-20120807132905-9cz330v0fmjzyjuq
2012-08-07 18:59:05 +05:30
Khushboo Bhatt (Open ERP)
116191f725
[IMP]l10n_in_hr_payroll:code improved
...
bzr revid: kbh@tinyerp.com-20120807125407-f3jhkju13qru50y0
2012-08-07 18:24:07 +05:30
Mustufa Rangwala (OpenERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
6694495343
[FIX]l10n_in_hr_payroll:register name changed
...
bzr revid: kbh@tinyerp.com-20120807083734-yhob146pybjykuex
2012-08-07 14:07:34 +05:30
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
fb8cedcaf4
[REM]l10n_in_hr_payroll:unnecessary list
...
bzr revid: kbh@tinyerp.com-20120803115218-idsjn31q1wavlsjx
2012-08-03 17:22:18 +05:30
Khushboo Bhatt (Open ERP)
05f7b700de
[FIX]l10n_in_hr_payroll:query updated
...
bzr revid: kbh@tinyerp.com-20120803114853-7ra17yebqim6ct39
2012-08-03 17:18:53 +05:30
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
2438b3e7ed
[FIX]l10n_in_hr_payroll:typo
...
bzr revid: kbh@tinyerp.com-20120803092636-po1r5jg1e0bgh8gc
2012-08-03 14:56:36 +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)
498f0ae6ea
[REM]l10n_in_hr_payroll:unnesesary list removed
...
bzr revid: kbh@tinyerp.com-20120803063900-j31qbhjmsecojbke
2012-08-03 12:09:00 +05:30
Khushboo Bhatt (Open ERP)
a7232ac79f
[REM]l10n_in_hr_payroll:unnesesary list removed
...
bzr revid: kbh@tinyerp.com-20120803062930-u2hsy4m8s3nqfy9x
2012-08-03 11:59:30 +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)
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
Digvijay Singh
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
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
Digvijay Singh
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
Mustufa Rangwala (OpenERP)
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
Mustufa Rangwala (OpenERP)
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
Digvijay Singh
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
Mustufa Rangwala (OpenERP)
533e5d8bdc
[IMP] l10n_in_hr_payroll: Code clean
...
bzr revid: mra@tinyerp.com-20120726063757-mwagbj21a8hg8rc8
2012-07-26 12:07:57 +05:30
Mustufa Rangwala (OpenERP)
e6d0b95665
[IMP] l10n_in_hr_payroll: typo
...
bzr revid: mra@tinyerp.com-20120726063314-67w4cbokejy6eat7
2012-07-26 12:03:14 +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
Mustufa Rangwala (OpenERP)
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
Mustufa Rangwala (OpenERP)
8a9c1618f2
[IMP] l10n_in_hr_payroll: Small improvement
...
bzr revid: mra@tinyerp.com-20120726055406-h3pibgj7fw5r038v
2012-07-26 11:24:06 +05:30
Mustufa Rangwala (OpenERP)
56e10a0ef0
[IMP] l10n_in_hr_payroll: Small improvement
...
bzr revid: mra@tinyerp.com-20120726055237-fe2trv4lispbqx2o
2012-07-26 11:22:37 +05:30
Mustufa Rangwala (OpenERP)
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
Digvijay Singh
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
Mustufa Rangwala (OpenERP)
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
Digvijay Singh
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
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)
e7288247b6
[FIX]l10n_in_hr_payroll:total of salary
...
bzr revid: kbh@tinyerp.com-20120725060814-jech1omb9vquin7v
2012-07-25 11:38:14 +05:30
Khushboo Bhatt (Open ERP)
7e6d5474f4
[FIX]l10n_in_hr_payroll:variable name changed
...
bzr revid: kbh@tinyerp.com-20120724130149-7foqh69oevgzwd9s
2012-07-24 18:31:49 +05:30
Khushboo Bhatt (Open ERP)
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
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
Mustufa Rangwala (OpenERP)
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
Khushboo Bhatt (Open ERP)
a0b08a77a6
[IMP]l10n_in_hr_payroll:typo
...
bzr revid: kbh@tinyerp.com-20120720104051-sjfxjcq0kqegwrnp
2012-07-20 16:10:51 +05:30
Meera Trambadia (OpenERP)
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
Khushboo Bhatt (Open ERP)
3ae4fd6bf7
[IMP]l10n_in_hr_payroll:typo
...
bzr revid: kbh@tinyerp.com-20120720103610-exq3v9rnwg8xjsdz
2012-07-20 16:06:10 +05:30
Khushboo Bhatt (Open ERP)
921db910e6
[IMP]l10n_in_hr_payroll:typo
...
bzr revid: kbh@tinyerp.com-20120720103401-pzlg0jkcu3lw95aw
2012-07-20 16:04:01 +05:30
Khushboo Bhatt (Open ERP)
a89806dc05
[IMP]l10n_in_hr_payroll:typo
...
bzr revid: kbh@tinyerp.com-20120720102419-axh96q4li89y5qw8
2012-07-20 15:54:19 +05:30
Khushboo Bhatt (Open ERP)
cd203da095
[IMP]l10n_in_hr_payroll:report rml improved
...
bzr revid: kbh@tinyerp.com-20120720101740-07frj5y57h79vx8z
2012-07-20 15:47:40 +05:30
Meera Trambadia (OpenERP)
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
Khushboo Bhatt (Open ERP)
2e4fe7dee7
[IMP]l10n_in_hr_payroll:report rml improved
...
bzr revid: kbh@tinyerp.com-20120720095528-rencfiorrdvsh2vi
2012-07-20 15:25:28 +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)
4b8f5ce491
[FIX]remove unnecessay change
...
bzr revid: kbh@tinyerp.com-20120719131728-f70xb2umme3s8mz6
2012-07-19 18:47:28 +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)
b0508a59a8
[IMP]l10n_in_hr_payroll
...
bzr revid: kbh@tinyerp.com-20120719113957-82wtpw19p9h5ihjv
2012-07-19 17:09:57 +05:30
Khushboo Bhatt (Open ERP)
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
Khushboo Bhatt (Open ERP)
2e777fa99e
[IMP]l10n_in_hr_payroll:query updated
...
bzr revid: kbh@tinyerp.com-20120719111930-gvuhcf6n5qkg9zk3
2012-07-19 16:49:30 +05:30
Khushboo Bhatt (Open ERP)
df4139ff08
[FIX]reml updated
...
bzr revid: kbh@tinyerp.com-20120719110144-aul91plaakwa6h00
2012-07-19 16:31:44 +05:30
Khushboo Bhatt (Open ERP)
adcd986ebf
[FIX]typo
...
bzr revid: kbh@tinyerp.com-20120719053053-ic63122f6fllw87c
2012-07-19 11:00:53 +05:30
Khushboo Bhatt (Open ERP)
e136fba798
[FIX]remove print
...
bzr revid: kbh@tinyerp.com-20120718131933-mnyg1dpuchzmqb91
2012-07-18 18:49:33 +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
Mustufa Rangwala (OpenERP)
06d731ebd2
[MERGE] l10n_in_hr_payroll: Report fix
...
bzr revid: mra@tinyerp.com-20120718121139-oplqvkxunbj9i4zj
2012-07-18 17:41:39 +05:30
Digvijay Singh
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
Mustufa Rangwala (OpenERP)
c0cbde43f1
[IMP] l10n_in_hr_payroll: typo
...
bzr revid: mra@tinyerp.com-20120718094401-lxe5xava781vddle
2012-07-18 15:14:01 +05:30
Mustufa Rangwala (OpenERP)
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
Meera Trambadia (OpenERP)
780eac4177
[IMP] l10n_in_hr_payroll: changed menu sequence
...
bzr revid: mtr@tinyerp.com-20120718085218-6kgrkivfg7rgoofe
2012-07-18 14:22:18 +05:30
Mustufa Rangwala (OpenERP)
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
Meera Trambadia (OpenERP)
8f3156f060
[MERGE] branch merged with trunk-payroll-india-mra
...
bzr revid: mtr@tinyerp.com-20120718055826-1bs9xu2egant55pv
2012-07-18 11:28:26 +05:30
Meera Trambadia (OpenERP)
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
Mustufa Rangwala (OpenERP)
dfb97e2141
[IMP] l10n_in_hr_payroll: Icon improved
...
bzr revid: mra@tinyerp.com-20120718052454-7qx9zgpl7k7h1xjd
2012-07-18 10:54:54 +05:30
Mustufa Rangwala (OpenERP)
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
Meera Trambadia (OpenERP)
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
Meera Trambadia (OpenERP)
5884f6dabe
[IMP] l10n_in_hr_payroll: changed string
...
bzr revid: mtr@tinyerp.com-20120717111934-j6rkorvnaubk7rdm
2012-07-17 16:49:34 +05:30
Meera Trambadia (OpenERP)
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
Digvijay Singh
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
Meera Trambadia (OpenERP)
be188bedab
[MERGE] branch merged with trunk-payroll-india-mra
...
bzr revid: mtr@tinyerp.com-20120717084325-lr81od3q7x2veltx
2012-07-17 14:13:25 +05:30
Meera Trambadia (OpenERP)
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
Mustufa Rangwala (OpenERP)
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
Mustufa Rangwala (OpenERP)
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
Mustufa Rangwala (OpenERP)
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
Ankita Patel (OpenERP)
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
Meera Trambadia (OpenERP)
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
Digvijay Singh
aad3669928
[MERGE] branch merged with trunk-payroll-india-mra
...
bzr revid: dsi@tinyerp.com-20120716064339-cpl2uf48nc49yj6m
2012-07-16 12:13:39 +05:30
Ankita Patel (OpenERP)
ed4ca43c69
[IMP]hr_payroll: resolve conflicts
...
bzr revid: pat@tinyerp.com-20120716055914-ps31ejm29hlez34y
2012-07-16 11:29:14 +05:30
Meera Trambadia (OpenERP)
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
Ankita Patel (OpenERP)
1b4dd5856e
[IMP]hr_payroll: create button
...
bzr revid: pat@tinyerp.com-20120713120927-pnx0qdmsjxgn9som
2012-07-13 17:39:27 +05:30
Meera Trambadia (OpenERP)
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
Digvijay Singh
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
Ankita Patel (OpenERP)
87bdb4895d
[IMP]hr_payroll: create button
...
bzr revid: pat@tinyerp.com-20120713104501-kp20pumuiyrwdaip
2012-07-13 16:15:01 +05:30
Mustufa Rangwala (OpenERP)
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
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
Meera Trambadia (OpenERP)
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
Digvijay Singh
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
Digvijay Singh
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
Ankita Patel (OpenERP)
3ce1e711c5
[IMP] l10n_in_hr_payroll : improve onchange event
...
bzr revid: pat@tinyerp.com-20120709114112-4vxp86voy9ys106d
2012-07-09 17:11:12 +05:30
Digvijay Singh
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
Jagdish Panchal (Open ERP)
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
Jagdish Panchal (Open ERP)
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
Jagdish Panchal (Open ERP)
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
Mustufa Rangwala (OpenERP)
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
Mustufa Rangwala (OpenERP)
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
Mustufa Rangwala (OpenERP)
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
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)
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
Mustufa Rangwala (OpenERP)
c97219fbbd
[FIX] l10n_in_hr_payroll: Fix view inhritance
...
bzr revid: mra@tinyerp.com-20120702072432-gdmypy92cx0ila7o
2012-07-02 12:54:32 +05:30
Khushboo Bhatt (Open ERP)
06676feb49
[MERGE]merge with project branch and remove conflicts.
...
bzr revid: kbh@tinyerp.com-20120629090731-ex7nxbepw8tzydjo
2012-06-29 14:37:31 +05:30