2447cd56dd
[IMP] hr_payroll_account: improved code to assigned analytic account on payslip line from salary rule
...
bzr revid: mtr@mtr-20110420085519-emevo3dufjvso7w6
2011-04-20 14:25:19 +05:30
eb36f0c726
[IMP] hr_payroll_account: commented unrequired prev_bounds() method
...
bzr revid: mtr@mtr-20110420085011-sujli3n7xeab22r3
2011-04-20 14:20:11 +05:30
fa908b5e00
[IMP] hr_payroll_account: commented code, creating hr.expense.expense as payslip line
...
bzr revid: mtr@mtr-20110419124637-p96wnqvwbfm3uhv1
2011-04-19 18:16:37 +05:30
5051b21ea4
[IMP] hr_payroll_account: improved code to assign credit/debit account on payslip line
...
bzr revid: mtr@mtr-20110419124401-fpn4kxijz74xxhbu
2011-04-19 18:14:01 +05:30
148c73acb1
[IMP] hr_payroll_account: improved code to assign the account(if empty) on salary rules from payslip journal
...
bzr revid: mtr@mtr-20110419070204-r3xaby5fl7rl1e80
2011-04-19 12:32:04 +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
6550a55bb4
[IMP] hr_payroll_account: improved code for the verify_sheet function
...
bzr revid: mtr@mtr-20110414133315-3ecyexf2xngs2peb
2011-04-14 19:03:15 +05:30
00495a0bf6
[IMP] hr_payroll_account: removed unrequired objects and added fields as per etherpad
...
bzr revid: mtr@mtr-20110413131628-wp4km4zwuatfjn63
2011-04-13 18:46:28 +05:30
4dfb66a35a
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110412045612-7bny7k331a0y2ree
bzr revid: mtr@mtr-20110412052754-7q392mf48cv0xg9b
bzr revid: mtr@mtr-20110413060140-nhu313xpavd5sv2m
2011-04-13 11:31:40 +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
43af0b6cdf
[MERGE] Small fix on demo data for payroll stcturure
...
mtr branch lp:~openerp-dev/openobject-addons/trunk-payroll-demo-data-mtr
bzr revid: mra@mra-laptop-20110412095606-oijfyt65v2pvyqdc
2011-04-12 15:26:06 +05:30
9ed1b31b4f
[ADD] Payroll: Payslip line action on payslip + search view added for payslip lines
...
bzr revid: mra@mra-laptop-20110412095337-ohnd7nymekow41eb
2011-04-12 15:23:37 +05:30
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
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
d900e9768b
[FIX] Payroll: Meal voucher correct the sequnce
...
bzr revid: mra@mra-laptop-20110412084427-12jupz8i6s6lol6d
2011-04-12 14:14:27 +05:30
e91d5a7c38
[FIX] Payroll: Fix for installation
...
bzr revid: mra@mra-laptop-20110412052349-bcjzxxtkwqy3caol
2011-04-12 10:53:49 +05:30
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
33f392cb28
[MERGE] merge
...
bzr revid: qdp-launchpad@openerp.com-20110411155356-jncdanf2fv0rgynd
2011-04-11 17:53:56 +02:00
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
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
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
5f8574d16f
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110411131049-yu4ipa9cij4yywip
2011-04-11 18:40:49 +05:30
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
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
d433642232
[IMP] hr_payroll: added access rules
...
bzr revid: mtr@mtr-20110411115823-kp0oarpmo8vz9rtr
2011-04-11 17:28:23 +05:30
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
d996fc00ae
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110411110135-38vwvlqttj8ou9gc
2011-04-11 16:31:35 +05:30
a325842fc3
[IMP] hr_payroll: improved demo data
...
bzr revid: mtr@mtr-20110411105747-w76xe1ylr9e14r42
2011-04-11 16:27:47 +05:30
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
07cfef6b51
[MERGE] merge from trunk-payroll main branch
...
bzr revid: mra@mra-laptop-20110411084222-ztm9ackwbvq7v021
2011-04-11 14:12:22 +05:30
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
69f697b7ef
[IMP] hr_payroll: improved demo data
...
bzr revid: qdp-launchpad@openerp.com-20110411081139-7x93kr8v11q19f2x
2011-04-11 10:11:39 +02:00
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
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
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
f41c989295
[IMP] hr_payroll: cosmetic imp
...
bzr revid: qdp-launchpad@openerp.com-20110408223845-8kj51e3uo6ko8gt0
2011-04-09 00:38:45 +02:00
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
0df1e74d79
[FIX] hr_payroll: fixed default rules
...
bzr revid: qdp-launchpad@openerp.com-20110408163312-x26jnh5zr6erxmqm
2011-04-08 18:33:12 +02:00
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
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
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
mtr
Quentin (OpenERP)
Mustufa Rangwala