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

149 Commits

Author SHA1 Message Date
mtr 97a5a3c227 [MERGE] branch merged with trunk-payroll-salary_rules-psi 
bzr revid: mtr@mtr-20110331050506-yczfv6k3rq0027r5
 2011-03-31 10:35:06 +05:30
psi (Open ERP) 4bf712c413 [IMP] on_change_contract works for every condition now 
bzr revid: psi@tinyerp.co.in-20110330132114-i30h0pk8ho8ikjme
 2011-03-30 18:51:14 +05:30
mtr b8bdd54fe1 [IMP] hr_payroll: committing view changes which got reverted 
bzr revid: mtr@mtr-20110330063927-25p27rwvklr12ge8
 2011-03-30 12:09:27 +05:30
mtr 473be47059 [IMP] hr_payroll: improved string 
bzr revid: mtr@mtr-20110330053457-jf3gowwjdbs290w1
 2011-03-30 11:04:57 +05:30
mtr 4f27ec3e8f [IMP] hr_payroll: again committing changes which got reverted 
bzr revid: mtr@mtr-20110330053055-3ovz8idtmrvtkoqq
 2011-03-30 11:00:55 +05:30
psi (Open ERP) bc6a98c3ab [IMP] onchange_employee on holidays will update the contract also, and now get_contract function will return list of contract object 
bzr revid: psi@tinyerp.co.in-20110329133243-ki3uigbuskveb6sd
 2011-03-29 19:02:43 +05:30
psi (Open ERP) fa5ceb85c2 [MERGE] merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110329072747-zugi6o6pmpsvtt3z
bzr revid: psi@tinyerp.co.in-20110329073653-ueki6be4gby8briw
 2011-03-29 13:06:53 +05:30
psi (Open ERP) c92303afc1 [IMP] hr_payroll: Holidays for multiple contracts 
bzr revid: psi@tinyerp.co.in-20110329072648-e9dilqyvijhv6li2
 2011-03-29 12:56:48 +05:30
Osenda e9d028ea34 [IMP]Changes on salary rule form 
bzr revid: osenda-20110328135032-yfumqec54ovtsbox
 2011-03-28 15:50:32 +02:00
mtr 8eaf9ae4a5 [IMP] hr_payroll:created a method for three function fields. 
bzr revid: mtr@mtr-20110328123241-m0tul6jysd4cr2k8
 2011-03-28 18:02:41 +05:30
psi (Open ERP) 491387a736 [IMP] Update the code of compute_sheet method for recompute button 
bzr revid: psi@tinyerp.co.in-20110328102153-z7deqd97musv89d0
 2011-03-28 15:51:53 +05:30
psi (Open ERP) cfb4267d8a [MERGE, IMP] Merge with mtr's branch and improve compute_sheet method for multiple contracts of an employee 
bzr revid: psi@tinyerp.co.in-20110328052714-7p6lh6p9hzj9s7pr
 2011-03-28 10:57:14 +05:30
psi (Open ERP) f8050e531c [IMP] hr_payroll: Improve onchange_employee_id function so it will consider more than one contract 
bzr revid: psi@tinyerp.co.in-20110325132010-2wbznignx994jvb5
 2011-03-25 18:50:10 +05:30
mtr 5182562f9b [IMP] hr_payroll:added fields and code for tab i.e 'Applied Salary Rules' and 'Appears on Payslip' 
bzr revid: mtr@mtr-20110325131512-qzyzqemlqvc48yof
 2011-03-25 18:45:12 +05:30
Osenda b97e5ce8f7 [IMP]Changes on payslip from aos 
bzr revid: osenda-20110324084009-0xldm7gnnkayctza
 2011-03-24 09:40:09 +01:00
Osenda 49ed5e1336 [IMP] hr_payroll: changes on payslip 
bzr revid: osenda-20110324091103-1krcvxhz38lf5bup
 2011-03-24 10:11:03 +01:00
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
Quentin (OpenERP) 9e5609adb5 [IMP] hr_payroll: few modifications 
bzr revid: qdp-launchpad@openerp.com-20110322160808-1voe9ad36u1dot1b
 2011-03-22 17:08:08 +01:00
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) 8a3cd9df15 [IMP] small change in view of salary rule 
bzr revid: psi@tinyerp.co.in-20110321101044-0meog6mah7rm3avn
 2011-03-21 15:40:44 +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
psi (Open ERP) db4327dd2d [IMP] add company on hr.payroll.register form and tree view 
bzr revid: psi@tinyerp.co.in-20110318131313-gd7o475deqaooyo3
 2011-03-18 18:43:13 +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) 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
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) 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
Mustufa Rangwala adf35bc8e0 [IMP] Cleaning employee object 
bzr revid: mra@mra-laptop-20110314085854-g192a5k8is984klt
 2011-03-14 14:28:54 +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
mtr d4a5c96afa [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll 
bzr revid: mtr@mtr-20110310053747-79fbrkud3ycqfhz6
 2011-03-10 11:07:47 +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 5b0fdb52a9 [IMP] hr_payroll:commented 'allounce' and 'deduction' field in view of payroll register. 
bzr revid: mtr@mtr-20110309085733-1cmjz1q1fojs3iso
 2011-03-09 14:27:33 +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
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 6e6b21a875 [IMP] hr_payroll,hr_contract:commented 'hr.contract.wage.type' and improved strings of menuitem in payroll. 
bzr revid: mtr@mtr-20110307112817-f3c7o3fro4oxzejn
 2011-03-07 16:58:17 +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 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