Commit Graph

285 Commits

Author SHA1 Message Date
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