git.inspyration.org Git - odoo/odoo.git/log

Quentin (OpenERP) [Thu, 12 May 2011 11:01:21 +0000 (13:01 +0200)]

[IMP] hr_payroll_account: cleaning of views and implementation of compute_sheet method

bzr revid: qdp-launchpad@openerp.com-20110512110121-mqo8bv40fc54wdp3

commit | commitdiff | tree

Quentin (OpenERP) [Thu, 12 May 2011 08:01:47 +0000 (10:01 +0200)]

[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

commit | commitdiff | tree

mtr [Thu, 12 May 2011 05:36:37 +0000 (11:06 +0530)]

[IMP] hr_payroll_account: made account_id unrequired field on contribution register

bzr revid: mtr@mtr-20110512053637-2yudj4rinjtwayy1

commit | commitdiff | tree

mtr [Thu, 12 May 2011 05:19:49 +0000 (10:49 +0530)]

[IMP] hr_payroll_account: added onchange_employee_id method and comments(help) in the code

bzr revid: mtr@mtr-20110512051949-8znbh8wy6yyt192t

commit | commitdiff | tree

Mustufa Rangwala [Thu, 12 May 2011 05:01:50 +0000 (10:31 +0530)]

[MERGE] Merge from trunk-payroll main project branch

bzr revid: mra@mra-laptop-20110512050150-m4qysq80qgo48fp1

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 11 May 2011 14:52:39 +0000 (16:52 +0200)]

[MERGE] merged psi with fix of computation engine

bzr revid: qdp-launchpad@openerp.com-20110511145239-uidsrlki2kn35x8f

commit | commitdiff | tree

psi (Open ERP) [Wed, 11 May 2011 13:35:22 +0000 (19:05 +0530)]

[FIX] small fix

bzr revid: psi@tinyerp.co.in-20110511133522-8e51br6tsnzs4dao

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 11 May 2011 13:21:48 +0000 (15:21 +0200)]

[MERGE] merged mtr's branch with new name for salary.head

bzr revid: qdp-launchpad@openerp.com-20110511132148-g2pyjq9oy6e88w6t

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 11 May 2011 13:16:50 +0000 (15:16 +0200)]

[MERGE] merged psi branch with new feature for input on payslip

bzr revid: qdp-launchpad@openerp.com-20110511131650-2en4cz4331u4ihnh

commit | commitdiff | tree

psi (Open ERP) [Wed, 11 May 2011 10:17:33 +0000 (15:47 +0530)]

[MERGE] merge with main branch

bzr revid: psi@tinyerp.co.in-20110511101733-8a0tbbmuwvo5bix5

commit | commitdiff | tree

mtr [Wed, 11 May 2011 07:18:54 +0000 (12:48 +0530)]

[IMP] hr_payroll: renamed hr.salary.category into hr.salary.rule.category

bzr revid: mtr@mtr-20110511071854-ctdf3czpedhe5t6l

commit | commitdiff | tree

mtr [Wed, 11 May 2011 06:43:27 +0000 (12:13 +0530)]

[MERGE] branch merged with trunk-payroll

bzr revid: mtr@mtr-20110511064327-jzwjr10clzh33m37

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 10 May 2011 14:50:46 +0000 (16:50 +0200)]

[MERGE] merged mtr's branch related to security improvements

bzr revid: qdp-launchpad@openerp.com-20110510145046-vc2603j5wrmc48tf

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 10 May 2011 14:27:23 +0000 (16:27 +0200)]

[MERGE] merged mtr's branch with salary.head => salary.category

bzr revid: qdp-launchpad@openerp.com-20110510142723-6kr9k4ivqwrusxss

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 10 May 2011 14:02:56 +0000 (16:02 +0200)]

[MERGE] merged psi's branch with improvement of search view of employees

bzr revid: qdp-launchpad@openerp.com-20110510140256-2j5sxnjatudmjnym

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 10 May 2011 13:42:37 +0000 (15:42 +0200)]

[MERGE] merge psi branch with removal of sequence on salary heads

bzr revid: qdp-launchpad@openerp.com-20110510134237-ac3lu8aeec50hlsf

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 10 May 2011 13:34:10 +0000 (15:34 +0200)]

[MERGE] merged psi branch with tooltip improvement

bzr revid: qdp-launchpad@openerp.com-20110510133410-c9lapqzd49291o76

commit | commitdiff | tree

psi (Open ERP) [Tue, 10 May 2011 13:32:27 +0000 (19:02 +0530)]

[IMP] improve searh view of hr.employee add filter on categories

bzr revid: psi@tinyerp.co.in-20110510133227-fzbbptd2tje5suf8

commit | commitdiff | tree

Mustufa Rangwala [Tue, 10 May 2011 13:11:10 +0000 (18:41 +0530)]

[FIX] Payroll: Payslip lines readonly with all states of payslips

bzr revid: mra@mra-laptop-20110510131110-gd32dkedh7m3gv2i

commit | commitdiff | tree

mtr [Tue, 10 May 2011 11:54:11 +0000 (17:24 +0530)]

[IMP] hr_payroll: renamed salary head into salary category

bzr revid: mtr@mtr-20110510115411-lkf923pyakj1ykug

commit | commitdiff | tree

psi (Open ERP) [Tue, 10 May 2011 11:19:31 +0000 (16:49 +0530)]

[ADD] improve code and add demo rule for sales

bzr revid: psi@tinyerp.co.in-20110510111931-4v21peqft66hblpp

commit | commitdiff | tree

psi (Open ERP) [Mon, 9 May 2011 08:50:02 +0000 (14:20 +0530)]

[IMP] rename object to worked_days and add one object hr.salary.input

bzr revid: psi@tinyerp.co.in-20110509085002-l0ygkq5al9yedmz6

commit | commitdiff | tree

psi (Open ERP) [Wed, 4 May 2011 11:13:48 +0000 (16:43 +0530)]

[IMP] remove sequence form salary head object

bzr revid: psi@tinyerp.co.in-20110504111348-kngj0i0tert4w9pt

commit | commitdiff | tree

Mustufa Rangwala [Tue, 3 May 2011 09:12:02 +0000 (14:42 +0530)]

[IMP] Payroll: form and tree view of Salary heads

bzr revid: mra@mra-laptop-20110503091202-pmitrzjymkrr3otf

commit | commitdiff | tree

psi (Open ERP) [Thu, 28 Apr 2011 13:30:56 +0000 (19:00 +0530)]

[IMP] improve the tooltip on code field of hr.salary.rule object

bzr revid: psi@tinyerp.co.in-20110428133056-cramofq63y4s9nhy

commit | commitdiff | tree

Quentin (OpenERP) [Thu, 28 Apr 2011 13:08:48 +0000 (15:08 +0200)]

[IMP] hr_payroll: improved help tooltip

bzr revid: qdp-launchpad@openerp.com-20110428130848-cs584ryp8sesqmm7

commit | commitdiff | tree

Quentin (OpenERP) [Thu, 28 Apr 2011 12:40:14 +0000 (14:40 +0200)]

[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

commit | commitdiff | tree

Quentin (OpenERP) [Thu, 28 Apr 2011 12:34:02 +0000 (14:34 +0200)]

[MERGE] merged mtr's branch: improved payslip line view

bzr revid: qdp-launchpad@openerp.com-20110428123402-2aj4ylhc13msk6fq

commit | commitdiff | tree

Quentin (OpenERP) [Thu, 28 Apr 2011 12:26:05 +0000 (14:26 +0200)]

[MERGE] merged mtr's branch: payslip line color is blue when total is 0

bzr revid: qdp-launchpad@openerp.com-20110428122605-5l7e4xe75imw6u4b

commit | commitdiff | tree

Quentin (OpenERP) [Thu, 28 Apr 2011 12:22:06 +0000 (14:22 +0200)]

[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

commit | commitdiff | tree

mtr [Thu, 28 Apr 2011 08:53:11 +0000 (14:23 +0530)]

[IMP] hr_payroll: revert back the changes of access rights,made for hr user

bzr revid: mtr@mtr-20110428085311-7017lofdf8jf7s3f

commit | commitdiff | tree

mtr [Thu, 28 Apr 2011 08:35:38 +0000 (14:05 +0530)]

[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

commit | commitdiff | tree

mtr [Thu, 28 Apr 2011 06:31:40 +0000 (12:01 +0530)]

[IMP] hr_payroll: added ir.rule for employee payslip and modified access rights

bzr revid: mtr@mtr-20110428063140-rxao7nev4xgzl9f2

commit | commitdiff | tree

psi (Open ERP) [Tue, 26 Apr 2011 12:08:26 +0000 (17:38 +0530)]

[IMP] add help on code field of hr.salary.rule

bzr revid: psi@tinyerp.co.in-20110426120826-3uid7tvyfwrj5fjt

commit | commitdiff | tree

mtr [Mon, 25 Apr 2011 13:17:40 +0000 (18:47 +0530)]

[IMP] hr_payroll:added company_id in payslip line view

bzr revid: mtr@mtr-20110425131740-422eih4okmi6rjqh

commit | commitdiff | tree

mtr [Mon, 25 Apr 2011 12:04:30 +0000 (17:34 +0530)]

[IMP] hr_payroll:again improved exception message string

bzr revid: mtr@mtr-20110425120430-kacidzhufm6n25q7

commit | commitdiff | tree

mtr [Mon, 25 Apr 2011 10:37:18 +0000 (16:07 +0530)]

[IMP] hr_payroll:improved payslip line view,removed fields that are used to calculate the total

bzr revid: mtr@mtr-20110425103718-r80y25vatlik17z4

commit | commitdiff | tree

ARA (OpenERP) [Mon, 25 Apr 2011 10:25:44 +0000 (15:55 +0530)]

[FIX] hr_payroll: payslip line color is blue when total is 0

bzr revid: ara@tinyerp.com-20110425102544-ivqy6vu4fb14z68u

commit | commitdiff | tree

mtr [Mon, 25 Apr 2011 10:25:02 +0000 (15:55 +0530)]

[IMP] hr_payroll:improved exception message string

bzr revid: mtr@mtr-20110425102502-6basvgqilrh664th

commit | commitdiff | tree

mtr [Mon, 25 Apr 2011 09:55:37 +0000 (15:25 +0530)]

[IMP] hr_payroll:removed qty from demo,improved search engine,made qty mandatory and added tooltip

bzr revid: mtr@mtr-20110425095537-ewmhlikkh5i50jyg

commit | commitdiff | tree

ARA (OpenERP) [Mon, 25 Apr 2011 09:41:42 +0000 (15:11 +0530)]

[FIX] hr_payroll: payslip line color is blue when total is 0

bzr revid: ara@tinyerp.com-20110425094142-w0hjdx79bq84r920

commit | commitdiff | tree

mtr [Mon, 25 Apr 2011 07:25:10 +0000 (12:55 +0530)]

[IMP] hr_payroll:added field 'quantity' on salary rules,modified computation engine and demo data

bzr revid: mtr@mtr-20110425072510-9f7tbuo9w3q3qq30

commit | commitdiff | tree

Mustufa Rangwala [Mon, 25 Apr 2011 07:19:30 +0000 (12:49 +0530)]

[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

[FIX] hr_payroll_account: changed domain and ir.property to make account type=payable

lp bug: https://launchpad.net/bugs/761456 fixed

bzr revid: mtr@mtr-20110421113925-r6j0cxhdxrcaqqyg

commit | commitdiff | tree

Mustufa Rangwala [Thu, 21 Apr 2011 07:22:56 +0000 (12:52 +0530)]

[IMP] Payroll_account: improved views, on the other state of draft make fields on payslip to readonly=true

bzr revid: mra@mra-laptop-20110421072256-la7412gwr7osf0hj

commit | commitdiff | tree

Mustufa Rangwala [Thu, 21 Apr 2011 06:22:09 +0000 (11:52 +0530)]

[FIX] Payroll_account: fix

bzr revid: mra@mra-laptop-20110421062209-dv0rpudc6tdt6gtg

commit | commitdiff | tree

Mustufa Rangwala [Thu, 21 Apr 2011 05:15:22 +0000 (10:45 +0530)]

[MERGE] merge from same branch

bzr revid: mra@mra-laptop-20110421051522-2sas8btck974jirm

commit | commitdiff | tree

Mustufa Rangwala [Thu, 21 Apr 2011 05:11:46 +0000 (10:41 +0530)]

[FIX] Payroll: rename demo file

bzr revid: mra@mra-laptop-20110421051146-xvy2lvai7wa8k9lw

commit | commitdiff | tree

ARA (OpenERP) [Thu, 21 Apr 2011 04:56:52 +0000 (10:26 +0530)]

[FIX] hr_payroll_accounr: merge same for same branch

bzr revid: ara@tinyerp.com-20110420133835-bxkb1dwgznexhm6g
bzr revid: ara@tinyerp.com-20110421045652-2c44p0ypnfxsvu0f

commit | commitdiff | tree

mtr [Wed, 20 Apr 2011 13:30:58 +0000 (19:00 +0530)]

[IMP] hr_payroll_account: code cleaning

bzr revid: mtr@mtr-20110420133058-wrt4tzupai4osgfs

commit | commitdiff | tree

mtr [Wed, 20 Apr 2011 13:25:08 +0000 (18:55 +0530)]

[IMP] hr_payroll_account: assign journal on payslip with contract journal

bzr revid: mtr@mtr-20110420132508-7u5lry0mkq9533a9

commit | commitdiff | tree

ARA (OpenERP) [Wed, 20 Apr 2011 13:24:28 +0000 (18:54 +0530)]

[FIX] hr_payroll_account: payslip line link not working

bzr revid: ara@tinyerp.com-20110420132428-kk8fa7v0bhm616d9

commit | commitdiff | tree

Mustufa Rangwala [Wed, 20 Apr 2011 11:38:47 +0000 (17:08 +0530)]

[FIX] payroll_account: improve code

bzr revid: mra@mra-laptop-20110420113847-fu562g080n3svr8b

commit | commitdiff | tree

Mustufa Rangwala [Wed, 20 Apr 2011 11:22:22 +0000 (16:52 +0530)]

[FIX] payroll_account: fix

bzr revid: mra@mra-laptop-20110420112222-l0ztdl70fxhyqs16

commit | commitdiff | tree

Mustufa Rangwala [Wed, 20 Apr 2011 11:11:17 +0000 (16:41 +0530)]

[FIX] Payroll: Correct xml views

bzr revid: mra@mra-laptop-20110420111117-1k9ihl2ytwu1zbyq

commit | commitdiff | tree

mtr [Wed, 20 Apr 2011 10:38:11 +0000 (16:08 +0530)]

[IMP] hr_payroll_account: added account.move(m2m) field on payslip and improved code to get its Entries

bzr revid: mtr@mtr-20110420103811-rphergw2re9ca11y

commit | commitdiff | tree

mtr [Wed, 20 Apr 2011 08:55:19 +0000 (14:25 +0530)]

[IMP] hr_payroll_account: improved code to assigned analytic account on payslip line from salary rule

bzr revid: mtr@mtr-20110420085519-emevo3dufjvso7w6

commit | commitdiff | tree

mtr [Wed, 20 Apr 2011 08:50:11 +0000 (14:20 +0530)]

[IMP] hr_payroll_account: commented unrequired prev_bounds() method

bzr revid: mtr@mtr-20110420085011-sujli3n7xeab22r3

commit | commitdiff | tree

mtr [Tue, 19 Apr 2011 12:46:37 +0000 (18:16 +0530)]

[IMP] hr_payroll_account: commented code, creating hr.expense.expense as payslip line

bzr revid: mtr@mtr-20110419124637-p96wnqvwbfm3uhv1

commit | commitdiff | tree

mtr [Tue, 19 Apr 2011 12:44:01 +0000 (18:14 +0530)]

[IMP] hr_payroll_account: improved code to assign credit/debit account on payslip line

bzr revid: mtr@mtr-20110419124401-fpn4kxijz74xxhbu

commit | commitdiff | tree

mtr [Tue, 19 Apr 2011 07:02:04 +0000 (12:32 +0530)]

[IMP] hr_payroll_account: improved code to assign the account(if empty) on salary rules from payslip journal

bzr revid: mtr@mtr-20110419070204-r3xaby5fl7rl1e80

commit | commitdiff | tree

mtr [Mon, 18 Apr 2011 13:36:42 +0000 (19:06 +0530)]

[IMP] hr_payroll: improved code for payslip reference

bzr revid: mtr@mtr-20110418133642-8xn0ka4bkwrty241

commit | commitdiff | tree

mtr [Mon, 18 Apr 2011 12:27:08 +0000 (17:57 +0530)]

[IMP] hr_payroll_account: demo data and code for the verify_sheet,process_sheet function

bzr revid: mtr@mtr-20110418122708-qeb452wyl9gk18q4

commit | commitdiff | tree

mtr [Thu, 14 Apr 2011 13:33:15 +0000 (19:03 +0530)]

[IMP] hr_payroll_account: improved code for the verify_sheet function

bzr revid: mtr@mtr-20110414133315-3ecyexf2xngs2peb

commit | commitdiff | tree

mtr [Wed, 13 Apr 2011 13:16:28 +0000 (18:46 +0530)]

[IMP] hr_payroll_account: removed unrequired objects and added fields as per etherpad

bzr revid: mtr@mtr-20110413131628-wp4km4zwuatfjn63

commit | commitdiff | tree

mtr [Wed, 13 Apr 2011 06:01:40 +0000 (11:31 +0530)]

[MERGE] branch merged with trunk-payroll

bzr revid: mtr@mtr-20110412045612-7bny7k331a0y2ree
bzr revid: mtr@mtr-20110412052754-7q392mf48cv0xg9b
bzr revid: mtr@mtr-20110413060140-nhu313xpavd5sv2m

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 12 Apr 2011 17:01:28 +0000 (19:01 +0200)]

[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

commit | commitdiff | tree

Mustufa Rangwala [Tue, 12 Apr 2011 13:35:42 +0000 (19:05 +0530)]

[IMP] Payroll: payslip lines with appears on payslip = true only

bzr revid: mra@mra-laptop-20110412133542-etbmskrdx05fml2q

commit | commitdiff | tree

Mustufa Rangwala [Tue, 12 Apr 2011 09:56:06 +0000 (15:26 +0530)]

[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

commit | commitdiff | tree

Mustufa Rangwala [Tue, 12 Apr 2011 09:53:37 +0000 (15:23 +0530)]

[ADD] Payroll: Payslip line action on payslip + search view added for payslip lines

bzr revid: mra@mra-laptop-20110412095337-ohnd7nymekow41eb

commit | commitdiff | tree

mtr [Tue, 12 Apr 2011 08:51:11 +0000 (14:21 +0530)]

[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll

bzr revid: mtr@mtr-20110412085111-f47gcnu21e2s6433

commit | commitdiff | tree

mtr [Tue, 12 Apr 2011 08:44:35 +0000 (14:14 +0530)]

[IMP] hr_payroll: corrected m2m field rule_ids in demo data

bzr revid: mtr@mtr-20110412084435-e9wmpo4c0thm9954

commit | commitdiff | tree

Mustufa Rangwala [Tue, 12 Apr 2011 08:44:27 +0000 (14:14 +0530)]

[FIX] Payroll: Meal voucher correct the sequnce

bzr revid: mra@mra-laptop-20110412084427-12jupz8i6s6lol6d

commit | commitdiff | tree

Mustufa Rangwala [Tue, 12 Apr 2011 05:23:49 +0000 (10:53 +0530)]

[FIX] Payroll: Fix for installation

bzr revid: mra@mra-laptop-20110412052349-bcjzxxtkwqy3caol

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 15:54:29 +0000 (17:54 +0200)]

[MERGE] merged mtr branch with demo data improvements

bzr revid: qdp-launchpad@openerp.com-20110411155429-qe1irgln9ick9m3y

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 15:53:56 +0000 (17:53 +0200)]

[MERGE] merge

bzr revid: qdp-launchpad@openerp.com-20110411155356-jncdanf2fv0rgynd

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 15:51:33 +0000 (17:51 +0200)]

[MERGE] merged mtr's branch with fix of access rules

bzr revid: qdp-launchpad@openerp.com-20110411155133-s2ok782n4olvp1jj

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 15:50:34 +0000 (17:50 +0200)]

[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

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 15:47:15 +0000 (17:47 +0200)]

[IMP] hr_payroll: added head data for company contribution

bzr revid: qdp-launchpad@openerp.com-20110411154715-idvt0myzjnurmlj2

commit | commitdiff | tree

mtr [Mon, 11 Apr 2011 13:10:49 +0000 (18:40 +0530)]

[MERGE] branch merged with trunk-payroll

bzr revid: mtr@mtr-20110411131049-yu4ipa9cij4yywip

commit | commitdiff | tree

mtr [Mon, 11 Apr 2011 13:08:03 +0000 (18:38 +0530)]

[IMP] hr_payroll: improved demo data i.e. sequence on salary rules

bzr revid: mtr@mtr-20110411130803-fp5gfz4plxap6h59

commit | commitdiff | tree

Mustufa Rangwala [Mon, 11 Apr 2011 12:25:59 +0000 (17:55 +0530)]

[MERGE] merge from trunk payroll

bzr revid: mra@mra-laptop-20110411122559-8s7vnahm7jguta5d

commit | commitdiff | tree

Mustufa Rangwala [Mon, 11 Apr 2011 12:12:41 +0000 (17:42 +0530)]

[REM] payroll: remove the if condition from payslip lines appears

bzr revid: mra@mra-laptop-20110411121241-eh69dw6hq2bu8smb

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 12:10:46 +0000 (14:10 +0200)]

[IMP] hr_payroll: refund payslip feature improved

bzr revid: qdp-launchpad@openerp.com-20110411121046-7r0dzzqiw6hv6hkl

commit | commitdiff | tree

mtr [Mon, 11 Apr 2011 11:58:23 +0000 (17:28 +0530)]

[IMP] hr_payroll: added access rules

bzr revid: mtr@mtr-20110411115823-kp0oarpmo8vz9rtr

commit | commitdiff | tree

Mustufa Rangwala [Mon, 11 Apr 2011 11:44:15 +0000 (17:14 +0530)]

[MERGE] merge from trunk payroll

bzr revid: mra@mra-laptop-20110411114415-bp4bchwp51i0932i

commit | commitdiff | tree

Mustufa Rangwala [Mon, 11 Apr 2011 11:36:37 +0000 (17:06 +0530)]

[FIX] payroll: grouping of details by salayr head AND domain is not applied on first tab of payslip, we should see there only the payslip lines with appears_on_payslip = True

bzr revid: mra@mra-laptop-20110411113637-qfnxuylu1icn6889

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 11:19:23 +0000 (13:19 +0200)]

[FIX] hr_payroll: refund button

bzr revid: qdp-launchpad@openerp.com-20110411111923-18x2v4weqm71hms4

commit | commitdiff | tree

mtr [Mon, 11 Apr 2011 11:01:35 +0000 (16:31 +0530)]

[MERGE] branch merged with trunk-payroll

bzr revid: mtr@mtr-20110411110135-38vwvlqttj8ou9gc

commit | commitdiff | tree

mtr [Mon, 11 Apr 2011 10:57:47 +0000 (16:27 +0530)]

[IMP] hr_payroll: improved demo data

bzr revid: mtr@mtr-20110411105747-w76xe1ylr9e14r42

commit | commitdiff | tree

Mustufa Rangwala [Mon, 11 Apr 2011 10:44:37 +0000 (16:14 +0530)]

[REM] unused code

bzr revid: mra@mra-laptop-20110411104437-08y014kaeelpw150

commit | commitdiff | tree

Mustufa Rangwala [Mon, 11 Apr 2011 10:35:27 +0000 (16:05 +0530)]

[IMP] payroll: new structure should get as default for parent_id: ref(structure_base)

bzr revid: mra@mra-laptop-20110411103527-7zza1n093a27ohhu

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 10:08:46 +0000 (12:08 +0200)]

[MERGE] merged mra's dev branch containing stuff with refund

bzr revid: qdp-launchpad@openerp.com-20110411100846-4vwlngl6iqb2juvv

commit | commitdiff | tree

Mustufa Rangwala [Mon, 11 Apr 2011 08:42:22 +0000 (14:12 +0530)]

[MERGE] merge from trunk-payroll main branch

bzr revid: mra@mra-laptop-20110411084222-ztm9ackwbvq7v021

commit | commitdiff | tree

Mustufa Rangwala [Mon, 11 Apr 2011 08:40:07 +0000 (14:10 +0530)]

[IMP] Payroll: put back the tab with rules grouped by head

bzr revid: mra@mra-laptop-20110411084007-g5p3gvdcl7z9uh2m

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 08:11:39 +0000 (10:11 +0200)]

[IMP] hr_payroll: improved demo data

bzr revid: qdp-launchpad@openerp.com-20110411081139-7x93kr8v11q19f2x

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 08:09:03 +0000 (10:09 +0200)]

[FIX] hr_payroll: sequence > 100 for deduction demo rules

bzr revid: qdp-launchpad@openerp.com-20110411080903-x44oiaj1ex0m3gwv

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 08:06:54 +0000 (10:06 +0200)]

[FIX] hr_payroll: set the parent of demo structure

bzr revid: qdp-launchpad@openerp.com-20110411080654-sx3ie5pw0seqmnir

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 08:06:24 +0000 (10:06 +0200)]

[FIX] hr_payroll: fixed NET rule in data

bzr revid: qdp-launchpad@openerp.com-20110411080624-okp70ykmmp4gqop1

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 22:38:45 +0000 (00:38 +0200)]

[IMP] hr_payroll: cosmetic imp

bzr revid: qdp-launchpad@openerp.com-20110408223845-8kj51e3uo6ko8gt0

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom