Commit Graph

350 Commits

Author SHA1 Message Date
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
Ujjvala Collins (OpenERP) 4bac6d8969 [FIX] all: Fixed incomplete behavior of act_window.
lp bug: https://launchpad.net/bugs/708467 fixed

bzr revid: uco@tinyerp.com-20110127094939-v8gugx666pakihva
2011-01-27 15:19:39 +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
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
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 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 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
Vir (Open ERP) 7e54aa782c [Merge]
bzr revid: vir@tinyerp.com-20100924043941-x7ij7c6saw272bwe
2010-09-24 10:09:41 +05:30
Mantavya Gajjar cc4ee88766 [FIX]: solve the usability issue in psyslip view
bzr revid: mga@tinyerp.com-20100923100036-mtbc9m87t39fpya9
2010-09-23 15:30:36 +05:30
uco (Open ERP) 31d249a9ab [MERGE]
bzr revid: uco@tinyerp.com-20100819125727-iuofahcl931exx1r
2010-08-19 18:27:27 +05:30
RHA (Open ERP) d5ad0b8ff1 [CLEAN]: Removed commented codes, unnecessary spaces.
bzr revid: uco@tinyerp.com-20100819115157-sfsmbnjdgpp4wl12
2010-08-19 17:21:57 +05:30
PSI(OpenERP) 04e5144b2d [IMP] HR modules: Usebility, on employee add contract field (latest)
bzr revid: mra@mra-laptop-20100819093802-9z5a0t6rn4f17i5j
2010-08-19 15:08:02 +05:30
PSI(OpenERP) 2f80a95c91 [IMP] Analytic account with group extended with all modules where it refrence
bzr revid: mra@mra-laptop-20100817111335-8zu0l0tqno8dj5u9
2010-08-17 16:43:35 +05:30
AMP(Open ERP) aff16ab9a5 [MOD/IMP] hr_* : Improvement in access rights
bzr revid: vir@tinyerp.com-20100813133645-w8nex9k1he2zjq9h
2010-08-13 19:06:45 +05:30
Vir (Open ERP) 18672119ec [Merge] Usability Improvements in access rights
bzr revid: vir@tinyerp.com-20100809113241-zjdl5on5tksqtb7k
2010-08-09 17:02:41 +05:30
PSI(OpenERP) 57e7c51818 [IMP] hr related modules search views
bzr revid: mra@mra-laptop-20100809104010-mdsyd3lqxt2ntip4
2010-08-09 16:10:10 +05:30
Vir (Open ERP) 7eb7dab740 [Merge]
bzr revid: vir@tinyerp.com-20100806043513-ct3a1prtx6eaacc5
2010-08-06 10:05:13 +05:30
PSI(OpenERP) 187e9ff63c [IMP] hr_payroll: Reports improvements and add bank field on payroll advice object
bzr revid: mra@mra-laptop-20100805044104-jt6s9irtb1v59fr2
2010-08-05 10:11:04 +05:30
Vir (Open ERP) 9a012c51fa [Merge]
bzr revid: vir@tinyerp.com-20100804050241-7zf6wm1c1ab1leka
2010-08-04 10:32:41 +05:30
Mantavya Gajjar f182d69495 [FIX]: fix a broken window action for account move wizard 'Reconcile Entries'
[IMP]: improve some views in account, and hr_payroll module view

bzr revid: mga@tinyerp.com-20100803133719-5jgyo5gcvrugxqkq
2010-08-03 19:07:19 +05:30
PSI(OpenERP) 2fdd2000e6 [IMP] hr related modules
bzr revid: mra@mra-laptop-20100803064146-1tlbgy3huwxfer4e
2010-08-03 12:11:46 +05:30
AMP (OpenERP) 6eb86abda3 [MOD] usability improvement in access rights
bzr revid: amp@tinyerp.com-20100723072243-kpex4cdgckhga46d
2010-07-23 12:52:43 +05:30
Mantavya Gajjar 224319dd51 [FIX]: fix a hr payroll data
bzr revid: mga@tinyerp.com-20100721115602-m5mqo5fc42t0u267
2010-07-21 17:26:02 +05:30
dbr(Open ERP) c8bea68cd4 [MOD] auction,audittrail,crm_*,hr_*,email_template,event,idea,lunch,marketing_campaign,mrp : set colors in tree views according to state
bzr revid: vir@tinyerp.com-20100720111402-kcq52pa035hsyyb9
2010-07-20 16:44:02 +05:30
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
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
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
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 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
Vir (Open ERP) 2f4347a365 [Fix] hr_contract,hr_payroll : fix an error of type_id in yml and demo data
bzr revid: vir@tinyerp.com-20100915053258-sew40oyi4wo0y0tg
2010-09-15 11:02:58 +05:30
Vir (Open ERP) e5f3fd07e2 [MOD] hr: otherid,identification_id , hr_holidays: action added on list view
bzr revid: vir@tinyerp.com-20100911132900-q5fxoeqr42m3tifb
2010-09-11 18:59:00 +05:30
Vir (Open ERP) 8882b118d3 [MOD] hr : passport field set as char,and added on_change method
bzr revid: vir@tinyerp.com-20100911093215-sbr079z0rwpj2r6n
2010-09-11 15:02:15 +05:30
DBR (OpenERP) e5971516dc [IMP/MOD] hr :usability improvements
bzr revid: dbr@tinyerp.com-20100909115824-9018aqoywtp6dyxm
2010-09-09 17:28:24 +05:30
AMP (OpenERP) 0dbc10bf6c [MOD]hr_* : usability improvement in menuitem
bzr revid: amp@tinyerp.com-20100908090229-v4qvmjkfp00ymn0f
2010-09-08 14:32:29 +05:30
DBR (OpenERP) ea46dd2678 [MOD]hr_payroll : usability improvement
bzr revid: dbr@tinyerp.com-20100906105042-e1ui9sbn0r57c4sw
2010-09-06 16:20:42 +05:30
AMP (OpenERP) 1d15f71146 [MOD] project_timesheet,hr_* : usability improvement in access rights
bzr revid: amp@tinyerp.com-20100901132905-hslnywxf4zxogxdo
2010-09-01 18:59:05 +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 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