b55e82f0d9
[MERGE] merged mtr's branch with salary.head => salary.category
...
bzr revid: qdp-launchpad@openerp.com-20110510142723-6kr9k4ivqwrusxss
2011-05-10 16:27:23 +02:00
962da7711c
[MERGE] merge psi branch with removal of sequence on salary heads
...
bzr revid: qdp-launchpad@openerp.com-20110510134237-ac3lu8aeec50hlsf
2011-05-10 15:42:37 +02:00
1819c3d5ad
[MERGE] merged psi branch with tooltip improvement
...
bzr revid: qdp-launchpad@openerp.com-20110510133410-c9lapqzd49291o76
2011-05-10 15:34:10 +02:00
7e28aed3a0
[FIX] Payroll: Payslip lines readonly with all states of payslips
...
bzr revid: mra@mra-laptop-20110510131110-gd32dkedh7m3gv2i
2011-05-10 18:41:10 +05:30
84739f218e
[IMP] hr_payroll: renamed salary head into salary category
...
bzr revid: mtr@mtr-20110510115411-lkf923pyakj1ykug
2011-05-10 17:24:11 +05:30
c600603f3a
[ADD] improve code and add demo rule for sales
...
bzr revid: psi@tinyerp.co.in-20110510111931-4v21peqft66hblpp
2011-05-10 16:49:31 +05:30
8666be5ebd
[IMP] rename object to worked_days and add one object hr.salary.input
...
bzr revid: psi@tinyerp.co.in-20110509085002-l0ygkq5al9yedmz6
2011-05-09 14:20:02 +05:30
7f97f2e2b3
[IMP] Payroll: Clean the code
...
bzr revid: mra@mra-laptop-20110506063903-4hno1tb6enrd0bk4
2011-05-06 12:09:03 +05:30
3bca5dc9c8
[IMP] hr_payroll: minor improvement in methods for parameter employee
...
bzr revid: mtr@mtr-20110505124959-062hns4ca03vltbu
2011-05-05 18:19:59 +05:30
12aeaca553
[IMP] hr_payroll: minor changes
...
bzr revid: mtr@mtr-20110505123515-in7313mb4ryqeb0f
2011-05-05 18:05:15 +05:30
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
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
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
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
a13984cf7b
[IMP] remove sequence form salary head object
...
bzr revid: psi@tinyerp.co.in-20110504111348-kngj0i0tert4w9pt
2011-05-04 16:43:48 +05:30
fe16882b43
[IMP] small fixes
...
bzr revid: psi@tinyerp.co.in-20110503131750-24xxudj2qs84vy21
2011-05-03 18:47:50 +05:30
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
d8962fac28
[MERGE] merge with trunk-payroll branch
...
bzr revid: psi@tinyerp.co.in-20110502122136-wxilodkqcxk0wv05
2011-05-02 17:51:36 +05:30
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
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
19db9c692b
[IMP] hr_payroll: improved help tooltip
...
bzr revid: qdp-launchpad@openerp.com-20110428130848-cs584ryp8sesqmm7
2011-04-28 15:08:48 +02:00
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
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
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
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
30564f93e9
[IMP] hr_payroll:again improved exception message string
...
bzr revid: mtr@mtr-20110425120430-kacidzhufm6n25q7
2011-04-25 17:34:30 +05:30
122d51a2d7
[IMP] hr_payroll:improved exception message string
...
bzr revid: mtr@mtr-20110425102502-6basvgqilrh664th
2011-04-25 15:55:02 +05:30
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
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
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
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
566c5c7a8c
[IMP] hr_payroll: improved code for payslip reference
...
bzr revid: mtr@mtr-20110418133642-8xn0ka4bkwrty241
2011-04-18 19:06:42 +05:30
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
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
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
e91d5a7c38
[FIX] Payroll: Fix for installation
...
bzr revid: mra@mra-laptop-20110412052349-bcjzxxtkwqy3caol
2011-04-12 10:53:49 +05:30
33f392cb28
[MERGE] merge
...
bzr revid: qdp-launchpad@openerp.com-20110411155356-jncdanf2fv0rgynd
2011-04-11 17:53:56 +02:00
3f69757064
[MERGE] merge from trunk payroll
...
bzr revid: mra@mra-laptop-20110411122559-8s7vnahm7jguta5d
2011-04-11 17:55:59 +05:30
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
7080f2b5f3
[IMP] hr_payroll: refund payslip feature improved
...
bzr revid: qdp-launchpad@openerp.com-20110411121046-7r0dzzqiw6hv6hkl
2011-04-11 14:10:46 +02:00
8994649cf3
[MERGE] merge from trunk payroll
...
bzr revid: mra@mra-laptop-20110411114415-bp4bchwp51i0932i
2011-04-11 17:14:15 +05:30
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
3e1f543b78
[FIX] hr_payroll: refund button
...
bzr revid: qdp-launchpad@openerp.com-20110411111923-18x2v4weqm71hms4
2011-04-11 13:19:23 +02:00
295f699558
[REM] unused code
...
bzr revid: mra@mra-laptop-20110411104437-08y014kaeelpw150
2011-04-11 16:14:37 +05:30
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
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
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
f41c989295
[IMP] hr_payroll: cosmetic imp
...
bzr revid: qdp-launchpad@openerp.com-20110408223845-8kj51e3uo6ko8gt0
2011-04-09 00:38:45 +02:00
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
5cf844c230
[MERGE] merge from same branch
...
bzr revid: mra@mra-laptop-20110408130434-lgsdbrfl95j6cxwo
2011-04-08 18:34:34 +05:30
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
97b7ef99ff
[FIX] Payroll: strcut_id on contract now compulsory
...
bzr revid: mra@mra-laptop-20110408130136-y4g2m87dzo0zei51
2011-04-08 18:31:36 +05:30
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
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
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
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
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
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
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
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
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
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
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
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
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
5853d90ae0
[FIX] small fix in compute_sheet method
...
bzr revid: psi@tinyerp.co.in-20110406053948-mg7uc3mo23vaat0d
2011-04-06 11:09:48 +05:30
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
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
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
9843f42b1f
[FIX] payroll
...
bzr revid: mra@mra-laptop-20110404130033-rxhyg3jpwga7xaof
2011-04-04 18:30:33 +05:30
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
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
c369b99712
[FIX] hr_payroll
...
bzr revid: psi@tinyerp.co.in-20110404100637-ljba7flsrrawhxdp
2011-04-04 15:36:37 +05:30
3bb9bf2065
[FIX] payrol;
...
bzr revid: mra@mra-laptop-20110404100136-usw6fe76l64bph8u
2011-04-04 15:31:36 +05:30
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
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
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
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
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
a5cacc1ff7
[IMP] clean the code
...
bzr revid: psi@tinyerp.co.in-20110401131735-pwddzzgf21ie4hcj
2011-04-01 18:47:35 +05:30
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
03a02288f9
[FIX] payroll: fix on payroll register
...
bzr revid: mra@mra-laptop-20110401122643-mbuqzap5emjzxvg3
2011-04-01 17:56:43 +05:30
2688eada6e
[FIX] payroll
...
bzr revid: mra@mra-laptop-20110401122132-5rdibau7jngyeeal
2011-04-01 17:51:32 +05:30
34f8594f58
[FIX] Payroll: Add seq field on salary head
...
bzr revid: mra@mra-laptop-20110401113211-4qcdob9xi0xq30xi
2011-04-01 17:02:11 +05:30
6056d569ae
[FIX] Payroll: Small fix
...
bzr revid: mra@mra-laptop-20110401110105-8i6rmnxd4rdz8qr4
2011-04-01 16:31:05 +05:30
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
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
b78fdb96ec
[IMP] hr_payroll: improved company contribution
...
bzr revid: mtr@mtr-20110401103832-vla2it1171yumm8w
2011-04-01 16:08:32 +05:30
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
cafe5a4baa
[FIX] payroll: structure on payslip readonly
...
bzr revid: mra@mra-laptop-20110401054512-s2s2pfu2miq9xgw9
2011-04-01 11:15:12 +05:30
ad0286795f
[IMP] Holidays based on contract
...
bzr revid: psi@tinyerp.co.in-20110401051417-od73wdl9u77vto1g
2011-04-01 10:44:17 +05:30
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
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
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
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
e9b4d4538c
[IMP] hr_payroll: improved string for 'state' fields
...
bzr revid: mtr@mtr-20110331123213-8kqt1becfgcqwfgy
2011-03-31 18:02:13 +05:30
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
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
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
cb6176a892
[MERGE] merge
...
bzr revid: mra@mra-laptop-20110331102726-ouqn5sq5hur501nu
2011-03-31 15:57:26 +05:30
71d2458390
[IMP] payroll improve code
...
bzr revid: mra@mra-laptop-20110331102436-h318f46xiwnm1u8m
2011-03-31 15:54:36 +05:30
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
352a3ec142
[FIX] payroll remove the tabs
...
bzr revid: mra@mra-laptop-20110331092325-vfsm4q487lh9dmo2
2011-03-31 14:53:25 +05:30
ab98d8809d
[FIX] payroll
...
bzr revid: mra@mra-laptop-20110331092048-uivs7dxmh2o7fhp8
2011-03-31 14:50:48 +05:30
f7777d457d
[IMP] in payslip asked by qdp
...
bzr revid: osenda-20110331072504-pspga7znfo87dvl0
2011-03-31 09:25:04 +02:00
88de3c4148
[IMP]new salary head view
...
bzr revid: osenda-20110330133046-o4ef7gz1n1laekt5
2011-03-30 15:30:46 +02:00
ca98534357
[IMP] l10n_be_payroll: rules ok
...
bzr revid: osenda-20110330082730-9esh7xn89mv9s0v5
2011-03-30 10:27:30 +02:00
2e4287681d
[FIX] payroll
...
bzr revid: mra@mra-laptop-20110331071802-7dht90mooy7egqf1
2011-03-31 12:48:02 +05:30
3066f1206b
[FIX] fixes on payroll
...
bzr revid: mra@mra-laptop-20110331060658-d79zu4ov0ess6rix
2011-03-31 11:36:58 +05:30
97a5a3c227
[MERGE] branch merged with trunk-payroll-salary_rules-psi
...
bzr revid: mtr@mtr-20110331050506-yczfv6k3rq0027r5
2011-03-31 10:35:06 +05:30
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
8663c434a4
[IMP] hr_payroll: improved code
...
bzr revid: mtr@mtr-20110330084832-t4iuqxrl2l2le3b9
2011-03-30 14:18:32 +05:30
4f27ec3e8f
[IMP] hr_payroll: again committing changes which got reverted
...
bzr revid: mtr@mtr-20110330053055-3ovz8idtmrvtkoqq
2011-03-30 11:00:55 +05:30
2d7687ab6e
[MERGE] branch merged with trunk-payroll-salary_rules-psi
...
bzr revid: mtr@mtr-20110330051941-06s0i1nqfri8cv1r
2011-03-30 10:49:41 +05:30
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
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
c7a7415891
[FIX] hr_payroll: small fix
...
bzr revid: mra@mra-laptop-20110329112813-7oyymhljq7gcy2ze
2011-03-29 16:58:13 +05:30
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
c92303afc1
[IMP] hr_payroll: Holidays for multiple contracts
...
bzr revid: psi@tinyerp.co.in-20110329072648-e9dilqyvijhv6li2
2011-03-29 12:56:48 +05:30
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
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
e9d028ea34
[IMP]Changes on salary rule form
...
bzr revid: osenda-20110328135032-yfumqec54ovtsbox
2011-03-28 15:50:32 +02:00
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
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
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
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
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
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
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
9f43efede6
[FIX] small fix
...
bzr revid: mra@mra-laptop-20110324093258-s8ykye3eatn23o09
2011-03-24 15:02:58 +05:30
49ed5e1336
[IMP] hr_payroll: changes on payslip
...
bzr revid: osenda-20110324091103-1krcvxhz38lf5bup
2011-03-24 10:11:03 +01:00
3b6449f709
[MERGE] branch merged with trunk-payroll-salary_rules-psi
...
bzr revid: mtr@mtr-20110324083517-rg2u6e6nm12z7nd1
2011-03-24 14:05:17 +05:30
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
80e501b581
[IMP] tool tips and small changes
...
bzr revid: psi@tinyerp.co.in-20110323131600-dqhennoatjpl13o1
2011-03-23 18:46:00 +05:30
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
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
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
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
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
9e5609adb5
[IMP] hr_payroll: few modifications
...
bzr revid: qdp-launchpad@openerp.com-20110322160808-1voe9ad36u1dot1b
2011-03-22 17:08:08 +01:00
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
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
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
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
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
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
3929c35749
[IMP] hr_payroll:added fields,code for company contribution
...
bzr revid: mtr@mtr-20110318114619-hxjpj7g3itgwbcwg
2011-03-18 17:16:19 +05:30
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
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
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
Quentin (OpenERP)
Mustufa Rangwala
mtr
psi (Open ERP)
ARA (OpenERP)
Osenda