pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,510 Commits 1 Branch 0 Tags
cbb45ef370b32c0bd972a95fccfbe45ff6dbec09
Commit Graph
28510 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mtr 5f8574d16f [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110411131049-yu4ipa9cij4yywip
 2011-04-11 18:40:49 +05:30
mtr 3c3d8349c9 [IMP] hr_payroll: improved demo data i.e. sequence on salary rules 
bzr revid: mtr@mtr-20110411130803-fp5gfz4plxap6h59
 2011-04-11 18:38:03 +05:30
Mustufa Rangwala 3f69757064 [MERGE] merge from trunk payroll 
bzr revid: mra@mra-laptop-20110411122559-8s7vnahm7jguta5d
 2011-04-11 17:55:59 +05:30
Mustufa Rangwala c4a1c85e41 [REM] payroll: remove the if condition from payslip lines appears 
bzr revid: mra@mra-laptop-20110411121241-eh69dw6hq2bu8smb
 2011-04-11 17:42:41 +05:30
Quentin (OpenERP) 7080f2b5f3 [IMP] hr_payroll: refund payslip feature improved 
bzr revid: qdp-launchpad@openerp.com-20110411121046-7r0dzzqiw6hv6hkl
 2011-04-11 14:10:46 +02:00
mtr d433642232 [IMP] hr_payroll: added access rules 
bzr revid: mtr@mtr-20110411115823-kp0oarpmo8vz9rtr
 2011-04-11 17:28:23 +05:30
Mustufa Rangwala 8994649cf3 [MERGE] merge from trunk payroll 
bzr revid: mra@mra-laptop-20110411114415-bp4bchwp51i0932i
 2011-04-11 17:14:15 +05:30
Mustufa Rangwala 81a66b9d39 [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
 2011-04-11 17:06:37 +05:30
Quentin (OpenERP) 3e1f543b78 [FIX] hr_payroll: refund button 
bzr revid: qdp-launchpad@openerp.com-20110411111923-18x2v4weqm71hms4
 2011-04-11 13:19:23 +02:00
mtr d996fc00ae [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110411110135-38vwvlqttj8ou9gc
 2011-04-11 16:31:35 +05:30
mtr a325842fc3 [IMP] hr_payroll: improved demo data 
bzr revid: mtr@mtr-20110411105747-w76xe1ylr9e14r42
 2011-04-11 16:27:47 +05:30
Mustufa Rangwala 295f699558 [REM] unused code 
bzr revid: mra@mra-laptop-20110411104437-08y014kaeelpw150
 2011-04-11 16:14:37 +05:30
Mustufa Rangwala dd68253b95 [IMP] payroll: new structure should get as default for parent_id: ref(structure_base) 
bzr revid: mra@mra-laptop-20110411103527-7zza1n093a27ohhu
 2011-04-11 16:05:27 +05:30
Quentin (OpenERP) a1fec3b62f [MERGE] merged mra's dev branch containing stuff with refund 
bzr revid: qdp-launchpad@openerp.com-20110411100846-4vwlngl6iqb2juvv
 2011-04-11 12:08:46 +02:00
Mustufa Rangwala 07cfef6b51 [MERGE] merge from trunk-payroll main branch 
bzr revid: mra@mra-laptop-20110411084222-ztm9ackwbvq7v021
 2011-04-11 14:12:22 +05:30
Mustufa Rangwala d4950bdbd8 [IMP] Payroll: put back the tab with rules grouped by head 
bzr revid: mra@mra-laptop-20110411084007-g5p3gvdcl7z9uh2m
 2011-04-11 14:10:07 +05:30
Quentin (OpenERP) 69f697b7ef [IMP] hr_payroll: improved demo data 
bzr revid: qdp-launchpad@openerp.com-20110411081139-7x93kr8v11q19f2x
 2011-04-11 10:11:39 +02:00
Quentin (OpenERP) a85f8c2b72 [FIX] hr_payroll: sequence > 100 for deduction demo rules 
bzr revid: qdp-launchpad@openerp.com-20110411080903-x44oiaj1ex0m3gwv
 2011-04-11 10:09:03 +02:00
Quentin (OpenERP) 20485cdb2a [FIX] hr_payroll: set the parent of demo structure 
bzr revid: qdp-launchpad@openerp.com-20110411080654-sx3ie5pw0seqmnir
 2011-04-11 10:06:54 +02:00
Quentin (OpenERP) f9aa29d04d [FIX] hr_payroll: fixed NET rule in data 
bzr revid: qdp-launchpad@openerp.com-20110411080624-okp70ykmmp4gqop1
 2011-04-11 10:06:24 +02:00
Quentin (OpenERP) f41c989295 [IMP] hr_payroll: cosmetic imp 
bzr revid: qdp-launchpad@openerp.com-20110408223845-8kj51e3uo6ko8gt0
 2011-04-09 00:38:45 +02:00
Quentin (OpenERP) a79f6fe7a5 [FIX] hr_contract, hr_payroll: fixed installation errors due to previous commit 
bzr revid: qdp-launchpad@openerp.com-20110408173129-sqvdowkfuawxjddb
 2011-04-08 19:31:29 +02:00
Quentin (OpenERP) 0df1e74d79 [FIX] hr_payroll: fixed default rules 
bzr revid: qdp-launchpad@openerp.com-20110408163312-x26jnh5zr6erxmqm
 2011-04-08 18:33:12 +02:00
Quentin (OpenERP) f7323eb1af [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
 2011-04-08 18:31:16 +02:00
Quentin (OpenERP) 2efe4da3ee [IMP] hr_payroll: default data for base structure 
bzr revid: qdp-launchpad@openerp.com-20110408154849-8v42egah6r1ge6vu
 2011-04-08 17:48:49 +02:00
Quentin (OpenERP) 1042c0c0d6 [FIX] hr_payroll, computation engine: the heads have to be summed recursively 
bzr revid: qdp-launchpad@openerp.com-20110408145554-q09v8sud2jf63l3j
 2011-04-08 16:55:54 +02:00
Mustufa Rangwala 5cf844c230 [MERGE] merge from same branch 
bzr revid: mra@mra-laptop-20110408130434-lgsdbrfl95j6cxwo
 2011-04-08 18:34:34 +05:30
Quentin (OpenERP) 73173225a7 [MERGE] merged the ara branch containing bugfix on reset to draft button 
bzr revid: qdp-launchpad@openerp.com-20110408130313-ldaslut65hcb9l3s
 2011-04-08 15:03:13 +02:00
Mustufa Rangwala 97b7ef99ff [FIX] Payroll: strcut_id on contract now compulsory 
bzr revid: mra@mra-laptop-20110408130136-y4g2m87dzo0zei51
 2011-04-08 18:31:36 +05:30
Quentin (OpenERP) 9cf97597ae [MERGE] merged the branch with input available in computation engine and better error messages 
bzr revid: qdp-launchpad@openerp.com-20110408125930-bo2szaqo9r048usc
 2011-04-08 14:59:30 +02:00
Quentin (OpenERP) fc2d33a3be [IMP] hr_payroll: cosmetic changes + small code optimization 
bzr revid: qdp-launchpad@openerp.com-20110408125616-4k6phaduqbfzv88c
 2011-04-08 14:56:16 +02:00
Mustufa Rangwala 2e796b85a6 [IMP] hr payroll: use worked_days['NORM100'] in the computation engine 
bzr revid: mra@mra-laptop-20110408123156-dwcg5rnlwo4i8lyq
 2011-04-08 18:01:56 +05:30
Quentin (OpenERP) 112a4c77b4 [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
 2011-04-08 14:19:36 +02:00
Quentin (OpenERP) 8ba367a839 [REF] hr_payroll: moved recursive_search_of_rule function in hr.salary.rule class 
bzr revid: qdp-launchpad@openerp.com-20110408121759-zok1ml5ff1ix1lkr
 2011-04-08 14:17:59 +02:00
Mustufa Rangwala 5a2d032bdc [IMP] Payroll: refund button will open refund payslip => todo: need to directly open form instead of tree 
bzr revid: mra@mra-laptop-20110408103412-hmijd7i9q3a62fkl
 2011-04-08 16:04:12 +05:30
Quentin (OpenERP) 24ea4323c6 [IMP] hr_payroll: view improvements 
bzr revid: qdp-launchpad@openerp.com-20110408101059-mnfv1v4xabha6ob0
 2011-04-08 12:10:59 +02:00
ARA (OpenERP) 0b00184c32 [FIX] hr_payroll: set to draft button not working in cancel state 
bzr revid: ara@tinyerp.com-20110408093829-b62t39d3heuk3mnh
 2011-04-08 15:08:29 +05:30
Mustufa Rangwala 9133186eda [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
 2011-04-08 15:00:10 +05:30
Mustufa Rangwala c9a30f97ae [FIX] Payroll: Installation error on csv access 
bzr revid: mra@mra-laptop-20110408054841-7vpltohm639ov7u5
 2011-04-08 11:18:41 +05:30
Mustufa Rangwala 7ff22495b9 [FIX] Payroll: Remove contribution reg lines in xml and in .csv 
bzr revid: mra@mra-laptop-20110407130634-syjdvcme17nwhdhe
 2011-04-07 18:36:34 +05:30
Quentin (OpenERP) 7785eb0c2a [FIX] hr_payroll: fixed localdict in satisfy_condition 
bzr revid: qdp-launchpad@openerp.com-20110407124050-3qvf3zyzxff6ctim
 2011-04-07 14:40:50 +02:00