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

151 Commits

Author SHA1 Message Date
Mustufa Rangwala 9f43efede6 [FIX] small fix 
bzr revid: mra@mra-laptop-20110324093258-s8ykye3eatn23o09
 2011-03-24 15:02:58 +05:30
Osenda 49ed5e1336 [IMP] hr_payroll: changes on payslip 
bzr revid: osenda-20110324091103-1krcvxhz38lf5bup
 2011-03-24 10:11:03 +01:00
mtr 3b6449f709 [MERGE] branch merged with trunk-payroll-salary_rules-psi 
bzr revid: mtr@mtr-20110324083517-rg2u6e6nm12z7nd1
 2011-03-24 14:05:17 +05:30
mtr e80c3728f3 [IMP] hr_payroll:made 'struct_id' fields.related on hr.payslip 
bzr revid: mtr@mtr-20110323132959-qklty03qyl35ytpt
 2011-03-23 18:59:59 +05:30
psi (Open ERP) 80e501b581 [IMP] tool tips and small changes 
bzr revid: psi@tinyerp.co.in-20110323131600-dqhennoatjpl13o1
 2011-03-23 18:46:00 +05:30
mtr 36ab36f290 [IMP] hr_payroll:removed 'display_child_rules' from the code 
bzr revid: mtr@mtr-20110323130824-dcafcx8t85fm0wou
 2011-03-23 18:38:24 +05:30
Mustufa Rangwala 66d96e0cf1 [IMP] hr_payroll: add contract id on onchange on contract on payslip 
bzr revid: mra@mra-laptop-20110323114112-2q1bvj1db1qtnpwz
 2011-03-23 17:11:12 +05:30
psi (Open ERP) 794c39d803 [MERGE] merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110323084226-n1wm534d0hso6n90
bzr revid: psi@tinyerp.co.in-20110323101135-iidb0qlg4zk97t9a
bzr revid: psi@tinyerp.co.in-20110323101358-29ejnjid6wn72meq
 2011-03-23 15:43:58 +05:30
mtr 56fd660481 [IMP] hr_payroll:improved code for holidays in 'onchange_employee_id' function. 
bzr revid: mtr@mtr-20110323101149-pz4c5dzn3zvvkbqp
 2011-03-23 15:41:49 +05:30
mtr 04bceafd1f [IMP] hr_payroll:improved fields of 'hr.salary.head' and 'hr.payslip.line' objects 
bzr revid: mtr@mtr-20110323092318-zihgwzvthagfg2g6
 2011-03-23 14:53:18 +05:30
Quentin (OpenERP) 9e5609adb5 [IMP] hr_payroll: few modifications 
bzr revid: qdp-launchpad@openerp.com-20110322160808-1voe9ad36u1dot1b
 2011-03-22 17:08:08 +01:00
mtr be62097447 [IMP] hr_payroll:code for child rules of holidays and in python code 
bzr revid: mtr@mtr-20110322133713-ungnqrl9ynxrzv93
 2011-03-22 19:07:13 +05:30
psi (Open ERP) d12a1256de [IMP] small change update state before writing payslip data 
bzr revid: psi@tinyerp.co.in-20110322112504-ugwdsrj1gpw4rzyn
 2011-03-22 16:55:04 +05:30
psi (Open ERP) e56a6ef0fb [IMP] small improvment in _calculate_basic method of hr.employee so it will consider today's contract days to total the basic of employee form all contracts 
bzr revid: psi@tinyerp.co.in-20110322110353-ph0w969grj8ua6l3
 2011-03-22 16:33:53 +05:30
psi (Open ERP) 188ca3c715 [IMP] hr_contract: remove unwanted object 'hr.contract.wage.type.period', hr_payroll: Add recompute button, improve the compute method or hr.payroll.register and workflow of hr.payslip 
bzr revid: psi@tinyerp.co.in-20110322103531-kxk06fej7kh95td5
 2011-03-22 16:05:31 +05:30
psi (Open ERP) 24e773acd0 [IMP, MERGE] merge with mtr's branch, improve view 
bzr revid: psi@tinyerp.co.in-20110318131606-26l1q04kgxoza6u4
bzr revid: psi@tinyerp.co.in-20110321093539-u76i7umiyf01jhc9
 2011-03-21 15:05:39 +05:30
mtr 4785bb5afc [IMP] hr_payroll:added field schedule_pay on hr.contract and improved view of company contribution 
bzr revid: mtr@mtr-20110318131333-2msspn1nonnyd7g2
 2011-03-18 18:43:33 +05:30
mtr 3929c35749 [IMP] hr_payroll:added fields,code for company contribution 
bzr revid: mtr@mtr-20110318114619-hxjpj7g3itgwbcwg
 2011-03-18 17:16:19 +05:30
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