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

433 Commits

Author SHA1 Message Date
mtr de09f57d7b [IMP] hr_payroll:improved code for child_rules,added display_child_rules field 
bzr revid: mtr@mtr-20110317132913-ffrst2r4dxgtw3w8
 2011-03-17 18:59:13 +05:30
psi (Open ERP) a3d4555688 [IMP] payslip line created by holidays will also consider the amount_type=code 
bzr revid: psi@tinyerp.co.in-20110317125547-lj532yj9wy79uz2a
 2011-03-17 18:25:47 +05:30
psi (Open ERP) aeb88e7675 [IMP] change for amount_type='code' on hr.salary.rule object improve the calculation for the same 
bzr revid: psi@tinyerp.co.in-20110317113535-7o5j9gz8bf3g8zmx
 2011-03-17 17:05:35 +05:30
psi (Open ERP) 468631afd7 [MERGE] Merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110317085442-5lt6vjulygmqeif3
 2011-03-17 14:24:42 +05:30
psi (Open ERP) 3947b67231 [IMP] small improvment in compute_sheet method of hr.payroll.register 
bzr revid: psi@tinyerp.co.in-20110316131407-ax2dysk4x6b1kjph
 2011-03-16 18:44:07 +05:30
psi (Open ERP) c42ce2d208 [IMP] imporve the compute_sheet method of hr.payroll.register 
bzr revid: psi@tinyerp.co.in-20110316114302-m5vg413dk7otpzxz
 2011-03-16 17:13:02 +05:30
mtr ee2f49bc09 [IMP] hr_payroll:added code for child rules 
bzr revid: mtr@mtr-20110315133322-uqg7rawcx4btm332
 2011-03-15 19:03:22 +05:30
psi (Open ERP) 57a9c5e7f5 [IMP] small improvement in default of python_compute field of hr.salary.rule object 
bzr revid: psi@tinyerp.co.in-20110315095722-i6kpzy3c6yt6tjw7
 2011-03-15 15:27:22 +05:30
psi (Open ERP) fd1bf58bfb [IMP] improve code so it will calculate lines for type=code 
bzr revid: psi@tinyerp.co.in-20110314133428-cey6umex57d62po8
 2011-03-14 19:04:28 +05:30
psi (Open ERP) 748259854c [MERGE] merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110314122749-6b4i14zwcs5zudyr
 2011-03-14 17:57:49 +05:30
psi (Open ERP) 8092a079d2 [IMP] remove unused code 
bzr revid: psi@tinyerp.co.in-20110314120359-clwrb39i70lkfxsf
 2011-03-14 17:33:59 +05:30
Mustufa Rangwala 5d5392dff5 [FIX] small fix 
bzr revid: mra@mra-laptop-20110314114708-uff1npg60l21q488
 2011-03-14 17:17:08 +05:30
Mustufa Rangwala 9672c7c83f [FIX] small fix 
bzr revid: mra@mra-laptop-20110314114447-h1zwjsaedpmlnmdl
 2011-03-14 17:14:47 +05:30
Mustufa Rangwala bfdec77ead [IMP] payroll cleaning 
bzr revid: mra@mra-laptop-20110314112227-6rzbc31dpg0tvop1
 2011-03-14 16:52:27 +05:30
mtr 007e96a197 [IMP] hr_payroll:improved code for min and max range condition for amount_type=percentage 
bzr revid: mtr@mtr-20110314094429-zulakh5vl7cykotu
 2011-03-14 15:14:29 +05:30
psi (Open ERP) d7e626ff76 [MERGE] merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110314090226-f9ut7cqf5l0r1xud
 2011-03-14 14:32:26 +05:30
Mustufa Rangwala adf35bc8e0 [IMP] Cleaning employee object 
bzr revid: mra@mra-laptop-20110314085854-g192a5k8is984klt
 2011-03-14 14:28:54 +05:30
psi (Open ERP) 41fd33e46e [IMP] improve in workflow of hr.payslip object 
bzr revid: psi@tinyerp.co.in-20110314085750-5qk7f0txo8b003d2
 2011-03-14 14:27:50 +05:30
Mustufa Rangwala e50705e393 [IMP] remove line_ids (hr.payslip lines) from employee object 
bzr revid: mra@mra-laptop-20110314084555-jxm2en3l9yiy8tyb
 2011-03-14 14:15:55 +05:30
Mustufa Rangwala a523e73c1e [IMP] hr_payroll: Code improved 
bzr revid: mra@mra-laptop-20110314072317-rivtyc4yokwvsqtd
 2011-03-14 12:53:17 +05:30
psi (Open ERP) 743a6fe8ee [IMP] get holidays line of employee in holidays tab 
bzr revid: psi@tinyerp.co.in-20110314061621-zn9ntg6l28zts7a6
 2011-03-14 11:46:21 +05:30
psi (Open ERP) 0be7eecb8f [MERGE] merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110314050010-pkqhcumi84fhmfdd
 2011-03-14 10:30:10 +05:30
psi (Open ERP) cc8bb306f5 [IMP] improve _caluculate method on hr.payslip object so it will consider all line_ids of hr.payslip 
bzr revid: psi@tinyerp.co.in-20110311122326-golfefokn1bp2gsz
 2011-03-11 17:53:26 +05:30
mtr 36366390b5 [IMP] hr_payroll:created a function to get parent_id of salary structure 
bzr revid: mtr@mtr-20110311114155-stpuykd37s02iyq1
 2011-03-11 17:11:55 +05:30
mtr 5c0680f7f8 [MERGE] branch merged with trunk-payroll-salary_rules-psi 
bzr revid: mtr@mtr-20110311101220-9yehi8n5lz7ui2hx
 2011-03-11 15:42:20 +05:30
mtr 473a1541e1 [IMP] hr_payroll:added code in onchange_employee_id if salary structure has parent_id 
bzr revid: mtr@mtr-20110311085740-gkz19qlnpt38gowc
 2011-03-11 14:27:40 +05:30
psi (Open ERP) 2dc26c64c1 [IMP] fix the problem related to save the payslip record 
bzr revid: psi@tinyerp.co.in-20110310115525-hdmc23gxma25jbya
 2011-03-10 17:25:25 +05:30
mtr 3fbb7333ab [IMP] hr_payroll:added code in onchange_employee_id for min and max range condition 
bzr revid: mtr@mtr-20110310065326-2vtu0z1fyy1esj09
 2011-03-10 12:23:26 +05:30
psi (Open ERP) da3745b2d6 [IMP] hr_payroll: Get payslip_line for leaves 
bzr revid: psi@tinyerp.co.in-20110309133027-2z1b6i3pvz0di3i9
 2011-03-09 19:00:27 +05:30
mtr bb4cc763a9 [MERGE] branch merged with trunk-payroll-salary_rules-psi 
bzr revid: mtr@mtr-20110309125647-4qv3bwf6rm6j9b5j
 2011-03-09 18:26:47 +05:30
mtr f0e3ce0dbb [IMP] hr_payroll:improved code of _calculate(hr.payslip) for gross and net 
bzr revid: mtr@mtr-20110309113003-03rr094fnxwn5n35
 2011-03-09 17:00:03 +05:30
psi (Open ERP) 8b1895b8e8 [IMP] hr_payroll: Improve demo data(set negative value for deduction) 
bzr revid: psi@tinyerp.co.in-20110309103758-x4kzt9kn5krogre3
 2011-03-09 16:07:58 +05:30
psi (Open ERP) b46811e762 [MERGE] merge with mtr's payroll branch 
bzr revid: psi@tinyerp.co.in-20110309101242-385e7hxtp2z9j04h
 2011-03-09 15:42:42 +05:30
psi (Open ERP) 4de1ee3f35 [IMP] on hr.employee object make basic field as function and the function make the sum of basic field of all the hr.contract for this employee that have date_start < now() and now() < date_stop or not date_stop 
bzr revid: psi@tinyerp.co.in-20110309101041-p4i0n49uq0qo2tm2
 2011-03-09 15:40:41 +05:30
mtr f6a7d660be [IMP] hr_payroll:improved code and view for 'basic_amount' of hr.payslip 
bzr revid: mtr@mtr-20110309085441-nka6x5s8hfhxt982
 2011-03-09 14:24:41 +05:30
mtr 1dc96b5404 [IMP] hr,hr_payroll:removed hr.passport from .csv,improved hr.payslip and hr.payslip.line object 
bzr revid: mtr@mtr-20110309061111-sl9d1b10c9wnk16r
 2011-03-09 11:41:11 +05:30
Mustufa Rangwala d39237d474 [IMP/FIX] hr_payroll: Improvement and cleaning 
bzr revid: mra@mra-laptop-20110308063637-zfv8hawzqkdvsk8d
 2011-03-08 12:06:37 +05:30
mtr de09fe0af3 [IMP] hr_payroll:improved code of onchange_employee_id for min and max range condition 
bzr revid: mtr@mtr-20110308055145-q31b346sxscys51o
 2011-03-08 11:21:45 +05:30
mtr a4cc0a400d [IMP] hr_payroll:added warning to fix the error on payslip,when structure is not defined for an employee 
bzr revid: mtr@mtr-20110307131329-dlpac23lr2edb863
 2011-03-07 18:43:29 +05:30
mtr b66b346664 [IMP] hr_payroll:improved code to fix the error on payslip,when structure is not defined for an employee 
bzr revid: mtr@mtr-20110307124607-kj0qokxxblhx4uie
 2011-03-07 18:16:07 +05:30
mtr 7b7a1915f4 [MERGE] branch merged with trunk-payroll-salary_rules-psi 
bzr revid: mtr@mtr-20110307113703-mu4v0hsd8e7a6qqa
 2011-03-07 17:07:03 +05:30
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
psi (Open ERP) e35ce1fdcd [IMP] hr_payroll: Get line_ids on hr_payslip based on salary rules, Improve _calculate function on hr.payslip, if Appears on payslip is set then the salary rule will be added in line_ids of hr.payslip else it will consider in calculation only 
bzr revid: psi@tinyerp.co.in-20110307092649-u6cd4hkfk8biikqq
 2011-03-07 14:56:49 +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) 6bb91a2926 [MERGE] merge with trunk-payroll-salary_rules-mtr branch 
bzr revid: psi@tinyerp.co.in-20110304094702-udyk182mv00jg08b
 2011-03-04 15:17:02 +05:30
psi (Open ERP) 5b8c80ce13 [IMP] hr_payroll: Improve onchange_employee_id on hr.payslip 
bzr revid: psi@tinyerp.co.in-20110304094414-kuahly8xm90zjep6
 2011-03-04 15:14:14 +05:30
mtr e584769f5b [IMP] hr_payroll:improved code in hr.payslip(verify_sheet) 
bzr revid: mtr@mtr-20110304093534-jjjpp0loyqltxg41
 2011-03-04 15:05:34 +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) 899dccfc23 [IMP] remove working_days_per_week field from hr.contract object 
bzr revid: psi@tinyerp.co.in-20110303131754-bw7qa76z5tsn2mua
 2011-03-03 18:47:54 +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 cbaaaba383 [IMP] hr_payroll:improved help for salary rules. 
bzr revid: mtr@mtr-20110302085359-19ayfxa43pe2aasa
 2011-03-02 14:23:59 +05:30
mtr 4723e2da6b [IMP] hr_payroll:added help for salary rules. 
bzr revid: mtr@mtr-20110302084815-m2ybjteobf4t1s2f
 2011-03-02 14:18:15 +05:30
mtr bb0decba67 [IMP] hr_payroll:commented the line_ids field(hr.payroll.structure) and function_id field(hr.payslip.line) 
bzr revid: mtr@mtr-20110302071238-s3efwfa486q0ylht
 2011-03-02 12:42:38 +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 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
psi (Open ERP) 250e2fc68e [IMP] hr_payroll: Improve the onchange_employee function so it will update the holidays details of the employee 
bzr revid: psi@tinyerp.co.in-20110228121015-vml7i72e1ey2ayv5
 2011-02-28 17:40:15 +05:30
Quentin (OpenERP) 8798384504 [IMP] hr_payroll: some clearance 
bzr revid: qdp-launchpad@openerp.com-20110228105524-tymoxmlzi81dksz2
 2011-02-28 11:55:24 +01:00
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 4196288c4e [IMP] hr_payroll:improved the string for boolean field on salary rule 
bzr revid: mtr@mtr-20110225133552-po1y1y7gu14rhk6b
 2011-02-25 19:05:52 +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
psi (Open ERP) 7a795aa8f6 [FIX] hr_payroll: speling correction of lables 
lp bug: https://launchpad.net/bugs/702027 fixed

bzr revid: psi@tinyerp.co.in-20110113075536-q1gjfq0mu3a26hd0
 2011-01-13 13:25:36 +05:30
husen 5fefd9f529 typo 
bzr revid: husen@husen-laptop-20101230134220-nqz0cncs6cqhaacg
 2010-12-30 19:12:20 +05:30
husen f433b959c2 merged with trunk 
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
 2010-12-30 15:28:09 +05:30
Quentin THEURET f078fe580a [FIX] hr_payrol: Fixed unicodeerror 
lp bug: https://launchpad.net/bugs/693788 fixed

bzr revid: pso@tinyerp.com-20101224120544-fav3jc3co3kkrly6
 2010-12-24 17:35:44 +05:30
Mustufa Rangwala b0f61a9546 [MERGE] merge from trunk addons 
bzr revid: mra@mra-laptop-20101214130232-wqsim6966u1hilu9
bzr revid: mra@mra-laptop-20101217043732-ri8dfx38pacpruye
 2010-12-17 10:07:32 +05:30
Mustufa Rangwala 6428d964a9 [FIX] Hr: hr, passport field, bad widget 
lp bug: https://launchpad.net/bugs/687310 fixed

bzr revid: mra@mra-laptop-20101213082134-1qjew9qqz2wqmrs8
 2010-12-13 13:51:34 +05:30
uco (OpenERP) d827b2f6ea [REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods. 
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
 2010-12-13 12:13:09 +05:30
uco (OpenERP) 097ff85deb [MERGE]: Merged with trunk-addons. 
bzr revid: uco@tinyerp.com-20101123071135-712ya21x2v77mn36
 2010-11-23 12:41:35 +05:30
uco (OpenERP) 6dd290e824 [REF]: Replace the condition 'if not context' with 'if context is None'. 
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
 2010-11-23 12:35:05 +05:30
uco (OpenERP) 12fcd1be2f [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None. 
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
 2010-11-19 19:18:01 +05:30
Olivier Dony e1d9d1d6c6 [FIX] stock,hr,pos,project,...: cleanup some calls to _( ) - only literal strings should ever been used! 
bzr revid: odo@openerp.com-20101119122003-4r52xuupedyhgmcx
 2010-11-19 13:20:03 +01:00
Olivier Dony c90aa7f2f0 [FIX] caldav,email_template,hr_payroll,mrp: cleanup some calls to _( ) - only literal strings should ever been passed! 
bzr revid: odo@openerp.com-20101118162131-s2nb25l3e4xzmnjg
 2010-11-18 17:21:31 +01:00
Thibault Francois d516bc0ea1 [MERGE] with trunk 
bzr revid: tfr@openerp.com-20101110120902-k60lls4irx842pq2
 2010-11-10 13:09:02 +01:00
pso e0bd6974e2 [FIX] hr_payroll: Fixed decimal precision error 
lp bug: https://launchpad.net/bugs/617974 fixed

bzr revid: pso@tinyerp.com-20101103080442-xp0k54djtvx6cw8l
 2010-11-03 13:34:42 +05:30
uco (OpenERP) ffbb15e03e [MERGE]: Merged with team1. 
bzr revid: uco@tinyerp.com-20101028070542-fhe8w6z1ggb4crne
 2010-10-28 12:35:42 +05:30
uco (OpenERP) eccc1d33b2 [REF] copyrights: Replaced 'GNU General Public License' with 'GNU Affero General Public License' 
bzr revid: uco@tinyerp.com-20101028065418-ahi6poaxn1aa5dmp
 2010-10-28 12:24:18 +05:30
Mustufa Rangwala 63024dc43f [REF] hr_payroll: Removed warnings from buildbot 
bzr revid: mra@mra-laptop-20101028042705-9fq386jz2wk7mrxb
 2010-10-28 09:57:05 +05:30
vra c0561bea93 [FIX][IMP] hr_payroll, hr_payroll_account: improved the demo for default account, fixed the datetime traceback in payslip compute action. 
bzr revid: vra@tinyerp.com-20101027141328-hs3qcosrckpzpbm5
 2010-10-27 19:43:28 +05:30
Mustufa Rangwala 17a5fd4ee8 [REF] 
bzr revid: mra@mra-laptop-20101027131019-mx6r2q7fgpnkh0sb
 2010-10-27 18:40:19 +05:30
vth cd8e9de724 [REF] hr_* 
bzr revid: vth@tinyerp.com-20101027124959-phubwje70rmbec4p
 2010-10-27 18:19:59 +05:30
jas 90e8a2a9ac [FIX] hr_payroll :added cancel_sheet and set_to_draft function 
bzr revid: jas@tinyerp.com-20101026122332-9olfswqdnjgqxeye
 2010-10-26 17:53:32 +05:30
vra 90e27fd366 [REF]hr_payroll, hr_payroll_account: code cleaning. 
bzr revid: vra@tinyerp.com-20101015055414-d5p5lchgh3t1e7n8
 2010-10-15 11:24:14 +05:30
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 30efb09f7a [IMP]: improve the usability 
bzr revid: mga@tinyerp.com-20101008131845-alqqlb6d97y3s3d5
 2010-10-08 18:48:45 +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 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
Vir (Open ERP) 7e54aa782c [Merge] 
bzr revid: vir@tinyerp.com-20100924043941-x7ij7c6saw272bwe
 2010-09-24 10:09:41 +05:30
Mantavya Gajjar 07b88cb8da [FIX]: add the missing field to the payslip model 
bzr revid: mga@tinyerp.com-20100923091734-7niyoorw5hmryo58
 2010-09-23 14:47:34 +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) 2c9f004a19 [FIX] hr_payroll: onchange company 
bzr revid: mra@mra-laptop-20100805134155-mefm72ezoclnfqog
 2010-08-05 19:11:55 +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
PSI (OpenERP) 4b1348a989 [IMP] hr related modules improvements 
bzr revid: mra@mra-laptop-20100727071145-4n3z9i1jj1zosp8z
 2010-07-27 12:41:45 +05:30
Mantavya Gajjar 0ffd63135c [FIX]: improvement in hr_payroll and account recurring wizard 
bzr revid: mga@tinyerp.com-20100722121342-4kx7jv06zonmv5g2
 2010-07-22 17:43:42 +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
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
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
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
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