odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
64,045 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

1183 Commits

Author SHA1 Message Date
Jagdish Panchal (Open ERP) 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
Jagdish Panchal (Open ERP) 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
Meera Trambadia (OpenERP) 440037d7bc [MERGE] branch merged with openobject-addons 
bzr revid: mtr@tinyerp.com-20120313051730-3rmlg1z493owjtzo
 2012-03-13 10:47:30 +05:30
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Numerigraphe - Lionel Sausin 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
Meera Trambadia (OpenERP) 0e20074121 [IMP] hr_*:-changed sequence for menus 
bzr revid: mtr@tinyerp.com-20120305124245-xh77bpp62l4wfalm
 2012-03-05 18:12:45 +05:30
Olivier Dony 318d99d029 [MERGE] Latest bugfixes from 6.1 
bzr revid: odo@openerp.com-20120229094502-sp0xrg4yf5uvq5k9
 2012-02-29 10:45:02 +01:00
Olivier Dony 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Carlos Vásquez 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
Launchpad Translations on behalf of openerp 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
Olivier Dony 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
Launchpad Translations on behalf of openerp 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
Antony Lesuisse 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
Raphael Collet 57dc69d8ae [MERGE] lp:916526 (hr_payroll: improve tooltip) 
bzr revid: rco@openerp.com-20120130152345-5qd8luramysp0bt8
 2012-01-30 16:23:45 +01:00
Vo Minh Thu ad4b6fcc21 [IMP] manifest: renamed active to auto_install. 
bzr revid: vmt@openerp.com-20120130101837-zyebtyhfjypg2b4w
 2012-01-30 11:18:37 +01:00
Launchpad Translations on behalf of openerp 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
Purnendu Singh (OpenERP) a09cff3cf3 [IMP] hr_payroll: update help string 
bzr revid: psi@tinyerp.com-20120127053724-pkqv2f0xre2p87mf
 2012-01-27 11:07:24 +05:30
Purnendu Singh (OpenERP) d260a2bc75 [MERGE] hr_payroll: merge with main addons 
bzr revid: psi@tinyerp.com-20120127053414-fjqvbmb057ekmfov
 2012-01-27 11:04:14 +05:30
Launchpad Translations on behalf of openerp 7dfe3e3413 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20120126052824-8ja030g3lhanp8g7
 2012-01-26 05:28:24 +00:00
Launchpad Translations on behalf of openerp 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
Divyesh Makwana (Open ERP) 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
Launchpad Translations on behalf of openerp 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
Serpent Consulting Services 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
Olivier Dony 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
Quentin (OpenERP) 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 55446d0097 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20111230054000-0ygl1bapby2gy0pt
 2011-12-30 05:40:00 +00:00
Launchpad Translations on behalf of openerp 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
Olivier Dony cb28f8de07 [I18N] all: update translation templates 
bzr revid: odo@openerp.com-20111222185539-9gn06tu38ynoc416
 2011-12-22 19:55:39 +01:00
Raphael Collet a7bd2da414 [MERGE] trunk 
bzr revid: rco@openerp.com-20111222162924-644yfj4213b6z7pk
 2011-12-22 17:29:24 +01:00
Quentin (OpenERP) 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
Raphael Collet 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
Raphael Collet 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
Fabien Pinckaers 6aa1e416da [IMP] indexes on _order 
bzr revid: fp@tinyerp.com-20111221221504-dcj2l8x2xstqmccs
 2011-12-21 23:15:04 +01:00
Minh Tran 52ead43457 Changed module icons 
bzr revid: mit@openerp.com-20111221173739-pl26y182tgjb1s2j
 2011-12-21 18:37:39 +01:00
Mayur Maheshwari (OpenERP) 357f3fca2f [MERGE]: Merge with lp:openobject-addons 
bzr revid: mma@tinyerp.com-20111221123724-buifqfz9zvmu9s8n
 2011-12-21 18:07:24 +05:30
Rucha (Open ERP) 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
Minh Tran a64d3dbcbc Added modules icons for main apps 
bzr revid: mit@openerp.com-20111214144815-itsfpfo68l2m0jnx
 2011-12-14 15:48:15 +01:00
Fabien Pinckaers 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
Mayur Maheshwari (OpenERP) 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
Antony Lesuisse 69f685f386 [IMP] rename is_application to application 
bzr revid: al@openerp.com-20111208222543-avte2h9qit5zfvht
 2011-12-08 23:25:43 +01:00
Christophe Simonis 1831cddc7e [FIX] core -> is_application 
bzr revid: chs@openerp.com-20111208151455-d7pffuiwxdns76ec
 2011-12-08 16:14:55 +01:00
Vo Minh Thu 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
Vo Minh Thu f20cdb19f5 [FIX] clean some warnings. 
bzr revid: vmt@openerp.com-20111206121955-tbv84nfcni0c0q8k
 2011-12-06 13:19:55 +01:00
Fabien Pinckaers 0eab577b40 [IMP] Core modules for apps 
bzr revid: fp@tinyerp.com-20111206112127-5lir7aovygx4a4oi
 2011-12-06 12:21:27 +01:00
Vo Minh Thu 7c63902af8 [FIX] clean some warnings. 
bzr revid: vmt@openerp.com-20111205150311-6xkx4eytvxnkvdck
 2011-12-05 16:03:11 +01:00
Raphael Collet 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
Launchpad Translations on behalf of openerp 44e9d42e08 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20111130052737-yw0i1aunztyvwfzu
 2011-11-30 05:27:37 +00:00
Launchpad Translations on behalf of openerp 847bddb3e5 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20111126055025-zf1bvsdxa5sw7cn4
 2011-11-26 05:50:25 +00:00
Vo Minh Thu 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
Ravish Murari (OpenERP) 9890c9e044 date _from_hr 
bzr revid: rmu@tinyerp.com-20111124052327-a7beohzmnuab1pzc
 2011-11-24 10:53:27 +05:30
Amit (OpenERP) 7e3dbcf1e9 [IMP]:improved code 
bzr revid: apa@tinyerp.com-20111123055221-pnaz34zffzjw1eg2
 2011-11-23 11:22:21 +05:30
Amit (OpenERP) 2e758fb463 [IMP]:improved code 
bzr revid: apa@tinyerp.com-20111123053154-gsay5gufpz83vkns
 2011-11-23 11:01:54 +05:30
RavishchanraMurari (Open ERP) fe0754a549 hr_payroll 
bzr revid: rmu@tinyerp.com-20111122124129-awp6gqiu2prp7egc
 2011-11-22 18:11:29 +05:30
Olivier Dony 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
Quentin (OpenERP) 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
Fabien Pinckaers db8da808ff fix 
bzr revid: fp@tinyerp.com-20111114224213-asq9x16vsnhv33ap
 2011-11-14 23:42:13 +01:00
Fabien Pinckaers b959378ec5 merge: allows to delete a payslip 
bzr revid: fp@tinyerp.com-20111111145207-nuewll488gpnqhld
 2011-11-11 15:52:07 +01:00
Fabien Pinckaers 6cbf19d815 [Merge] es_MX from Vauxoo 
bzr revid: fp@tinyerp.com-20111111144930-5o37idpxdvyhtfri
 2011-11-11 15:49:30 +01:00
Raphael Collet 1896683037 [MERGE] improve tests on hr modules 
bzr revid: rco@openerp.com-20111110164111-xrwdee76e192q18x
 2011-11-10 17:41:11 +01:00
Divyesh Makwana (Open ERP) 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
Antony Lesuisse 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
Antony Lesuisse a206306d23 [MERGE] polish1 (stw) 
bzr revid: al@openerp.com-20111108225914-4ivtczbmyqk96na7
 2011-11-08 23:59:14 +01:00
Ujjvala Collins (OpenERP) b99ce24793 [MERGE]: Merged with trunk-addons. 
bzr revid: uco@tinyerp.com-20111108083655-tu5u488okyudvts0
 2011-11-08 14:06:55 +05:30
Launchpad Translations on behalf of openerp 8af1fb554a Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20111106052412-g035gs0ux047skr1
 2011-11-06 05:24:12 +00:00
Launchpad Translations on behalf of openerp 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
Stephane Wirtel 2930432219 [FIX] hr_payroll: Change a label 
bzr revid: stw@openerp.com-20111027094722-xq0h0cbn21y8bt58
 2011-10-27 11:47:22 +02:00
Stephane Wirtel 42f5b78eae [IMP] hr_payroll: Change the complexity 
bzr revid: stw@openerp.com-20111026120609-mpbaes0aj9rm372i
 2011-10-26 14:06:09 +02:00
Quentin (OpenERP) 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
Launchpad Translations on behalf of openerp 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
Quentin (OpenERP) 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
Israel Fermin Montilla 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
Israel Fermin Montilla 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
Stephane Wirtel 3dc8168974 [FIX] Set the categories 
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
 2011-10-05 16:19:02 +02:00
Ujjvala Collins (OpenERP) bc75893824 [MERGE]: Merged with trunk-addons. 
bzr revid: uco@tinyerp.com-20110928113535-55grblizb5c2ckrw
 2011-09-28 17:05:35 +05:30
Fabien Pinckaers 1ae77effae merge 
bzr revid: fp@tinyerp.com-20110924141651-lzlmllxy5np7eb90
 2011-09-24 16:16:51 +02:00
Ujjvala Collins (OpenERP) 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
Fabien Pinckaers 78f60c63f2 fix 
bzr revid: fp@tinyerp.com-20110917145731-h0woi9z87i9b14fn
 2011-09-17 16:57:31 +02:00
Fabien Pinckaers 523be42bd1 merge 
bzr revid: fp@tinyerp.com-20110917141929-2goj9ifzidq8g6rk
 2011-09-17 16:19:29 +02:00
Fabien Pinckaers 05d6d35cc8 [Merge] 
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
 2011-09-17 13:03:17 +02:00
ARA (OpenERP) 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
Quentin (OpenERP) ffd416e00e [MERGE[ hr_payroll: usability enhancement 
bzr revid: qdp-launchpad@openerp.com-20110915163050-n2ueot8ee2vb0ljq
 2011-09-15 18:30:50 +02:00
Quentin (OpenERP) d4c1e8ad34 [MERGE[ hr_payroll: fix payslip detail report 
bzr revid: qdp-launchpad@openerp.com-20110915162818-wupvt4i1n3wwxpxr
 2011-09-15 18:28:18 +02:00
Quentin (OpenERP) 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
Meera Trambadia (OpenERP) ba5341a5e6 [MERGE] branch merged with lp:openobject-addons 
bzr revid: mtr@tinyerp.com-20110915130151-7uxiju44u28o7b9h
 2011-09-15 18:31:51 +05:30
Purnendu Singh (OpenERP) ba785eca19 [IMP] hr_payroll: small changes(imporve view ids) 
bzr revid: psi@tinyerp.com-20110915124055-is068g72tfk47nl1
 2011-09-15 18:10:55 +05:30
Purnendu Singh (OpenERP) 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
Purnendu Singh (OpenERP) 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
Purnendu Singh (OpenERP) 4960c39193 [IMP] hr_payroll:label improvment 
bzr revid: psi@tinyerp.com-20110915060953-zslf0b4pdcg03oya
 2011-09-15 11:39:53 +05:30
Purnendu Singh (OpenERP) 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
Mustufa Rangwala (OpenERP) 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
Quentin (OpenERP) 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
Quentin (OpenERP) 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
Purnendu Singh (OpenERP) 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
Quentin (OpenERP) 3b8ebe0615 [IMP] hr_payroll: usability improvements 
bzr revid: qdp-launchpad@openerp.com-20110914123108-k5xtjxau4zc50sv8
 2011-09-14 14:31:08 +02:00
Quentin (OpenERP) 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
Quentin (OpenERP) dac8a9e4fb [MERGE] merged with main addons branch 
bzr revid: qdp-launchpad@openerp.com-20110913120012-339iigyjojh89sy3
 2011-09-13 14:00:12 +02:00
Quentin (OpenERP) a5b2f68edb [IMP] hr_payroll: demo data improvement 
bzr revid: qdp-launchpad@openerp.com-20110913074705-ai34g7g6wcwou4aw
 2011-09-13 09:47:05 +02:00
Xavier Morel 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
Launchpad Translations on behalf of openerp 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
Meera Trambadia (OpenERP) 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
Launchpad Translations on behalf of openerp 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
mtr 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
Raphael Collet f24b3536fb [MERGE] from trunk 
bzr revid: rco@openerp.com-20110722150257-3s6caa3c2mn5et4o
 2011-07-22 17:02:57 +02:00
Launchpad Translations on behalf of openerp 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
Raphael Collet 81a1eb18a1 [MERGE] from trunk 
bzr revid: rco@openerp.com-20110718083424-kdaesx3gflza142a
 2011-07-18 10:34:24 +02:00
Quentin (OpenERP) cc5639bbac [IMP] usaiblity improvements 
bzr revid: qdp-launchpad@openerp.com-20110711160549-n2rgb060zuo51g65
 2011-07-11 18:05:49 +02:00
Quentin (OpenERP) 4f77873577 [IMP] payroll: small usabiltiy improvements 
bzr revid: qdp-launchpad@openerp.com-20110711150309-z1j2780kijojmzep
 2011-07-11 17:03:09 +02:00
Quentin (OpenERP) ecb85380ad [IMP] hr_payrolll: usability improvements 
bzr revid: qdp-launchpad@openerp.com-20110711121525-88cz0kag3s6qim68
 2011-07-11 14:15:25 +02:00
Quentin (OpenERP) d53a9f55ec [MERGE] payroll yaml test 
bzr revid: qdp-launchpad@openerp.com-20110711104448-2xsw62pmfxzv1gv9
 2011-07-11 12:44:48 +02:00
Quentin (OpenERP) 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
mtr 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
mtr 781ebda8f9 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110711102131-gecb7yb6og0x8ac4
 2011-07-11 15:51:31 +05:30
Quentin (OpenERP) f9464f5ee4 [MERGE] payroll:usabilty 
bzr revid: qdp-launchpad@openerp.com-20110710013833-s07r2l6zlyxg8t6f
 2011-07-10 03:38:33 +02:00
Quentin (OpenERP) 0f89d90573 [MERGE] payroll: report cleaning 
bzr revid: qdp-launchpad@openerp.com-20110710013710-efrp7hsz1hfp87ux
 2011-07-10 03:37:10 +02:00
Quentin (OpenERP) ccac68b4a0 [MERGE] payroll: usability 
bzr revid: qdp-launchpad@openerp.com-20110710013513-hvu3brjm502nn2hv
 2011-07-10 03:35:13 +02:00
Raphael Collet 292b4683b6 [MERGE] add field 'complexity' in modules 
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
 2011-07-08 12:03:07 +02:00
Hardik Ansodariy (OpenERP) 1f5aa0643f [IMP]: module is defined by its complexity 
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
 2011-07-06 17:59:28 +05:30
Olivier Dony 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
Antony Lesuisse de41ee470e [FIX] hr payroll attrs, remove trailing comma 
bzr revid: al@openerp.com-20110705110728-ihwts1v4ot06kimt
 2011-07-05 13:07:28 +02:00
Olivier Dony 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
mtr 9dbd0df043 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110630115822-u0rnk1w1auk7s583
 2011-06-30 17:28:22 +05:30
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 167b5b0686 [IMP] hr_payroll: Improvement in demo data 
bzr revid: psi@tinyerp.co.in-20110629102801-wx3i2rcpy5ols9pg
 2011-06-29 15:58:01 +05:30
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
Quentin (OpenERP) 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
Quentin (OpenERP) 42f835eb93 [MERGE] payroll: added the contribution register report 
bzr revid: qdp-launchpad@openerp.com-20110616104918-5q5ddzavn39albb5
 2011-06-16 12:49:18 +02:00
Quentin (OpenERP) c40c82a1bd [MERGE] removal of unused things in payroll 
bzr revid: qdp-launchpad@openerp.com-20110616103949-s260q5cq22u0rria
 2011-06-16 12:39:49 +02:00
Quentin (OpenERP) a4f2bb20d2 [MERGE] payroll reports improvements 
bzr revid: qdp-launchpad@openerp.com-20110616103051-001utngd2i9iz42v
 2011-06-16 12:30:51 +02:00
Launchpad Translations on behalf of openerp 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
mtr 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
mtr c2b9195d04 [REM] hr_payroll: removed unused yaml 
bzr revid: mtr@mtr-20110609125516-fampkxgnwlsxtxmy
 2011-06-09 18:25:16 +05:30
mtr f63c039f42 [REM] hr_payroll: removed unused reports 
bzr revid: mtr@mtr-20110609123723-zhcgfq69ytimxw7h
 2011-06-09 18:07:23 +05:30
Quentin (OpenERP) 8ce709f04a [MERGE] decimal precision for payroll module 
bzr revid: qdp-launchpad@openerp.com-20110609112733-p3w2ptg4cgmgvwmv
 2011-06-09 13:27:33 +02:00
Quentin (OpenERP) 387b534a33 [MERGE] improvements in payslip run 
bzr revid: qdp-launchpad@openerp.com-20110609100743-ogqkahrq0pg9vz03
 2011-06-09 12:07:43 +02:00
Quentin (OpenERP) e182ef2a10 [MERGE] usability imp 
bzr revid: qdp-launchpad@openerp.com-20110609091555-1i677vp4qfewl2f6
 2011-06-09 11:15:55 +02:00
Launchpad Translations on behalf of openerp 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
Mustufa Rangwala 1a1ee753b8 [IMP] hr_payroll: Minor improvement in payslip.yml 
bzr revid: mra@mra-laptop-20110607083611-50p6d0a1uaxmcd3q
 2011-06-07 14:06:11 +05:30
mtr dd04d97155 [IMP] hr_payroll: changed the string 
bzr revid: mtr@mtr-20110607055951-cr5kmn6loybn25b2
 2011-06-07 11:29:51 +05:30
mtr 0b52e63ee2 [IMP] hr_payroll: removed bank record from payslip.yml 
bzr revid: mtr@mtr-20110607050816-sd002svezngdm1nh
 2011-06-07 10:38:16 +05:30
mtr 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
Launchpad Translations on behalf of openerp 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
psi (Open ERP) 5b4effe33d [IMP] hr_payroll: Use formatLang in reports 
bzr revid: psi@tinyerp.co.in-20110603103907-y5t7qihsi4efaoj6
 2011-06-03 16:09:07 +05:30
psi (Open ERP) 90ecd793ef [IMP] hr_payroll: Used formatLang in reports 
bzr revid: psi@tinyerp.co.in-20110603103238-41triu06bx5vworm
 2011-06-03 16:02:38 +05:30
mtr 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
Quentin (OpenERP) 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
psi (Open ERP) 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
mtr 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
psi (Open ERP) 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
mtr 45ec4a4110 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110527061311-2tn9n7cbu5gb7l6a
 2011-05-27 11:43:11 +05:30
mtr 253eaa325e [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110527060154-1fq5lppd897p9jc3
 2011-05-27 11:31:54 +05:30
psi (Open ERP) 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
mtr ea2fc5b4d9 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110527054718-ik8t3hdxpsfmj87e
 2011-05-27 11:17:18 +05:30
psi (Open ERP) 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
Quentin (OpenERP) 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
psi (Open ERP) 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
mtr 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
mtr 481d4e4bbe [IMP] hr_payroll: made 'rules' into browseable object 
bzr revid: mtr@mtr-20110526110838-n5juwnp5atajt8on
 2011-05-26 16:38:38 +05:30
mtr 9325bbf70e [IMP] hr_payroll: improved string of label 
bzr revid: mtr@mtr-20110526101304-ls5emcuj5f1ttr9y
 2011-05-26 15:43:04 +05:30
mtr b3653a88d2 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110526093749-uam9vgtya56vpvm2
 2011-05-26 15:07:49 +05:30
mtr 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
mtr 2b8e537224 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110526085043-psf4ph1ywl5b3sxd
 2011-05-26 14:20:43 +05:30
mtr 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
mtr 09b88682e1 [IMP] hr_payroll: improved help string categories=>rule_categories 
bzr revid: mtr@mtr-20110526055655-iw9yg4999a5l8g1z
 2011-05-26 11:26:55 +05:30
mtr 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
psi (Open ERP) 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
Quentin (OpenERP) c6fa707ca2 [MERGE] 
bzr revid: qdp-launchpad@openerp.com-20110525134101-7v3n4bjszg1di0k7
 2011-05-25 15:41:01 +02:00
mtr 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
mtr 46afc22ac9 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110525062621-m04kj8v37ov1v6bu
 2011-05-25 11:56:21 +05:30
mtr d353d12965 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110525061731-ayjulztx5mxq6flb
 2011-05-25 11:47:31 +05:30
mtr 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
mtr 14b089bd33 [IMP] hr_payroll: improved indentation 
bzr revid: mtr@mtr-20110525054743-kud7fi4o8uepjqjs
 2011-05-25 11:17:43 +05:30
mtr 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
mtr f9c4f6d754 [IMP] hr_payroll: optimised code for Generate Payslip wizard 
bzr revid: mtr@mtr-20110524133246-pdgbei67rnpmdjsc
 2011-05-24 19:02:46 +05:30
psi (Open ERP) 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
Quentin (OpenERP) 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
Quentin (OpenERP) c002b2df9e [MERGE] hr_payroll: merged the branch with modifications on workflow and state of payslip 
bzr revid: qdp-launchpad@openerp.com-20110524123116-y0l7o66mclk8fkd2
 2011-05-24 14:31:16 +02:00
mtr 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
psi (Open ERP) 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
mtr 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
psi (Open ERP) 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
mtr a54773c65d [IMP] hr_payroll: used 'BrowsableObject' method instead of inheritancy 
bzr revid: mtr@mtr-20110524103312-dvn8fbyzfp2grpll
 2011-05-24 16:03:12 +05:30
Quentin (OpenERP) 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
Quentin (OpenERP) 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
mtr b5849f3519 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110524085206-tdpekv2v5fy2zbvf
 2011-05-24 14:22:06 +05:30
mtr ad6b2593c2 [IMP] hr_payroll: renamed the field 'quantity' to 'amount' 
bzr revid: mtr@mtr-20110524060202-z58x324zvkugddd1
 2011-05-24 11:32:02 +05:30
Quentin (OpenERP) da8281001a [IMP] hr_payroll: better demo data 
bzr revid: qdp-launchpad@openerp.com-20110523141423-5x5e6curv55gpdej
 2011-05-23 16:14:23 +02:00
Quentin (OpenERP) 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
mtr 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
mtr 961e04cc9e [IMP] hr_payroll: initiate object outside the for loop 
bzr revid: mtr@mtr-20110523093504-m2ibjrkk755dejuu
 2011-05-23 15:05:04 +05:30
psi (Open ERP) 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
mtr 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
mtr 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
psi (Open ERP) 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
mtr b6778a8c02 [IMP] hr_payroll: improved tooltip for 'credit_note' field 
bzr revid: mtr@mtr-20110520133737-w7ioouj4l2jkkk6g
 2011-05-20 19:07:37 +05:30
psi (Open ERP) f69a2a7b7d [IMP] hr_payroll: Imporve search view of hr.payslip 
bzr revid: psi@tinyerp.co.in-20110520133452-1auudht73qdm0idv
 2011-05-20 19:04:52 +05:30
psi (Open ERP) 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
mtr 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
mtr d3e3941eea [IMP] hr_payroll: improved tooltip for 'state' field 
bzr revid: mtr@mtr-20110520120009-7pq67hy8a9wfwa83
 2011-05-20 17:30:09 +05:30
mtr 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
mtr 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
psi (Open ERP) 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
mtr 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
psi (Open ERP) 7c36ebc0d8 [IMP] hr_payroll: Added search based on payslip.run object on payslip 
bzr revid: psi@tinyerp.co.in-20110517105818-ae5u33d3luh1z42x
 2011-05-17 16:28:18 +05:30
mtr 0df1f06801 [IMP] hr_payroll: improved payslip states(draft, verify, done) and workflow 
bzr revid: mtr@mtr-20110517105155-d4dp2tt7d7ut4jxd
 2011-05-17 16:21:55 +05:30
psi (Open ERP) 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
mtr 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
Mustufa Rangwala f46219d266 [REF] Payroll: remove unused import 
bzr revid: mra@mra-laptop-20110513063931-g83470vtp5z9o5lv
 2011-05-13 12:09:31 +05:30
Mustufa Rangwala 83345d5af5 [IMP] Payroll: clean codee 
bzr revid: mra@mra-laptop-20110513063639-kx4lbs2gq3bef6py
 2011-05-13 12:06:39 +05:30
Mustufa Rangwala 62c0ddad78 [IMP] Payroll: demo and default string improvements 
bzr revid: mra@mra-laptop-20110513062405-pf57a2ntrsze36mp
 2011-05-13 11:54:05 +05:30
Mustufa Rangwala 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
Mustufa Rangwala e85341722f [IMP] Payroll: remove print 
bzr revid: mra@mra-laptop-20110513060206-59oo6dc2arw8bps0
 2011-05-13 11:32:06 +05:30
Mustufa Rangwala 5439b7eb58 [IMP] Payroll: Payslips with python code 
bzr revid: mra@mra-laptop-20110513060012-q0qcwg6wbe9vk613
 2011-05-13 11:30:12 +05:30
Mustufa Rangwala efdacca163 [MERGE] Payroll: merge from main trunk-payroll branch 
bzr revid: mra@mra-laptop-20110513050945-zj8tudmzqdkqayli
 2011-05-13 10:39:45 +05:30
Quentin (OpenERP) 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
mtr 8ff806bea3 [IMP] hr_payroll: improved sum method of worked days 
bzr revid: mtr@mtr-20110512135825-r6ighyds5xusu4cd
 2011-05-12 19:28:25 +05:30
Quentin (OpenERP) 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
psi (Open ERP) 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
psi (Open ERP) 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
Mustufa Rangwala 8dea4d2698 [MERGE] merge from trunk-payroll main branch 
bzr revid: mra@mra-laptop-20110512130410-5ybp0b0drz6iqg7f
 2011-05-12 18:34:10 +05:30
mtr 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
mtr 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
Quentin (OpenERP) 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
Quentin (OpenERP) 4418c83a5f [REF] hr_payroll: added TODO comment 
bzr revid: qdp-launchpad@openerp.com-20110512115458-kg1s089del0032lx
 2011-05-12 13:54:58 +02:00