Commit Graph

62 Commits

Author SHA1 Message Date
Amit Bhavsar (Open ERP) b190137aa6 [Imp] improve view for Payslips Batches and Payment Advices.
bzr revid: amb@tinyerp.com-20130628104052-s9we23nm5gt2z5ht
2013-06-28 16:10:52 +05:30
Olivier Dony cd0714b78d [FIX] all: change confusing labels on Cancel buttons in form views
lp bug: https://launchpad.net/bugs/1103426 fixed

bzr revid: odo@openerp.com-20130225133804-k7012p8p81e6g8vg
2013-02-25 14:38:04 +01:00
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) 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) 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
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) 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
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
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
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
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
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) 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) 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
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
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
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
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) 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) 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) 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
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) 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
Khushboo Bhatt (Open ERP) 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
Khushboo Bhatt (Open ERP) 35a9faf9ed [IMP]improved payroll advice form view
bzr revid: kbh@tinyerp.com-20120627105052-i14kz4wz47v5lrnk
2012-06-27 16:20:52 +05:30
Mustufa Rangwala (OpenERP) 9e43d3db91 typo
bzr revid: mra@tinyerp.com-20120627061404-et3mugyf2l39xiz9
2012-06-27 11:44:04 +05:30
Khushboo Bhatt (Open ERP) 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
Mustufa Rangwala (OpenERP) f7278c6baf [IMP] typo
bzr revid: mra@tinyerp.com-20120626072858-pcw2dfvblv3pe6ng
2012-06-26 12:58:58 +05:30
Mustufa Rangwala (OpenERP) 95a64af19e [FIX]
bzr revid: mra@tinyerp.com-20120626063003-5sh236r4otzgxly6
2012-06-26 12:00:03 +05:30
Khushboo Bhatt (Open ERP) 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
Khushboo Bhatt (Open ERP) 1514f85e33 [IMP]button removed from tree view and state name changed.
bzr revid: kbh@tinyerp.com-20120613065322-k538s2sb7nekx5q4
2012-06-13 12:23:22 +05:30
Khushboo Bhatt (Open ERP) 8ca629034c [ADD]sequence number created in mentho,access rights added for payroll advice.
bzr revid: kbh@tinyerp.com-20120613065137-78ye6taovw0yffdw
2012-06-13 12:21:37 +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) fb53de6357 [IMP]added icon,add search view,update list view,made fields readonly.
bzr revid: kbh@tinyerp.com-20120611111055-kc3k2x8kwx6srdgw
2012-06-11 16:40:55 +05:30