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

projects / odoo / odoo.git / log

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

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

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

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 17:31:29 +0000 (19:31 +0200)]

[FIX] hr_contract, hr_payroll: fixed installation errors due to previous commit

bzr revid: qdp-launchpad@openerp.com-20110408173129-sqvdowkfuawxjddb

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 16:33:12 +0000 (18:33 +0200)]

[FIX] hr_payroll: fixed default rules

bzr revid: qdp-launchpad@openerp.com-20110408163312-x26jnh5zr6erxmqm

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 16:31:16 +0000 (18:31 +0200)]

[IMP] hr: replaced marital.status object by a fields.selection to ease to use in payroll module

bzr revid: qdp-launchpad@openerp.com-20110408163116-3qmhc4phurtpuzmf

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 15:48:49 +0000 (17:48 +0200)]

[IMP] hr_payroll: default data for base structure

bzr revid: qdp-launchpad@openerp.com-20110408154849-8v42egah6r1ge6vu

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 14:55:54 +0000 (16:55 +0200)]

[FIX] hr_payroll, computation engine: the heads have to be summed recursively

bzr revid: qdp-launchpad@openerp.com-20110408145554-q09v8sud2jf63l3j

commit | commitdiff | tree

Mustufa Rangwala [Fri, 8 Apr 2011 13:04:34 +0000 (18:34 +0530)]

[MERGE] merge from same branch

bzr revid: mra@mra-laptop-20110408130434-lgsdbrfl95j6cxwo

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 13:03:13 +0000 (15:03 +0200)]

[MERGE] merged the ara branch containing bugfix on reset to draft button

bzr revid: qdp-launchpad@openerp.com-20110408130313-ldaslut65hcb9l3s

commit | commitdiff | tree

Mustufa Rangwala [Fri, 8 Apr 2011 13:01:36 +0000 (18:31 +0530)]

[FIX] Payroll: strcut_id on contract now compulsory

bzr revid: mra@mra-laptop-20110408130136-y4g2m87dzo0zei51

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 12:59:30 +0000 (14:59 +0200)]

[MERGE] merged the branch with input available in computation engine and better error messages

bzr revid: qdp-launchpad@openerp.com-20110408125930-bo2szaqo9r048usc

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 12:56:16 +0000 (14:56 +0200)]

[IMP] hr_payroll: cosmetic changes + small code optimization

bzr revid: qdp-launchpad@openerp.com-20110408125616-4k6phaduqbfzv88c

commit | commitdiff | tree

Mustufa Rangwala [Fri, 8 Apr 2011 12:31:56 +0000 (18:01 +0530)]

[IMP] hr payroll: use worked_days['NORM100'] in the computation engine

bzr revid: mra@mra-laptop-20110408123156-dwcg5rnlwo4i8lyq

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 12:19:36 +0000 (14:19 +0200)]

[FIX] hr_payroll, computation engine: added a blacklist to avoid computing rules for which an ancestor has failed to satisfy_condition()

bzr revid: qdp-launchpad@openerp.com-20110408121936-nqivku1zh45p4ipc

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 12:17:59 +0000 (14:17 +0200)]

[REF] hr_payroll: moved recursive_search_of_rule function in hr.salary.rule class

bzr revid: qdp-launchpad@openerp.com-20110408121759-zok1ml5ff1ix1lkr

commit | commitdiff | tree

Mustufa Rangwala [Fri, 8 Apr 2011 10:34:12 +0000 (16:04 +0530)]

[IMP] Payroll: refund button will open refund payslip => todo: need to directly open form instead of tree

bzr revid: mra@mra-laptop-20110408103412-hmijd7i9q3a62fkl

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 10:10:59 +0000 (12:10 +0200)]

[IMP] hr_payroll: view improvements

bzr revid: qdp-launchpad@openerp.com-20110408101059-mnfv1v4xabha6ob0

commit | commitdiff | tree

ARA (OpenERP) [Fri, 8 Apr 2011 09:38:29 +0000 (15:08 +0530)]

[FIX] hr_payroll: set to draft button not working in cancel state

bzr revid: ara@tinyerp.com-20110408093829-b62t39d3heuk3mnh

commit | commitdiff | tree

Mustufa Rangwala [Fri, 8 Apr 2011 09:30:10 +0000 (15:00 +0530)]

[IMP] Payroll: define a new field.boolean on payslip: 'credit note'
on a 'done' payslip, add a button 'make a credite note' that will duplicate the current payslip with 'credit note' = True, confirm and done it.

bzr revid: mra@mra-laptop-20110408093010-qgkeiy7wud1exwgd

commit | commitdiff | tree

Mustufa Rangwala [Fri, 8 Apr 2011 05:48:41 +0000 (11:18 +0530)]

[FIX] Payroll: Installation error on csv access

bzr revid: mra@mra-laptop-20110408054841-7vpltohm639ov7u5

commit | commitdiff | tree

Mustufa Rangwala [Thu, 7 Apr 2011 13:06:34 +0000 (18:36 +0530)]

[FIX] Payroll: Remove contribution reg lines in xml and in .csv

bzr revid: mra@mra-laptop-20110407130634-syjdvcme17nwhdhe

commit | commitdiff | tree

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

[FIX] hr_payroll: fixed localdict in satisfy_condition

bzr revid: qdp-launchpad@openerp.com-20110407124050-3qvf3zyzxff6ctim

commit | commitdiff | tree

Mustufa Rangwala [Thu, 7 Apr 2011 11:45:52 +0000 (17:15 +0530)]

[FIX] Payroll: problem with the onchange_contract in payslip => contract_id is not saved

bzr revid: mra@mra-laptop-20110407114552-nxvwbfg7nbjxo1ma

commit | commitdiff | tree

Mustufa Rangwala [Thu, 7 Apr 2011 11:13:58 +0000 (16:43 +0530)]

[MERGE] merge same branch

bzr revid: mra@mra-laptop-20110407111358-j8wriz4vu4mlrg26

commit | commitdiff | tree

Mustufa Rangwala [Thu, 7 Apr 2011 11:08:44 +0000 (16:38 +0530)]

[FIX] payroll: Not open employee form

bzr revid: mra@mra-laptop-20110407110844-5bchm1c4mrkoomtt

commit | commitdiff | tree

Quentin (OpenERP) [Thu, 7 Apr 2011 10:16:59 +0000 (12:16 +0200)]

[MERGE] merged dev branch

bzr revid: qdp-launchpad@openerp.com-20110407101659-szon9zgxz9bclrz2

commit | commitdiff | tree

Quentin (OpenERP) [Thu, 7 Apr 2011 10:12:26 +0000 (12:12 +0200)]

[IMP] hr_payroll: removed hr.contibution.register.line object

bzr revid: qdp-launchpad@openerp.com-20110407101226-9gworw70i6rvqlp2

commit | commitdiff | tree

mtr [Thu, 7 Apr 2011 05:29:46 +0000 (10:59 +0530)]

[ADD] hr_payroll: added new payslip report

bzr revid: mtr@mtr-20110407052946-c7nrhw9yx939o1pj

commit | commitdiff | tree

psi (Open ERP) [Thu, 7 Apr 2011 05:25:28 +0000 (10:55 +0530)]

[FIX] hr_contract: Fix yml test

bzr revid: psi@tinyerp.co.in-20110407052528-uxz29uxwyjj5kf03

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 15:14:29 +0000 (17:14 +0200)]

[MERGE] merged the dev branch of payroll with clean code as work basis

bzr revid: qdp-launchpad@openerp.com-20110406151429-z3sgsbe9mugb58qt

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 14:20:06 +0000 (16:20 +0200)]

[FIX] hr_payroll: fixed typo in filename

bzr revid: qdp-launchpad@openerp.com-20110406142006-qmiyipvpnb0fcodu

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 14:16:45 +0000 (16:16 +0200)]

[REF] hr_payroll: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)

bzr revid: qdp-launchpad@openerp.com-20110406141645-rbn5zu51jm5tipmm

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 14:15:32 +0000 (16:15 +0200)]

[REF] hr_payroll: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)

bzr revid: qdp-launchpad@openerp.com-20110406141532-d6f2r49dbtr95rzf

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 13:11:49 +0000 (15:11 +0200)]

[REF] hr_contract: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)

bzr revid: qdp-launchpad@openerp.com-20110406131149-i1135jaom7vhny8z

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 13:07:21 +0000 (15:07 +0200)]

[REF] hr_contract: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)

bzr revid: qdp-launchpad@openerp.com-20110406130721-ttg9xgrkq5n3ry3d

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 12:54:21 +0000 (14:54 +0200)]

[REF] hr_payroll: small code refactoring in compute_sheet() method

bzr revid: qdp-launchpad@openerp.com-20110406125421-owo9vuxjldb9ddoo

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 12:46:24 +0000 (14:46 +0200)]

[IMP] hr_contract: enable back the yaml test (why was it disable?)

bzr revid: qdp-launchpad@openerp.com-20110406124624-iv16tm1egw1i2yvn

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 12:28:45 +0000 (14:28 +0200)]

[IMP] hr_payroll: major improvements (fill input, compute only on button pressed, code cleaning, improved computation engine...)

bzr revid: qdp-launchpad@openerp.com-20110406122845-au66vdlm7i39mh1c

commit | commitdiff | tree

psi (Open ERP) [Wed, 6 Apr 2011 05:55:19 +0000 (11:25 +0530)]

[FIX] small fix in compute_sheet method so it will delete the old payslip lines

bzr revid: psi@tinyerp.co.in-20110406055519-u9a1joiyp8f3f2m0

commit | commitdiff | tree

psi (Open ERP) [Wed, 6 Apr 2011 05:39:48 +0000 (11:09 +0530)]

[FIX] small fix in compute_sheet method

bzr revid: psi@tinyerp.co.in-20110406053948-mg7uc3mo23vaat0d

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 5 Apr 2011 16:46:17 +0000 (18:46 +0200)]

[IMP] hr_payroll: improvements on framework and code cleaning

bzr revid: qdp-launchpad@openerp.com-20110405164617-j0zbg9m7ue9eqftx

commit | commitdiff | tree

mtr [Tue, 5 Apr 2011 13:38:34 +0000 (19:08 +0530)]

[IMP] hr_payroll: minor changes on payslip report, still major changes are yet to be completed

bzr revid: mtr@mtr-20110405133834-u5u2k3toqfn2brej

commit | commitdiff | tree

mtr [Tue, 5 Apr 2011 11:55:28 +0000 (17:25 +0530)]

[IMP] hr_payroll:improved code,demo data and Details by salary head

bzr revid: mtr@mtr-20110405115528-p78zhmgfr87q6ifd

commit | commitdiff | tree

mtr [Tue, 5 Apr 2011 06:21:32 +0000 (11:51 +0530)]

[IMP] hr_payroll:improved ir.model.access.csv file

bzr revid: mtr@mtr-20110405062132-fswk1fn73341866x

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 4 Apr 2011 21:28:11 +0000 (23:28 +0200)]

[IMP] hr_payroll: major improvements (redesign computation machina and code cleaning, mostly)

bzr revid: qdp-launchpad@openerp.com-20110404212811-2abh9j4i6tg4ob5w

commit | commitdiff | tree

Mustufa Rangwala [Mon, 4 Apr 2011 13:00:33 +0000 (18:30 +0530)]

[FIX] payroll

bzr revid: mra@mra-laptop-20110404130033-rxhyg3jpwga7xaof

commit | commitdiff | tree

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

[IMP] hr_payroll: several major improvements among
   * removed hr.payroll.register object
   * removed hr.salary.head.type object, now replaced by a m2o(hr.salary.head) named parent_id on the salary head
   * removed unused fields state and user_id on hr.salary.head
   * defined new object hr.salary.input (and commented the references to hr.holidays)
   * added condition 'Always True' on the hr.salary.rule
   * improved view of hr.salary.rule

bzr revid: qdp-launchpad@openerp.com-20110404113219-nc949ndu1hvtiobl

commit | commitdiff | tree

mtr [Mon, 4 Apr 2011 10:48:31 +0000 (16:18 +0530)]

[IMP] hr_payroll:improved code to display salary rules as per the sequence of salary head

bzr revid: mtr@mtr-20110404104831-zb30sau1ikzuufjl

commit | commitdiff | tree

psi (Open ERP) [Mon, 4 Apr 2011 10:06:37 +0000 (15:36 +0530)]

[FIX] hr_payroll

bzr revid: psi@tinyerp.co.in-20110404100637-ljba7flsrrawhxdp

commit | commitdiff | tree

Mustufa Rangwala [Mon, 4 Apr 2011 10:01:36 +0000 (15:31 +0530)]

[FIX] payrol;

bzr revid: mra@mra-laptop-20110404100136-usw6fe76l64bph8u

commit | commitdiff | tree

psi (Open ERP) [Mon, 4 Apr 2011 09:06:56 +0000 (14:36 +0530)]

[IMP] Improve verify_sheet method of hr.payslip object so it will consider the child rules and holidays

bzr revid: psi@tinyerp.co.in-20110404090656-mq92felignt05nq5

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

RSS Atom