Commit Graph
41 Commits
Author SHA1 Message Date
AMP(Open ERP) 6def8566b4 [MOD] Usability Improvements :Label name changes Validate -> Approve, To Validate-> To Approve.
bzr revid: vir@tinyerp.com-20100714060149-drpbnaqzg3uhxhmk
2010-07-14 11:31:49 +05:30
Mantavya Gajjar f8efca986f [IMP]: improvement in payroll module
bzr revid: mga@tinyerp.com-20100707130347-r4zlz7ktthfet0ai
2010-07-07 18:33:47 +05:30
Mantavya Gajjar 21786ff375 [FIX]: fix a small problems related to views and labels
bzr revid: mga@tinyerp.com-20100707062107-yljp2sv5tlpr17at
2010-07-07 11:51:07 +05:30
mtr eb0459c432 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20100706091037-bfhj9vjfc63le5hg
2010-07-06 14:40:37 +05:30
mtr 4d68c0c8c2 [IMP] hr_payroll:Added yaml for hr_payroll
bzr revid: mtr@mtr-20100706090709-hmefb20mdmxb9tb4
2010-07-06 14:37:09 +05:30
Mantavya Gajjar 0e61edf922 [FIX]: reviwe payroll and recall lost changes during the merge
bzr revid: mga@tinyerp.com-20100702103715-iew7rlke3we92ipg
2010-07-02 16:07:15 +05:30
Mantavya Gajjar c4aa8bc8a3 [IMP]: improvement in hr_payroll, payslip view
bzr revid: mga@tinyerp.com-20100702054229-3z91plsgvbm338wk
2010-07-02 11:12:29 +05:30
Mustufa Rangwala fc210d0b95 [MERGE] hr_payroll: branch merge for sbh => osv memory conversion and search view
bzr revid: mra@mra-laptop-20100701073146-ms0xdv7pvx7fsbzt
2010-07-01 13:01:46 +05:30
sbh (Open ERP) 90aadf6958 [IMP] hr_payroll: Improve the view
bzr revid: sbh@tinyerp.com-20100701062503-rw4885decztd3upn
2010-07-01 11:55:03 +05:30
sbh (Open ERP) 953a317809 [IMP] hr_payroll: Improve the view
bzr revid: sbh@tinyerp.com-20100701060455-7bh08h93rmqwkvg2
2010-07-01 11:34:55 +05:30
sbh (Open ERP) 5a58c72228 [IMP] hr_payroll: Improve the view and code
bzr revid: sbh@tinyerp.com-20100701054809-7ttw11r6x3qeczpg
2010-07-01 11:18:09 +05:30
Mantavya Gajjar 1eeecc465b [ADD]: add demo date to payroll module
bzr revid: mga@tinyerp.com-20100701041712-7257n4soxgb4xit2
2010-07-01 09:47:12 +05:30
sbh (Open ERP) fda81bfab1 [IMP] hr_payroll: Imporve the view
bzr revid: sbh@tinyerp.com-20100630132453-i03wo2723cco0ktd
2010-06-30 18:54:53 +05:30
sbh (Open ERP) 5f51045da7 [IMP] hr_payroll: Imporve the view
bzr revid: sbh@tinyerp.com-20100630132213-zfoellnqem4tiy4u
2010-06-30 18:52:13 +05:30
sbh (Open ERP) 6b8ca34ca4 [IMP] hr_payroll: convert the wizard of hr_payroll_year_salary into osv_memory
bzr revid: sbh@tinyerp.com-20100630125412-7gqx7s7x5wxegcc2
2010-06-30 18:24:12 +05:30
sbh (Open ERP) 0f5d7b52da [IMP] hr_payroll: convert the wizard_employees_detail into osv_memeroy
bzr revid: sbh@tinyerp.com-20100630121632-i37b2t5wh26zu2l8
2010-06-30 17:46:32 +05:30
sbh (Open ERP) 8a26c4f6e7 [IMP] hr_payroll: convert the wizard into osv_memory and add the search view
bzr revid: sbh@tinyerp.com-20100630104716-pjppif2wwokxqn8l
2010-06-30 16:17:16 +05:30
sbh (Open ERP) ef4724aaea [IMP]hr_payroll: Add the search view of allounce_deduction_categoty
bzr revid: sbh@tinyerp.com-20100630060359-p02io88128ikcaoc
2010-06-30 11:33:59 +05:30
sbh (Open ERP) 5519124d47 [IMP]hr_payroll: Add the search view of passport
bzr revid: sbh@tinyerp.com-20100630053851-1drc8ea33jl6mfo8
2010-06-30 11:08:51 +05:30
sbh (Open ERP) 3b91a3b1e8 MERGE with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: sbh@tinyerp.com-20100630044812-2m6q7teb7o4kosiz
2010-06-30 10:18:12 +05:30
Mantavya Gajjar c622a78fb5 [MERGE]: merging form the trunk addons
bzr revid: mga@tinyerp.com-20100629174145-14f0b8v757yckbqf
2010-06-29 23:11:45 +05:30
Mantavya Gajjar a6ccc72a96 [IMP]: improve payslip view
bzr revid: mga@tinyerp.com-20100629173159-yfho45oji9mxrlyr
2010-06-29 23:01:59 +05:30
Mantavya Gajjar 8a7e4a2617 [FIX]: fix a problems in payroll module
bzr revid: mga@tinyerp.com-20100629172204-0jmz15a7ak6nk7ff
2010-06-29 22:52:04 +05:30
sbh (Open ERP) ecf5d29ab4 [IMP] hr_payroll: Add the icon on button
bzr revid: sbh@tinyerp.com-20100629133715-5wxqscs5bh3762o9
2010-06-29 19:07:15 +05:30
Mustufa Rangwala 403bf5f236 [MERGE] merge with trunk addons
bzr revid: mra@mra-laptop-20100626070939-6whcffnrj4x8ndsi
2010-06-26 12:39:39 +05:30
Launchpad Code Hosting 9be835d632 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100626035831-n0mmsbylbslbeotl
2010-06-26 04:58:31 +01:00
Mantavya Gajjar 832ce4a6e2 [ADD]: add demo data
[FIX]: remove commented code
[ADD]: add demo data file to the module descriptor file

bzr revid: mga@tinyerp.com-20100621204523-nzkwal4rm7hpvaga
2010-06-22 02:15:23 +05:30
Mantavya Gajjar 98cc2f8c55 [FIX]: enabled bank accout feature for employee, for finalcial entries through bank
bzr revid: mga@tinyerp.com-20100619150413-o8g1vdt9zb87pq0a
2010-06-19 20:34:13 +05:30
Mantavya Gajjar f5f8c836c3 [MOVE]: move accounting from hr_payroll to hr_payroll_india module.
now hr_payroll is not dependant on account module, we can use just payroll without accounting

bzr revid: mga@tinyerp.com-20100618202907-g3s8mu8w07q4fy0q
2010-06-19 01:59:07 +05:30
Mantavya Gajjar 7406420996 [FIX]: fix a problem for the accounting for the payroll
bzr revid: mga@tinyerp.com-20100618140101-5e1wuqaxjv3otkzw
2010-06-18 19:31:01 +05:30
Mantavya Gajjar f789e02e82 [IMP]: enable holiday calculation with payslip
bzr revid: mga@tinyerp.com-20100618031140-eqg2negwaggok5tf
2010-06-18 08:41:40 +05:30
Mantavya Gajjar fc7529f3e6 [IMP]: improvements to payroll module
bzr revid: mga@tinyerp.com-20100618005141-bh618yzj9ucz1jt5
2010-06-18 06:21:41 +05:30
Mantavya Gajjar c3f32862d1 [IMP]: implement view for new object company contrinute
bzr revid: mga@tinyerp.com-20100609145448-o6pgy1huodq6c5mm
2010-06-09 20:24:48 +05:30
Mantavya Gajjar 3f3b015306 [IMP]: improvement in payroll, seprate objects for the heads ad company contribution
bzr revid: mga@tinyerp.com-20100609143822-4sv2r1skek77t8mw
2010-06-09 20:08:22 +05:30
Mantavya Gajjar 3f8867daf4 [IMP]: improved the employee object and view
bzr revid: mga@tinyerp.com-20100607132659-6lzu9mws93uvobd2
2010-06-07 18:56:59 +05:30
Mantavya Gajjar 8c1f9e2cb0 [CLEAN]: clean employee form
bzr revid: mga@tinyerp.com-20100606190953-45vjl1hehsp6zhkv
2010-06-07 00:39:53 +05:30
Mantavya Gajjar 16a8c578d8 [CHANGE]: migrate code from 5.0 to 6.0 with few backlog changes
bzr revid: mga@tinyerp.com-20100606182608-e5uncndaqreracba
2010-06-06 23:56:08 +05:30
Mantavya Gajjar 9f1620aeff [ADD]: add other files to the hr_payroll module
bzr revid: mga@tinyerp.com-20100606163023-pkf6httl19hma6nx
2010-06-06 22:00:23 +05:30
Mantavya Gajjar 8c2642cc10 [MERGE]: migrate old hr_payroll, migrate other files to trunk
bzr revid: mga@tinyerp.com-20100606162911-2sdpumzgq6kqafvj
2010-06-06 21:59:11 +05:30
Mantavya Gajjar 6d29e1ec65 [IMP]: implement passport, passport based contracts
bzr revid: mga@tinyerp.com-20100605073216-kfbka70jhkacfsmo
2010-06-05 13:02:16 +05:30
Mantavya Gajjar a8cda443b4 [ADD]: start migrating module from trunk_extra_addons to trunk_addons
bzr revid: mga@tinyerp.com-20100605063912-enth6zqm0m82mnp9
2010-06-05 12:09:12 +05:30