Quentin (OpenERP)
c002b2df9e
[MERGE] hr_payroll: merged the branch with modifications on workflow and state of payslip
...
bzr revid: qdp-launchpad@openerp.com-20110524123116-y0l7o66mclk8fkd2
2011-05-24 14:31:16 +02:00
psi (Open ERP)
f69a2a7b7d
[IMP] hr_payroll: Imporve search view of hr.payslip
...
bzr revid: psi@tinyerp.co.in-20110520133452-1auudht73qdm0idv
2011-05-20 19:04:52 +05:30
psi (Open ERP)
7c36ebc0d8
[IMP] hr_payroll: Added search based on payslip.run object on payslip
...
bzr revid: psi@tinyerp.co.in-20110517105818-ae5u33d3luh1z42x
2011-05-17 16:28:18 +05:30
mtr
0df1f06801
[IMP] hr_payroll: improved payslip states(draft, verify, done) and workflow
...
bzr revid: mtr@mtr-20110517105155-d4dp2tt7d7ut4jxd
2011-05-17 16:21:55 +05:30
psi (Open ERP)
badc8caef5
[IMP] small improvment in wizard
...
bzr revid: psi@tinyerp.co.in-20110512070253-iyahei1j6cc1m4r0
2011-05-12 12:32:53 +05:30
psi (Open ERP)
ba27653083
[MERGE,IMP] merge with main payroll branch and improve the code in wizard according to that
...
bzr revid: psi@tinyerp.co.in-20110511093426-0ao8e98y846hfmiv
bzr revid: psi@tinyerp.co.in-20110512045902-e310b5m3k7wf3m7b
2011-05-12 10:29:02 +05:30
Quentin (OpenERP)
5aab6e88a8
[MERGE] merged mtr's branch with new name for salary.head
...
bzr revid: qdp-launchpad@openerp.com-20110511132148-g2pyjq9oy6e88w6t
2011-05-11 15:21:48 +02:00
psi (Open ERP)
03fb4577c4
[MERGE] merge with main branch
...
bzr revid: psi@tinyerp.co.in-20110511101733-8a0tbbmuwvo5bix5
2011-05-11 15:47:33 +05:30
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
mtr
7ae069998e
[IMP] hr_payroll: renamed hr.salary.category into hr.salary.rule.category
...
bzr revid: mtr@mtr-20110511071854-ctdf3czpedhe5t6l
2011-05-11 12:48:54 +05:30
Quentin (OpenERP)
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
mtr
84739f218e
[IMP] hr_payroll: renamed salary head into salary category
...
bzr revid: mtr@mtr-20110510115411-lkf923pyakj1ykug
2011-05-10 17:24:11 +05:30
psi (Open ERP)
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
psi (Open ERP)
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
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)
c5d6059ab2
[FIX] rename the menu name
...
bzr revid: psi@tinyerp.co.in-20110504063316-26r7wu0ni4gtqhad
2011-05-04 12:03:16 +05:30
psi (Open ERP)
df2bac2686
[IMP] remanes view ids
...
bzr revid: psi@tinyerp.co.in-20110504055023-rngf7l4vwf25ilj7
2011-05-04 11:20:23 +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
Mustufa Rangwala
efdb84c905
[IMP] Payroll: form and tree view of Salary heads
...
bzr revid: mra@mra-laptop-20110503091202-pmitrzjymkrr3otf
2011-05-03 14:42:02 +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)
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
Quentin (OpenERP)
d997f0a92c
[MERGE] merged mtr's branch: improved payslip line view
...
bzr revid: qdp-launchpad@openerp.com-20110428123402-2aj4ylhc13msk6fq
2011-04-28 14:34:02 +02:00
Quentin (OpenERP)
6535ed21f6
[MERGE] merged mtr's branch: payslip line color is blue when total is 0
...
bzr revid: qdp-launchpad@openerp.com-20110428122605-5l7e4xe75imw6u4b
2011-04-28 14:26:05 +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
mtr
98438b2376
[IMP] hr_payroll:added company_id in payslip line view
...
bzr revid: mtr@mtr-20110425131740-422eih4okmi6rjqh
2011-04-25 18:47:40 +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
eac6fb073c
[IMP] hr_payroll:improved payslip line view,removed fields that are used to calculate the total
...
bzr revid: mtr@mtr-20110425103718-r80y25vatlik17z4
2011-04-25 16:07:18 +05:30
ARA (OpenERP)
11da3fc37b
[FIX] hr_payroll: payslip line color is blue when total is 0
...
bzr revid: ara@tinyerp.com-20110425102544-ivqy6vu4fb14z68u
2011-04-25 15:55:44 +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
ARA (OpenERP)
9f2709ccd0
[FIX] hr_payroll: payslip line color is blue when total is 0
...
bzr revid: ara@tinyerp.com-20110425094142-w0hjdx79bq84r920
2011-04-25 15:11:42 +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
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
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
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)
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)
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
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
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
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
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)
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