odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
27,687 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

107 Commits

Author SHA1 Message Date
mtr ad9f23f99f [IMP] hr_payroll:added field 'python_code' and improved view of Salary Rules 
bzr revid: mtr@mtr-20110307104513-mjcjedxtozza6wdf
 2011-03-07 16:15:13 +05:30
mtr e85b5701ee [IMP] hr_payroll:added default company_id on salary rules 
bzr revid: mtr@mtr-20110307094710-px4r3q1ik57h536k
 2011-03-07 15:17:10 +05:30
mtr 11c72fb988 [IMP] hr_payroll:removed 'advantages_net' and 'advantages_gross' fields from hr.contract 
bzr revid: mtr@mtr-20110307084515-3o33wpeh1uh3czhe
 2011-03-07 14:15:15 +05:30
mtr 971a91390a [IMP] hr_payroll:improvements in salary rules,salary head,salary structure and demo data 
bzr revid: mtr@mtr-20110307071829-rluk1idcxjtbw43u
 2011-03-07 12:48:29 +05:30
psi (Open ERP) ed78081860 [MERGE] merge with trunk-payroll-salary_rules-mtr branch 
bzr revid: psi@tinyerp.co.in-20110304070625-ya6lepni4jyjw8c7
 2011-03-04 12:36:25 +05:30
psi (Open ERP) 016fbccf00 [IMP] changes as per hr_payroll_new file given by QDP sir: move hr_passport obj to hr module, move some fields of hr.contract from hr_paroll to hr_contract, remove working_days_per_week field for contart and get it from resource calender 
bzr revid: psi@tinyerp.co.in-20110303124903-nopz0swoebyqtsqq
 2011-03-03 18:19:03 +05:30
mtr 64b46e24e4 [IMP] hr_payroll:improved company.contribution object 
bzr revid: mtr@mtr-20110303124406-rcctrip72051sbuf
 2011-03-03 18:14:06 +05:30
mtr 29a46c9f18 [IMP] hr_payroll:improved 'hr.employee',commented m2m field i.e. Salary Rules on Employee 
bzr revid: mtr@mtr-20110303103321-ecd9eooj9l6ixlgo
 2011-03-03 16:03:21 +05:30
mtr 533ea71235 [IMP] hr_payroll:removed all fields from 'hr.holidays.status',except the 'code' field. 
bzr revid: mtr@mtr-20110303102745-uds7mbwabpjs372w
 2011-03-03 15:57:45 +05:30
mtr 6f0f2e5325 [IMP] hr_payroll:removed 'Bank Advice' and 'Bank Advice Lines' 
bzr revid: mtr@mtr-20110303100753-jdc0o3nddrlv21jv
 2011-03-03 15:37:53 +05:30
mtr d840425793 [IMP] hr_payroll:renamed 'hr.allounce.deduction.categoty' to 'hr.salary.head' and improved its object and fields 
bzr revid: mtr@mtr-20110303095226-kga2d2ulq0mhb4ne
 2011-03-03 15:22:26 +05:30
mtr 183e37aaef [IMP] hr_payroll:improved 'salary_head_type' class,object and its fields. 
bzr revid: mtr@mtr-20110302120023-ihc9mi4pqk3gucvt
 2011-03-02 17:30:23 +05:30
mtr dcd7a887b1 [IMP] hr_payroll:removed 'hr.payslip.line.line' from code and view. 
bzr revid: mtr@mtr-20110302101736-v9xhxj0hbpted3bt
 2011-03-02 15:47:36 +05:30
psi (Open ERP) aeb79ab194 [IMP, FIX] hr_payroll: Remove Compute and Recompute buttons from hr.payslip, fixes: on hr.contract Visa fields become required=true when we fill the passport, Improve view of hr.payslip 
bzr revid: psi@tinyerp.co.in-20110302093407-7vchj5e2hw70357h
 2011-03-02 15:04:07 +05:30
mtr 17cb7eff2b [IMP] hr_payroll:improved the view of Salary Head 
bzr revid: mtr@mtr-20110302090941-trq1bznmutpxvba4
 2011-03-02 14:39:41 +05:30
mtr 017c72127b [IMP] hr_payroll:improved demo data and the structure of 'Salary Head' 
bzr revid: mtr@mtr-20110301132938-rt8nqcwndgj0gefp
 2011-03-01 18:59:38 +05:30
mtr 821705ed00 [IMP] hr_payroll:improved the tree view of Salary Rules on Salary structure 
bzr revid: mtr@mtr-20110301121815-3gpaoa5hm6wc6o06
 2011-03-01 17:48:15 +05:30
mtr a9b46f9eb8 [IMP] hr_payroll:removed commented(#) obj company.contribution 
bzr revid: mtr@mtr-20110301113852-fpv8uk4fst2ducvs
 2011-03-01 17:08:52 +05:30
mtr 73bbece660 [IMP] hr_payroll:removed Function from salary rules,modified the hr.holiday.status 
bzr revid: mtr@mtr-20110301112908-agdcje98pb5hrgx2
 2011-03-01 16:59:08 +05:30
mtr 5778a97065 [IMP] hr_payroll:removed company contribution object and merged it with salry rules 
bzr revid: mtr@mtr-20110301095910-y1qhf82zms1lubrs
 2011-03-01 15:29:10 +05:30
Quentin (OpenERP) 91f14201bf [IMP] hr_payroll: renamed struct_id field of hr.payroll.structure into parent_id 
bzr revid: qdp-launchpad@openerp.com-20110228095643-rji364bszjfq2a60
 2011-02-28 10:56:43 +01:00
psi (Open ERP) 3f1aeeef70 [IMP] hr_payroll: Add new tab Holiday on hr.payslip object and comment unwanted calculation for gross and net, remove wage_type_id 
bzr revid: psi@tinyerp.co.in-20110225134314-zopq8bwlwmh61glr
 2011-02-25 19:13:14 +05:30
mtr e703cdfad1 [IMP] hr_payroll:added Child Rules as one2many on Salary Rules 
bzr revid: mtr@mtr-20110225133339-0f0711n4kaijl6p6
 2011-02-25 19:03:39 +05:30
mtr deec616aa5 [IMP] hr_payroll: improved Salary Head,added 'salary.head.type' object and 'salary rule' as m2m on employee,removed one2many 'Child Salary Structure' 
bzr revid: mtr@mtr-20110225130726-5bc1b5hf2cgefeo3
 2011-02-25 18:37:26 +05:30
mtr a59188e080 [IMP] hr_payroll: improvements-Salary Rules 
bzr revid: mtr@mtr-20110224131220-468gscq24wbr3pt6
 2011-02-24 18:42:20 +05:30
qdp-launchpad@tinyerp.com 2df4a68377 [MERGE] merged the dev3 branch 
bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak
 2011-01-14 01:11:01 +01:00
mtr bb1e27f8b1 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 
bzr revid: mtr@mtr-20110103093647-asp0jy7rml15pb4v
 2011-01-03 15:06:47 +05:30
Mustufa Rangwala 3bdca04e28 [MERGE] merge from trunk addons 
bzr revid: mra@mra-laptop-20110103090825-h3f9ie8qu7l09ceb
 2011-01-03 14:38:25 +05:30
mtr cf2bedf278 [FIX] hr_payroll: removed 'active' field from the view of Leave type to avoid duplication 
lp bug: https://launchpad.net/bugs/695632 fixed

bzr revid: mtr@mtr-20110103061953-jx80offy0hkd8cin
 2011-01-03 11:49:53 +05:30
Francois Degrave e494a992dd [IMP ]added shortcuts to demo user, modified visibility of elements in employee views 
bzr revid: fde@openerp.com-20101230170800-drbr5ie19trv0nxj
 2010-12-30 18:08:00 +01:00
husen f433b959c2 merged with trunk 
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
 2010-12-30 15:28:09 +05:30
François Degrave 22c847d00c [IMP] groups in employeeshortcuts 
bzr revid: fde@openerp.com-20101230084638-fhc3bl0p8n5w0ztl
 2010-12-30 09:46:38 +01:00
Fabien Pinckaers e2f6d60065 fix 
bzr revid: fp@tinyerp.com-20101229201026-ybz9nifb3nmwh0m3
 2010-12-29 21:10:26 +01:00
François Degrave e5c69704a3 [IMP] removed salary structure from employee view 
bzr revid: fde@openerp.com-20101229164118-5louilqm23my95ip
 2010-12-29 17:41:18 +01:00
François Degrave 469b5a8c6e [IMP] removed contract tab in employee form view + fixed holidays shortcut 
bzr revid: fde@openerp.com-20101229161029-o5cko7yu1sf3li45
 2010-12-29 17:10:29 +01:00
François Degrave e678fd472a [IMP] access rights, menus for HR 
bzr revid: fde@openerp.com-20101228153417-ps9ql3h4lij87jx8
 2010-12-28 16:34:17 +01:00
qdp-launchpad@tinyerp.com 1970e5fbca [REF] hr_payroll: removed unecessary view overwriting 
bzr revid: qdp-launchpad@tinyerp.com-20101220094604-h9rie16joi0vcatk
 2010-12-20 10:46:04 +01:00
Mustufa Rangwala ac935b31d9 [FIX] hr_payroll: HR can not create bank account for employee 
lp bug: https://launchpad.net/bugs/676113 fixed

bzr revid: mra@mra-laptop-20101209045011-72iybqisy069jlon
 2010-12-09 10:20:11 +05:30
olt@tinyerp.com 941b47c774 [FIX] hr_payroll: no need to 'eval' in view_id attribute 
bzr revid: olt@tinyerp.com-20101201131909-p0k732h89cij80y7
 2010-12-01 14:19:09 +01:00
AMP (OpenERP) 743501fe11 [MOD/IMP] hr_* Usebility Improvement in Icon 
bzr revid: amp@tinyerp.com-20101028072340-6oyqm4yx1n3yoe44
 2010-10-28 12:53:40 +05:30
DBR (OpenERP) ab0d260114 [MOD]: Usability Improvment in cancel & validate button position 
bzr revid: dbr@tinyerp.com-20101025093236-mdsrvgyuvq8q2nbl
 2010-10-25 15:02:36 +05:30
DBR (OpenERP) d2012542a3 [IMP]hr_holidays,hr_payroll : Usability Improvment 
bzr revid: dbr@tinyerp.com-20101021113438-7yscni6sx7ponvzk
 2010-10-21 17:04:38 +05:30
DBR (OpenERP) eb38ea17a7 [MOD/IMP]hr_* :Usability Improvement in view 
bzr revid: dbr@tinyerp.com-20101016073610-e6usev1z24timua6
 2010-10-16 13:06:10 +05:30
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
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
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
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
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
Mantavya Gajjar cf672602eb [IMP]: improvement to the contract object 
bzr revid: mga@tinyerp.com-20101007144456-vu0v0750ujf8bgzq
 2010-10-07 20:14:56 +05:30