Commit Graph

92 Commits

Author SHA1 Message Date
Christophe Matthieu 9d9e3d2ef8 [IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
bzr revid: chm@openerp.com-20130607113829-1mi6jk18c2v3jjhn
2013-06-07 13:38:29 +02: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
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
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
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) 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) ee80611902 [IMP] l10n_in_hr_payroll: typo
bzr revid: mra@tinyerp.com-20120827051507-d6jpql116j7s8q3k
2012-08-27 10:45:07 +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) 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) 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
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) 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) 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) 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
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) 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) 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
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
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) 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) 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
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
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
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) 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) 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) 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
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
Khushboo Bhatt (Open ERP) 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
Khushboo Bhatt (Open ERP) 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
Mustufa Rangwala (OpenERP) 4bfaeb5e17 [IMP] l10n_in_hr_payroll: Clean
bzr revid: mra@tinyerp.com-20120629051711-ql2954rycp5raite
2012-06-29 10:47:11 +05:30
Mustufa Rangwala (OpenERP) 634646956b [FIX] l10n_in_hr_payroll: Small fix
bzr revid: mra@tinyerp.com-20120628062741-1ob3zfgddl10gexo
2012-06-28 11:57:41 +05:30