pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,551 Commits 1 Branch 0 Tags
dad5da0b60eac07686c09d46357d9b1f5f347d18
Commit Graph
28551 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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) 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
Quentin (OpenERP) 19db9c692b [IMP] hr_payroll: improved help tooltip 
bzr revid: qdp-launchpad@openerp.com-20110428130848-cs584ryp8sesqmm7
 2011-04-28 15:08:48 +02:00
Quentin (OpenERP) 4023e0d5e9 [MERGE] merged mtr's branch: added field 'quantity' on salary rule object and changed the computation engine accordingly 
bzr revid: qdp-launchpad@openerp.com-20110428124014-31j04y8kx3cm31k6
 2011-04-28 14:40:14 +02:00
Quentin (OpenERP) d997f0a92c [MERGE] merged mtr's branch: improved payslip line view 
bzr revid: qdp-launchpad@openerp.com-20110428123402-2aj4ylhc13msk6fq
 2011-04-28 14:34:02 +02:00
Quentin (OpenERP) 6535ed21f6 [MERGE] merged mtr's branch: payslip line color is blue when total is 0 
bzr revid: qdp-launchpad@openerp.com-20110428122605-5l7e4xe75imw6u4b
 2011-04-28 14:26:05 +02:00
Quentin (OpenERP) 243182d909 [MERGE] merged mra's branch: now we can access rules directly by giving rule code no need to give rules[Code name] in dictionary 
bzr revid: qdp-launchpad@openerp.com-20110428122206-vougeyi34zhp5gga
 2011-04-28 14:22:06 +02:00
mtr 148b1d45a1 [IMP] hr_payroll: revert back the changes of access rights,made for hr user 
bzr revid: mtr@mtr-20110428085311-7017lofdf8jf7s3f
 2011-04-28 14:23:11 +05:30
mtr 43327d9e9b [IMP] hr_payroll: 'HR / Officer' can now see the payslips of him and of employess for which he's the manager 
bzr revid: mtr@mtr-20110428083538-v08g50zk6sx18t4j
 2011-04-28 14:05:38 +05:30
mtr ac07145e5a [IMP] hr_payroll: added ir.rule for employee payslip and modified access rights 
bzr revid: mtr@mtr-20110428063140-rxao7nev4xgzl9f2
 2011-04-28 12:01:40 +05:30
psi (Open ERP) 740aceecc3 [IMP] add help on code field of hr.salary.rule 
bzr revid: psi@tinyerp.co.in-20110426120826-3uid7tvyfwrj5fjt
 2011-04-26 17:38:26 +05:30
mtr 98438b2376 [IMP] hr_payroll:added company_id in payslip line view 
bzr revid: mtr@mtr-20110425131740-422eih4okmi6rjqh
 2011-04-25 18:47:40 +05:30
mtr 30564f93e9 [IMP] hr_payroll:again improved exception message string 
bzr revid: mtr@mtr-20110425120430-kacidzhufm6n25q7
 2011-04-25 17:34:30 +05:30
mtr eac6fb073c [IMP] hr_payroll:improved payslip line view,removed fields that are used to calculate the total 
bzr revid: mtr@mtr-20110425103718-r80y25vatlik17z4
 2011-04-25 16:07:18 +05:30
ARA (OpenERP) 11da3fc37b [FIX] hr_payroll: payslip line color is blue when total is 0 
bzr revid: ara@tinyerp.com-20110425102544-ivqy6vu4fb14z68u
 2011-04-25 15:55:44 +05:30
mtr 122d51a2d7 [IMP] hr_payroll:improved exception message string 
bzr revid: mtr@mtr-20110425102502-6basvgqilrh664th
 2011-04-25 15:55:02 +05:30
mtr 3c877bb4c7 [IMP] hr_payroll:removed qty from demo,improved search engine,made qty mandatory and added tooltip 
bzr revid: mtr@mtr-20110425095537-ewmhlikkh5i50jyg
 2011-04-25 15:25:37 +05:30
ARA (OpenERP) 9f2709ccd0 [FIX] hr_payroll: payslip line color is blue when total is 0 
bzr revid: ara@tinyerp.com-20110425094142-w0hjdx79bq84r920
 2011-04-25 15:11:42 +05:30
mtr 51543fa458 [IMP] hr_payroll:added field 'quantity' on salary rules,modified computation engine and demo data 
bzr revid: mtr@mtr-20110425072510-9f7tbuo9w3q3qq30
 2011-04-25 12:55:10 +05:30
Mustufa Rangwala d6dd4198ea [IMP] Payroll: to ease the use of the engine, we should use the code of rule directly as variable name instead of rules[<code of rule>] (we keep as it for heads[]). So it means that i should be able to use 'gross' instead of rules['gross'] 
bzr revid: mra@mra-laptop-20110425071930-co05h4pyl0k73a4v
 2011-04-25 12:49:30 +05:30
Quentin (OpenERP) 2dad28d4fd [IMP] hr_payroll: misc improvements among 
* remove typo in hr.contribution.register object name
   * fix engine: a rule with same code must overwrite the previous value
   * improved demo data: set same code for Conveyance Allowance for Paolino and parent rule
   * improved tree/search views

bzr revid: qdp-launchpad@openerp.com-20110412170128-xlf1r1tfsm8ke7e5
 2011-04-12 19:01:28 +02:00
Mustufa Rangwala e4f4d851b8 [IMP] Payroll: payslip lines with appears on payslip = true only 
bzr revid: mra@mra-laptop-20110412133542-etbmskrdx05fml2q
 2011-04-12 19:05:42 +05:30
Mustufa Rangwala 43af0b6cdf [MERGE] Small fix on demo data for payroll stcturure 
mtr branch lp:~openerp-dev/openobject-addons/trunk-payroll-demo-data-mtr

bzr revid: mra@mra-laptop-20110412095606-oijfyt65v2pvyqdc
 2011-04-12 15:26:06 +05:30
Mustufa Rangwala 9ed1b31b4f [ADD] Payroll: Payslip line action on payslip + search view added for payslip lines 
bzr revid: mra@mra-laptop-20110412095337-ohnd7nymekow41eb
 2011-04-12 15:23:37 +05:30
mtr cbb45ef370 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll 
bzr revid: mtr@mtr-20110412085111-f47gcnu21e2s6433
 2011-04-12 14:21:11 +05:30
mtr 6448821818 [IMP] hr_payroll: corrected m2m field rule_ids in demo data 
bzr revid: mtr@mtr-20110412084435-e9wmpo4c0thm9954
 2011-04-12 14:14:35 +05:30
Mustufa Rangwala d900e9768b [FIX] Payroll: Meal voucher correct the sequnce 
bzr revid: mra@mra-laptop-20110412084427-12jupz8i6s6lol6d
 2011-04-12 14:14:27 +05:30
Mustufa Rangwala e91d5a7c38 [FIX] Payroll: Fix for installation 
bzr revid: mra@mra-laptop-20110412052349-bcjzxxtkwqy3caol
 2011-04-12 10:53:49 +05:30
Quentin (OpenERP) 6fcff64542 [MERGE] merged mtr branch with demo data improvements 
bzr revid: qdp-launchpad@openerp.com-20110411155429-qe1irgln9ick9m3y
 2011-04-11 17:54:29 +02:00
Quentin (OpenERP) 33f392cb28 [MERGE] merge 
bzr revid: qdp-launchpad@openerp.com-20110411155356-jncdanf2fv0rgynd
 2011-04-11 17:53:56 +02:00
Quentin (OpenERP) 44d60f1b0c [MERGE] merged mtr's branch with fix of access rules 
bzr revid: qdp-launchpad@openerp.com-20110411155133-s2ok782n4olvp1jj
 2011-04-11 17:51:33 +02:00
Quentin (OpenERP) aecd9527c9 [MERGE] merge mra's branch with detail by salary head tab, on payslip (removed mtr branch content) 
bzr revid: qdp-launchpad@openerp.com-20110411155034-8szy0fpbcglqtej0
 2011-04-11 17:50:34 +02:00
Quentin (OpenERP) c976c757d8 [IMP] hr_payroll: added head data for company contribution 
bzr revid: qdp-launchpad@openerp.com-20110411154715-idvt0myzjnurmlj2
 2011-04-11 17:47:15 +02:00