pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,678 Commits 1 Branch 0 Tags
664fbb68d6c4bd0c482adc87b5e0ca47c8db893d
Commit Graph
28678 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
psi (Open ERP) 664fbb68d6 [IMP] hr_payroll: code improvment in details by payslip report 
bzr revid: psi@tinyerp.co.in-20110602132346-x23d19p3j2ulancv
 2011-06-02 18:53:46 +05:30
psi (Open ERP) 51f8615651 [IMP] hr_payroll: Label improve on payslip report 
bzr revid: psi@tinyerp.co.in-20110602131532-7qkksk94tt0okpb9
 2011-06-02 18:45:32 +05:30
psi (Open ERP) 248f04f0ce [MERGE] hr_payroll: Merge with main payroll branch 
bzr revid: psi@tinyerp.co.in-20110531134351-ocbn936x1t2d61ei
 2011-05-31 19:13:51 +05:30
psi (Open ERP) abfeeabd5f [IMP] hr_payslip: improve layout and add field amount and qunatity in contribution register section on payslip details report 
bzr revid: psi@tinyerp.co.in-20110531134237-ka2v0mkxa1ume0fk
 2011-05-31 19:12:37 +05:30
psi (Open ERP) 546725cca0 [IMP] hr_payroll: payslip and payslip details report will show value in column like amount, quantiry and total even it is zero 
bzr revid: psi@tinyerp.co.in-20110527103933-2eqspaubjc5beqfx
 2011-05-27 16:09:33 +05:30
Quentin (OpenERP) e41d251cdc [MERGE] hr_payroll: merged branch of mtr with browsable categories + fixed few points in it 
[IMP] hr_payroll: improved BrowsableObject class to return 0.0 if the key isn't defined
[FIX] hr_payroll: fix the computation of categories

bzr revid: qdp-launchpad@openerp.com-20110527101322-k0lx0660feopt30i
 2011-05-27 12:13:22 +02:00
Quentin (OpenERP) 6872104462 [MERGE] payroll: merged branch for briwsing rules 
bzr revid: qdp-launchpad@openerp.com-20110527080441-khw4ggihutiawvfx
 2011-05-27 10:04:41 +02:00
mtr 43eb0502b6 [IMP] hr_payroll: improved code to have access of all the fields on rules object 
bzr revid: mtr@mtr-20110527072352-tdexanp29hxmnepi
 2011-05-27 12:53:52 +05:30
psi (Open ERP) d25e8fe61a [IMP] hr_payroll: Add total and quantity field on payslip report and add currency symbol to every row in payslip report and payslip details report 
bzr revid: psi@tinyerp.co.in-20110527065641-uks394pt8eyj5r5y
 2011-05-27 12:26:41 +05:30
mtr 45ec4a4110 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110527061311-2tn9n7cbu5gb7l6a
 2011-05-27 11:43:11 +05:30
mtr 253eaa325e [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110527060154-1fq5lppd897p9jc3
 2011-05-27 11:31:54 +05:30
Quentin (OpenERP) b55495512c [IMP] hr_payroll: added quantity on payslip lines 
bzr revid: qdp-launchpad@openerp.com-20110526165610-3ppefzx2tqk4sd98
 2011-05-26 18:56:10 +02:00
mtr 2eb5bb33f7 [IMP] hr_payroll: improved help string on 'amount_python_compute' field 
bzr revid: mtr@mtr-20110526113525-de0h5y8bp7c5shdm
 2011-05-26 17:05:25 +05:30
mtr 481d4e4bbe [IMP] hr_payroll: made 'rules' into browseable object 
bzr revid: mtr@mtr-20110526110838-n5juwnp5atajt8on
 2011-05-26 16:38:38 +05:30
mtr b3653a88d2 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110526093749-uam9vgtya56vpvm2
 2011-05-26 15:07:49 +05:30
mtr 09b88682e1 [IMP] hr_payroll: improved help string categories=>rule_categories 
bzr revid: mtr@mtr-20110526055655-iw9yg4999a5l8g1z
 2011-05-26 11:26:55 +05:30
mtr 8b32533bec [IMP] hr_payroll: revert back the changes from localdict => category_dict 
bzr revid: mtr@mtr-20110526055402-ua3mu846d8zw4jso
 2011-05-26 11:24:02 +05:30
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
mtr 46afc22ac9 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110525062621-m04kj8v37ov1v6bu
 2011-05-25 11:56:21 +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
mtr a54773c65d [IMP] hr_payroll: used 'BrowsableObject' method instead of inheritancy 
bzr revid: mtr@mtr-20110524103312-dvn8fbyzfp2grpll
 2011-05-24 16:03:12 +05:30
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 b5849f3519 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110524085206-tdpekv2v5fy2zbvf
 2011-05-24 14:22:06 +05:30
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
mtr 33f2f16249 [IMP] hr_payroll: inherited 'Inputline' class and changed help strings 
bzr revid: mtr@mtr-20110523112203-3xj8q54ffiqxmyz3
 2011-05-23 16:52:03 +05:30
mtr 961e04cc9e [IMP] hr_payroll: initiate object outside the for loop 
bzr revid: mtr@mtr-20110523093504-m2ibjrkk755dejuu
 2011-05-23 15:05:04 +05:30
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
mtr 32c8d6cb70 [IMP] hr_payroll: The python code expression can now be defined using 'browse',accordingly changed data file 
bzr revid: mtr@mtr-20110519053118-yzcmr39m3hqdb4u5
 2011-05-19 11:01:18 +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