odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
87,941 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

420 Commits

Author SHA1 Message Date
mtr 0f0a6246d7 [IMP] hr_payroll: improved two methods and moved worked_days_sum method to 'hr.payslip.input' object 
bzr revid: mtr@mtr-20110505123027-jluag8sqpp12gtwk
 2011-05-05 18:00:27 +05:30
mtr e04c62a5f9 [IMP] hr_payroll: if employee is not provided in an argument it returns 0 
bzr revid: mtr@mtr-20110505072004-1254kzo59rv9z97e
 2011-05-05 12:50:04 +05:30
mtr 89a6e52202 [IMP] hr_payroll: added worked_days_sum method to compute 'payslip' on 'other payslip' 
bzr revid: mtr@mtr-20110505054745-hkbzoothm3bqa46u
 2011-05-05 11:17:45 +05:30
mtr f97c21c40c [IMP] hr_payroll: added payslip_sum method to compute 'payslip' on other payslip' 
bzr revid: mtr@mtr-20110504125627-5zyck6tp8438gyd5
 2011-05-04 18:26:27 +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
psi (Open ERP) fe16882b43 [IMP] small fixes 
bzr revid: psi@tinyerp.co.in-20110503131750-24xxudj2qs84vy21
 2011-05-03 18:47:50 +05:30
psi (Open ERP) 46cf364574 [IMP] rename the class and changed the view accourdingly 
bzr revid: psi@tinyerp.co.in-20110503123807-ptgnp6gejy045fai
 2011-05-03 18:08:07 +05:30
psi (Open ERP) d8962fac28 [MERGE] merge with trunk-payroll branch 
bzr revid: psi@tinyerp.co.in-20110502122136-wxilodkqcxk0wv05
 2011-05-02 17:51:36 +05:30
psi (Open ERP) 978b756760 [IMP] wizard will work for employees instead of employee categories 
bzr revid: psi@tinyerp.co.in-20110502121822-2xw9r1yilxoovr2o
 2011-05-02 17:48:22 +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
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
psi (Open ERP) e425496f88 [IMP] improve the newly created wizard as per requirment suggested 
bzr revid: psi@tinyerp.co.in-20110426102656-s2lfltvnkkvzz6ve
 2011-04-26 15:56:56 +05:30
psi (Open ERP) ea9ab772d6 [IMP] Add wizard to generate payslip by employee categories 
bzr revid: psi@tinyerp.co.in-20110425123044-hxb20cq7iynw5ou7
 2011-04-25 18:00:44 +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 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
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
Mustufa Rangwala 60ad4cdfe6 [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
 2011-04-21 12:52:56 +05:30
mtr 566c5c7a8c [IMP] hr_payroll: improved code for payslip reference 
bzr revid: mtr@mtr-20110418133642-8xn0ka4bkwrty241
 2011-04-18 19:06:42 +05:30
mtr 5fa182ab00 [IMP] hr_payroll_account: demo data and code for the verify_sheet,process_sheet function 
bzr revid: mtr@mtr-20110418122708-qeb452wyl9gk18q4
 2011-04-18 17:57:08 +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 e91d5a7c38 [FIX] Payroll: Fix for installation 
bzr revid: mra@mra-laptop-20110412052349-bcjzxxtkwqy3caol
 2011-04-12 10:53:49 +05:30
Quentin (OpenERP) 33f392cb28 [MERGE] merge 
bzr revid: qdp-launchpad@openerp.com-20110411155356-jncdanf2fv0rgynd
 2011-04-11 17:53:56 +02:00
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
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
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 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) f41c989295 [IMP] hr_payroll: cosmetic imp 
bzr revid: qdp-launchpad@openerp.com-20110408223845-8kj51e3uo6ko8gt0
 2011-04-09 00:38:45 +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) 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
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
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
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
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) 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 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
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
mtr c472eaafbc [IMP] hr_payroll:improved code to calculate total_payment using 'NET' rule 
bzr revid: mtr@mtr-20110401133226-pbhv7xbr5n7bwwji
 2011-04-01 19:02:26 +05:30
psi (Open ERP) a5cacc1ff7 [IMP] clean the code 
bzr revid: psi@tinyerp.co.in-20110401131735-pwddzzgf21ie4hcj
 2011-04-01 18:47:35 +05:30
Mustufa Rangwala f380549275 [IMP] payroll: code clean, add date argument on onchnage-employee from holidays to get it latest contract 
bzr revid: mra@mra-laptop-20110401125959-hsuwv6ms31v4it75
 2011-04-01 18:29:59 +05:30
Mustufa Rangwala 03a02288f9 [FIX] payroll: fix on payroll register 
bzr revid: mra@mra-laptop-20110401122643-mbuqzap5emjzxvg3
 2011-04-01 17:56:43 +05:30
Mustufa Rangwala 2688eada6e [FIX] payroll 
bzr revid: mra@mra-laptop-20110401122132-5rdibau7jngyeeal
 2011-04-01 17:51:32 +05:30
Mustufa Rangwala 34f8594f58 [FIX] Payroll: Add seq field on salary head 
bzr revid: mra@mra-laptop-20110401113211-4qcdob9xi0xq30xi
 2011-04-01 17:02:11 +05:30
Mustufa Rangwala 6056d569ae [FIX] Payroll: Small fix 
bzr revid: mra@mra-laptop-20110401110105-8i6rmnxd4rdz8qr4
 2011-04-01 16:31:05 +05:30
Mustufa Rangwala 0b2aeb031e [FIX] Payroll: Small but if we have no stcture defined for contract and try to make onchanges 
bzr revid: mra@mra-laptop-20110401105807-1l1z3gvg1top1wei
 2011-04-01 16:28:07 +05:30
psi (Open ERP) 5e571864f7 [IMP] improve Other Information tab view of payslip 
bzr revid: psi@tinyerp.co.in-20110401104932-v71cdub1pse5543h
 2011-04-01 16:19:32 +05:30
mtr b78fdb96ec [IMP] hr_payroll: improved company contribution 
bzr revid: mtr@mtr-20110401103832-vla2it1171yumm8w
 2011-04-01 16:08:32 +05:30
psi (Open ERP) c6ef6826a9 [IMP] Details by salary head will show the salary head related to holidays also 
bzr revid: psi@tinyerp.co.in-20110401100750-uxlggpoxumej3ihf
 2011-04-01 15:37:50 +05:30
Mustufa Rangwala cafe5a4baa [FIX] payroll: structure on payslip readonly 
bzr revid: mra@mra-laptop-20110401054512-s2s2pfu2miq9xgw9
 2011-04-01 11:15:12 +05:30
psi (Open ERP) ad0286795f [IMP] Holidays based on contract 
bzr revid: psi@tinyerp.co.in-20110401051417-od73wdl9u77vto1g
 2011-04-01 10:44:17 +05:30
mtr 794e3ee8b2 [IMP] hr_payroll: added NET rule in data file and removed 'sequence' field 
bzr revid: mtr@mtr-20110401051048-f20cz98tdqmlrewd
 2011-04-01 10:40:48 +05:30
Mustufa Rangwala 9ea2084e08 [ADD] payroll: Onchange on company contribution boolean: if company contribution then appears on payslip = uncheck disable company contribution = checkenable so like this we can tell if it is a company contribution or not 
bzr revid: mra@mra-laptop-20110401050630-15la70amdihuz68k
 2011-04-01 10:36:30 +05:30
psi (Open ERP) adb7b1fab7 [IMP] comment the holidays_confirm method b'coz it was creating problem while creating new database due to demo data of holidays is without contract 
bzr revid: psi@tinyerp.co.in-20110331125635-t0kcgsrepp37w311
 2011-03-31 18:26:35 +05:30
psi (Open ERP) d9f0d9f279 [IMP] small change in holidays_confirm method so it will raise warning for only leave requests 
bzr revid: psi@tinyerp.co.in-20110331123742-gc0vfk5a1d8gq10w
 2011-03-31 18:07:42 +05:30
mtr e9b4d4538c [IMP] hr_payroll: improved string for 'state' fields 
bzr revid: mtr@mtr-20110331123213-8kqt1becfgcqwfgy
 2011-03-31 18:02:13 +05:30
psi (Open ERP) e5fb623048 [IMP] raise warning if there isn't any contract selected on employee leave request 
bzr revid: psi@tinyerp.co.in-20110331122829-20k622n739xad2xi
 2011-03-31 17:58:29 +05:30
psi (Open ERP) 01217907a4 [IMP] Improve _get_holidays method on hr.paysilp so it will not give traceback when no contract selected on hr.payslip 
bzr revid: psi@tinyerp.co.in-20110331113828-k65poknbx19ye9ad
 2011-03-31 17:08:28 +05:30
mtr c74c3fe55f [IMP] hr_payroll: improved code to check condition when amount_type=code 
bzr revid: mtr@mtr-20110331104700-u3xp4h2rg42w9lkq
 2011-03-31 16:17:00 +05:30
Mustufa Rangwala cb6176a892 [MERGE] merge 
bzr revid: mra@mra-laptop-20110331102726-ouqn5sq5hur501nu
 2011-03-31 15:57:26 +05:30
Mustufa Rangwala 71d2458390 [IMP] payroll improve code 
bzr revid: mra@mra-laptop-20110331102436-h318f46xiwnm1u8m
 2011-03-31 15:54:36 +05:30
mtr 14c6473473 [IMP] hr_payroll: improved code to avoid duplicate rules on payslip 
bzr revid: mtr@mtr-20110331093109-0wq8bqq2q4t6y5bz
 2011-03-31 15:01:09 +05:30
Mustufa Rangwala 352a3ec142 [FIX] payroll remove the tabs 
bzr revid: mra@mra-laptop-20110331092325-vfsm4q487lh9dmo2
 2011-03-31 14:53:25 +05:30
Mustufa Rangwala ab98d8809d [FIX] payroll 
bzr revid: mra@mra-laptop-20110331092048-uivs7dxmh2o7fhp8
 2011-03-31 14:50:48 +05:30
Osenda f7777d457d [IMP] in payslip asked by qdp 
bzr revid: osenda-20110331072504-pspga7znfo87dvl0
 2011-03-31 09:25:04 +02:00
Osenda 88de3c4148 [IMP]new salary head view 
bzr revid: osenda-20110330133046-o4ef7gz1n1laekt5
 2011-03-30 15:30:46 +02:00
Osenda ca98534357 [IMP] l10n_be_payroll: rules ok 
bzr revid: osenda-20110330082730-9esh7xn89mv9s0v5
 2011-03-30 10:27:30 +02:00
Mustufa Rangwala 2e4287681d [FIX] payroll 
bzr revid: mra@mra-laptop-20110331071802-7dht90mooy7egqf1
 2011-03-31 12:48:02 +05:30
Mustufa Rangwala 3066f1206b [FIX] fixes on payroll 
bzr revid: mra@mra-laptop-20110331060658-d79zu4ov0ess6rix
 2011-03-31 11:36:58 +05:30
mtr 97a5a3c227 [MERGE] branch merged with trunk-payroll-salary_rules-psi 
bzr revid: mtr@mtr-20110331050506-yczfv6k3rq0027r5
 2011-03-31 10:35:06 +05:30
psi (Open ERP) 4bf712c413 [IMP] on_change_contract works for every condition now 
bzr revid: psi@tinyerp.co.in-20110330132114-i30h0pk8ho8ikjme
 2011-03-30 18:51:14 +05:30
mtr 8663c434a4 [IMP] hr_payroll: improved code 
bzr revid: mtr@mtr-20110330084832-t4iuqxrl2l2le3b9
 2011-03-30 14:18:32 +05:30
mtr 4f27ec3e8f [IMP] hr_payroll: again committing changes which got reverted 
bzr revid: mtr@mtr-20110330053055-3ovz8idtmrvtkoqq
 2011-03-30 11:00:55 +05:30
mtr 2d7687ab6e [MERGE] branch merged with trunk-payroll-salary_rules-psi 
bzr revid: mtr@mtr-20110330051941-06s0i1nqfri8cv1r
 2011-03-30 10:49:41 +05:30
mtr 601ea5ed7b [IMP] hr_payroll:improved code for Condition based on python expression 
bzr revid: mtr@mtr-20110329134116-huy3g670mswl48il
 2011-03-29 19:11:16 +05:30
psi (Open ERP) bc6a98c3ab [IMP] onchange_employee on holidays will update the contract also, and now get_contract function will return list of contract object 
bzr revid: psi@tinyerp.co.in-20110329133243-ki3uigbuskveb6sd
 2011-03-29 19:02:43 +05:30
Mustufa Rangwala c7a7415891 [FIX] hr_payroll: small fix 
bzr revid: mra@mra-laptop-20110329112813-7oyymhljq7gcy2ze
 2011-03-29 16:58:13 +05:30
psi (Open ERP) fa5ceb85c2 [MERGE] merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110329072747-zugi6o6pmpsvtt3z
bzr revid: psi@tinyerp.co.in-20110329073653-ueki6be4gby8briw
 2011-03-29 13:06:53 +05:30
psi (Open ERP) c92303afc1 [IMP] hr_payroll: Holidays for multiple contracts 
bzr revid: psi@tinyerp.co.in-20110329072648-e9dilqyvijhv6li2
 2011-03-29 12:56:48 +05:30
Mustufa Rangwala 5146542ccb [FIX] payroll: expression_result make it required=false for now will work with attrs if python code 
bzr revid: mra@mra-laptop-20110329070125-qzk5o0zdcogvmci3
 2011-03-29 12:31:25 +05:30
mtr f440181021 [IMP] hr_payroll:improved code of _get_salary_rules for variable contracts 
bzr revid: mtr@mtr-20110329063055-a7vek0zrwij9099g
 2011-03-29 12:00:55 +05:30
Osenda e9d028ea34 [IMP]Changes on salary rule form 
bzr revid: osenda-20110328135032-yfumqec54ovtsbox
 2011-03-28 15:50:32 +02:00
mtr 90ecf5b90f [IMP] hr_payroll:assigned default value for condition_select field on salary rules. 
bzr revid: mtr@mtr-20110328125211-iv509sw789vp8t2l
 2011-03-28 18:22:11 +05:30
mtr 8eaf9ae4a5 [IMP] hr_payroll:created a method for three function fields. 
bzr revid: mtr@mtr-20110328123241-m0tul6jysd4cr2k8
 2011-03-28 18:02:41 +05:30
psi (Open ERP) 491387a736 [IMP] Update the code of compute_sheet method for recompute button 
bzr revid: psi@tinyerp.co.in-20110328102153-z7deqd97musv89d0
 2011-03-28 15:51:53 +05:30
psi (Open ERP) cfb4267d8a [MERGE, IMP] Merge with mtr's branch and improve compute_sheet method for multiple contracts of an employee 
bzr revid: psi@tinyerp.co.in-20110328052714-7p6lh6p9hzj9s7pr
 2011-03-28 10:57:14 +05:30
psi (Open ERP) f8050e531c [IMP] hr_payroll: Improve onchange_employee_id function so it will consider more than one contract 
bzr revid: psi@tinyerp.co.in-20110325132010-2wbznignx994jvb5
 2011-03-25 18:50:10 +05:30
mtr 5182562f9b [IMP] hr_payroll:added fields and code for tab i.e 'Applied Salary Rules' and 'Appears on Payslip' 
bzr revid: mtr@mtr-20110325131512-qzyzqemlqvc48yof
 2011-03-25 18:45:12 +05:30
mtr efbd32bb3b [IMP] hr_payroll:improved code in 'onchange_employee_id' function for condition_based_on=range 
bzr revid: mtr@mtr-20110324120213-14fuj571041mfqcm
 2011-03-24 17:32:13 +05:30
Mustufa Rangwala 9f43efede6 [FIX] small fix 
bzr revid: mra@mra-laptop-20110324093258-s8ykye3eatn23o09
 2011-03-24 15:02:58 +05:30
Osenda 49ed5e1336 [IMP] hr_payroll: changes on payslip 
bzr revid: osenda-20110324091103-1krcvxhz38lf5bup
 2011-03-24 10:11:03 +01:00
mtr 3b6449f709 [MERGE] branch merged with trunk-payroll-salary_rules-psi 
bzr revid: mtr@mtr-20110324083517-rg2u6e6nm12z7nd1
 2011-03-24 14:05:17 +05:30
mtr e80c3728f3 [IMP] hr_payroll:made 'struct_id' fields.related on hr.payslip 
bzr revid: mtr@mtr-20110323132959-qklty03qyl35ytpt
 2011-03-23 18:59:59 +05:30
psi (Open ERP) 80e501b581 [IMP] tool tips and small changes 
bzr revid: psi@tinyerp.co.in-20110323131600-dqhennoatjpl13o1
 2011-03-23 18:46:00 +05:30
mtr 36ab36f290 [IMP] hr_payroll:removed 'display_child_rules' from the code 
bzr revid: mtr@mtr-20110323130824-dcafcx8t85fm0wou
 2011-03-23 18:38:24 +05:30
Mustufa Rangwala 66d96e0cf1 [IMP] hr_payroll: add contract id on onchange on contract on payslip 
bzr revid: mra@mra-laptop-20110323114112-2q1bvj1db1qtnpwz
 2011-03-23 17:11:12 +05:30
psi (Open ERP) 794c39d803 [MERGE] merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110323084226-n1wm534d0hso6n90
bzr revid: psi@tinyerp.co.in-20110323101135-iidb0qlg4zk97t9a
bzr revid: psi@tinyerp.co.in-20110323101358-29ejnjid6wn72meq
 2011-03-23 15:43:58 +05:30
mtr 56fd660481 [IMP] hr_payroll:improved code for holidays in 'onchange_employee_id' function. 
bzr revid: mtr@mtr-20110323101149-pz4c5dzn3zvvkbqp
 2011-03-23 15:41:49 +05:30
mtr 04bceafd1f [IMP] hr_payroll:improved fields of 'hr.salary.head' and 'hr.payslip.line' objects 
bzr revid: mtr@mtr-20110323092318-zihgwzvthagfg2g6
 2011-03-23 14:53:18 +05:30
Quentin (OpenERP) 9e5609adb5 [IMP] hr_payroll: few modifications 
bzr revid: qdp-launchpad@openerp.com-20110322160808-1voe9ad36u1dot1b
 2011-03-22 17:08:08 +01:00
mtr be62097447 [IMP] hr_payroll:code for child rules of holidays and in python code 
bzr revid: mtr@mtr-20110322133713-ungnqrl9ynxrzv93
 2011-03-22 19:07:13 +05:30
psi (Open ERP) d12a1256de [IMP] small change update state before writing payslip data 
bzr revid: psi@tinyerp.co.in-20110322112504-ugwdsrj1gpw4rzyn
 2011-03-22 16:55:04 +05:30
psi (Open ERP) e56a6ef0fb [IMP] small improvment in _calculate_basic method of hr.employee so it will consider today's contract days to total the basic of employee form all contracts 
bzr revid: psi@tinyerp.co.in-20110322110353-ph0w969grj8ua6l3
 2011-03-22 16:33:53 +05:30
psi (Open ERP) 188ca3c715 [IMP] hr_contract: remove unwanted object 'hr.contract.wage.type.period', hr_payroll: Add recompute button, improve the compute method or hr.payroll.register and workflow of hr.payslip 
bzr revid: psi@tinyerp.co.in-20110322103531-kxk06fej7kh95td5
 2011-03-22 16:05:31 +05:30
psi (Open ERP) 24e773acd0 [IMP, MERGE] merge with mtr's branch, improve view 
bzr revid: psi@tinyerp.co.in-20110318131606-26l1q04kgxoza6u4
bzr revid: psi@tinyerp.co.in-20110321093539-u76i7umiyf01jhc9
 2011-03-21 15:05:39 +05:30
mtr 4785bb5afc [IMP] hr_payroll:added field schedule_pay on hr.contract and improved view of company contribution 
bzr revid: mtr@mtr-20110318131333-2msspn1nonnyd7g2
 2011-03-18 18:43:33 +05:30
mtr 3929c35749 [IMP] hr_payroll:added fields,code for company contribution 
bzr revid: mtr@mtr-20110318114619-hxjpj7g3itgwbcwg
 2011-03-18 17:16:19 +05:30
mtr de09f57d7b [IMP] hr_payroll:improved code for child_rules,added display_child_rules field 
bzr revid: mtr@mtr-20110317132913-ffrst2r4dxgtw3w8
 2011-03-17 18:59:13 +05:30
psi (Open ERP) a3d4555688 [IMP] payslip line created by holidays will also consider the amount_type=code 
bzr revid: psi@tinyerp.co.in-20110317125547-lj532yj9wy79uz2a
 2011-03-17 18:25:47 +05:30
psi (Open ERP) aeb88e7675 [IMP] change for amount_type='code' on hr.salary.rule object improve the calculation for the same 
bzr revid: psi@tinyerp.co.in-20110317113535-7o5j9gz8bf3g8zmx
 2011-03-17 17:05:35 +05:30
psi (Open ERP) 468631afd7 [MERGE] Merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110317085442-5lt6vjulygmqeif3
 2011-03-17 14:24:42 +05:30
psi (Open ERP) 3947b67231 [IMP] small improvment in compute_sheet method of hr.payroll.register 
bzr revid: psi@tinyerp.co.in-20110316131407-ax2dysk4x6b1kjph
 2011-03-16 18:44:07 +05:30
psi (Open ERP) c42ce2d208 [IMP] imporve the compute_sheet method of hr.payroll.register 
bzr revid: psi@tinyerp.co.in-20110316114302-m5vg413dk7otpzxz
 2011-03-16 17:13:02 +05:30
mtr ee2f49bc09 [IMP] hr_payroll:added code for child rules 
bzr revid: mtr@mtr-20110315133322-uqg7rawcx4btm332
 2011-03-15 19:03:22 +05:30
psi (Open ERP) 57a9c5e7f5 [IMP] small improvement in default of python_compute field of hr.salary.rule object 
bzr revid: psi@tinyerp.co.in-20110315095722-i6kpzy3c6yt6tjw7
 2011-03-15 15:27:22 +05:30
psi (Open ERP) fd1bf58bfb [IMP] improve code so it will calculate lines for type=code 
bzr revid: psi@tinyerp.co.in-20110314133428-cey6umex57d62po8
 2011-03-14 19:04:28 +05:30
psi (Open ERP) 748259854c [MERGE] merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110314122749-6b4i14zwcs5zudyr
 2011-03-14 17:57:49 +05:30
psi (Open ERP) 8092a079d2 [IMP] remove unused code 
bzr revid: psi@tinyerp.co.in-20110314120359-clwrb39i70lkfxsf
 2011-03-14 17:33:59 +05:30
Mustufa Rangwala 5d5392dff5 [FIX] small fix 
bzr revid: mra@mra-laptop-20110314114708-uff1npg60l21q488
 2011-03-14 17:17:08 +05:30
Mustufa Rangwala 9672c7c83f [FIX] small fix 
bzr revid: mra@mra-laptop-20110314114447-h1zwjsaedpmlnmdl
 2011-03-14 17:14:47 +05:30
Mustufa Rangwala bfdec77ead [IMP] payroll cleaning 
bzr revid: mra@mra-laptop-20110314112227-6rzbc31dpg0tvop1
 2011-03-14 16:52:27 +05:30
mtr 007e96a197 [IMP] hr_payroll:improved code for min and max range condition for amount_type=percentage 
bzr revid: mtr@mtr-20110314094429-zulakh5vl7cykotu
 2011-03-14 15:14:29 +05:30
psi (Open ERP) d7e626ff76 [MERGE] merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110314090226-f9ut7cqf5l0r1xud
 2011-03-14 14:32:26 +05:30
Mustufa Rangwala adf35bc8e0 [IMP] Cleaning employee object 
bzr revid: mra@mra-laptop-20110314085854-g192a5k8is984klt
 2011-03-14 14:28:54 +05:30
psi (Open ERP) 41fd33e46e [IMP] improve in workflow of hr.payslip object 
bzr revid: psi@tinyerp.co.in-20110314085750-5qk7f0txo8b003d2
 2011-03-14 14:27:50 +05:30
Mustufa Rangwala e50705e393 [IMP] remove line_ids (hr.payslip lines) from employee object 
bzr revid: mra@mra-laptop-20110314084555-jxm2en3l9yiy8tyb
 2011-03-14 14:15:55 +05:30
Mustufa Rangwala a523e73c1e [IMP] hr_payroll: Code improved 
bzr revid: mra@mra-laptop-20110314072317-rivtyc4yokwvsqtd
 2011-03-14 12:53:17 +05:30
psi (Open ERP) 743a6fe8ee [IMP] get holidays line of employee in holidays tab 
bzr revid: psi@tinyerp.co.in-20110314061621-zn9ntg6l28zts7a6
 2011-03-14 11:46:21 +05:30
psi (Open ERP) 0be7eecb8f [MERGE] merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110314050010-pkqhcumi84fhmfdd
 2011-03-14 10:30:10 +05:30
psi (Open ERP) cc8bb306f5 [IMP] improve _caluculate method on hr.payslip object so it will consider all line_ids of hr.payslip 
bzr revid: psi@tinyerp.co.in-20110311122326-golfefokn1bp2gsz
 2011-03-11 17:53:26 +05:30
mtr 36366390b5 [IMP] hr_payroll:created a function to get parent_id of salary structure 
bzr revid: mtr@mtr-20110311114155-stpuykd37s02iyq1
 2011-03-11 17:11:55 +05:30
mtr 5c0680f7f8 [MERGE] branch merged with trunk-payroll-salary_rules-psi 
bzr revid: mtr@mtr-20110311101220-9yehi8n5lz7ui2hx
 2011-03-11 15:42:20 +05:30
mtr 473a1541e1 [IMP] hr_payroll:added code in onchange_employee_id if salary structure has parent_id 
bzr revid: mtr@mtr-20110311085740-gkz19qlnpt38gowc
 2011-03-11 14:27:40 +05:30
psi (Open ERP) 2dc26c64c1 [IMP] fix the problem related to save the payslip record 
bzr revid: psi@tinyerp.co.in-20110310115525-hdmc23gxma25jbya
 2011-03-10 17:25:25 +05:30
mtr 3fbb7333ab [IMP] hr_payroll:added code in onchange_employee_id for min and max range condition 
bzr revid: mtr@mtr-20110310065326-2vtu0z1fyy1esj09
 2011-03-10 12:23:26 +05:30
psi (Open ERP) da3745b2d6 [IMP] hr_payroll: Get payslip_line for leaves 
bzr revid: psi@tinyerp.co.in-20110309133027-2z1b6i3pvz0di3i9
 2011-03-09 19:00:27 +05:30
mtr bb4cc763a9 [MERGE] branch merged with trunk-payroll-salary_rules-psi 
bzr revid: mtr@mtr-20110309125647-4qv3bwf6rm6j9b5j
 2011-03-09 18:26:47 +05:30
mtr f0e3ce0dbb [IMP] hr_payroll:improved code of _calculate(hr.payslip) for gross and net 
bzr revid: mtr@mtr-20110309113003-03rr094fnxwn5n35
 2011-03-09 17:00:03 +05:30
psi (Open ERP) 8b1895b8e8 [IMP] hr_payroll: Improve demo data(set negative value for deduction) 
bzr revid: psi@tinyerp.co.in-20110309103758-x4kzt9kn5krogre3
 2011-03-09 16:07:58 +05:30
psi (Open ERP) b46811e762 [MERGE] merge with mtr's payroll branch 
bzr revid: psi@tinyerp.co.in-20110309101242-385e7hxtp2z9j04h
 2011-03-09 15:42:42 +05:30
psi (Open ERP) 4de1ee3f35 [IMP] on hr.employee object make basic field as function and the function make the sum of basic field of all the hr.contract for this employee that have date_start < now() and now() < date_stop or not date_stop 
bzr revid: psi@tinyerp.co.in-20110309101041-p4i0n49uq0qo2tm2
 2011-03-09 15:40:41 +05:30
mtr f6a7d660be [IMP] hr_payroll:improved code and view for 'basic_amount' of hr.payslip 
bzr revid: mtr@mtr-20110309085441-nka6x5s8hfhxt982
 2011-03-09 14:24:41 +05:30
mtr 1dc96b5404 [IMP] hr,hr_payroll:removed hr.passport from .csv,improved hr.payslip and hr.payslip.line object 
bzr revid: mtr@mtr-20110309061111-sl9d1b10c9wnk16r
 2011-03-09 11:41:11 +05:30
Mustufa Rangwala d39237d474 [IMP/FIX] hr_payroll: Improvement and cleaning 
bzr revid: mra@mra-laptop-20110308063637-zfv8hawzqkdvsk8d
 2011-03-08 12:06:37 +05:30
mtr de09fe0af3 [IMP] hr_payroll:improved code of onchange_employee_id for min and max range condition 
bzr revid: mtr@mtr-20110308055145-q31b346sxscys51o
 2011-03-08 11:21:45 +05:30
mtr a4cc0a400d [IMP] hr_payroll:added warning to fix the error on payslip,when structure is not defined for an employee 
bzr revid: mtr@mtr-20110307131329-dlpac23lr2edb863
 2011-03-07 18:43:29 +05:30
mtr b66b346664 [IMP] hr_payroll:improved code to fix the error on payslip,when structure is not defined for an employee 
bzr revid: mtr@mtr-20110307124607-kj0qokxxblhx4uie
 2011-03-07 18:16:07 +05:30
mtr 7b7a1915f4 [MERGE] branch merged with trunk-payroll-salary_rules-psi 
bzr revid: mtr@mtr-20110307113703-mu4v0hsd8e7a6qqa
 2011-03-07 17:07:03 +05:30
mtr ad9f23f99f [IMP] hr_payroll:added field 'python_code' and improved view of Salary Rules 
bzr revid: mtr@mtr-20110307104513-mjcjedxtozza6wdf
 2011-03-07 16:15:13 +05:30
mtr e85b5701ee [IMP] hr_payroll:added default company_id on salary rules 
bzr revid: mtr@mtr-20110307094710-px4r3q1ik57h536k
 2011-03-07 15:17:10 +05:30
psi (Open ERP) e35ce1fdcd [IMP] hr_payroll: Get line_ids on hr_payslip based on salary rules, Improve _calculate function on hr.payslip, if Appears on payslip is set then the salary rule will be added in line_ids of hr.payslip else it will consider in calculation only 
bzr revid: psi@tinyerp.co.in-20110307092649-u6cd4hkfk8biikqq
 2011-03-07 14:56:49 +05:30
mtr 971a91390a [IMP] hr_payroll:improvements in salary rules,salary head,salary structure and demo data 
bzr revid: mtr@mtr-20110307071829-rluk1idcxjtbw43u
 2011-03-07 12:48:29 +05:30
psi (Open ERP) 6bb91a2926 [MERGE] merge with trunk-payroll-salary_rules-mtr branch 
bzr revid: psi@tinyerp.co.in-20110304094702-udyk182mv00jg08b
 2011-03-04 15:17:02 +05:30
psi (Open ERP) 5b8c80ce13 [IMP] hr_payroll: Improve onchange_employee_id on hr.payslip 
bzr revid: psi@tinyerp.co.in-20110304094414-kuahly8xm90zjep6
 2011-03-04 15:14:14 +05:30
mtr e584769f5b [IMP] hr_payroll:improved code in hr.payslip(verify_sheet) 
bzr revid: mtr@mtr-20110304093534-jjjpp0loyqltxg41
 2011-03-04 15:05:34 +05:30
psi (Open ERP) ed78081860 [MERGE] merge with trunk-payroll-salary_rules-mtr branch 
bzr revid: psi@tinyerp.co.in-20110304070625-ya6lepni4jyjw8c7
 2011-03-04 12:36:25 +05:30
psi (Open ERP) 899dccfc23 [IMP] remove working_days_per_week field from hr.contract object 
bzr revid: psi@tinyerp.co.in-20110303131754-bw7qa76z5tsn2mua
 2011-03-03 18:47:54 +05:30
psi (Open ERP) 016fbccf00 [IMP] changes as per hr_payroll_new file given by QDP sir: move hr_passport obj to hr module, move some fields of hr.contract from hr_paroll to hr_contract, remove working_days_per_week field for contart and get it from resource calender 
bzr revid: psi@tinyerp.co.in-20110303124903-nopz0swoebyqtsqq
 2011-03-03 18:19:03 +05:30
mtr 64b46e24e4 [IMP] hr_payroll:improved company.contribution object 
bzr revid: mtr@mtr-20110303124406-rcctrip72051sbuf
 2011-03-03 18:14:06 +05:30
mtr 29a46c9f18 [IMP] hr_payroll:improved 'hr.employee',commented m2m field i.e. Salary Rules on Employee 
bzr revid: mtr@mtr-20110303103321-ecd9eooj9l6ixlgo
 2011-03-03 16:03:21 +05:30
mtr 533ea71235 [IMP] hr_payroll:removed all fields from 'hr.holidays.status',except the 'code' field. 
bzr revid: mtr@mtr-20110303102745-uds7mbwabpjs372w
 2011-03-03 15:57:45 +05:30
mtr 6f0f2e5325 [IMP] hr_payroll:removed 'Bank Advice' and 'Bank Advice Lines' 
bzr revid: mtr@mtr-20110303100753-jdc0o3nddrlv21jv
 2011-03-03 15:37:53 +05:30
mtr d840425793 [IMP] hr_payroll:renamed 'hr.allounce.deduction.categoty' to 'hr.salary.head' and improved its object and fields 
bzr revid: mtr@mtr-20110303095226-kga2d2ulq0mhb4ne
 2011-03-03 15:22:26 +05:30
mtr 183e37aaef [IMP] hr_payroll:improved 'salary_head_type' class,object and its fields. 
bzr revid: mtr@mtr-20110302120023-ihc9mi4pqk3gucvt
 2011-03-02 17:30:23 +05:30
mtr dcd7a887b1 [IMP] hr_payroll:removed 'hr.payslip.line.line' from code and view. 
bzr revid: mtr@mtr-20110302101736-v9xhxj0hbpted3bt
 2011-03-02 15:47:36 +05:30
psi (Open ERP) aeb79ab194 [IMP, FIX] hr_payroll: Remove Compute and Recompute buttons from hr.payslip, fixes: on hr.contract Visa fields become required=true when we fill the passport, Improve view of hr.payslip 
bzr revid: psi@tinyerp.co.in-20110302093407-7vchj5e2hw70357h
 2011-03-02 15:04:07 +05:30
mtr cbaaaba383 [IMP] hr_payroll:improved help for salary rules. 
bzr revid: mtr@mtr-20110302085359-19ayfxa43pe2aasa
 2011-03-02 14:23:59 +05:30
mtr 4723e2da6b [IMP] hr_payroll:added help for salary rules. 
bzr revid: mtr@mtr-20110302084815-m2ybjteobf4t1s2f
 2011-03-02 14:18:15 +05:30
mtr bb0decba67 [IMP] hr_payroll:commented the line_ids field(hr.payroll.structure) and function_id field(hr.payslip.line) 
bzr revid: mtr@mtr-20110302071238-s3efwfa486q0ylht
 2011-03-02 12:42:38 +05:30
mtr 017c72127b [IMP] hr_payroll:improved demo data and the structure of 'Salary Head' 
bzr revid: mtr@mtr-20110301132938-rt8nqcwndgj0gefp
 2011-03-01 18:59:38 +05:30