psi (Open ERP)
d705511664
[IMP] Improve code and add state on hr.payslip.run object
...
bzr revid: psi@tinyerp.co.in-20110511091009-iyu5bloo5ewg5re9
2011-05-11 14:40:09 +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
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)
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
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