pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,585 Commits 1 Branch 0 Tags
f595581803776d5beaa2ba0d3ba277dca38eede7
Commit Graph
28585 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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) 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) 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) 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
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
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
Quentin (OpenERP) 1819c3d5ad [MERGE] merged psi branch with tooltip improvement 
bzr revid: qdp-launchpad@openerp.com-20110510133410-c9lapqzd49291o76
 2011-05-10 15:34:10 +02:00
psi (Open ERP) 3eb0031cae [IMP] improve searh view of hr.employee add filter on categories 
bzr revid: psi@tinyerp.co.in-20110510133227-fzbbptd2tje5suf8
 2011-05-10 19:02:27 +05:30
Mustufa Rangwala 7e28aed3a0 [FIX] Payroll: Payslip lines readonly with all states of payslips 
bzr revid: mra@mra-laptop-20110510131110-gd32dkedh7m3gv2i
 2011-05-10 18:41:10 +05:30
mtr 84739f218e [IMP] hr_payroll: renamed salary head into salary category 
bzr revid: mtr@mtr-20110510115411-lkf923pyakj1ykug
 2011-05-10 17:24:11 +05:30
psi (Open ERP) c600603f3a [ADD] improve code and add demo rule for sales 
bzr revid: psi@tinyerp.co.in-20110510111931-4v21peqft66hblpp
 2011-05-10 16:49:31 +05:30
psi (Open ERP) 8666be5ebd [IMP] rename object to worked_days and add one object hr.salary.input 
bzr revid: psi@tinyerp.co.in-20110509085002-l0ygkq5al9yedmz6
 2011-05-09 14:20:02 +05:30
Mustufa Rangwala 7f97f2e2b3 [IMP] Payroll: Clean the code 
bzr revid: mra@mra-laptop-20110506063903-4hno1tb6enrd0bk4
 2011-05-06 12:09:03 +05:30
mtr 3bca5dc9c8 [IMP] hr_payroll: minor improvement in methods for parameter employee 
bzr revid: mtr@mtr-20110505124959-062hns4ca03vltbu
 2011-05-05 18:19:59 +05:30
mtr 12aeaca553 [IMP] hr_payroll: minor changes 
bzr revid: mtr@mtr-20110505123515-in7313mb4ryqeb0f
 2011-05-05 18:05:15 +05:30
mtr 0f0a6246d7 [IMP] hr_payroll: improved two methods and moved worked_days_sum method to 'hr.payslip.input' object 
bzr revid: mtr@mtr-20110505123027-jluag8sqpp12gtwk
 2011-05-05 18:00:27 +05:30
mtr e04c62a5f9 [IMP] hr_payroll: if employee is not provided in an argument it returns 0 
bzr revid: mtr@mtr-20110505072004-1254kzo59rv9z97e
 2011-05-05 12:50:04 +05:30
mtr 89a6e52202 [IMP] hr_payroll: added worked_days_sum method to compute 'payslip' on 'other payslip' 
bzr revid: mtr@mtr-20110505054745-hkbzoothm3bqa46u
 2011-05-05 11:17:45 +05:30
mtr f97c21c40c [IMP] hr_payroll: added payslip_sum method to compute 'payslip' on other payslip' 
bzr revid: mtr@mtr-20110504125627-5zyck6tp8438gyd5
 2011-05-04 18:26:27 +05:30
psi (Open ERP) a13984cf7b [IMP] remove sequence form salary head object 
bzr revid: psi@tinyerp.co.in-20110504111348-kngj0i0tert4w9pt
 2011-05-04 16:43:48 +05:30
psi (Open ERP) c5d6059ab2 [FIX] rename the menu name 
bzr revid: psi@tinyerp.co.in-20110504063316-26r7wu0ni4gtqhad
 2011-05-04 12:03:16 +05:30
psi (Open ERP) df2bac2686 [IMP] remanes view ids 
bzr revid: psi@tinyerp.co.in-20110504055023-rngf7l4vwf25ilj7
 2011-05-04 11:20:23 +05:30
psi (Open ERP) fe16882b43 [IMP] small fixes 
bzr revid: psi@tinyerp.co.in-20110503131750-24xxudj2qs84vy21
 2011-05-03 18:47:50 +05:30
psi (Open ERP) 46cf364574 [IMP] rename the class and changed the view accourdingly 
bzr revid: psi@tinyerp.co.in-20110503123807-ptgnp6gejy045fai
 2011-05-03 18:08:07 +05:30
Mustufa Rangwala efdb84c905 [IMP] Payroll: form and tree view of Salary heads 
bzr revid: mra@mra-laptop-20110503091202-pmitrzjymkrr3otf
 2011-05-03 14:42:02 +05:30
psi (Open ERP) 0d8364a61b [FIX] small fix in hr_payroll 
bzr revid: psi@tinyerp.co.in-20110502124313-k0snr1nnx03026oo
 2011-05-02 18:13:13 +05:30
psi (Open ERP) d8962fac28 [MERGE] merge with trunk-payroll branch 
bzr revid: psi@tinyerp.co.in-20110502122136-wxilodkqcxk0wv05
 2011-05-02 17:51:36 +05:30
psi (Open ERP) 978b756760 [IMP] wizard will work for employees instead of employee categories 
bzr revid: psi@tinyerp.co.in-20110502121822-2xw9r1yilxoovr2o
 2011-05-02 17:48:22 +05:30
psi (Open ERP) c44fef6526 [IMP] improve the tooltip on code field of hr.salary.rule object 
bzr revid: psi@tinyerp.co.in-20110428133056-cramofq63y4s9nhy
 2011-04-28 19:00:56 +05:30