Commit Graph
174 Commits
Author SHA1 Message Date
vra d2b6e5ad00 [IMP]hr_payroll,hr_payroll_account: improved the Contibution Register view.
bzr revid: vra@tinyerp.com-20101014131430-h4gzor8hlbxdm704
2010-10-14 18:44:30 +05:30
vra 67d5a0c3a8 [IMP]hr_payroll: Improved the hr payroll demo xml file.
bzr revid: vra@tinyerp.com-20101014120429-bfcf6o96hbe1odjv
2010-10-14 17:34:29 +05:30
Mustufa Rangwala 6e6ed69a03 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101013092327-sc1mvi418lb98zsx
2010-10-13 14:53:27 +05:30
Launchpad Translations on behalf of openerp d54048c6d7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101013045918-hlirree3j3xy4ga9
2010-10-13 04:59:18 +00:00
Mustufa Rangwala b64d58a93b [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101013044334-jk5zyjfbdfid17ai
2010-10-13 10:13:34 +05:30
qdp-launchpad@tinyerp.com cd14eb5ed4 [MERGE] merged the usability branch
bzr revid: qdp-launchpad@tinyerp.com-20101012170546-qrtnb10w1mkxontb
2010-10-12 19:05:46 +02:00
vra 58d9ab63fc [IMP]hr_payroll: replaced ' ' instead of '0.0' in employee detail and yearly salary reports.
bzr revid: vra@tinyerp.com-20101012121534-v4dre24uck5c3knk
2010-10-12 17:45:34 +05:30
Fabien Pinckaers af6d14b9c4 merge
bzr revid: fp@tinyerp.com-20101012070738-ri3zajc3rtwd4vn1
2010-10-12 09:07:38 +02:00
DBR (OpenERP) 3678e09a80 [MOD/IMP] hr_* : Cancel Button Set on left side
bzr revid: dbr@tinyerp.com-20101012051930-h37amb58eps2bzf0
2010-10-12 10:49:30 +05:30
Launchpad Translations on behalf of openerp 4f9b180931 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101012045143-dafaof1g5r27tu29
2010-10-12 04:51:43 +00:00
vra 4685282c4b [MERGE][IMP] account_voucher: restore the previous commit lost changes in some reports of hr payroll.
bzr revid: vra@tinyerp.com-20101011125646-4qjzb2gr2lbjqe0v
2010-10-11 18:26:46 +05:30
apa-tiny eaa031075c remove conflicts
bzr revid: apa@tinyerp.com-20101011100617-noz4sgp9xfpevzgv
2010-10-11 15:36:17 +05:30
apa-tiny 7a30f6643b remove conflicts
bzr revid: apa@tinyerp.com-20101011100419-jzburzmpos92am48
2010-10-11 15:34:19 +05:30
apa-tiny a82e2f729c merged from trunk
bzr revid: apa@tinyerp.com-20101011094034-3gqu5rsswp784gr0
2010-10-11 15:10:34 +05:30
Mustufa Rangwala bf339ae070 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101011093239-lv5q18ij2dcii359
2010-10-11 15:02:39 +05:30
vra 9bf62c39d7 [FIX][IMP]hr_payroll : Fixed and improved the employee detail and year report.
bzr revid: vra@tinyerp.com-20101011061058-djvd4zijs2b9s2rn
2010-10-11 11:40:58 +05:30
Launchpad Translations on behalf of openerp 9e8be15fd5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101011044533-mu3e6rmywz6ilyi7
2010-10-11 04:45:33 +00:00
qdp-launchpad@tinyerp.com 175e637ed3 [FIX] hr, hr_contract, hr_payroll: moved back the field bank_account on the hr.employee object into the HR module: even if it's used only in payroll it may be interssting to record that info before. besides, the view of hr_contract module was crashing
bzr revid: qdp-launchpad@tinyerp.com-20101008160155-nwpaxwqyltc6d663
2010-10-08 18:01:55 +02:00
Mantavya Gajjar 48f0a8554e [IMP]: improve the usability for the payslip line
bzr revid: mga@tinyerp.com-20101008141143-k2l0txnqr3y7j44g
2010-10-08 19:41:43 +05:30
vra 377d126628 [IMP] hr_payroll: improved the reports.
bzr revid: vra@tinyerp.com-20101008135353-cbe6jt2pzdy9ch7m
2010-10-08 19:23:53 +05:30
Mantavya Gajjar 30efb09f7a [IMP]: improve the usability
bzr revid: mga@tinyerp.com-20101008131845-alqqlb6d97y3s3d5
2010-10-08 18:48:45 +05:30
Vir (Open ERP) 9138707ef7 [MOD] hr_payroll : Improvements in access rights
bzr revid: vir@tinyerp.com-20101008124815-k6ti98b1a12pb74n
2010-10-08 18:18:15 +05:30
Mustufa Rangwala b2b4a5e6fc [MERGE] Merge from trunk addons
bzr revid: mra@mra-laptop-20101008121708-eaco7kqb1zoaeaoe
2010-10-08 17:47:08 +05:30
apa-tiny dd2f48ce83 merge
bzr revid: apa@tinyerp.com-20101008113122-6jriz700xjos5yag
2010-10-08 17:01:22 +05:30
apa-tiny 0935df7cba salary structure
bzr revid: apa@tinyerp.com-20101008105603-r53paarjw8rotym8
2010-10-08 16:26:03 +05:30
vra a2656467c9 [FIX]hr_payroll: fixed the not require company issue in employee object for salary struture report.
bzr revid: vra@tinyerp.com-20101008103828-4vef8aef3qkq39ry
2010-10-08 16:08:28 +05:30
vra 27834e2fa7 [IMP]hr_payroll: improved employee struture report.
bzr revid: vra@tinyerp.com-20101008100146-hv90z0sg9fffh7ms
2010-10-08 15:31:46 +05:30
vra 62592beb07 [IMP][FIX]hr_payroll: fixed the error if contract is not define and some improvement in report.
bzr revid: vra@tinyerp.com-20101008094910-psvxtftbau0txae6
2010-10-08 15:19:10 +05:30
Mantavya Gajjar 86a26c1d6b [IMP]: now from the employee object we will get the earnings and computations
bzr revid: mga@tinyerp.com-20101008090555-24n0qrti5obce8bx
2010-10-08 14:35:55 +05:30
Launchpad Translations on behalf of openerp 6d3d608750 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101008044002-5tq08qdkcv6vf3fj
2010-10-08 04:40:02 +00:00
Mantavya Gajjar cf672602eb [IMP]: improvement to the contract object
bzr revid: mga@tinyerp.com-20101007144456-vu0v0750ujf8bgzq
2010-10-07 20:14:56 +05:30
vra d0e0cb7ad2 [IMP] hr_payroll: Improved Employee Salary Structure report.
bzr revid: vra@tinyerp.com-20101007143507-6apfh565afuxamn3
2010-10-07 20:05:07 +05:30
Mantavya Gajjar f2e3f5fc2b [IMP]: implement the salary calculation for the structure
bzr revid: mga@tinyerp.com-20101007140056-r3mo0e7ltp7k4bd1
2010-10-07 19:30:56 +05:30
apa-tiny 5987cb0a8d improve
bzr revid: apa@tinyerp.com-20101007140008-1q8f9m64p198exk6
2010-10-07 19:30:08 +05:30
apa-tiny 2902b1138f improve
bzr revid: apa@tinyerp.com-20101007134119-q04dm2l2ubqjpymd
2010-10-07 19:11:19 +05:30
apa-tiny 5d14c37496 improve
bzr revid: apa@tinyerp.com-20101007123936-iioup1p4e49o1ue5
2010-10-07 18:09:36 +05:30
Mantavya Gajjar 1a2015de2c [IMP]: improvement to view, add links to employee for payslip
[ADD]: add demo data for the contract

bzr revid: mga@tinyerp.com-20101007091900-tglpl048qpffnle8
2010-10-07 14:49:00 +05:30
Mantavya Gajjar e74b9a6f31 [FIX]: fix a problem of type in the demo data
bzr revid: mga@tinyerp.com-20101007073832-colu8w7g4fik545b
2010-10-07 13:08:32 +05:30
Mantavya Gajjar c6968eaf3e [FIX]: fix a usability problem for the hr and payroll related to the employee passport informaion
bzr revid: mga@tinyerp.com-20101007073131-ba4dkusjnz6kuj8d
2010-10-07 13:01:31 +05:30
Mantavya Gajjar eb95954919 [IMP]: improvement to payroll
[REM]: remove some field specific to the localize data, may be added from the localize module

bzr revid: mga@tinyerp.com-20101007071334-tonherdg56xbn0xa
2010-10-07 12:43:34 +05:30
Mantavya Gajjar 52462287f3 [IMP]L improvement and fix to the payroll module
bzr revid: mga@tinyerp.com-20101007063156-tijiyci4w5r0v29w
2010-10-07 12:01:56 +05:30
Mantavya Gajjar 9860aa21c1 [FIX]: fix a small code that will allow user to prepare a slip for any contract based on the date
bzr revid: mga@tinyerp.com-20101006134724-24ki3h7m6k8gjloo
2010-10-06 19:17:24 +05:30
Mantavya Gajjar 15792bb9fa [IMP]: improve the hr_payroll module make it fully independent of account and hr_expanse module
Accounting functionalities to payroll will be added by the hr_payroll_account module.

bzr revid: mga@tinyerp.com-20101006124454-t1vgn6879dnu62ou
2010-10-06 18:14:54 +05:30
ARA (OpenERP) c791e55ef6 [IMP] Account: Access rights for Analytic Account (Add analytic group on all modules) where this field appear
bzr revid: ara@tinyerp.com-20101004111344-8rx877ce28g5eigv
2010-10-04 16:43:44 +05:30
Anup (OpenERP) f80c5fbd12 [FIX] base_iban,hr_payroll : 'bank' added in res.partner.bank record in demo data
bzr revid: ach@tinyerp.com-20101004095813-bo6h57yu6v26fku6
2010-10-04 15:28:13 +05:30
Launchpad Translations on behalf of openerp 97546e5b06 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20100930044423-jl0kqf9w3u57xdjc
2010-09-30 04:44:23 +00:00
qdp-launchpad@tinyerp.com a00ba7134c [MERGE] merged the branch of aag related to act_window (context instead of domain) and mx.Datetime removal)
bzr revid: qdp-launchpad@tinyerp.com-20100929125142-erbui0hrso5vslei
2010-09-29 14:51:42 +02:00
aag (OpenERP) 7b2e3875b1 [REMOVE]: mx.Date from trunk
bzr revid: aag@tinyerp.co.in-20100929080501-j7hqsb3qfftp6qbo
2010-09-29 13:35:01 +05:30
Launchpad Translations on behalf of openerp 417879f83a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20100929051813-dmrwrwhdjmxy72qr
2010-09-29 05:18:13 +00:00
apa-tiny 1bf301fd85 merged
bzr revid: apa@tinyerp.com-20100928104736-2uvt12jtm98kvep8
2010-09-28 16:17:36 +05:30