pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,636 Commits 1 Branch 0 Tags
da8281001a91c4ff858655be40b7eaf36e6eed5c
Commit Graph
28636 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Quentin (OpenERP) da8281001a [IMP] hr_payroll: better demo data 
bzr revid: qdp-launchpad@openerp.com-20110523141423-5x5e6curv55gpdej
 2011-05-23 16:14:23 +02:00
Quentin (OpenERP) 00384b71e5 [IMP] hr_payroll: better name class for browsable object in python code of salary rules 
bzr revid: qdp-launchpad@openerp.com-20110523140926-388dp1b8egyt08zl
 2011-05-23 16:09:26 +02:00
mtr 16228651c6 [IMP] hr_payroll: changed amount in the demo data for 'Meal voucher' rule 
bzr revid: mtr@mtr-20110523071328-ngvq8z1somz7bomt
 2011-05-23 12:43:28 +05:30
mtr 8d903b60aa [IMP] hr_payroll: improved query for sum method of Payslips class 
bzr revid: mtr@mtr-20110513112315-qcaemrufa22gdnag
 2011-05-13 16:53:15 +05:30
Mustufa Rangwala f46219d266 [REF] Payroll: remove unused import 
bzr revid: mra@mra-laptop-20110513063931-g83470vtp5z9o5lv
 2011-05-13 12:09:31 +05:30
Mustufa Rangwala 83345d5af5 [IMP] Payroll: clean codee 
bzr revid: mra@mra-laptop-20110513063639-kx4lbs2gq3bef6py
 2011-05-13 12:06:39 +05:30
Mustufa Rangwala 62c0ddad78 [IMP] Payroll: demo and default string improvements 
bzr revid: mra@mra-laptop-20110513062405-pf57a2ntrsze36mp
 2011-05-13 11:54:05 +05:30
Mustufa Rangwala 340a1a11d6 [IMP] Payroll: remove unused mehtod def sum from payslip now...it will work now with payslips class .. 
bzr revid: mra@mra-laptop-20110513060327-viq49sr0cx0nj1zp
 2011-05-13 11:33:27 +05:30
Mustufa Rangwala e85341722f [IMP] Payroll: remove print 
bzr revid: mra@mra-laptop-20110513060206-59oo6dc2arw8bps0
 2011-05-13 11:32:06 +05:30
Mustufa Rangwala 5439b7eb58 [IMP] Payroll: Payslips with python code 
bzr revid: mra@mra-laptop-20110513060012-q0qcwg6wbe9vk613
 2011-05-13 11:30:12 +05:30
Mustufa Rangwala efdacca163 [MERGE] Payroll: merge from main trunk-payroll branch 
bzr revid: mra@mra-laptop-20110513050945-zj8tudmzqdkqayli
 2011-05-13 10:39:45 +05:30
Quentin (OpenERP) f595581803 [IMP] hr_payroll: implemented the feature worked_days.WORK100.number_of_hours + improved worked_days.sum() method 
bzr revid: qdp-launchpad@openerp.com-20110512161628-wc8zvq62nqldc5jt
 2011-05-12 18:16:28 +02:00
mtr 8ff806bea3 [IMP] hr_payroll: improved sum method of worked days 
bzr revid: mtr@mtr-20110512135825-r6ighyds5xusu4cd
 2011-05-12 19:28:25 +05:30
Quentin (OpenERP) 7499c98d42 [MERGE] merged psi's branch with payslip report 
bzr revid: qdp-launchpad@openerp.com-20110512135749-jaipercgs20ae539
 2011-05-12 15:57:49 +02:00
psi (Open ERP) 211844634f [IMP] pass details_by_salary_rule_category instead of line_ids so the report will show payslip_lines with rule as Appear on payslip checked 
bzr revid: psi@tinyerp.co.in-20110512133940-cwmcdbtl3rz8giru
 2011-05-12 19:09:40 +05:30
psi (Open ERP) 80f2474862 [MERGE, IMP] merge with main payroll branch, Add payslip lines by contribution register on Employee payslip report 
bzr revid: psi@tinyerp.co.in-20110512083943-5e5eys6j7ae0af8e
bzr revid: psi@tinyerp.co.in-20110512130543-ld0w9si6oypo298u
 2011-05-12 18:35:43 +05:30
Mustufa Rangwala 8dea4d2698 [MERGE] merge from trunk-payroll main branch 
bzr revid: mra@mra-laptop-20110512130410-5ybp0b0drz6iqg7f
 2011-05-12 18:34:10 +05:30
mtr 54586b7d55 [IMP] hr_payroll: updated localdict to copmute payslip on payslip 
bzr revid: mtr@mtr-20110512123619-bss3lcy1dlrbi9r7
 2011-05-12 18:06:19 +05:30
mtr 30dee04d10 [IMP] hr_payroll: improved method of hr.payslip,to call it without passing(cr,uid) 
bzr revid: mtr@mtr-20110512120752-sdqi99qim652kwk0
 2011-05-12 17:37:52 +05:30
Quentin (OpenERP) 631d8a9e53 [MERGE] merged the branch containing the modifications on hr_payroll_account (author mtr and qpd) 
bzr revid: qdp-launchpad@openerp.com-20110512115719-m5ppmv0sk02wutgr
 2011-05-12 13:57:19 +02:00
Quentin (OpenERP) 4418c83a5f [REF] hr_payroll: added TODO comment 
bzr revid: qdp-launchpad@openerp.com-20110512115458-kg1s089del0032lx
 2011-05-12 13:54:58 +02:00
Quentin (OpenERP) 6abc27ba6d [FIX] hr_payroll_account: debugged the process_sheet method() 
bzr revid: qdp-launchpad@openerp.com-20110512114749-bbpukg17a3kad67q
 2011-05-12 13:47:49 +02:00
Quentin (OpenERP) e9e490b1fe [FIX] hr_payroll_account: removed the reference to old and removed objects 
bzr revid: qdp-launchpad@openerp.com-20110512110703-9ri4udog0gdmo422
 2011-05-12 13:07:03 +02:00
Quentin (OpenERP) b98ea8905e [IMP] hr_payroll_account: no need of new security rules in the module hr_payroll_account 
bzr revid: qdp-launchpad@openerp.com-20110512110243-9ixjk1ywyxwn00a6
 2011-05-12 13:02:43 +02:00
Quentin (OpenERP) 6b5e01d3ea [IMP] hr_payroll_account: cleaning of views and implementation of compute_sheet method 
bzr revid: qdp-launchpad@openerp.com-20110512110121-mqo8bv40fc54wdp3
 2011-05-12 13:01:21 +02:00
Quentin (OpenERP) b6f4aef872 [FIX] hr_payroll: fix errors in get_contract + removed old commented code 
bzr revid: qdp-launchpad@openerp.com-20110512090009-2wt0cqfm6kh9brtw
 2011-05-12 11:00:09 +02:00
Quentin (OpenERP) b653a74923 [IMP] hr_payroll_account: set the basis for the new version of hr_payroll_account based on our new vision of hr_payroll 
bzr revid: qdp-launchpad@openerp.com-20110512080147-emqikvpp8idhiwnx
 2011-05-12 10:01:47 +02:00
Quentin (OpenERP) 746a2f073d [MERGE] merged the branch of psi with payslip run feature (+add required=True on name field of payslip.run) 
bzr revid: qdp-launchpad@openerp.com-20110512074918-7h5qqgj4an2smayy
 2011-05-12 09:49:18 +02:00
psi (Open ERP) 2058cd5859 [IMP] small change in warning 
bzr revid: psi@tinyerp.co.in-20110512072131-bkyu91oejlje6k1e
 2011-05-12 12:51:31 +05:30
psi (Open ERP) badc8caef5 [IMP] small improvment in wizard 
bzr revid: psi@tinyerp.co.in-20110512070253-iyahei1j6cc1m4r0
 2011-05-12 12:32:53 +05:30
mtr 3682e3df40 [IMP] hr_payroll_account: made account_id unrequired field on contribution register 
bzr revid: mtr@mtr-20110512053637-2yudj4rinjtwayy1
 2011-05-12 11:06:37 +05:30
mtr 9dda35f064 [IMP] hr_payroll_account: added onchange_employee_id method and comments(help) in the code 
bzr revid: mtr@mtr-20110512051949-8znbh8wy6yyt192t
 2011-05-12 10:49:49 +05:30
psi (Open ERP) 3df45b0659 [FIX] small fix in onchange_employee(when onchage is called with no employee, worked days lines will also update) 
bzr revid: psi@tinyerp.co.in-20110512050703-lvf1d3ra76i4walx
 2011-05-12 10:37:03 +05:30
Mustufa Rangwala ed0311cb56 [MERGE] Merge from trunk-payroll main project branch 
bzr revid: mra@mra-laptop-20110512050150-m4qysq80qgo48fp1
 2011-05-12 10:31:50 +05:30
psi (Open ERP) ba27653083 [MERGE,IMP] merge with main payroll branch and improve the code in wizard according to that 
bzr revid: psi@tinyerp.co.in-20110511093426-0ao8e98y846hfmiv
bzr revid: psi@tinyerp.co.in-20110512045902-e310b5m3k7wf3m7b
 2011-05-12 10:29:02 +05:30
Quentin (OpenERP) e6c93096ae [MERGE] merged psi with fix of computation engine 
bzr revid: qdp-launchpad@openerp.com-20110511145239-uidsrlki2kn35x8f
 2011-05-11 16:52:39 +02:00
psi (Open ERP) dad5da0b60 [FIX] small fix 
bzr revid: psi@tinyerp.co.in-20110511133522-8e51br6tsnzs4dao
 2011-05-11 19:05:22 +05:30
Quentin (OpenERP) 5aab6e88a8 [MERGE] merged mtr's branch with new name for salary.head 
bzr revid: qdp-launchpad@openerp.com-20110511132148-g2pyjq9oy6e88w6t
 2011-05-11 15:21:48 +02:00
Quentin (OpenERP) fb727037e4 [MERGE] merged psi branch with new feature for input on payslip 
bzr revid: qdp-launchpad@openerp.com-20110511131650-2en4cz4331u4ihnh
 2011-05-11 15:16:50 +02:00
psi (Open ERP) 03fb4577c4 [MERGE] merge with main branch 
bzr revid: psi@tinyerp.co.in-20110511101733-8a0tbbmuwvo5bix5
 2011-05-11 15:47:33 +05:30
psi (Open ERP) d705511664 [IMP] Improve code and add state on hr.payslip.run object 
bzr revid: psi@tinyerp.co.in-20110511091009-iyu5bloo5ewg5re9
 2011-05-11 14:40:09 +05:30
mtr 042adc54a4 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110511073453-oqxvhdp20mfkc4ax
 2011-05-11 13:04:53 +05:30
mtr 7ae069998e [IMP] hr_payroll: renamed hr.salary.category into hr.salary.rule.category 
bzr revid: mtr@mtr-20110511071854-ctdf3czpedhe5t6l
 2011-05-11 12:48:54 +05:30
mtr 46303f0eb0 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110511064327-jzwjr10clzh33m37
 2011-05-11 12:13:27 +05:30
mtr c866c963e3 [IMP] hr_payroll: removed context,as we don't use the context later in the function 
bzr revid: mtr@mtr-20110511062312-r3lzjbdp10nqa28a
 2011-05-11 11:53:12 +05:30
mtr 4058da5295 [IMP] hr_payroll: improved code to take into account credit_note while calculating the sum 
bzr revid: mtr@mtr-20110511061349-dj6jlpmnhjn13iij
 2011-05-11 11:43:49 +05:30
Quentin (OpenERP) f302fa5ea3 [MERGE] merged mtr's branch related to security improvements 
bzr revid: qdp-launchpad@openerp.com-20110510145046-vc2603j5wrmc48tf
 2011-05-10 16:50:46 +02:00
Quentin (OpenERP) b55e82f0d9 [MERGE] merged mtr's branch with salary.head => salary.category 
bzr revid: qdp-launchpad@openerp.com-20110510142723-6kr9k4ivqwrusxss
 2011-05-10 16:27:23 +02:00
Quentin (OpenERP) f0de17b169 [MERGE] merged psi's branch with improvement of search view of employees 
bzr revid: qdp-launchpad@openerp.com-20110510140256-2j5sxnjatudmjnym
 2011-05-10 16:02:56 +02:00
Quentin (OpenERP) 962da7711c [MERGE] merge psi branch with removal of sequence on salary heads 
bzr revid: qdp-launchpad@openerp.com-20110510134237-ac3lu8aeec50hlsf
 2011-05-10 15:42:37 +02:00