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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
24ea4323c6
[IMP] hr_payroll: view improvements
...
bzr revid: qdp-launchpad@openerp.com-20110408101059-mnfv1v4xabha6ob0
2011-04-08 12:10:59 +02:00
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
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
7e320d618f
[FIX] payroll: Not open employee form
...
bzr revid: mra@mra-laptop-20110407110844-5bchm1c4mrkoomtt
2011-04-07 16:38:44 +05:30
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
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
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
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
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
33a795167f
[MERGE] merge
...
bzr revid: mra@mra-laptop-20110401113506-274l4aoq3nu1jb9w
2011-04-01 17:05:06 +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
6ee3a940ed
[IMP] improve Holidays and Details by Salary Head tab view of payslip
...
bzr revid: psi@tinyerp.co.in-20110401112511-dxidmww1ujzxgrg2
2011-04-01 16:55:11 +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
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
47c207a56a
[FIX] Payroll: Remove appear on payslip tab from payslip form
...
bzr revid: mra@mra-laptop-20110401044945-73k0m9t2tyzdloar
2011-04-01 10:19:45 +05:30
b390d2ce07
[ADD] compuation exp tab
...
bzr revid: mra@mra-laptop-20110331103748-p50ewmk1vfq99p8y
2011-03-31 16:07:48 +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
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
b8bdd54fe1
[IMP] hr_payroll: committing view changes which got reverted
...
bzr revid: mtr@mtr-20110330063927-25p27rwvklr12ge8
2011-03-30 12:09:27 +05:30
473be47059
[IMP] hr_payroll: improved string
...
bzr revid: mtr@mtr-20110330053457-jf3gowwjdbs290w1
2011-03-30 11:04:57 +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
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
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
e9d028ea34
[IMP]Changes on salary rule form
...
bzr revid: osenda-20110328135032-yfumqec54ovtsbox
2011-03-28 15:50:32 +02:00
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
b97e5ce8f7
[IMP]Changes on payslip from aos
...
bzr revid: osenda-20110324084009-0xldm7gnnkayctza
2011-03-24 09:40:09 +01:00
49ed5e1336
[IMP] hr_payroll: changes on payslip
...
bzr revid: osenda-20110324091103-1krcvxhz38lf5bup
2011-03-24 10:11:03 +01:00
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
9e5609adb5
[IMP] hr_payroll: few modifications
...
bzr revid: qdp-launchpad@openerp.com-20110322160808-1voe9ad36u1dot1b
2011-03-22 17:08:08 +01:00
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
8a3cd9df15
[IMP] small change in view of salary rule
...
bzr revid: psi@tinyerp.co.in-20110321101044-0meog6mah7rm3avn
2011-03-21 15:40:44 +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
db4327dd2d
[IMP] add company on hr.payroll.register form and tree view
...
bzr revid: psi@tinyerp.co.in-20110318131313-gd7o475deqaooyo3
2011-03-18 18:43:13 +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
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
468631afd7
[MERGE] Merge with mtr's branch
...
bzr revid: psi@tinyerp.co.in-20110317085442-5lt6vjulygmqeif3
2011-03-17 14:24:42 +05:30
4e6a9ea55c
[REM] all @col and @colspan attributes on groups in search views: search views are not laid out by columns, therefore these attributes do not belong
...
bzr revid: xmo@openerp.com-20110315140859-uh9w3exdit84qz47
2011-03-15 15:08:59 +01:00
ee2f49bc09
[IMP] hr_payroll:added code for child rules
...
bzr revid: mtr@mtr-20110315133322-uqg7rawcx4btm332
2011-03-15 19:03:22 +05:30
8141573dee
[REM] attribute 'select' on field elements in search views, this attributes makes no sense
...
bzr revid: xmo@openerp.com-20110315124111-c79fxotsc0tk011q
2011-03-15 13:41:11 +01:00
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
adf35bc8e0
[IMP] Cleaning employee object
...
bzr revid: mra@mra-laptop-20110314085854-g192a5k8is984klt
2011-03-14 14:28:54 +05:30
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
d4a5c96afa
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
...
bzr revid: mtr@mtr-20110310053747-79fbrkud3ycqfhz6
2011-03-10 11:07:47 +05:30
b46811e762
[MERGE] merge with mtr's payroll branch
...
bzr revid: psi@tinyerp.co.in-20110309101242-385e7hxtp2z9j04h
2011-03-09 15:42:42 +05:30
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
5b0fdb52a9
[IMP] hr_payroll:commented 'allounce' and 'deduction' field in view of payroll register.
...
bzr revid: mtr@mtr-20110309085733-1cmjz1q1fojs3iso
2011-03-09 14:27:33 +05:30
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
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
7b7a1915f4
[MERGE] branch merged with trunk-payroll-salary_rules-psi
...
bzr revid: mtr@mtr-20110307113703-mu4v0hsd8e7a6qqa
2011-03-07 17:07:03 +05:30
6e6b21a875
[IMP] hr_payroll,hr_contract:commented 'hr.contract.wage.type' and improved strings of menuitem in payroll.
...
bzr revid: mtr@mtr-20110307112817-f3c7o3fro4oxzejn
2011-03-07 16:58:17 +05:30
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
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
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
11c72fb988
[IMP] hr_payroll:removed 'advantages_net' and 'advantages_gross' fields from hr.contract
...
bzr revid: mtr@mtr-20110307084515-3o33wpeh1uh3czhe
2011-03-07 14:15:15 +05:30
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
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
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
64b46e24e4
[IMP] hr_payroll:improved company.contribution object
...
bzr revid: mtr@mtr-20110303124406-rcctrip72051sbuf
2011-03-03 18:14:06 +05:30
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
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
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
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
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
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
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
17cb7eff2b
[IMP] hr_payroll:improved the view of Salary Head
...
bzr revid: mtr@mtr-20110302090941-trq1bznmutpxvba4
2011-03-02 14:39:41 +05:30
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
821705ed00
[IMP] hr_payroll:improved the tree view of Salary Rules on Salary structure
...
bzr revid: mtr@mtr-20110301121815-3gpaoa5hm6wc6o06
2011-03-01 17:48:15 +05:30
a9b46f9eb8
[IMP] hr_payroll:removed commented(#) obj company.contribution
...
bzr revid: mtr@mtr-20110301113852-fpv8uk4fst2ducvs
2011-03-01 17:08:52 +05:30
73bbece660
[IMP] hr_payroll:removed Function from salary rules,modified the hr.holiday.status
...
bzr revid: mtr@mtr-20110301112908-agdcje98pb5hrgx2
2011-03-01 16:59:08 +05:30
5778a97065
[IMP] hr_payroll:removed company contribution object and merged it with salry rules
...
bzr revid: mtr@mtr-20110301095910-y1qhf82zms1lubrs
2011-03-01 15:29:10 +05:30
91f14201bf
[IMP] hr_payroll: renamed struct_id field of hr.payroll.structure into parent_id
...
bzr revid: qdp-launchpad@openerp.com-20110228095643-rji364bszjfq2a60
2011-02-28 10:56:43 +01:00
3f1aeeef70
[IMP] hr_payroll: Add new tab Holiday on hr.payslip object and comment unwanted calculation for gross and net, remove wage_type_id
...
bzr revid: psi@tinyerp.co.in-20110225134314-zopq8bwlwmh61glr
2011-02-25 19:13:14 +05:30
e703cdfad1
[IMP] hr_payroll:added Child Rules as one2many on Salary Rules
...
bzr revid: mtr@mtr-20110225133339-0f0711n4kaijl6p6
2011-02-25 19:03:39 +05:30
deec616aa5
[IMP] hr_payroll: improved Salary Head,added 'salary.head.type' object and 'salary rule' as m2m on employee,removed one2many 'Child Salary Structure'
...
bzr revid: mtr@mtr-20110225130726-5bc1b5hf2cgefeo3
2011-02-25 18:37:26 +05:30
a59188e080
[IMP] hr_payroll: improvements-Salary Rules
...
bzr revid: mtr@mtr-20110224131220-468gscq24wbr3pt6
2011-02-24 18:42:20 +05:30
4bac6d8969
[FIX] all: Fixed incomplete behavior of act_window.
...
lp bug: https://launchpad.net/bugs/708467 fixed
bzr revid: uco@tinyerp.com-20110127094939-v8gugx666pakihva
2011-01-27 15:19:39 +05:30
2df4a68377
[MERGE] merged the dev3 branch
...
bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak
2011-01-14 01:11:01 +01:00
bb1e27f8b1
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20110103093647-asp0jy7rml15pb4v
2011-01-03 15:06:47 +05:30
3bdca04e28
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20110103090825-h3f9ie8qu7l09ceb
2011-01-03 14:38:25 +05:30
cf2bedf278
[FIX] hr_payroll: removed 'active' field from the view of Leave type to avoid duplication
...
lp bug: https://launchpad.net/bugs/695632 fixed
bzr revid: mtr@mtr-20110103061953-jx80offy0hkd8cin
2011-01-03 11:49:53 +05:30
e494a992dd
[IMP ]added shortcuts to demo user, modified visibility of elements in employee views
...
bzr revid: fde@openerp.com-20101230170800-drbr5ie19trv0nxj
2010-12-30 18:08:00 +01:00
f433b959c2
merged with trunk
...
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
2010-12-30 15:28:09 +05:30
22c847d00c
[IMP] groups in employeeshortcuts
...
bzr revid: fde@openerp.com-20101230084638-fhc3bl0p8n5w0ztl
2010-12-30 09:46:38 +01:00
e2f6d60065
fix
...
bzr revid: fp@tinyerp.com-20101229201026-ybz9nifb3nmwh0m3
2010-12-29 21:10:26 +01:00
e5c69704a3
[IMP] removed salary structure from employee view
...
bzr revid: fde@openerp.com-20101229164118-5louilqm23my95ip
2010-12-29 17:41:18 +01:00
469b5a8c6e
[IMP] removed contract tab in employee form view + fixed holidays shortcut
...
bzr revid: fde@openerp.com-20101229161029-o5cko7yu1sf3li45
2010-12-29 17:10:29 +01:00
e678fd472a
[IMP] access rights, menus for HR
...
bzr revid: fde@openerp.com-20101228153417-ps9ql3h4lij87jx8
2010-12-28 16:34:17 +01:00
1970e5fbca
[REF] hr_payroll: removed unecessary view overwriting
...
bzr revid: qdp-launchpad@tinyerp.com-20101220094604-h9rie16joi0vcatk
2010-12-20 10:46:04 +01:00
ac935b31d9
[FIX] hr_payroll: HR can not create bank account for employee
...
lp bug: https://launchpad.net/bugs/676113 fixed
bzr revid: mra@mra-laptop-20101209045011-72iybqisy069jlon
2010-12-09 10:20:11 +05:30
941b47c774
[FIX] hr_payroll: no need to 'eval' in view_id attribute
...
bzr revid: olt@tinyerp.com-20101201131909-p0k732h89cij80y7
2010-12-01 14:19:09 +01:00
743501fe11
[MOD/IMP] hr_* Usebility Improvement in Icon
...
bzr revid: amp@tinyerp.com-20101028072340-6oyqm4yx1n3yoe44
2010-10-28 12:53:40 +05:30
ab0d260114
[MOD]: Usability Improvment in cancel & validate button position
...
bzr revid: dbr@tinyerp.com-20101025093236-mdsrvgyuvq8q2nbl
2010-10-25 15:02:36 +05:30
d2012542a3
[IMP]hr_holidays,hr_payroll : Usability Improvment
...
bzr revid: dbr@tinyerp.com-20101021113438-7yscni6sx7ponvzk
2010-10-21 17:04:38 +05:30
eb38ea17a7
[MOD/IMP]hr_* :Usability Improvement in view
...
bzr revid: dbr@tinyerp.com-20101016073610-e6usev1z24timua6
2010-10-16 13:06:10 +05:30
d2b6e5ad00
[IMP]hr_payroll,hr_payroll_account: improved the Contibution Register view.
...
bzr revid: vra@tinyerp.com-20101014131430-h4gzor8hlbxdm704
2010-10-14 18:44:30 +05:30
3678e09a80
[MOD/IMP] hr_* : Cancel Button Set on left side
...
bzr revid: dbr@tinyerp.com-20101012051930-h37amb58eps2bzf0
2010-10-12 10:49:30 +05:30
48f0a8554e
[IMP]: improve the usability for the payslip line
...
bzr revid: mga@tinyerp.com-20101008141143-k2l0txnqr3y7j44g
2010-10-08 19:41:43 +05:30
30efb09f7a
[IMP]: improve the usability
...
bzr revid: mga@tinyerp.com-20101008131845-alqqlb6d97y3s3d5
2010-10-08 18:48:45 +05:30
9138707ef7
[MOD] hr_payroll : Improvements in access rights
...
bzr revid: vir@tinyerp.com-20101008124815-k6ti98b1a12pb74n
2010-10-08 18:18:15 +05:30
86a26c1d6b
[IMP]: now from the employee object we will get the earnings and computations
...
bzr revid: mga@tinyerp.com-20101008090555-24n0qrti5obce8bx
2010-10-08 14:35:55 +05:30
cf672602eb
[IMP]: improvement to the contract object
...
bzr revid: mga@tinyerp.com-20101007144456-vu0v0750ujf8bgzq
2010-10-07 20:14:56 +05:30
f2e3f5fc2b
[IMP]: implement the salary calculation for the structure
...
bzr revid: mga@tinyerp.com-20101007140056-r3mo0e7ltp7k4bd1
2010-10-07 19:30:56 +05:30
1a2015de2c
[IMP]: improvement to view, add links to employee for payslip
...
[ADD]: add demo data for the contract
bzr revid: mga@tinyerp.com-20101007091900-tglpl048qpffnle8
2010-10-07 14:49:00 +05:30
c6968eaf3e
[FIX]: fix a usability problem for the hr and payroll related to the employee passport informaion
...
bzr revid: mga@tinyerp.com-20101007073131-ba4dkusjnz6kuj8d
2010-10-07 13:01:31 +05:30
eb95954919
[IMP]: improvement to payroll
...
[REM]: remove some field specific to the localize data, may be added from the localize module
bzr revid: mga@tinyerp.com-20101007071334-tonherdg56xbn0xa
2010-10-07 12:43:34 +05:30
52462287f3
[IMP]L improvement and fix to the payroll module
...
bzr revid: mga@tinyerp.com-20101007063156-tijiyci4w5r0v29w
2010-10-07 12:01:56 +05:30
15792bb9fa
[IMP]: improve the hr_payroll module make it fully independent of account and hr_expanse module
...
Accounting functionalities to payroll will be added by the hr_payroll_account module.
bzr revid: mga@tinyerp.com-20101006124454-t1vgn6879dnu62ou
2010-10-06 18:14:54 +05:30
c791e55ef6
[IMP] Account: Access rights for Analytic Account (Add analytic group on all modules) where this field appear
...
bzr revid: ara@tinyerp.com-20101004111344-8rx877ce28g5eigv
2010-10-04 16:43:44 +05:30
7e54aa782c
[Merge]
...
bzr revid: vir@tinyerp.com-20100924043941-x7ij7c6saw272bwe
2010-09-24 10:09:41 +05:30
cc4ee88766
[FIX]: solve the usability issue in psyslip view
...
bzr revid: mga@tinyerp.com-20100923100036-mtbc9m87t39fpya9
2010-09-23 15:30:36 +05:30
31d249a9ab
[MERGE]
...
bzr revid: uco@tinyerp.com-20100819125727-iuofahcl931exx1r
2010-08-19 18:27:27 +05:30
d5ad0b8ff1
[CLEAN]: Removed commented codes, unnecessary spaces.
...
bzr revid: uco@tinyerp.com-20100819115157-sfsmbnjdgpp4wl12
2010-08-19 17:21:57 +05:30
04e5144b2d
[IMP] HR modules: Usebility, on employee add contract field (latest)
...
bzr revid: mra@mra-laptop-20100819093802-9z5a0t6rn4f17i5j
2010-08-19 15:08:02 +05:30
2f80a95c91
[IMP] Analytic account with group extended with all modules where it refrence
...
bzr revid: mra@mra-laptop-20100817111335-8zu0l0tqno8dj5u9
2010-08-17 16:43:35 +05:30
aff16ab9a5
[MOD/IMP] hr_* : Improvement in access rights
...
bzr revid: vir@tinyerp.com-20100813133645-w8nex9k1he2zjq9h
2010-08-13 19:06:45 +05:30
18672119ec
[Merge] Usability Improvements in access rights
...
bzr revid: vir@tinyerp.com-20100809113241-zjdl5on5tksqtb7k
2010-08-09 17:02:41 +05:30
57e7c51818
[IMP] hr related modules search views
...
bzr revid: mra@mra-laptop-20100809104010-mdsyd3lqxt2ntip4
2010-08-09 16:10:10 +05:30
7eb7dab740
[Merge]
...
bzr revid: vir@tinyerp.com-20100806043513-ct3a1prtx6eaacc5
2010-08-06 10:05:13 +05:30
187e9ff63c
[IMP] hr_payroll: Reports improvements and add bank field on payroll advice object
...
bzr revid: mra@mra-laptop-20100805044104-jt6s9irtb1v59fr2
2010-08-05 10:11:04 +05:30
9a012c51fa
[Merge]
...
bzr revid: vir@tinyerp.com-20100804050241-7zf6wm1c1ab1leka
2010-08-04 10:32:41 +05:30
f182d69495
[FIX]: fix a broken window action for account move wizard 'Reconcile Entries'
...
[IMP]: improve some views in account, and hr_payroll module view
bzr revid: mga@tinyerp.com-20100803133719-5jgyo5gcvrugxqkq
2010-08-03 19:07:19 +05:30
2fdd2000e6
[IMP] hr related modules
...
bzr revid: mra@mra-laptop-20100803064146-1tlbgy3huwxfer4e
2010-08-03 12:11:46 +05:30
6eb86abda3
[MOD] usability improvement in access rights
...
bzr revid: amp@tinyerp.com-20100723072243-kpex4cdgckhga46d
2010-07-23 12:52:43 +05:30
224319dd51
[FIX]: fix a hr payroll data
...
bzr revid: mga@tinyerp.com-20100721115602-m5mqo5fc42t0u267
2010-07-21 17:26:02 +05:30
c8bea68cd4
[MOD] auction,audittrail,crm_*,hr_*,email_template,event,idea,lunch,marketing_campaign,mrp : set colors in tree views according to state
...
bzr revid: vir@tinyerp.com-20100720111402-kcq52pa035hsyyb9
2010-07-20 16:44:02 +05:30
6def8566b4
[MOD] Usability Improvements :Label name changes Validate -> Approve, To Validate-> To Approve.
...
bzr revid: vir@tinyerp.com-20100714060149-drpbnaqzg3uhxhmk
2010-07-14 11:31:49 +05:30
f8efca986f
[IMP]: improvement in payroll module
...
bzr revid: mga@tinyerp.com-20100707130347-r4zlz7ktthfet0ai
2010-07-07 18:33:47 +05:30
21786ff375
[FIX]: fix a small problems related to views and labels
...
bzr revid: mga@tinyerp.com-20100707062107-yljp2sv5tlpr17at
2010-07-07 11:51:07 +05:30
0e61edf922
[FIX]: reviwe payroll and recall lost changes during the merge
...
bzr revid: mga@tinyerp.com-20100702103715-iew7rlke3we92ipg
2010-07-02 16:07:15 +05:30
c4aa8bc8a3
[IMP]: improvement in hr_payroll, payslip view
...
bzr revid: mga@tinyerp.com-20100702054229-3z91plsgvbm338wk
2010-07-02 11:12:29 +05:30
5a58c72228
[IMP] hr_payroll: Improve the view and code
...
bzr revid: sbh@tinyerp.com-20100701054809-7ttw11r6x3qeczpg
2010-07-01 11:18:09 +05:30
8a26c4f6e7
[IMP] hr_payroll: convert the wizard into osv_memory and add the search view
...
bzr revid: sbh@tinyerp.com-20100630104716-pjppif2wwokxqn8l
2010-06-30 16:17:16 +05:30
ef4724aaea
[IMP]hr_payroll: Add the search view of allounce_deduction_categoty
...
bzr revid: sbh@tinyerp.com-20100630060359-p02io88128ikcaoc
2010-06-30 11:33:59 +05:30
5519124d47
[IMP]hr_payroll: Add the search view of passport
...
bzr revid: sbh@tinyerp.com-20100630053851-1drc8ea33jl6mfo8
2010-06-30 11:08:51 +05:30
3b91a3b1e8
MERGE with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: sbh@tinyerp.com-20100630044812-2m6q7teb7o4kosiz
2010-06-30 10:18:12 +05:30
a6ccc72a96
[IMP]: improve payslip view
...
bzr revid: mga@tinyerp.com-20100629173159-yfho45oji9mxrlyr
2010-06-29 23:01:59 +05:30
8a7e4a2617
[FIX]: fix a problems in payroll module
...
bzr revid: mga@tinyerp.com-20100629172204-0jmz15a7ak6nk7ff
2010-06-29 22:52:04 +05:30
ecf5d29ab4
[IMP] hr_payroll: Add the icon on button
...
bzr revid: sbh@tinyerp.com-20100629133715-5wxqscs5bh3762o9
2010-06-29 19:07:15 +05:30
2f4347a365
[Fix] hr_contract,hr_payroll : fix an error of type_id in yml and demo data
...
bzr revid: vir@tinyerp.com-20100915053258-sew40oyi4wo0y0tg
2010-09-15 11:02:58 +05:30
e5f3fd07e2
[MOD] hr: otherid,identification_id , hr_holidays: action added on list view
...
bzr revid: vir@tinyerp.com-20100911132900-q5fxoeqr42m3tifb
2010-09-11 18:59:00 +05:30
8882b118d3
[MOD] hr : passport field set as char,and added on_change method
...
bzr revid: vir@tinyerp.com-20100911093215-sbr079z0rwpj2r6n
2010-09-11 15:02:15 +05:30
e5971516dc
[IMP/MOD] hr :usability improvements
...
bzr revid: dbr@tinyerp.com-20100909115824-9018aqoywtp6dyxm
2010-09-09 17:28:24 +05:30
0dbc10bf6c
[MOD]hr_* : usability improvement in menuitem
...
bzr revid: amp@tinyerp.com-20100908090229-v4qvmjkfp00ymn0f
2010-09-08 14:32:29 +05:30
ea46dd2678
[MOD]hr_payroll : usability improvement
...
bzr revid: dbr@tinyerp.com-20100906105042-e1ui9sbn0r57c4sw
2010-09-06 16:20:42 +05:30
1d15f71146
[MOD] project_timesheet,hr_* : usability improvement in access rights
...
bzr revid: amp@tinyerp.com-20100901132905-hslnywxf4zxogxdo
2010-09-01 18:59:05 +05:30
98cc2f8c55
[FIX]: enabled bank accout feature for employee, for finalcial entries through bank
...
bzr revid: mga@tinyerp.com-20100619150413-o8g1vdt9zb87pq0a
2010-06-19 20:34:13 +05:30
f5f8c836c3
[MOVE]: move accounting from hr_payroll to hr_payroll_india module.
...
now hr_payroll is not dependant on account module, we can use just payroll without accounting
bzr revid: mga@tinyerp.com-20100618202907-g3s8mu8w07q4fy0q
2010-06-19 01:59:07 +05:30
7406420996
[FIX]: fix a problem for the accounting for the payroll
...
bzr revid: mga@tinyerp.com-20100618140101-5e1wuqaxjv3otkzw
2010-06-18 19:31:01 +05:30
f789e02e82
[IMP]: enable holiday calculation with payslip
...
bzr revid: mga@tinyerp.com-20100618031140-eqg2negwaggok5tf
2010-06-18 08:41:40 +05:30
fc7529f3e6
[IMP]: improvements to payroll module
...
bzr revid: mga@tinyerp.com-20100618005141-bh618yzj9ucz1jt5
2010-06-18 06:21:41 +05:30
c3f32862d1
[IMP]: implement view for new object company contrinute
...
bzr revid: mga@tinyerp.com-20100609145448-o6pgy1huodq6c5mm
2010-06-09 20:24:48 +05:30
3f3b015306
[IMP]: improvement in payroll, seprate objects for the heads ad company contribution
...
bzr revid: mga@tinyerp.com-20100609143822-4sv2r1skek77t8mw
2010-06-09 20:08:22 +05:30
3f8867daf4
[IMP]: improved the employee object and view
...
bzr revid: mga@tinyerp.com-20100607132659-6lzu9mws93uvobd2
2010-06-07 18:56:59 +05:30
8c1f9e2cb0
[CLEAN]: clean employee form
...
bzr revid: mga@tinyerp.com-20100606190953-45vjl1hehsp6zhkv
2010-06-07 00:39:53 +05:30
16a8c578d8
[CHANGE]: migrate code from 5.0 to 6.0 with few backlog changes
...
bzr revid: mga@tinyerp.com-20100606182608-e5uncndaqreracba
2010-06-06 23:56:08 +05:30
8c2642cc10
[MERGE]: migrate old hr_payroll, migrate other files to trunk
...
bzr revid: mga@tinyerp.com-20100606162911-2sdpumzgq6kqafvj
2010-06-06 21:59:11 +05:30
6d29e1ec65
[IMP]: implement passport, passport based contracts
...
bzr revid: mga@tinyerp.com-20100605073216-kfbka70jhkacfsmo
2010-06-05 13:02:16 +05:30
a8cda443b4
[ADD]: start migrating module from trunk_extra_addons to trunk_addons
...
bzr revid: mga@tinyerp.com-20100605063912-enth6zqm0m82mnp9
2010-06-05 12:09:12 +05:30
psi (Open ERP)
Quentin (OpenERP)
mtr
ARA (OpenERP)
Mustufa Rangwala
Osenda
Xavier Morel
Ujjvala Collins (OpenERP)
Francois Degrave
husen
Fabien Pinckaers
AMP (OpenERP)
DBR (OpenERP)
vra
Mantavya Gajjar
Vir (Open ERP)
sbh (Open ERP)