pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,655 Commits 1 Branch 0 Tags
c6fa707ca2f73fcd94888986cb0aa73547cd0f2c
Commit Graph
28655 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Quentin (OpenERP) c6fa707ca2 [MERGE] 
bzr revid: qdp-launchpad@openerp.com-20110525134101-7v3n4bjszg1di0k7
 2011-05-25 15:41:01 +02:00
mtr 60794632f8 [IMP] hr_payroll: improved payslip state as per workflow changes and removed unrequired methods 
bzr revid: mtr@mtr-20110525091234-ih8c8e9vei8vfhbp
 2011-05-25 14:42:34 +05:30
Quentin (OpenERP) 06f1f00def [MERGE] hr_payroll: changed field 'quantity' into 'amount' in input lines 
bzr revid: qdp-launchpad@openerp.com-20110524124908-hzgk4vhegmynonsc
 2011-05-24 14:49:08 +02:00
Quentin (OpenERP) c002b2df9e [MERGE] hr_payroll: merged the branch with modifications on workflow and state of payslip 
bzr revid: qdp-launchpad@openerp.com-20110524123116-y0l7o66mclk8fkd2
 2011-05-24 14:31:16 +02:00
Quentin (OpenERP) 86bf1a8448 [MERGE] merged branch with improvements in payslip and payslip run 
bzr revid: qdp-launchpad@openerp.com-20110524092138-rf6ldei8mpmpya2v
 2011-05-24 11:21:38 +02:00
Quentin (OpenERP) cbc5c114be [MERGE] merged the branch with split of the 2 reports on payslip 
bzr revid: qdp-launchpad@openerp.com-20110524091417-neoz2vbj0ubjdx13
 2011-05-24 11:14:17 +02:00
mtr ad6b2593c2 [IMP] hr_payroll: renamed the field 'quantity' to 'amount' 
bzr revid: mtr@mtr-20110524060202-z58x324zvkugddd1
 2011-05-24 11:32:02 +05:30
mtr 9f1a74ca3e [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110524051948-sr86je1hlk5bkyvr
 2011-05-24 10:49:48 +05:30
Quentin (OpenERP) 24822683dc [MERGE] 
bzr revid: qdp-launchpad@openerp.com-20110523142020-tlr7jjc1n3zhgf65
 2011-05-23 16:20:20 +02:00
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
psi (Open ERP) 59d55a993d [IMP] hr_payroll: used removeParaNode if there isn't any description on payslip 
bzr revid: psi@tinyerp.co.in-20110523091029-a1doow4k02y67ax7
 2011-05-23 14:40:29 +05:30
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
psi (Open ERP) f69a2a7b7d [IMP] hr_payroll: Imporve search view of hr.payslip 
bzr revid: psi@tinyerp.co.in-20110520133452-1auudht73qdm0idv
 2011-05-20 19:04:52 +05:30
psi (Open ERP) cbcf51e5a5 [IMP] hr_payroll: Change the label of the report from PaySlip Details to Employee Payslip Details 
bzr revid: psi@tinyerp.co.in-20110520132554-2ohtfufdnsh9dm52
 2011-05-20 18:55:54 +05:30
mtr d3e3941eea [IMP] hr_payroll: improved tooltip for 'state' field 
bzr revid: mtr@mtr-20110520120009-7pq67hy8a9wfwa83
 2011-05-20 17:30:09 +05:30
mtr 6cbbeb16a8 [IMP] hr_payroll: improved tooltip for 'state' field and renamed method name. 
bzr revid: mtr@mtr-20110520115514-t5kw865rhuv53q5x
 2011-05-20 17:25:14 +05:30
psi (Open ERP) 7c36ebc0d8 [IMP] hr_payroll: Added search based on payslip.run object on payslip 
bzr revid: psi@tinyerp.co.in-20110517105818-ae5u33d3luh1z42x
 2011-05-17 16:28:18 +05:30
mtr 0df1f06801 [IMP] hr_payroll: improved payslip states(draft, verify, done) and workflow 
bzr revid: mtr@mtr-20110517105155-d4dp2tt7d7ut4jxd
 2011-05-17 16:21:55 +05:30
mtr 22c2b27b3a [IMP] hr_payroll: changed label of field quantity on Payslip input into 'Amount' 
bzr revid: mtr@mtr-20110516132739-bay9gf9tpolxagsx
 2011-05-16 18:57:39 +05:30
psi (Open ERP) 83a34f56c9 [IMP] split payslip report in to two. Employee payslip report will show the payslip lines appears on payslip and the payslip details report will show all the payslip line by category as well as by contribution register 
bzr revid: psi@tinyerp.co.in-20110516094655-gj6qtu29b6us3lh2
 2011-05-16 15:16:55 +05:30
psi (Open ERP) 36763f6af1 [MERGE] merge with trunk-payroll branch 
bzr revid: psi@tinyerp.co.in-20110516045404-xlphkqjrtvkuw0fw
 2011-05-16 10:24:04 +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