5a78049c7a
[merge] removed complexity and update applications
...
bzr revid: fp@tinyerp.com-20120523063913-kn324m7u80o5dgol
2012-05-23 08:39:13 +02:00
5c791531aa
[IMP] improved typos
...
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
b3fa4ccf5c
[IMP] removed icons from topbar
...
bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
2012-05-22 11:14:45 +02:00
ee566d388c
[IMP] merged topbar status widgets
...
bzr revid: fp@tinyerp.com-20120522085037-oktkq3td2hg9lvzr
2012-05-22 10:50:37 +02:00
ea859f54c8
[IMP]all: remove a complexity in openerp and move asset management and Payroll in extra modules
...
bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
2012-05-18 10:56:05 +05:30
1aefff9733
[MERGE]:merged from trunk
...
bzr revid: apa@tinyerp.com-20120517101517-npk57s14kgxlk7in
2012-05-17 15:45:17 +05:30
bcb9291df3
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120514150926-osvdmdyopi6ynn6o
2012-05-14 17:09:26 +02:00
420e45e139
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120511051518-305vmplvaiu2zncy
bzr revid: launchpad_translations_on_behalf_of_openerp-20120512054219-7jxlr0c1whe4vrob
bzr revid: launchpad_translations_on_behalf_of_openerp-20120513044345-ujj9bgbnd64gpfnz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120514044358-vu4410a564766u5f
2012-05-14 04:43:58 +00:00
45a864c139
[IMP] adapt po files to label changes, to ease translations
...
bzr revid: rco@openerp.com-20120510132150-bxw8anyiunr5mzoi
2012-05-10 15:21:50 +02:00
a2a05cfc19
[IMP]:improved titles State by Status everywhere
...
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
acfd8ab255
[IMP]hr_payroll : Added state and buttons on top bar
...
bzr revid: mma@tinyerp.com-20120503132018-dohip75it2rwgqmm
2012-05-03 18:50:18 +05:30
7dbf665c5d
[IMP] HR: Rename field in configuration wizard of hr application, add new field and change the position of field
...
bzr revid: jap@tinyerp.com-20120427104359-4r9cwx0637y57f0g
2012-04-27 16:13:59 +05:30
c71446957f
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120426091833-ocminkwzjkntdkde
2012-04-26 14:48:33 +05:30
e4efcb808d
[IMP] hr*: remove group_extended
...
bzr revid: rco@openerp.com-20120425141135-9jgai7os8mxj80go
2012-04-25 16:11:35 +02:00
9e59ce8812
[IMP]all: Improve all typos
...
bzr revid: mma@tinyerp.com-20120424060532-ohrf0sxwq8rpq6ls
2012-04-24 11:35:32 +05:30
75daaf4123
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120419043835-l1vrldcmgh9o6s0c
2012-04-19 04:38:35 +00:00
79c1e97479
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120418044206-a2vk0nr789l7d42j
bzr revid: launchpad_translations_on_behalf_of_openerp-20120418045743-hzbql3f1knlrc5yh
2012-04-18 04:57:43 +00:00
dfda972285
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120417045202-9zgk4szsg252hiln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120417052401-zew26x0fyljrziw5
2012-04-17 05:24:01 +00:00
876f092244
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120414045803-1rv00b0kwk1mpv71
bzr revid: launchpad_translations_on_behalf_of_openerp-20120415044258-ajcrqt4n8657dmm2
bzr revid: launchpad_translations_on_behalf_of_openerp-20120416044107-arc2q29ue5n7szmx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120407050332-buq5bktv391us3gy
bzr revid: launchpad_translations_on_behalf_of_openerp-20120409050207-ze633yedjkb17kta
bzr revid: launchpad_translations_on_behalf_of_openerp-20120410050225-xyadncrywlfnh100
bzr revid: launchpad_translations_on_behalf_of_openerp-20120413053835-4sd9w9m9bai7vu3s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120414050449-ru2otwgxyto3vms0
bzr revid: launchpad_translations_on_behalf_of_openerp-20120415044852-h5zx5a8e1lk6eit2
bzr revid: launchpad_translations_on_behalf_of_openerp-20120416045035-ghs2iw9qcuwumwyy
2012-04-16 04:50:35 +00:00
068619bf8f
[IMP] hr.config.settings: improve code and form layout
...
bzr revid: rco@openerp.com-20120410115219-78ydkfe521am7g5n
2012-04-10 13:52:19 +02:00
63673df964
[IMP] hr*: rename model of config wizard to hr.config.settings
...
bzr revid: rco@openerp.com-20120410105632-n0bvdklu1ttlxcsa
2012-04-10 12:56:32 +02:00
b91d41bce7
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120410104839-pv9kmiizwv0w8e8f
2012-04-10 12:48:39 +02:00
040deac7df
[IMP] hr*: fix copyright on res_config.py files
...
bzr revid: rco@openerp.com-20120410095642-zwpfi3rpodznvza6
2012-04-10 11:56:42 +02:00
8d0ab9cd1c
[ADD,IMP] HR : Add configuarion files in hr_payroll and set remove module_hr_payroll fields from hr config file
...
bzr revid: dbr@tinyerp.com-20120405063156-6usu8opc7ntejp2e
2012-04-05 12:01:56 +05:30
0634b27f7c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120404044121-394vbp6i7nu4yf2g
bzr revid: launchpad_translations_on_behalf_of_openerp-20120405044345-1akl9s0cao4bjyeb
2012-04-05 04:43:45 +00:00
0e8ccd774d
[MERGE] branch merged with openobject-addons
...
bzr revid: mtr@tinyerp.com-20120326114847-6yju1vy8h7a33iwv
2012-03-26 17:18:47 +05:30
8dc623fb21
[IMP] HR: change sequence of menus and apply group_no_one
...
bzr revid: jap@tinyerp.com-20120322123823-gpn075d2e09etchq
2012-03-22 18:08:23 +05:30
9ab663db09
[IMP] HR: apply group_no_one on menus Categories structure,Job Positions, Contract Types,Attendance Reasons,Stages, Degrees, Sources of Applicants,Salary Structures Hierarchy, Salary Rule Categories, Salary Rule Categories Hierarchy, Salary Rules
...
bzr revid: jap@tinyerp.com-20120316104313-f3f7234wi8yg98zb
2012-03-16 16:13:13 +05:30
440037d7bc
[MERGE] branch merged with openobject-addons
...
bzr revid: mtr@tinyerp.com-20120313051730-3rmlg1z493owjtzo
2012-03-13 10:47:30 +05:30
abfa7ea555
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120309045159-lozy0xh0ud7jmbaa
bzr revid: launchpad_translations_on_behalf_of_openerp-20120310045459-pobr12hzfpnsma2q
2012-03-10 04:54:59 +00:00
c1e887c9a4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120307051356-qt4l9psx78mvgfkb
bzr revid: launchpad_translations_on_behalf_of_openerp-20120307053805-lwhhzrl94y022bpw
2012-03-07 05:38:05 +00:00
2d2a44dcf2
[FIX] unmutable default in the remaining modules
...
[REF] coding style consistency
lp bug: https://launchpad.net/bugs/525808 fixed
bzr revid: ls@numerigraphe.fr-20120305184003-er00xtj9vtcw7gna
2012-03-05 19:40:03 +01:00
0e20074121
[IMP] hr_*:-changed sequence for menus
...
bzr revid: mtr@tinyerp.com-20120305124245-xh77bpp62l4wfalm
2012-03-05 18:12:45 +05:30
318d99d029
[MERGE] Latest bugfixes from 6.1
...
bzr revid: odo@openerp.com-20120229094502-sp0xrg4yf5uvq5k9
2012-02-29 10:45:02 +01:00
1e2ad76483
[FIX] *payroll: proper date calculations in tests, avoid issues on leap years
...
bzr revid: odo@openerp.com-20120229084240-afe5cay3r2wxpvoy
2012-02-29 09:42:40 +01:00
a3ac698fe8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218071328-fl3yjw2gawigfooh
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219063344-7w5y8nkweukg0f88
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220061321-0z254064e8vsx286
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221063558-wc526qfv4ko5s6q0
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221063603-medp0cjt2z5vy70x
2012-02-21 06:36:03 +00:00
88c25488a5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218050004-fsjgcm68ejwkyila
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219054401-1933r0e5ukykqh0h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220054126-hug47vk8c43pxbqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221055612-pdqteum51dyapu2e
2012-02-21 05:56:12 +00:00
9f65e1565e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217050201-xlguleciidhnkxln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217051344-6opxazcgg875mypq
2012-02-17 05:13:44 +00:00
2094148de5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216050419-fgzhvlogc71u42qe
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216050718-lf9hgvr1p33jpm2h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216052148-ta5bwtqg3bzmvp3i
2012-02-16 05:21:48 +00:00
74b3b0bc69
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054303-2gawtr1s4zulhhhs
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054630-925y7kotw7axa7z4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214061906-2g5kxwe0xle5u54c
2012-02-14 06:19:06 +00:00
0e2e9ddd78
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209055558-qfwy9bg1km791dys
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209071015-0jykfhbo8iamzpzk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209072746-stmwycdircyzrxn4
2012-02-09 07:27:46 +00:00
3afecc7604
[ADD] es_CR.po: added po to all modules, copy from es.po or from pot
...
bzr revid: carlos.vasquez@clearcorp.co.cr-20120208145917-aaai0irh68omlzmb
2012-02-08 08:59:17 -06:00
320b2d2e2e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208060921-wir47e717rh04xxn
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208063913-vg9qdu30tx09ojrl
2012-02-08 06:39:13 +00:00
0a63ecb0cf
[I18N] all: updated translation template
...
This should be the last major template sync
before the final release of 6.1.
bzr revid: odo@openerp.com-20120208010830-zchnkg48u7s40nw2
2012-02-08 02:08:30 +01:00
69910d967c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120131050031-o00wn1tnzbkgjt6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20120131050331-w0omtl1lmfqzciwq
bzr revid: launchpad_translations_on_behalf_of_openerp-20120131052309-jtfsc2m4h3liyzb5
2012-01-31 05:23:09 +00:00
17bffc9cc6
[MERGE] active becomes auto_install: install this module when its dependencies (that can be empty) are satisfied
...
bzr revid: al@openerp.com-20120130211812-w0wu42hdu4l7koc4
2012-01-30 22:18:12 +01:00
57dc69d8ae
[MERGE] lp:916526 (hr_payroll: improve tooltip)
...
bzr revid: rco@openerp.com-20120130152345-5qd8luramysp0bt8
2012-01-30 16:23:45 +01:00
ad4b6fcc21
[IMP] manifest: renamed active to auto_install.
...
bzr revid: vmt@openerp.com-20120130101837-zyebtyhfjypg2b4w
2012-01-30 11:18:37 +01:00
ffbff476df
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120128050312-sep3uryazw4j1xz6
bzr revid: launchpad_translations_on_behalf_of_openerp-20120129052156-67wqllfafijp6h1m
bzr revid: launchpad_translations_on_behalf_of_openerp-20120130044112-h04p0g5ne16y1nav
bzr revid: launchpad_translations_on_behalf_of_openerp-20120128050513-ncpdbsqyyk18pc67
bzr revid: launchpad_translations_on_behalf_of_openerp-20120129052226-dfcf7sm2r00y1s3s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120130044131-sdsyvt62gvyzo0e3
2012-01-30 04:41:31 +00:00
a09cff3cf3
[IMP] hr_payroll: update help string
...
bzr revid: psi@tinyerp.com-20120127053724-pkqv2f0xre2p87mf
2012-01-27 11:07:24 +05:30
d260a2bc75
[MERGE] hr_payroll: merge with main addons
...
bzr revid: psi@tinyerp.com-20120127053414-fjqvbmb057ekmfov
2012-01-27 11:04:14 +05:30
7dfe3e3413
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120126052824-8ja030g3lhanp8g7
2012-01-26 05:28:24 +00:00
8ffb0a310f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120121054148-0jtsy55iwkhewr4r
bzr revid: launchpad_translations_on_behalf_of_openerp-20120122053059-j2aa26epvk6o1s3o
bzr revid: launchpad_translations_on_behalf_of_openerp-20120123052051-qlxloap8u2xcv0fa
2012-01-23 05:20:51 +00:00
885d596dc5
[FIX] hr_payroll : hr payroll please correct text
...
lp bug: https://launchpad.net/bugs/916526 fixed
bzr revid: mdi@tinyerp.com-20120118122936-yb4d9mc7gz9bkw0y
2012-01-18 17:59:36 +05:30
5b10b7022d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120115052053-qy9rgrxe745vw4zw
bzr revid: launchpad_translations_on_behalf_of_openerp-20120116051929-9hq3xgbkj3t90wvt
bzr revid: launchpad_translations_on_behalf_of_openerp-20120114054042-idria8u0iiizg9xu
bzr revid: launchpad_translations_on_behalf_of_openerp-20120115053522-rki2r1zjt8544t0c
bzr revid: launchpad_translations_on_behalf_of_openerp-20120116052722-mb4w266h2j8som8q
2012-01-16 05:27:22 +00:00
7aa3bc9660
[FIX] hr_payroll :- add parent_id domain in action of tree view in hr.salary.rule.category object
...
lp bug: https://launchpad.net/bugs/912194 fixed
bzr revid: support@serpentcs.com-20120109091415-gvaice2ltdfhljg4
2012-01-09 14:44:15 +05:30
fdd1d95fc2
[IMP] moved module sequences from module to each module's manifest
...
bzr revid: odo@openerp.com-20120107041212-boocriorprywgni1
2012-01-07 05:12:12 +01:00
5602ac13b7
[IMP] hr_payroll: modified the payroll engine in order to return the rate separately. Added a float precision for payroll rate. Original ideas from Yannick Buron.
...
bzr revid: qdp-launchpad@openerp.com-20120105081325-2pstk4naim07cy2o
2012-01-05 09:13:25 +01:00
52e0383f2c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120104044826-ms01gyypcfio5flg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120104051810-r42jfkfmn23nypsg
2012-01-04 05:18:10 +00:00
55446d0097
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111230054000-0ygl1bapby2gy0pt
2011-12-30 05:40:00 +00:00
a6c649dd4e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223054503-il515335tdfkghbw
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223073609-mpe8e232ykba47y0
2011-12-23 07:36:09 +00:00
cb28f8de07
[I18N] all: update translation templates
...
bzr revid: odo@openerp.com-20111222185539-9gn06tu38ynoc416
2011-12-22 19:55:39 +01:00
a7bd2da414
[MERGE] trunk
...
bzr revid: rco@openerp.com-20111222162924-644yfj4213b6z7pk
2011-12-22 17:29:24 +01:00
1fd5cf94e5
[MERGE] merged the dev branch with us letter format support for RML files
...
bzr revid: qdp-launchpad@openerp.com-20111222151758-1t7ixg0p770j2mli
2011-12-22 16:17:58 +01:00
479af749b9
[FIX] hr_payroll, hr_payroll_account, hr_recruitment: fix missing ref in tests
...
bzr revid: rco@openerp.com-20111222142257-2w8y8ocplzllv9rw
2011-12-22 15:22:57 +01:00
a078b524c7
[FIX] missing definitions of xml ids hr.employee1, etc.
...
bzr revid: rco@openerp.com-20111222133559-mq58fblnrkhykguu
2011-12-22 14:35:59 +01:00
6aa1e416da
[IMP] indexes on _order
...
bzr revid: fp@tinyerp.com-20111221221504-dcj2l8x2xstqmccs
2011-12-21 23:15:04 +01:00
52ead43457
Changed module icons
...
bzr revid: mit@openerp.com-20111221173739-pl26y182tgjb1s2j
2011-12-21 18:37:39 +01:00
357f3fca2f
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20111221123724-buifqfz9zvmu9s8n
2011-12-21 18:07:24 +05:30
84a517a6d7
[IMP]: Removed pageSize from report rml as it will be taken from company paper format;
...
bzr revid: rpa@tinyerp.com-20111221090811-tg1vbfqs303f8yvq
2011-12-21 14:38:11 +05:30
a64d3dbcbc
Added modules icons for main apps
...
bzr revid: mit@openerp.com-20111214144815-itsfpfo68l2m0jnx
2011-12-14 15:48:15 +01:00
f27318c8af
[IMP] Security Rule: removed duplicates due to inheritancies of groups
...
bzr revid: fp@tinyerp.com-20111212181113-mhnnbps3ip8ls6pp
2011-12-12 19:11:13 +01:00
b439bc1606
[FIX]All: create an index for the column on require table
...
lp bug: https://launchpad.net/bugs/901474 fixed
bzr revid: mma@tinyerp.com-20111209060308-muefwlr323ji4kk7
2011-12-09 11:33:08 +05:30
69f685f386
[IMP] rename is_application to application
...
bzr revid: al@openerp.com-20111208222543-avte2h9qit5zfvht
2011-12-08 23:25:43 +01:00
1831cddc7e
[FIX] core -> is_application
...
bzr revid: chs@openerp.com-20111208151455-d7pffuiwxdns76ec
2011-12-08 16:14:55 +01:00
0ae257c780
[MERGE] merged cleaned warnings (appearing in the install logs).
...
bzr revid: vmt@openerp.com-20111207161140-4ams7da4t5l5n54u
2011-12-07 17:11:40 +01:00
f20cdb19f5
[FIX] clean some warnings.
...
bzr revid: vmt@openerp.com-20111206121955-tbv84nfcni0c0q8k
2011-12-06 13:19:55 +01:00
0eab577b40
[IMP] Core modules for apps
...
bzr revid: fp@tinyerp.com-20111206112127-5lir7aovygx4a4oi
2011-12-06 12:21:27 +01:00
7c63902af8
[FIX] clean some warnings.
...
bzr revid: vmt@openerp.com-20111205150311-6xkx4eytvxnkvdck
2011-12-05 16:03:11 +01:00
bf3cbb4305
[MERGE] polish3_hr_payroll: add constraint on dates, default value for expenses journal, and rename report
...
bzr revid: rco@openerp.com-20111130140107-t3ta1kmcy70smavd
2011-11-30 15:01:07 +01:00
44e9d42e08
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111130052737-yw0i1aunztyvwfzu
2011-11-30 05:27:37 +00:00
847bddb3e5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111126055025-zf1bvsdxa5sw7cn4
2011-11-26 05:50:25 +00:00
2e1023ddbe
[IMP] domain to context:
...
Use explicitely default_xxx in the context instead of
relying on the domain to fill form views.
bzr revid: vmt@openerp.com-20111124121433-z5du2yeu319ea1ax
2011-11-24 13:14:33 +01:00
9890c9e044
date _from_hr
...
bzr revid: rmu@tinyerp.com-20111124052327-a7beohzmnuab1pzc
2011-11-24 10:53:27 +05:30
7e3dbcf1e9
[IMP]:improved code
...
bzr revid: apa@tinyerp.com-20111123055221-pnaz34zffzjw1eg2
2011-11-23 11:22:21 +05:30
2e758fb463
[IMP]:improved code
...
bzr revid: apa@tinyerp.com-20111123053154-gsay5gufpz83vkns
2011-11-23 11:01:54 +05:30
fe0754a549
hr_payroll
...
bzr revid: rmu@tinyerp.com-20111122124129-awp6gqiu2prp7egc
2011-11-22 18:11:29 +05:30
b22fa55566
[IMP] all: remove references to `object` column of ir.values, now gone
...
This will get rid of a lot of warnings now that the server
warns about unknown fields
bzr revid: odo@openerp.com-20111116115810-9c5kp7lql0yyhs3n
2011-11-16 12:58:10 +01:00
b72b197cf0
[FIX] hr_payroll: default value of 'quantity' field in payslip line must be a float (hence its parent object is a varchar and thus its default value was not compatible and breaking in web client)
...
bzr revid: qdp-launchpad@openerp.com-20111115140723-t4b9xcmi0av3wf5s
2011-11-15 15:07:23 +01:00
db8da808ff
fix
...
bzr revid: fp@tinyerp.com-20111114224213-asq9x16vsnhv33ap
2011-11-14 23:42:13 +01:00
b959378ec5
merge: allows to delete a payslip
...
bzr revid: fp@tinyerp.com-20111111145207-nuewll488gpnqhld
2011-11-11 15:52:07 +01:00
6cbf19d815
[Merge] es_MX from Vauxoo
...
bzr revid: fp@tinyerp.com-20111111144930-5o37idpxdvyhtfri
2011-11-11 15:49:30 +01:00
1896683037
[MERGE] improve tests on hr modules
...
bzr revid: rco@openerp.com-20111110164111-xrwdee76e192q18x
2011-11-10 17:41:11 +01:00
f2d356f857
[FIX] hr_payroll : Impossible to remove elements from the Employee payslip list view
...
lp bug: https://launchpad.net/bugs/885673 fixed
bzr revid: mdi@tinyerp.com-20111109053906-pfedy5myoj54vcx5
2011-11-09 11:09:06 +05:30
2e2042c510
[IMP] hr hierarchy view, rename payslip run into batches
...
bzr revid: al@openerp.com-20111108230027-uj9bgwyhtil6ve7u
2011-11-09 00:00:27 +01:00
a206306d23
[MERGE] polish1 (stw)
...
bzr revid: al@openerp.com-20111108225914-4ivtczbmyqk96na7
2011-11-08 23:59:14 +01:00
b99ce24793
[MERGE]: Merged with trunk-addons.
...
bzr revid: uco@tinyerp.com-20111108083655-tu5u488okyudvts0
2011-11-08 14:06:55 +05:30
8af1fb554a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111106052412-g035gs0ux047skr1
2011-11-06 05:24:12 +00:00
6f77ce98c7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105055805-1lmgpe8dot0mqkd3
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105060437-gd0ilsg6cdytkvq2
2011-11-05 06:04:37 +00:00
2930432219
[FIX] hr_payroll: Change a label
...
bzr revid: stw@openerp.com-20111027094722-xq0h0cbn21y8bt58
2011-10-27 11:47:22 +02:00
42f5b78eae
[IMP] hr_payroll: Change the complexity
...
bzr revid: stw@openerp.com-20111026120609-mpbaes0aj9rm372i
2011-10-26 14:06:09 +02:00
d835e13905
[MERGE] merged dev branch with small small small change in payslip data in order to have the report 'payslip details' displaying the categories in a suitable order. we should probably improve that later by adding a new field 'sequence' on this object.
...
bzr revid: qdp-launchpad@openerp.com-20111025155735-r5spuocw8039fvrg
2011-10-25 17:57:35 +02:00
e3ffcd94d6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019044609-vzsrc1a6nn17ahbo
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019055343-7s4rmkn8lpxvyt4n
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019060521-3smagczfoys4j5wl
2011-10-19 06:05:21 +00:00
d618938b1d
[MERGE] merged the branch with adding of an act window on a hr.salary.rule to see all its children in tree view (that part was not clean and improved in the merge commit)
...
bzr revid: qdp-launchpad@openerp.com-20111010131907-7iarc1ubi57ma7o1
2011-10-10 15:19:07 +02:00
52b23d7040
[ADD] added es_MX.po translation files for each module
...
bzr revid: israel@openerp.com.ve-20111007201144-kap9ou7w8g92ai02
2011-10-07 16:11:44 -04:00
9b189d5a90
[ADD] added the es_VE.po translation files for each module
...
bzr revid: israel@openerp.com.ve-20111007193500-i7k8h9t28nhxioap
2011-10-07 15:35:00 -04:00
3dc8168974
[FIX] Set the categories
...
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
bc75893824
[MERGE]: Merged with trunk-addons.
...
bzr revid: uco@tinyerp.com-20110928113535-55grblizb5c2ckrw
2011-09-28 17:05:35 +05:30
1ae77effae
merge
...
bzr revid: fp@tinyerp.com-20110924141651-lzlmllxy5np7eb90
2011-09-24 16:16:51 +02:00
4153508e1a
[IMP] hr_payroll: Improved yaml and added some more test for remaining methods.
...
bzr revid: uco@tinyerp.com-20110922123000-3fs24h3iij3765aq
2011-09-22 18:00:00 +05:30
78f60c63f2
fix
...
bzr revid: fp@tinyerp.com-20110917145731-h0woi9z87i9b14fn
2011-09-17 16:57:31 +02:00
523be42bd1
merge
...
bzr revid: fp@tinyerp.com-20110917141929-2goj9ifzidq8g6rk
2011-09-17 16:19:29 +02:00
05d6d35cc8
[Merge]
...
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
5724622376
[IMP] remove hr salary securty and merge into hr_payroll
...
bzr revid: ara@tinyerp.com-20110916101826-xf2ynbxg1o6zkfwh
2011-09-16 15:48:26 +05:30
ffd416e00e
[MERGE[ hr_payroll: usability enhancement
...
bzr revid: qdp-launchpad@openerp.com-20110915163050-n2ueot8ee2vb0ljq
2011-09-15 18:30:50 +02:00
d4c1e8ad34
[MERGE[ hr_payroll: fix payslip detail report
...
bzr revid: qdp-launchpad@openerp.com-20110915162818-wupvt4i1n3wwxpxr
2011-09-15 18:28:18 +02:00
d7dc402fee
[MERGE[ hr_payroll_account: journal_id on payslip run
...
bzr revid: qdp-launchpad@openerp.com-20110915162603-psjo4r9m6869v2ny
2011-09-15 18:26:03 +02:00
ba5341a5e6
[MERGE] branch merged with lp:openobject-addons
...
bzr revid: mtr@tinyerp.com-20110915130151-7uxiju44u28o7b9h
2011-09-15 18:31:51 +05:30
ba785eca19
[IMP] hr_payroll: small changes(imporve view ids)
...
bzr revid: psi@tinyerp.com-20110915124055-is068g72tfk47nl1
2011-09-15 18:10:55 +05:30
5274942d61
[IMP] hr_payroll: Add button to get salary rule hierarchy
...
bzr revid: psi@tinyerp.com-20110915112255-nls8msun2o4nfdb4
2011-09-15 16:52:55 +05:30
6caf40c88b
[IMP] hr_payroll: add act window button on contribution register which will give all payslip lines of that register
...
bzr revid: psi@tinyerp.com-20110915063446-qsfr61kqosv2l5rx
2011-09-15 12:04:46 +05:30
4960c39193
[IMP] hr_payroll:label improvment
...
bzr revid: psi@tinyerp.com-20110915060953-zslf0b4pdcg03oya
2011-09-15 11:39:53 +05:30
f763635a53
[FIX] hr_payroll: shifed the worked days and input tab to first position and rename Payslip Lines act window to Payslip Computation Detail
...
bzr revid: psi@tinyerp.com-20110915052737-541rkobli69etr2g
2011-09-15 10:57:37 +05:30
bddfe1cd5a
[IMP] hr_payroll, hr_payroll_account: Payslip Run => add journal_id field on payslip run, improve search view, fix for done button on payslip run, usibility improvements
...
bzr revid: mra@tinyerp.com-20110915051636-54xj84eams3fvyu5
2011-09-15 10:46:36 +05:30
7dfc61350c
[IMP] hr_payroll: default value for scheduled pay field
...
bzr revid: qdp-launchpad@openerp.com-20110914142450-au5t6fkg6h420qwg
2011-09-14 16:24:50 +02:00
0dff60cf26
[FIX] hr_payroll: fixed rule in demo data
...
bzr revid: qdp-launchpad@openerp.com-20110914140557-nkm6j1fjpo34nfd2
2011-09-14 16:05:57 +02:00
971ffbd5cc
[FIX] hr_payroll: payslip details report fails while we install hr_payroll_l10n_be module
...
bzr revid: psi@tinyerp.com-20110914131106-4743bpey6vtvtbxz
2011-09-14 18:41:06 +05:30
3b8ebe0615
[IMP] hr_payroll: usability improvements
...
bzr revid: qdp-launchpad@openerp.com-20110914123108-k5xtjxau4zc50sv8
2011-09-14 14:31:08 +02:00
514dfa0748
[IMP] hr_payroll: added tree view on payroll structures and rule categories. + few renaming of stupid copied/pasted xml_id meaningless
...
bzr revid: qdp-launchpad@openerp.com-20110914085311-nfg3sg0cdi5jv9y6
2011-09-14 10:53:11 +02:00
dac8a9e4fb
[MERGE] merged with main addons branch
...
bzr revid: qdp-launchpad@openerp.com-20110913120012-339iigyjojh89sy3
2011-09-13 14:00:12 +02:00
a5b2f68edb
[IMP] hr_payroll: demo data improvement
...
bzr revid: qdp-launchpad@openerp.com-20110913074705-ai34g7g6wcwou4aw
2011-09-13 09:47:05 +02:00
178fec5c64
[FIX] str 'in' str (singletons missing tuple-building comma), in @colors attributes. Replace by string equality
...
bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
2011-09-11 15:50:25 +02:00
752df5acbd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
2011-09-06 04:40:18 +00:00
3ff689c763
[IMP] hr_payroll: improved data.xml to change the sequence in the display of salary rule categories.
...
bzr revid: mtr@tinyerp.com-20110902092742-cyj58sya4krdu3al
2011-09-02 14:57:42 +05:30
ae7b1699cb
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110823050537-7q5lx6k2wq8n70ld
bzr revid: launchpad_translations_on_behalf_of_openerp-20110824043728-ri9o75i5hp2tss1x
2011-08-24 04:37:28 +00:00
b3d4085714
[FIX] account,hr,hr_recruitment,hr_payroll,product:- enforced _sql_constraint to maintain uniqueness
...
lp bug: https://launchpad.net/bugs/789019 fixed
bzr revid: mtr@mtr-20110805052025-3w0w7ccnnlrish2b
2011-08-05 10:50:25 +05:30
f24b3536fb
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110722150257-3s6caa3c2mn5et4o
2011-07-22 17:02:57 +02:00
d844fd133b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110720043721-c35fwfpelcbp1jbk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110721043532-p7f537lm5otnbht8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110722044222-ntao98t3fw2ldjgb
2011-07-22 04:42:22 +00:00
81a1eb18a1
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110718083424-kdaesx3gflza142a
2011-07-18 10:34:24 +02:00
cc5639bbac
[IMP] usaiblity improvements
...
bzr revid: qdp-launchpad@openerp.com-20110711160549-n2rgb060zuo51g65
2011-07-11 18:05:49 +02:00
4f77873577
[IMP] payroll: small usabiltiy improvements
...
bzr revid: qdp-launchpad@openerp.com-20110711150309-z1j2780kijojmzep
2011-07-11 17:03:09 +02:00
ecb85380ad
[IMP] hr_payrolll: usability improvements
...
bzr revid: qdp-launchpad@openerp.com-20110711121525-88cz0kag3s6qim68
2011-07-11 14:15:25 +02:00
d53a9f55ec
[MERGE] payroll yaml test
...
bzr revid: qdp-launchpad@openerp.com-20110711104448-2xsw62pmfxzv1gv9
2011-07-11 12:44:48 +02:00
243d19b89e
[MERGE] payroll: fixed error in schema of hr_contract
...
bzr revid: qdp-launchpad@openerp.com-20110711103326-rti0sjuex2a6mcmq
2011-07-11 12:33:26 +02:00
418265d252
[IMP] hr_payroll,hr_payroll_account: improved yaml and demo data for payroll_account
...
bzr revid: mtr@mtr-20110711102754-1qw17zempu4e32ol
2011-07-11 15:57:54 +05:30
781ebda8f9
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110711102131-gecb7yb6og0x8ac4
2011-07-11 15:51:31 +05:30
f9464f5ee4
[MERGE] payroll:usabilty
...
bzr revid: qdp-launchpad@openerp.com-20110710013833-s07r2l6zlyxg8t6f
2011-07-10 03:38:33 +02:00
0f89d90573
[MERGE] payroll: report cleaning
...
bzr revid: qdp-launchpad@openerp.com-20110710013710-efrp7hsz1hfp87ux
2011-07-10 03:37:10 +02:00
ccac68b4a0
[MERGE] payroll: usability
...
bzr revid: qdp-launchpad@openerp.com-20110710013513-hvu3brjm502nn2hv
2011-07-10 03:35:13 +02:00
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
f36e724804
[IMP] removed remaining method=True params from fields.function
...
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields.
bzr revid: odo@openerp.com-20110705122857-zvzpamu0n24zst1q
2011-07-05 14:28:57 +02:00
de41ee470e
[FIX] hr payroll attrs, remove trailing comma
...
bzr revid: al@openerp.com-20110705110728-ihwts1v4ot06kimt
2011-07-05 13:07:28 +02:00
06fb14130a
[IMP] removed method=True params from all fields.function
...
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!
bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
9dbd0df043
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110630115822-u0rnk1w1auk7s583
2011-06-30 17:28:22 +05:30
7890f2f080
[FIX] hr_payroll: fixes YML trace back as struct_id field was required on hr.contract object
...
bzr revid: psi@tinyerp.co.in-20110630091533-al5ei2f202aw5q7a
2011-06-30 14:45:33 +05:30
fff45e7a17
[IMP] hr_payroll: added a button relate on the payslip to get all the payslip lines applied grouped by contribution register
...
bzr revid: psi@tinyerp.co.in-20110629122727-1hfynocjx7kxjefd
2011-06-29 17:57:27 +05:30
606ebf8781
[IMP] hr_payroll: Added button for contribution register in group by search for payslip search view
...
bzr revid: psi@tinyerp.co.in-20110629111122-13e8l8fwyorjmjqc
2011-06-29 16:41:22 +05:30
4c37aafc45
[IMP] hr_payroll: remove abs from contribution report
...
bzr revid: psi@tinyerp.co.in-20110629103110-kjqz620ybuwxxswb
2011-06-29 16:01:10 +05:30
167b5b0686
[IMP] hr_payroll: Improvement in demo data
...
bzr revid: psi@tinyerp.co.in-20110629102801-wx3i2rcpy5ols9pg
2011-06-29 15:58:01 +05:30
82b0249a9d
[IMP] hr_payroll: Improve the contribution register report so it will now show the lines of confirmed payslips only
...
bzr revid: psi@tinyerp.co.in-20110629092032-2uq3i90evylxy8zu
2011-06-29 14:50:32 +05:30
48c01fbf51
[IMP] hr_payroll: make credit note readonly while state is not draft and remove unsused attrs from appers_on_payslip field
...
bzr revid: psi@tinyerp.co.in-20110629090353-xodv3bnvnjwdeyjw
2011-06-29 14:33:53 +05:30
6f5c7b8227
[IMP] hr_payroll: Added demo data for contribution register and updated the demo data
...
bzr revid: psi@tinyerp.co.in-20110629084855-ah2889z5oucv6ssg
2011-06-29 14:18:55 +05:30
0600e1334b
[FIX] payroll: added missing files for contribution register report wizard forgotten in previous merge prop
...
bzr revid: qdp-launchpad@openerp.com-20110623095410-fl7kl8iibx0m2yo3
2011-06-23 11:54:10 +02:00
42f835eb93
[MERGE] payroll: added the contribution register report
...
bzr revid: qdp-launchpad@openerp.com-20110616104918-5q5ddzavn39albb5
2011-06-16 12:49:18 +02:00
c40c82a1bd
[MERGE] removal of unused things in payroll
...
bzr revid: qdp-launchpad@openerp.com-20110616103949-s260q5cq22u0rria
2011-06-16 12:39:49 +02:00
a4f2bb20d2
[MERGE] payroll reports improvements
...
bzr revid: qdp-launchpad@openerp.com-20110616103051-001utngd2i9iz42v
2011-06-16 12:30:51 +02:00
d9527bc6e4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110611045707-80hy5o0jzhzgegg6
bzr revid: launchpad_translations_on_behalf_of_openerp-20110612045225-0cb8z6pthizjz5jw
bzr revid: launchpad_translations_on_behalf_of_openerp-20110613043706-3shtfzjbmfhs6ase
bzr revid: launchpad_translations_on_behalf_of_openerp-20110614044016-zvbl05dph25z6npc
bzr revid: launchpad_translations_on_behalf_of_openerp-20110615044012-k78a3yz2w70ywfhe
2011-06-15 04:40:12 +00:00
284d747eb0
[REM] hr_payroll: removed sequence and images of unrequired objects
...
bzr revid: mtr@mtr-20110609131617-jm1wio04cwmhse1u
2011-06-09 18:46:17 +05:30
c2b9195d04
[REM] hr_payroll: removed unused yaml
...
bzr revid: mtr@mtr-20110609125516-fampkxgnwlsxtxmy
2011-06-09 18:25:16 +05:30
f63c039f42
[REM] hr_payroll: removed unused reports
...
bzr revid: mtr@mtr-20110609123723-zhcgfq69ytimxw7h
2011-06-09 18:07:23 +05:30
8ce709f04a
[MERGE] decimal precision for payroll module
...
bzr revid: qdp-launchpad@openerp.com-20110609112733-p3w2ptg4cgmgvwmv
2011-06-09 13:27:33 +02:00
387b534a33
[MERGE] improvements in payslip run
...
bzr revid: qdp-launchpad@openerp.com-20110609100743-ogqkahrq0pg9vz03
2011-06-09 12:07:43 +02:00
e182ef2a10
[MERGE] usability imp
...
bzr revid: qdp-launchpad@openerp.com-20110609091555-1i677vp4qfewl2f6
2011-06-09 11:15:55 +02:00
154addd6bb
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110607043551-4rpi9kkxnhsqxd0n
bzr revid: launchpad_translations_on_behalf_of_openerp-20110608043635-x9rtk2xkh75xlvq5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110609043554-qetee7pedmsdwjm8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110610043735-3d5rff99pe1zho3w
2011-06-10 04:37:35 +00:00
1a1ee753b8
[IMP] hr_payroll: Minor improvement in payslip.yml
...
bzr revid: mra@mra-laptop-20110607083611-50p6d0a1uaxmcd3q
2011-06-07 14:06:11 +05:30
dd04d97155
[IMP] hr_payroll: changed the string
...
bzr revid: mtr@mtr-20110607055951-cr5kmn6loybn25b2
2011-06-07 11:29:51 +05:30
0b52e63ee2
[IMP] hr_payroll: removed bank record from payslip.yml
...
bzr revid: mtr@mtr-20110607050816-sd002svezngdm1nh
2011-06-07 10:38:16 +05:30
033c241543
[IMP] hr_payroll: changed yml for payslip as per the changes in hr_payroll module
...
bzr revid: mtr@mtr-20110606130157-bmb3g4t9yslx9n11
2011-06-06 18:31:57 +05:30
552afb10c5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110603044017-yoke5zwvpebyo93o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110604045342-rkt8o6e65uyj8kjd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110605043539-vvllkcbozllrdlg7
bzr revid: launchpad_translations_on_behalf_of_openerp-20110606043718-0i2770ro7c0oho9t
2011-06-06 04:37:18 +00:00
5b4effe33d
[IMP] hr_payroll: Use formatLang in reports
...
bzr revid: psi@tinyerp.co.in-20110603103907-y5t7qihsi4efaoj6
2011-06-03 16:09:07 +05:30
90ecd793ef
[IMP] hr_payroll: Used formatLang in reports
...
bzr revid: psi@tinyerp.co.in-20110603103238-41triu06bx5vworm
2011-06-03 16:02:38 +05:30
3898cb05ae
[IMP] hr_payroll: created decimal_precision for Payroll and improved dp in hr_payroll.py
...
bzr revid: mtr@mtr-20110603092555-tz8ajg8r578pw1zz
2011-06-03 14:55:55 +05:30
939fed8f4f
[IMP] hr_payroll: Increase the width of columns and rename lable
...
bzr revid: psi@tinyerp.co.in-20110603073917-v9cf1nl1voa9fxvb
2011-06-03 13:09:17 +05:30
a9327bd59e
[IMP] hr_payroll: Update the label of quantity field
...
bzr revid: psi@tinyerp.co.in-20110603050002-g5932m0150i9pccp
2011-06-03 10:30:02 +05:30
d00fb12dd4
[IMP] hr_payroll: small change in total currency symbol in contribution report
...
bzr revid: psi@tinyerp.co.in-20110602134400-sf0arl7ogxx5vn90
2011-06-02 19:14:00 +05:30
664fbb68d6
[IMP] hr_payroll: code improvment in details by payslip report
...
bzr revid: psi@tinyerp.co.in-20110602132346-x23d19p3j2ulancv
2011-06-02 18:53:46 +05:30
51f8615651
[IMP] hr_payroll: Label improve on payslip report
...
bzr revid: psi@tinyerp.co.in-20110602131532-7qkksk94tt0okpb9
2011-06-02 18:45:32 +05:30
0e076c4060
[IMP] hr_payroll: Improve code of contribution report and update the help on register_id of rule object
...
bzr revid: psi@tinyerp.co.in-20110602130043-lhfiercyh6bqp82p
2011-06-02 18:30:43 +05:30
eef6f323af
[IMP] hr_payroll: Change the heading to quantity/rate in contribution report
...
bzr revid: psi@tinyerp.co.in-20110601053649-xakk87hf01nmy7jd
2011-06-01 11:06:49 +05:30
23c22472ee
[MERGE] hr_payroll: Merge with main payroll branch
...
bzr revid: psi@tinyerp.co.in-20110601051224-6dwhpwxo3w7xla7c
2011-06-01 10:42:24 +05:30
248f04f0ce
[MERGE] hr_payroll: Merge with main payroll branch
...
bzr revid: psi@tinyerp.co.in-20110531134351-ocbn936x1t2d61ei
2011-05-31 19:13:51 +05:30
abfeeabd5f
[IMP] hr_payslip: improve layout and add field amount and qunatity in contribution register section on payslip details report
...
bzr revid: psi@tinyerp.co.in-20110531134237-ka2v0mkxa1ume0fk
2011-05-31 19:12:37 +05:30
3d28dc8043
[IMP] hr_payroll: Remove readonly from credit note field of hr payslip
...
bzr revid: psi@tinyerp.co.in-20110530055945-i22u93tr9pfyste7
2011-05-30 11:29:45 +05:30
4c05d621ea
[IMP] hr_payroll: rename the worked Days tab to worked days and inputs
...
bzr revid: psi@tinyerp.co.in-20110530053541-hrdg3c21xm59j0bd
2011-05-30 11:05:41 +05:30
546725cca0
[IMP] hr_payroll: payslip and payslip details report will show value in column like amount, quantiry and total even it is zero
...
bzr revid: psi@tinyerp.co.in-20110527103933-2eqspaubjc5beqfx
2011-05-27 16:09:33 +05:30
358ad47ed4
[IMP] hr_payroll: Increase the column width of total field
...
bzr revid: psi@tinyerp.co.in-20110527101435-rjqz078ytmqx2ar6
2011-05-27 15:44:35 +05:30
e41d251cdc
[MERGE] hr_payroll: merged branch of mtr with browsable categories + fixed few points in it
...
[IMP] hr_payroll: improved BrowsableObject class to return 0.0 if the key isn't defined
[FIX] hr_payroll: fix the computation of categories
bzr revid: qdp-launchpad@openerp.com-20110527101322-k0lx0660feopt30i
2011-05-27 12:13:22 +02:00
998c0f641f
[IMP] hr_payroll: contribution report improvemnt as specified in need fixing
...
bzr revid: psi@tinyerp.co.in-20110527073256-d6v6voa6ssw9fykg
2011-05-27 13:02:56 +05:30
43eb0502b6
[IMP] hr_payroll: improved code to have access of all the fields on rules object
...
bzr revid: mtr@mtr-20110527072352-tdexanp29hxmnepi
2011-05-27 12:53:52 +05:30
d25e8fe61a
[IMP] hr_payroll: Add total and quantity field on payslip report and add currency symbol to every row in payslip report and payslip details report
...
bzr revid: psi@tinyerp.co.in-20110527065641-uks394pt8eyj5r5y
2011-05-27 12:26:41 +05:30
45ec4a4110
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110527061311-2tn9n7cbu5gb7l6a
2011-05-27 11:43:11 +05:30
253eaa325e
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110527060154-1fq5lppd897p9jc3
2011-05-27 11:31:54 +05:30
908462ec0f
[IMP] hr_payroll: contribution report add fields total and qunatity to the report
...
bzr revid: psi@tinyerp.co.in-20110527054855-9u2fv9ou89hsddit
2011-05-27 11:18:55 +05:30
ea2fc5b4d9
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110527054718-ik8t3hdxpsfmj87e
2011-05-27 11:17:18 +05:30
b2bfc10213
[MERGE] hr_payroll: Merge with main payroll branch
...
bzr revid: psi@tinyerp.co.in-20110527045953-c0pmm96haygt6yk4
2011-05-27 10:29:53 +05:30
b55495512c
[IMP] hr_payroll: added quantity on payslip lines
...
bzr revid: qdp-launchpad@openerp.com-20110526165610-3ppefzx2tqk4sd98
2011-05-26 18:56:10 +02:00
d0a6dc07c7
[IMP] hr_payroll: Change the layout of the contribution report, and improve it
...
bzr revid: psi@tinyerp.co.in-20110526130758-97hntbczyskcjjg9
2011-05-26 18:37:58 +05:30
2eb5bb33f7
[IMP] hr_payroll: improved help string on 'amount_python_compute' field
...
bzr revid: mtr@mtr-20110526113525-de0h5y8bp7c5shdm
2011-05-26 17:05:25 +05:30
481d4e4bbe
[IMP] hr_payroll: made 'rules' into browseable object
...
bzr revid: mtr@mtr-20110526110838-n5juwnp5atajt8on
2011-05-26 16:38:38 +05:30
9325bbf70e
[IMP] hr_payroll: improved string of label
...
bzr revid: mtr@mtr-20110526101304-ls5emcuj5f1ttr9y
2011-05-26 15:43:04 +05:30
b3653a88d2
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110526093749-uam9vgtya56vpvm2
2011-05-26 15:07:49 +05:30
937dfdddb7
[IMP] hr_payroll: improved string of label on Payslip run wizard
...
bzr revid: mtr@mtr-20110526085314-tetaycxkkq6ge8gi
2011-05-26 14:23:14 +05:30
2b8e537224
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110526085043-psf4ph1ywl5b3sxd
2011-05-26 14:20:43 +05:30
92d7a663d6
[IMP] hr_payroll: removed 3 fields from wizard and generated payslip from dates of hr.payslip.run object
...
bzr revid: mtr@mtr-20110526083901-ju9sl16lp41o3b15
2011-05-26 14:09:01 +05:30
09b88682e1
[IMP] hr_payroll: improved help string categories=>rule_categories
...
bzr revid: mtr@mtr-20110526055655-iw9yg4999a5l8g1z
2011-05-26 11:26:55 +05:30
8b32533bec
[IMP] hr_payroll: revert back the changes from localdict => category_dict
...
bzr revid: mtr@mtr-20110526055402-ua3mu846d8zw4jso
2011-05-26 11:24:02 +05:30
4f1ed7c970
[MERGE] hr_payroll: Merge with main payroll branch
...
bzr revid: psi@tinyerp.co.in-20110526053146-cybrig63j99qt4tx
2011-05-26 11:01:46 +05:30
c6fa707ca2
[MERGE]
...
bzr revid: qdp-launchpad@openerp.com-20110525134101-7v3n4bjszg1di0k7
2011-05-25 15:41:01 +02:00
60794632f8
[IMP] hr_payroll: improved payslip state as per workflow changes and removed unrequired methods
...
bzr revid: mtr@mtr-20110525091234-ih8c8e9vei8vfhbp
2011-05-25 14:42:34 +05:30
46afc22ac9
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110525062621-m04kj8v37ov1v6bu
2011-05-25 11:56:21 +05:30
d353d12965
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110525061731-ayjulztx5mxq6flb
2011-05-25 11:47:31 +05:30
8462b39b9e
[IMP] hr_payroll: improved separator string for Generate Payslip wizard
...
bzr revid: mtr@mtr-20110525060059-1l5ml5xegex6so4i
2011-05-25 11:30:59 +05:30
14b089bd33
[IMP] hr_payroll: improved indentation
...
bzr revid: mtr@mtr-20110525054743-kud7fi4o8uepjqjs
2011-05-25 11:17:43 +05:30
d246077537
[IMP] hr_payroll: changed view,made fields required=True and optimised code for Generate Payslip wizard
...
bzr revid: mtr@mtr-20110525054446-bkp0wrgemigzytiu
2011-05-25 11:14:46 +05:30
f9c4f6d754
[IMP] hr_payroll: optimised code for Generate Payslip wizard
...
bzr revid: mtr@mtr-20110524133246-pdgbei67rnpmdjsc
2011-05-24 19:02:46 +05:30
fc4e99ccba
[IMP] hr_payroll: remove commented codes from hr_payroll_report.xml and hr_payroll.py files
...
bzr revid: psi@tinyerp.co.in-20110524131257-u5qc6qwhneeta3ds
2011-05-24 18:42:57 +05:30
06f1f00def
[MERGE] hr_payroll: changed field 'quantity' into 'amount' in input lines
...
bzr revid: qdp-launchpad@openerp.com-20110524124908-hzgk4vhegmynonsc
2011-05-24 14:49:08 +02:00
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
76f38cd088
[IMP] hr_payroll: added help string for fields on wizard
...
bzr revid: mtr@mtr-20110524121314-yb5eurgkad08wsp4
2011-05-24 17:43:14 +05:30
19489bb6a4
[IMP] hr_payroll: Menu for payslip details was missing, add the same
...
bzr revid: psi@tinyerp.co.in-20110524120832-u5j35vuflj3xni2v
2011-05-24 17:38:32 +05:30
4dd134c822
[IMP] hr_payroll: added fields on wizard and improved code so that generated payslip have date from payslip run
...
bzr revid: mtr@mtr-20110524114117-pqqarqenjwwempmj
2011-05-24 17:11:17 +05:30
7175b83346
[MERGE] hr_payroll: merge with main payroll branch
...
bzr revid: psi@tinyerp.co.in-20110524112625-rmuu1o1ogti7c7s3
2011-05-24 16:56:25 +05:30
a54773c65d
[IMP] hr_payroll: used 'BrowsableObject' method instead of inheritancy
...
bzr revid: mtr@mtr-20110524103312-dvn8fbyzfp2grpll
2011-05-24 16:03:12 +05:30
86bf1a8448
[MERGE] merged branch with improvements in payslip and payslip run
...
bzr revid: qdp-launchpad@openerp.com-20110524092138-rf6ldei8mpmpya2v
2011-05-24 11:21:38 +02:00
cbc5c114be
[MERGE] merged the branch with split of the 2 reports on payslip
...
bzr revid: qdp-launchpad@openerp.com-20110524091417-neoz2vbj0ubjdx13
2011-05-24 11:14:17 +02:00
b5849f3519
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110524085206-tdpekv2v5fy2zbvf
2011-05-24 14:22:06 +05:30
ad6b2593c2
[IMP] hr_payroll: renamed the field 'quantity' to 'amount'
...
bzr revid: mtr@mtr-20110524060202-z58x324zvkugddd1
2011-05-24 11:32:02 +05:30
da8281001a
[IMP] hr_payroll: better demo data
...
bzr revid: qdp-launchpad@openerp.com-20110523141423-5x5e6curv55gpdej
2011-05-23 16:14:23 +02:00
00384b71e5
[IMP] hr_payroll: better name class for browsable object in python code of salary rules
...
bzr revid: qdp-launchpad@openerp.com-20110523140926-388dp1b8egyt08zl
2011-05-23 16:09:26 +02:00
33f2f16249
[IMP] hr_payroll: inherited 'Inputline' class and changed help strings
...
bzr revid: mtr@mtr-20110523112203-3xj8q54ffiqxmyz3
2011-05-23 16:52:03 +05:30
961e04cc9e
[IMP] hr_payroll: initiate object outside the for loop
...
bzr revid: mtr@mtr-20110523093504-m2ibjrkk755dejuu
2011-05-23 15:05:04 +05:30
59d55a993d
[IMP] hr_payroll: used removeParaNode if there isn't any description on payslip
...
bzr revid: psi@tinyerp.co.in-20110523091029-a1doow4k02y67ax7
2011-05-23 14:40:29 +05:30
16228651c6
[IMP] hr_payroll: changed amount in the demo data for 'Meal voucher' rule
...
bzr revid: mtr@mtr-20110523071328-ngvq8z1somz7bomt
2011-05-23 12:43:28 +05:30
995cc05169
[IMP] hr_payroll: fields become readonly when state is close and changed tooltip for 'credit_note'
...
bzr revid: mtr@mtr-20110523060113-3flgpwe89tu7ezuo
2011-05-23 11:31:13 +05:30
e6ecd8a216
[IMP] hr_payroll: Improve contribution register report, remove unwanted get_register function
...
bzr revid: psi@tinyerp.co.in-20110523053311-9lj0z6lv00krbljd
2011-05-23 11:03:11 +05:30
b6778a8c02
[IMP] hr_payroll: improved tooltip for 'credit_note' field
...
bzr revid: mtr@mtr-20110520133737-w7ioouj4l2jkkk6g
2011-05-20 19:07:37 +05:30
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
cbcf51e5a5
[IMP] hr_payroll: Change the label of the report from PaySlip Details to Employee Payslip Details
...
bzr revid: psi@tinyerp.co.in-20110520132554-2ohtfufdnsh9dm52
2011-05-20 18:55:54 +05:30
79b139d095
[IMP] hr_payroll: improved tooltip,code and view for payslip run
...
bzr revid: mtr@mtr-20110520130536-j56u80qdnvjc6iii
2011-05-20 18:35:36 +05:30
d3e3941eea
[IMP] hr_payroll: improved tooltip for 'state' field
...
bzr revid: mtr@mtr-20110520120009-7pq67hy8a9wfwa83
2011-05-20 17:30:09 +05:30
6cbbeb16a8
[IMP] hr_payroll: improved tooltip for 'state' field and renamed method name.
...
bzr revid: mtr@mtr-20110520115514-t5kw865rhuv53q5x
2011-05-20 17:25:14 +05:30
32c8d6cb70
[IMP] hr_payroll: The python code expression can now be defined using 'browse',accordingly changed data file
...
bzr revid: mtr@mtr-20110519053118-yzcmr39m3hqdb4u5
2011-05-19 11:01:18 +05:30
f3387aa616
[ADD] hr_payroll: Add report on pyaslip.register object to get details of the payslip lines based on payslip register
...
bzr revid: psi@tinyerp.co.in-20110518100941-ur7d0bqukd7tr3g0
2011-05-18 15:39:41 +05:30
c22f7fece7
[IMP] hr_payroll: added fields and assigned value to start_date and end_date on payslip run
...
bzr revid: mtr@mtr-20110518050148-hhomxkvrsjot786n
2011-05-18 10:31:48 +05:30
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
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
83a34f56c9
[IMP] split payslip report in to two. Employee payslip report will show the payslip lines appears on payslip and the payslip details report will show all the payslip line by category as well as by contribution register
...
bzr revid: psi@tinyerp.co.in-20110516094655-gj6qtu29b6us3lh2
2011-05-16 15:16:55 +05:30
8d903b60aa
[IMP] hr_payroll: improved query for sum method of Payslips class
...
bzr revid: mtr@mtr-20110513112315-qcaemrufa22gdnag
2011-05-13 16:53:15 +05:30
f46219d266
[REF] Payroll: remove unused import
...
bzr revid: mra@mra-laptop-20110513063931-g83470vtp5z9o5lv
2011-05-13 12:09:31 +05:30
83345d5af5
[IMP] Payroll: clean codee
...
bzr revid: mra@mra-laptop-20110513063639-kx4lbs2gq3bef6py
2011-05-13 12:06:39 +05:30
62c0ddad78
[IMP] Payroll: demo and default string improvements
...
bzr revid: mra@mra-laptop-20110513062405-pf57a2ntrsze36mp
2011-05-13 11:54:05 +05:30
340a1a11d6
[IMP] Payroll: remove unused mehtod def sum from payslip now...it will work now with payslips class ..
...
bzr revid: mra@mra-laptop-20110513060327-viq49sr0cx0nj1zp
2011-05-13 11:33:27 +05:30
e85341722f
[IMP] Payroll: remove print
...
bzr revid: mra@mra-laptop-20110513060206-59oo6dc2arw8bps0
2011-05-13 11:32:06 +05:30
5439b7eb58
[IMP] Payroll: Payslips with python code
...
bzr revid: mra@mra-laptop-20110513060012-q0qcwg6wbe9vk613
2011-05-13 11:30:12 +05:30
efdacca163
[MERGE] Payroll: merge from main trunk-payroll branch
...
bzr revid: mra@mra-laptop-20110513050945-zj8tudmzqdkqayli
2011-05-13 10:39:45 +05:30
f595581803
[IMP] hr_payroll: implemented the feature worked_days.WORK100.number_of_hours + improved worked_days.sum() method
...
bzr revid: qdp-launchpad@openerp.com-20110512161628-wc8zvq62nqldc5jt
2011-05-12 18:16:28 +02:00
8ff806bea3
[IMP] hr_payroll: improved sum method of worked days
...
bzr revid: mtr@mtr-20110512135825-r6ighyds5xusu4cd
2011-05-12 19:28:25 +05:30
7499c98d42
[MERGE] merged psi's branch with payslip report
...
bzr revid: qdp-launchpad@openerp.com-20110512135749-jaipercgs20ae539
2011-05-12 15:57:49 +02:00
211844634f
[IMP] pass details_by_salary_rule_category instead of line_ids so the report will show payslip_lines with rule as Appear on payslip checked
...
bzr revid: psi@tinyerp.co.in-20110512133940-cwmcdbtl3rz8giru
2011-05-12 19:09:40 +05:30
80f2474862
[MERGE, IMP] merge with main payroll branch, Add payslip lines by contribution register on Employee payslip report
...
bzr revid: psi@tinyerp.co.in-20110512083943-5e5eys6j7ae0af8e
bzr revid: psi@tinyerp.co.in-20110512130543-ld0w9si6oypo298u
2011-05-12 18:35:43 +05:30
8dea4d2698
[MERGE] merge from trunk-payroll main branch
...
bzr revid: mra@mra-laptop-20110512130410-5ybp0b0drz6iqg7f
2011-05-12 18:34:10 +05:30
54586b7d55
[IMP] hr_payroll: updated localdict to copmute payslip on payslip
...
bzr revid: mtr@mtr-20110512123619-bss3lcy1dlrbi9r7
2011-05-12 18:06:19 +05:30
30dee04d10
[IMP] hr_payroll: improved method of hr.payslip,to call it without passing(cr,uid)
...
bzr revid: mtr@mtr-20110512120752-sdqi99qim652kwk0
2011-05-12 17:37:52 +05:30
631d8a9e53
[MERGE] merged the branch containing the modifications on hr_payroll_account (author mtr and qpd)
...
bzr revid: qdp-launchpad@openerp.com-20110512115719-m5ppmv0sk02wutgr
2011-05-12 13:57:19 +02:00
4418c83a5f
[REF] hr_payroll: added TODO comment
...
bzr revid: qdp-launchpad@openerp.com-20110512115458-kg1s089del0032lx
2011-05-12 13:54:58 +02:00
b6f4aef872
[FIX] hr_payroll: fix errors in get_contract + removed old commented code
...
bzr revid: qdp-launchpad@openerp.com-20110512090009-2wt0cqfm6kh9brtw
2011-05-12 11:00:09 +02:00
746a2f073d
[MERGE] merged the branch of psi with payslip run feature (+add required=True on name field of payslip.run)
...
bzr revid: qdp-launchpad@openerp.com-20110512074918-7h5qqgj4an2smayy
2011-05-12 09:49:18 +02:00
2058cd5859
[IMP] small change in warning
...
bzr revid: psi@tinyerp.co.in-20110512072131-bkyu91oejlje6k1e
2011-05-12 12:51:31 +05:30
badc8caef5
[IMP] small improvment in wizard
...
bzr revid: psi@tinyerp.co.in-20110512070253-iyahei1j6cc1m4r0
2011-05-12 12:32:53 +05:30
3df45b0659
[FIX] small fix in onchange_employee(when onchage is called with no employee, worked days lines will also update)
...
bzr revid: psi@tinyerp.co.in-20110512050703-lvf1d3ra76i4walx
2011-05-12 10:37:03 +05:30
ed0311cb56
[MERGE] Merge from trunk-payroll main project branch
...
bzr revid: mra@mra-laptop-20110512050150-m4qysq80qgo48fp1
2011-05-12 10:31:50 +05:30
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
12f8701002
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110510043731-q2jphpxofpk96w5o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110511043751-nk6ku955bxwo1i7r
bzr revid: launchpad_translations_on_behalf_of_openerp-20110512043510-7y1qenjz8zlpvolt
2011-05-12 04:35:10 +00:00
dad5da0b60
[FIX] small fix
...
bzr revid: psi@tinyerp.co.in-20110511133522-8e51br6tsnzs4dao
2011-05-11 19:05:22 +05:30
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
03fb4577c4
[MERGE] merge with main branch
...
bzr revid: psi@tinyerp.co.in-20110511101733-8a0tbbmuwvo5bix5
2011-05-11 15:47:33 +05:30
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
042adc54a4
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110511073453-oqxvhdp20mfkc4ax
2011-05-11 13:04:53 +05:30
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
c866c963e3
[IMP] hr_payroll: removed context,as we don't use the context later in the function
...
bzr revid: mtr@mtr-20110511062312-r3lzjbdp10nqa28a
2011-05-11 11:53:12 +05:30
4058da5295
[IMP] hr_payroll: improved code to take into account credit_note while calculating the sum
...
bzr revid: mtr@mtr-20110511061349-dj6jlpmnhjn13iij
2011-05-11 11:43:49 +05:30
f302fa5ea3
[MERGE] merged mtr's branch related to security improvements
...
bzr revid: qdp-launchpad@openerp.com-20110510145046-vc2603j5wrmc48tf
2011-05-10 16:50:46 +02:00
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
c5d6059ab2
[FIX] rename the menu name
...
bzr revid: psi@tinyerp.co.in-20110504063316-26r7wu0ni4gtqhad
2011-05-04 12:03:16 +05:30
df2bac2686
[IMP] remanes view ids
...
bzr revid: psi@tinyerp.co.in-20110504055023-rngf7l4vwf25ilj7
2011-05-04 11:20:23 +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
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
560915cb68
[MERGE] merged latest fixes from 6.0 up to r.4556
...
Rev 4556 = revision-id: jvo@tinyerp.com-20110502133745-s1zyed65h6ojwkvk .
bzr revid: odo@openerp.com-20110502184643-d3qzosqdurscd51i
2011-05-02 20:46:43 +02:00
0d8364a61b
[FIX] small fix in hr_payroll
...
bzr revid: psi@tinyerp.co.in-20110502124313-k0snr1nnx03026oo
2011-05-02 18:13:13 +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
d553615695
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
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
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
148b1d45a1
[IMP] hr_payroll: revert back the changes of access rights,made for hr user
...
bzr revid: mtr@mtr-20110428085311-7017lofdf8jf7s3f
2011-04-28 14:23:11 +05:30
43327d9e9b
[IMP] hr_payroll: 'HR / Officer' can now see the payslips of him and of employess for which he's the manager
...
bzr revid: mtr@mtr-20110428083538-v08g50zk6sx18t4j
2011-04-28 14:05:38 +05:30
86a2cfcb7e
[IMP] updated csv file, re-organized employee view, imp precompte rule
...
bzr revid: osenda-20110428080101-4cc6d8hb1ttenszd
2011-04-28 10:01:01 +02:00
ac07145e5a
[IMP] hr_payroll: added ir.rule for employee payslip and modified access rights
...
bzr revid: mtr@mtr-20110428063140-rxao7nev4xgzl9f2
2011-04-28 12:01:40 +05:30
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
588093d070
[IMP] payslip by category wizard
...
bzr revid: psi@tinyerp.co.in-20110426113709-znwz3vo0cf2wukjo
2011-04-26 17:07:09 +05:30
e91a6c9f03
[IMP] hr_payroll:commented older payslip report
...
bzr revid: mtr@mtr-20110426113559-bd8dr2d2txe1njxj
2011-04-26 17:05:59 +05:30
f90308d9e8
[IMP] hr_payroll:improved bank details on payslip report
...
bzr revid: mtr@mtr-20110426111715-p3kt5lz3arw1wgda
2011-04-26 16:47:15 +05:30
06f47c3c3e
[IMP] hr_payroll:calculates total for salary head in payslip report
...
bzr revid: mtr@mtr-20110426105215-aiijosjm7wv2rjjr
2011-04-26 16:22:15 +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
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
30564f93e9
[IMP] hr_payroll:again improved exception message string
...
bzr revid: mtr@mtr-20110425120430-kacidzhufm6n25q7
2011-04-25 17:34:30 +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
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
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
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
34e9bed678
[FIX] remove warning of keyError
...
bzr revid: psi@tinyerp.co.in-20110415054145-m3w71j5837v0su2j
2011-04-15 11:11:45 +05:30
a75715ec97
[IMP] Improved payslip report
...
bzr revid: psi@tinyerp.co.in-20110414131555-6d5tgt5vwjt05rn2
2011-04-14 18:45:55 +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
fe5f075f5f
[FIX] child alw (because deleted head in xml and referenced in csv file
...
bzr revid: osenda-20110412082952-wgf73mzgl3fgg48x
2011-04-12 10:29:52 +02:00
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
c05b34c409
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110408044528-x2b0tjohjf1dqbic
bzr revid: launchpad_translations_on_behalf_of_openerp-20110409050011-j1zonbxqthg6cnbv
bzr revid: launchpad_translations_on_behalf_of_openerp-20110410044959-wu9z8ma8je0netjq
bzr revid: launchpad_translations_on_behalf_of_openerp-20110411045409-41dld74ls1lcxfwl
2011-04-11 04:54:09 +00: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
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
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
9e44cd5bfe
all: Fix execute permission and shebang at files
...
Non-standalone python scripts shall not have a shebang. Others will need
to be executable.
(cherry picked from commit 6ec513d17cafcdd235b4805363d3cd6daa494f2f)
bzr revid: p_christ@hol.gr-20110408112324-nc781po7efhjye21
2011-04-08 14:23:24 +03: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
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
a0507fe0db
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110408061309-vdc4fos4jns3upnx
2011-04-08 06:13:09 +00:00
c9a30f97ae
[FIX] Payroll: Installation error on csv access
...
bzr revid: mra@mra-laptop-20110408054841-7vpltohm639ov7u5
2011-04-08 11:18:41 +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
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
2452fc120c
[MERGE] merge same branch
...
bzr revid: mra@mra-laptop-20110407111358-j8wriz4vu4mlrg26
2011-04-07 16:43:58 +05:30
7e320d618f
[FIX] payroll: Not open employee form
...
bzr revid: mra@mra-laptop-20110407110844-5bchm1c4mrkoomtt
2011-04-07 16:38:44 +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
60cbbccf8f
[ADD] hr_payroll: added new payslip report
...
bzr revid: mtr@mtr-20110407052946-c7nrhw9yx939o1pj
2011-04-07 10:59:46 +05:30
9efda48b6b
[FIX] hr_payroll: fixed typo in filename
...
bzr revid: qdp-launchpad@openerp.com-20110406142006-qmiyipvpnb0fcodu
2011-04-06 16:20:06 +02:00
60c64c6cff
[REF] hr_payroll: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)
...
bzr revid: qdp-launchpad@openerp.com-20110406141645-rbn5zu51jm5tipmm
2011-04-06 16:16:45 +02:00
d0a5221fcf
[REF] hr_payroll: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)
...
bzr revid: qdp-launchpad@openerp.com-20110406141532-d6f2r49dbtr95rzf
2011-04-06 16:15:32 +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
440392700c
[IMP] hr_payroll: minor changes on payslip report, still major changes are yet to be completed
...
bzr revid: mtr@mtr-20110405133834-u5u2k3toqfn2brej
2011-04-05 19:08:34 +05:30
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
481a4d104e
[IMP] hr_payroll:improved ir.model.access.csv file
...
bzr revid: mtr@mtr-20110405062132-fswk1fn73341866x
2011-04-05 11:51:32 +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
a8f0b1ac53
[MERGE] merge from same branch
...
bzr revid: mra@mra-laptop-20110401122314-i08827x7u2ebeffo
2011-04-01 17:53:14 +05:30
2688eada6e
[FIX] payroll
...
bzr revid: mra@mra-laptop-20110401122132-5rdibau7jngyeeal
2011-04-01 17:51:32 +05:30
8cf0079a92
[IMP] hr_payroll:uncommented the sequence on salary head in data file
...
bzr revid: mtr@mtr-20110401121434-u0s1kdmwodyary4m
2011-04-01 17:44:34 +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
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
9e3f4506ab
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110331063510-f4p831lra5n96r8x
bzr revid: launchpad_translations_on_behalf_of_openerp-20110401060423-9z5xbnnjsvzoc5t5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110401060529-0fxur0o8m2j8ttu2
2011-04-01 06:05:29 +00:00
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
Fabien Pinckaers
Mayur Maheshwari (OpenERP)
Amit Patel (OpenERP)
Raphael Collet
Launchpad Translations on behalf of openerp
Saurang Suthar (OpenERP)
Jagdish Panchal (Open ERP)
DBR (OpenERP)
Meera Trambadia (OpenERP)
Numerigraphe - Lionel Sausin
Olivier Dony
Carlos Vásquez
Antony Lesuisse
Vo Minh Thu
Purnendu Singh (OpenERP)
Divyesh Makwana (Open ERP)
Serpent Consulting Services
Quentin (OpenERP)
Minh Tran
Rucha (Open ERP)
Christophe Simonis
Ravish Murari (OpenERP)
Ujjvala Collins (OpenERP)
Stephane Wirtel
Israel Fermin Montilla
ARA (OpenERP)
Mustufa Rangwala (OpenERP)
Xavier Morel
mtr
Hardik Ansodariy (OpenERP)
psi (Open ERP)
Mustufa Rangwala
P. Christeas