pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,475 Commits 1 Branch 0 Tags
2efe4da3eedb2d78abb4c679b11da8f0644e12f2
Commit Graph
28475 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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
Mustufa Rangwala f4e63a2c22 [FIX] Payroll: problem with the onchange_contract in payslip => contract_id is not saved 
bzr revid: mra@mra-laptop-20110407114552-nxvwbfg7nbjxo1ma
 2011-04-07 17:15:52 +05:30
Mustufa Rangwala 2452fc120c [MERGE] merge same branch 
bzr revid: mra@mra-laptop-20110407111358-j8wriz4vu4mlrg26
 2011-04-07 16:43:58 +05:30
Mustufa Rangwala 7e320d618f [FIX] payroll: Not open employee form 
bzr revid: mra@mra-laptop-20110407110844-5bchm1c4mrkoomtt
 2011-04-07 16:38:44 +05:30
Quentin (OpenERP) 3df04543cb [MERGE] merged dev branch 
bzr revid: qdp-launchpad@openerp.com-20110407101659-szon9zgxz9bclrz2
 2011-04-07 12:16:59 +02:00
Quentin (OpenERP) 8a625c9901 [IMP] hr_payroll: removed hr.contibution.register.line object 
bzr revid: qdp-launchpad@openerp.com-20110407101226-9gworw70i6rvqlp2
 2011-04-07 12:12:26 +02:00
mtr 60cbbccf8f [ADD] hr_payroll: added new payslip report 
bzr revid: mtr@mtr-20110407052946-c7nrhw9yx939o1pj
 2011-04-07 10:59:46 +05:30
psi (Open ERP) ad8437fc0a [FIX] hr_contract: Fix yml test 
bzr revid: psi@tinyerp.co.in-20110407052528-uxz29uxwyjj5kf03
 2011-04-07 10:55:28 +05:30
Quentin (OpenERP) 09a5867da0 [MERGE] merged the dev branch of payroll with clean code as work basis 
bzr revid: qdp-launchpad@openerp.com-20110406151429-z3sgsbe9mugb58qt
 2011-04-06 17:14:29 +02:00
Quentin (OpenERP) 9efda48b6b [FIX] hr_payroll: fixed typo in filename 
bzr revid: qdp-launchpad@openerp.com-20110406142006-qmiyipvpnb0fcodu
 2011-04-06 16:20:06 +02:00
Quentin (OpenERP) 60c64c6cff [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
 2011-04-06 16:16:45 +02:00
Quentin (OpenERP) d0a5221fcf [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
 2011-04-06 16:15:32 +02:00
Quentin (OpenERP) 546fb69c7c [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
 2011-04-06 15:11:49 +02:00
Quentin (OpenERP) 8713630eb8 [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
 2011-04-06 15:07:21 +02:00
Quentin (OpenERP) a6fb80e028 [REF] hr_payroll: small code refactoring in compute_sheet() method 
bzr revid: qdp-launchpad@openerp.com-20110406125421-owo9vuxjldb9ddoo
 2011-04-06 14:54:21 +02:00
Quentin (OpenERP) 27b3cf53c6 [IMP] hr_contract: enable back the yaml test (why was it disable?) 
bzr revid: qdp-launchpad@openerp.com-20110406124624-iv16tm1egw1i2yvn
 2011-04-06 14:46:24 +02:00
Quentin (OpenERP) 230e12b5c4 [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
 2011-04-06 14:28:45 +02:00
psi (Open ERP) 2147838dda [FIX] small fix in compute_sheet method so it will delete the old payslip lines 
bzr revid: psi@tinyerp.co.in-20110406055519-u9a1joiyp8f3f2m0
 2011-04-06 11:25:19 +05:30
psi (Open ERP) 5853d90ae0 [FIX] small fix in compute_sheet method 
bzr revid: psi@tinyerp.co.in-20110406053948-mg7uc3mo23vaat0d
 2011-04-06 11:09:48 +05:30
Quentin (OpenERP) 6885252b1a [IMP] hr_payroll: improvements on framework and code cleaning 
bzr revid: qdp-launchpad@openerp.com-20110405164617-j0zbg9m7ue9eqftx
 2011-04-05 18:46:17 +02:00
mtr 440392700c [IMP] hr_payroll: minor changes on payslip report, still major changes are yet to be completed 
bzr revid: mtr@mtr-20110405133834-u5u2k3toqfn2brej
 2011-04-05 19:08:34 +05:30
mtr 55739910e7 [IMP] hr_payroll:improved code,demo data and Details by salary head 
bzr revid: mtr@mtr-20110405115528-p78zhmgfr87q6ifd
 2011-04-05 17:25:28 +05:30
mtr 481a4d104e [IMP] hr_payroll:improved ir.model.access.csv file 
bzr revid: mtr@mtr-20110405062132-fswk1fn73341866x
 2011-04-05 11:51:32 +05:30
Quentin (OpenERP) 2aac36a718 [IMP] hr_payroll: major improvements (redesign computation machina and code cleaning, mostly) 
bzr revid: qdp-launchpad@openerp.com-20110404212811-2abh9j4i6tg4ob5w
 2011-04-04 23:28:11 +02:00
Mustufa Rangwala 9843f42b1f [FIX] payroll 
bzr revid: mra@mra-laptop-20110404130033-rxhyg3jpwga7xaof
 2011-04-04 18:30:33 +05:30
Quentin (OpenERP) 9202d61260 [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
 2011-04-04 13:32:19 +02:00
mtr 19dd109f75 [IMP] hr_payroll:improved code to display salary rules as per the sequence of salary head 
bzr revid: mtr@mtr-20110404104831-zb30sau1ikzuufjl
 2011-04-04 16:18:31 +05:30
psi (Open ERP) c369b99712 [FIX] hr_payroll 
bzr revid: psi@tinyerp.co.in-20110404100637-ljba7flsrrawhxdp
 2011-04-04 15:36:37 +05:30
Mustufa Rangwala 3bb9bf2065 [FIX] payrol; 
bzr revid: mra@mra-laptop-20110404100136-usw6fe76l64bph8u
 2011-04-04 15:31:36 +05:30
psi (Open ERP) 9c796d9768 [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
 2011-04-04 14:36:56 +05:30
psi (Open ERP) cf2ed5f5aa [IMP] onchange will clear the field details_by_salary_head 
bzr revid: psi@tinyerp.co.in-20110404065026-6klls1fkg3mt8j41
 2011-04-04 12:20:26 +05:30
mtr d2ca30caf9 [IMP] hr_payroll:improved code to calculate total_payment for multiple contract 
bzr revid: mtr@mtr-20110404064453-sd7a9pecamnt80fn
 2011-04-04 12:14:53 +05:30
psi (Open ERP) 0c0ea31d9c [IMP] add help on state field of hr.payslip and view improvement 
bzr revid: psi@tinyerp.co.in-20110404062930-bf2onlnsmjb5mm43
 2011-04-04 11:59:30 +05:30
Mustufa Rangwala 6c5051fa38 [MERGE] merge from trunk-payroll branch 
bzr revid: mra@mra-laptop-20110404044953-hi0lrxppki4nekr2
 2011-04-04 10:19:53 +05:30
Mustufa Rangwala 57da5007e5 [MERGE] merge from trunk addons 
bzr revid: mra@mra-laptop-20110317044632-q2idnbo10137sp20
bzr revid: mra@mra-laptop-20110318090655-j34s9q5qu3iika49
bzr revid: mra@mra-laptop-20110321091456-nn8ydasget5h400r
bzr revid: mra@mra-laptop-20110322130110-e4q5os11b2aphfk6
bzr revid: mra@mra-laptop-20110323043940-490q3q9lnwwvduy0
bzr revid: mra@mra-laptop-20110328045527-rih3g38wcgonx05m
bzr revid: mra@mra-laptop-20110329045144-vclevl8cvq05ga8c
bzr revid: mra@mra-laptop-20110330044007-iiokjyv6ap6k94ak
bzr revid: mra@mra-laptop-20110401043719-mtgl4wwz90mi5rac
bzr revid: mra@mra-laptop-20110404044827-rqbqf6jdaf9o5unc
 2011-04-04 10:18:27 +05:30
Launchpad Translations on behalf of openerp 838512af0b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110401044755-ox0af9npzekocmtk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110402045547-u88jxku3jz7ejycg
bzr revid: launchpad_translations_on_behalf_of_openerp-20110403044009-x9bqq57ukyqvp6ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20110404044757-3uw7ib92gpv7ezu1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110405044706-ew5moemiz1wxra7h
 2011-04-05 04:47:06 +00:00