Commit Graph

350 Commits

Author SHA1 Message Date
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
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
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) 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
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
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) 4365592320 [IMP] typo
bzr revid: mra@tinyerp.com-20120627091101-ljbsd9v8568swar8
2012-06-27 14:41:01 +05:30
Mustufa Rangwala (OpenERP) cb586e2e4b [IMP] typo
bzr revid: mra@tinyerp.com-20120627091005-b9ojnfiiqs6uavh1
2012-06-27 14:40:05 +05:30
Mustufa Rangwala (OpenERP) 82246cfb09 [IMP] typo
bzr revid: mra@tinyerp.com-20120627090004-onw7v1m2lfshfovh
2012-06-27 14:30:04 +05:30
Mustufa Rangwala (OpenERP) 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
Mustufa Rangwala (OpenERP) ac3241ed13 [IMP] typo
bzr revid: mra@tinyerp.com-20120627072622-h8vlzlai418y2o7e
2012-06-27 12:56:22 +05:30
Mustufa Rangwala (OpenERP) 9e43d3db91 typo
bzr revid: mra@tinyerp.com-20120627061404-et3mugyf2l39xiz9
2012-06-27 11:44:04 +05:30
Mustufa Rangwala (OpenERP) f30c694150 [IMP] typo
bzr revid: mra@tinyerp.com-20120627054441-fw274wtwwua3m2ox
2012-06-27 11:14:41 +05:30
Khushboo Bhatt (Open ERP) 9c9f189d43 [FIX].
bzr revid: kbh@tinyerp.com-20120626105140-xj5oz4u5l8cuhms8
2012-06-26 16:21:40 +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) f57b58bbd2 [IMP] typo
bzr revid: mra@tinyerp.com-20120626071459-ltbasivd1hnpwpr8
2012-06-26 12:44:59 +05:30
Mustufa Rangwala (OpenERP) f227e6548b [IMP] typo
bzr revid: mra@tinyerp.com-20120626071346-exs4zrnekx5icssq
2012-06-26 12:43:46 +05:30
Mustufa Rangwala (OpenERP) 58f579fff1 [IMP] typo
bzr revid: mra@tinyerp.com-20120626071207-6u95sv62ybz4bc33
2012-06-26 12:42:07 +05:30
Mustufa Rangwala (OpenERP) f7d64e909c [FIX]
bzr revid: mra@tinyerp.com-20120626070918-a0ll1d8277udq9d0
2012-06-26 12:39:18 +05:30
Mustufa Rangwala (OpenERP) f1b51af5d4 [IMP] typo
bzr revid: mra@tinyerp.com-20120626070326-ovs3a42usmrf1rms
2012-06-26 12:33:26 +05:30
Mustufa Rangwala (OpenERP) f1523e3ab7 [IMP] typo
bzr revid: mra@tinyerp.com-20120626070246-v336zy1roe0ekqmr
2012-06-26 12:32:46 +05:30
Mustufa Rangwala (OpenERP) 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
Mustufa Rangwala (OpenERP) 738827e885 [IMP] typo
bzr revid: mra@tinyerp.com-20120626063309-qv0thobubn75kjg1
2012-06-26 12:03:09 +05:30
Mustufa Rangwala (OpenERP) c71ceea1a4 [IMP] typo
bzr revid: mra@tinyerp.com-20120626063219-fgaaklh8koi4azii
2012-06-26 12:02:19 +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) 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
Mustufa Rangwala (OpenERP) 1928914825 [IMP] typo
bzr revid: mra@tinyerp.com-20120626060354-jyqzuxdi9y30jzr3
2012-06-26 11:33:54 +05:30
Khushboo Bhatt (Open ERP) b4ee40fb17 [IMP]header added in report
bzr revid: kbh@tinyerp.com-20120626052222-3aqu7j8fuquygbny
2012-06-26 10:52:22 +05:30
Mustufa Rangwala (OpenERP) 15d17cc149 [MERGE] merge kbh branch for i18n
bzr revid: mra@tinyerp.com-20120625110432-oq8gau00aaxae2ed
2012-06-25 16:34:32 +05:30
Mustufa Rangwala (OpenERP) 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
Khushboo Bhatt (Open ERP) 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
Khushboo Bhatt (Open ERP) 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
Khushboo Bhatt (Open ERP) 56dbf247d3 [ADD]added doc strings in methods.
bzr revid: kbh@tinyerp.com-20120618111022-0mqf7ydd3n08hsgx
2012-06-18 16:40:22 +05:30
Khushboo Bhatt (Open ERP) 07081e4b73 [FIX]report modified.
bzr revid: kbh@tinyerp.com-20120618055642-1p2uztplg15ceu03
2012-06-18 11:26:42 +05:30
Mustufa Rangwala (OpenERP) 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
Khushboo Bhatt (Open ERP) c740e3fdf8 [FIX].
bzr revid: kbh@tinyerp.com-20120615120341-0paz93bx2luwrqi6
2012-06-15 17:33:41 +05:30
Khushboo Bhatt (Open ERP) 16fc152485 [FIX]dict update.
bzr revid: kbh@tinyerp.com-20120615115934-6i5nmzq2jmijvxn9
2012-06-15 17:29:34 +05:30
Khushboo Bhatt (Open ERP) 94059b2cda [FIX]return added.
bzr revid: kbh@tinyerp.com-20120615110656-kuyp9z4swxqcovoq
2012-06-15 16:36:56 +05:30
Khushboo Bhatt (Open ERP) 8c8de36e18 [FIX]prefix of sequence changed.
bzr revid: kbh@tinyerp.com-20120615104651-yyrys4pqgfuechly
2012-06-15 16:16:51 +05:30
Khushboo Bhatt (Open ERP) 2f43fd498e [FIX]sequence number changed,rename security file.
bzr revid: kbh@tinyerp.com-20120615095732-869m6lnbrwgax3ec
2012-06-15 15:27:32 +05:30
Khushboo Bhatt (Open ERP) a0aacb805a [MERGE]merge with project branch
bzr revid: kbh@tinyerp.com-20120615071522-ieb77ejkmdv4b15x
2012-06-15 12:45:22 +05:30
Mustufa Rangwala (OpenERP) 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
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) 18112a5ee0 [IMP]report improved.
bzr revid: kbh@tinyerp.com-20120614122919-sfucseuqr9z94mpg
2012-06-14 17:59:19 +05:30
Khushboo Bhatt (Open ERP) 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
Khushboo Bhatt (Open ERP) 1d4fbdeebc [ADD]added i18n for language translations.
bzr revid: kbh@tinyerp.com-20120613131547-vvzj19r5pjcgqok1
2012-06-13 18:45:47 +05:30
Khushboo Bhatt (Open ERP) f7ccfee64d [FIX]error message imporved and remove unnecessary access right.
bzr revid: kbh@tinyerp.com-20120613122605-ge147o1mps20wpdv
2012-06-13 17:56:05 +05:30
Khushboo Bhatt (Open ERP) ec4bf5e33c [ADD/IMP]payment advice report files added.
bzr revid: kbh@tinyerp.com-20120613072639-is9pr1vl3y7my3dg
2012-06-13 12:56:39 +05:30
Khushboo Bhatt (Open ERP) 13ce1a7d1a [IMP]added error message if no lines.
bzr revid: kbh@tinyerp.com-20120613065930-6wyjkh4yb1tt7y7p
2012-06-13 12:29:30 +05:30
Khushboo Bhatt (Open ERP) bd053e72bb [IMP]date and line_ids are readonly true when advice is confirm,tooltip on date field and default test on note filed.
bzr revid: kbh@tinyerp.com-20120613065807-e5ldjk8pfy4u46tr
2012-06-13 12:28:07 +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
Khushboo Bhatt (Open ERP) 71003a5aa0 [ADD]sequence file added for payroll advice.
bzr revid: kbh@tinyerp.com-20120613063845-1qiuuasfim19f94r
2012-06-13 12:08:45 +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
Khushboo Bhatt (Open ERP) 8827fee542 [IMP]compute advice method improved,state workflow changed and place of states are changed.
bzr revid: kbh@tinyerp.com-20120606095508-3rubur9xhrbsxw6u
2012-06-06 15:25:08 +05:30
Khushboo Bhatt (Open ERP) 71a4731a0f [IMP]field invisible parameter removed.
bzr revid: kbh@tinyerp.com-20120604132448-cfb5mkem318vhxpr
2012-06-04 18:54:48 +05:30
Khushboo Bhatt (Open ERP) f2d7415ec8 [IMP]payment advice tree view added,unnecessary action removed.
bzr revid: kbh@tinyerp.com-20120604091629-x0rapzx94yx5lj6u
2012-06-04 14:46:29 +05:30
Khushboo Bhatt (Open ERP) 986fd1159f [IMP]object and view of payment_advice and advice_line are added.
bzr revid: kbh@tinyerp.com-20120604061828-4dhq5c9w8t2o42sk
2012-06-04 11:48:28 +05:30
Khushboo Bhatt (Open ERP) a15c85fd4a [IMP]ids changed.
bzr revid: kbh@tinyerp.com-20120528085408-p1409ajat1yu5vkk
2012-05-28 14:24:08 +05:30
Khushboo Bhatt (Open ERP) c1c6205388 [IMP]changed sequence of salary rules.
bzr revid: kbh@tinyerp.com-20120528061802-rqijgqi3pbb4isjg
2012-05-28 11:48:02 +05:30
Khushboo Bhatt (Open ERP) 034a85428f [IMP]sequence changed for rules,update module descriptor,improved rule of gratuity and VPF.
bzr revid: kbh@tinyerp.com-20120524112412-8142nscbm8zl7zzr
2012-05-24 16:54:12 +05:30
Khushboo Bhatt (Open ERP) 2d9090c8f0 [IMP]removed changes from hr_payroll and changed code for Professional tax.
bzr revid: kbh@tinyerp.com-20120524062846-5had196y4n50fpli
2012-05-24 11:58:46 +05:30
Khushboo Bhatt (Open ERP) c77d5a88e9 [IMP]added icon on module.
bzr revid: kbh@tinyerp.com-20120524051226-rrsq51grjcstmuyw
2012-05-24 10:42:26 +05:30
Khushboo Bhatt (Open ERP) dc6e8fa904 [IMP]improved method for gratuity,added House rent Allowance rule and food coupon rule,added Contribution Register.
bzr revid: kbh@tinyerp.com-20120523133505-v6pvrvo25q9ur5kv
2012-05-23 19:05:05 +05:30
Khushboo Bhatt (Open ERP) 2672c52979 [IMP]improved method for gratuity,added House rent Allowance rule and food coupon rule,added Contribution Register.
bzr revid: kbh@tinyerp.com-20120523121210-qy0sv0xq2be1v7gw
2012-05-23 17:42:10 +05:30
Khushboo Bhatt (Open ERP) b7e6823cf6 [IMP]remove unnessesary import and variable.
bzr revid: kbh@tinyerp.com-20120523090331-gibnbltx5a5nvhli
2012-05-23 14:33:31 +05:30
Khushboo Bhatt (Open ERP) c6410d1258 [IMP]improve method for gratuity rule.
bzr revid: kbh@tinyerp.com-20120523072945-2gtphj2fageseg7g
2012-05-23 12:59:45 +05:30
Khushboo Bhatt (Open ERP) 48e4dd20ce [IMP]removed unnecessary category of salary rule,changed category_id for child allowance.
bzr revid: kbh@tinyerp.com-20120523065447-cl7f1xuav7z9p1uj
2012-05-23 12:24:47 +05:30
Khushboo Bhatt (Open ERP) 5f3e8f9c92 [IMP]improved salary rule for child hostel allowance.
bzr revid: kbh@tinyerp.com-20120523061203-rwgfx6opd07t1r9g
2012-05-23 11:42:03 +05:30
Khushboo Bhatt (Open ERP) cf88acabfa [IMP]improved salary rules,descriptions for rules, fields tooltip,gratuity calculation method,code for rules.
bzr revid: kbh@tinyerp.com-20120523054519-bdrmcnryfvj30j99
2012-05-23 11:15:19 +05:30
Khushboo Bhatt (Open ERP) d2d7cd1292 [IMP]improved salary rules for VPF,LTA,medical Allowance,howse income.
bzr revid: kbh@tinyerp.com-20120522054959-s95pc1goslo28t38
2012-05-22 11:19:59 +05:30
Khushboo Bhatt (Open ERP) cf28ac1918 [IMP]improved salary rules for allowance and deduction.
bzr revid: kbh@tinyerp.com-20120521132703-m1q4s1ccxyp3nr0p
2012-05-21 18:57:03 +05:30
Khushboo Bhatt (Open ERP) 00dd3743f8 [IMP]improved rules for gratuity,leave,uniform,telephone,proffessional developement. And implement method for gratuity rule.
bzr revid: kbh@tinyerp.com-20120521070643-523rov1a8v63f13p
2012-05-21 12:36:43 +05:30
Khushboo Bhatt (Open ERP) 38bc8ca8f0 [IMP]improved rules(HRA,DA,city allowance,driver salary,transport allowance).
bzr revid: kbh@tinyerp.com-20120517120335-inov2l3rsfraix96
2012-05-17 17:33:35 +05:30
Khushboo Bhatt (Open ERP) 0752cc0fe9 [IMP]improved child allowance rule for employee.
bzr revid: kbh@tinyerp.com-20120516050716-kprn03ib238h5tua
2012-05-16 10:37:16 +05:30
Khushboo Bhatt (Open ERP) c34e57aaf6 [IMP]improved child allowance rule for employee.
bzr revid: kbh@tinyerp.com-20120515112443-h79ixtb311xs7sdt
2012-05-15 16:54:43 +05:30
Khushboo Bhatt (Open ERP) 2c935c1c56 [IMP/ADD]added l10_in_hr_payroll.changes in module descrpition and added notes in salary rules.
bzr revid: kbh@tinyerp.com-20120515084129-uu7aroc0izfb0zk5
2012-05-15 14:11:29 +05:30