Commit Graph

591 Commits

Author SHA1 Message Date
Stephane Wirtel 3dc8168974 [FIX] Set the categories
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
Fabien Pinckaers 1dc046496e [IMP] useability
bzr revid: fp@tinyerp.com-20111002133324-ij24c1a83ynr805f
2011-10-02 15:33:24 +02:00
Fabien Pinckaers 431a33d0f9 [IMP] config wizards useability
bzr revid: fp@tinyerp.com-20111001214427-podsy51mdlure2yo
2011-10-01 23:44:27 +02:00
Stephane Wirtel 8a06c9f209 [MERGE] Upstream
bzr revid: stw@openerp.com-20110922131429-vlgqxnb37jsoaq5l
2011-09-22 15:14:29 +02:00
Stephane Wirtel e123082d88 [IMP] Add missing configuration wizards
bzr revid: stw@openerp.com-20110922131300-uudx3uwhkyaj3ry0
2011-09-22 15:13:00 +02:00
Launchpad Translations on behalf of openerp b933c96085 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110921045100-dgx5b3vgawaxqe19
2011-09-21 04:51:00 +00:00
Fabien Pinckaers 14b6faf57e merge
bzr revid: fp@tinyerp.com-20110917150141-mp36jj3tqb9ure6y
2011-09-17 17:01:41 +02:00
Fabien Pinckaers 696b7100be fix
bzr revid: fp@tinyerp.com-20110917145407-qp45yk4ma7mo6pp3
2011-09-17 16:54:07 +02:00
Fabien Pinckaers 05d6d35cc8 [Merge]
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
Meera Trambadia (OpenERP) 670621875e [MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110916052040-sqe9yyc3thilxhke
2011-09-16 10:50:40 +05:30
fp e37394cd58 [IMP] useability of timesheet
bzr revid: fp@fp-laptop-20110910124355-qkkbtgm3wz6l2w1f
2011-09-10 14:43:55 +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
Antony Lesuisse 76ffd4ab7f [MERGE] trunk-usability-modify_sale_application_configuration-aar
bzr revid: al@openerp.com-20110806132420-i2497zs0uvxtj5a2
2011-08-06 15:24:20 +02:00
Antony Lesuisse 114eda3ae3 [FIX] hr_timesheet remove some demo data
bzr revid: al@openerp.com-20110806121210-1ti8x35fd7o2u1q4
2011-08-06 14:12:10 +02:00
Raphael Collet e1e3d117a5 [MERGE] more demo data
bzr revid: rco@openerp.com-20110804132859-pvrkmzkeglj2cq9t
2011-08-04 15:28:59 +02:00
Amit Parmar (OpenERP) 3b34e9707d [IMP] remerge replace sale configuration wizard
bzr revid: aar@tinyerp.com-20110803121332-h2f33lswj3tb8afu
2011-08-03 17:43:32 +05:30
Hardik Ansodariy (OpenERP) 35f247bc7a [IMP]: inserted demo data in several objects
bzr revid: han@tinyerp.com-20110722113147-6mg9cjmkasdpn8ma
2011-07-22 17:01:47 +05:30
Raphael Collet 3cb016f7e5 [IMP] hr: employee form, fix behavior of 'My Timesheet', enable employee to confirm timesheet
bzr revid: rco@openerp.com-20110722100841-rog4jmdbjmhqb29f
2011-07-22 12:08:41 +02:00
Raphael Collet 81a1eb18a1 [MERGE] from trunk
bzr revid: rco@openerp.com-20110718083424-kdaesx3gflza142a
2011-07-18 10:34:24 +02:00
Hardik Ansodariy (OpenERP) fa0460f936 [IMP]: improved demo data in hr_timesheet
bzr revid: han@tinyerp.com-20110713093956-6pvxd61b1ctryeg5
2011-07-13 15:09:56 +05:30
Antony Lesuisse 3ef156beda [FIX] hr_timesheet test fix, marital is a selection
bzr revid: al@openerp.com-20110712120748-q9l7tj38a0ehuk9d
2011-07-12 14:07:48 +02:00
Hardik Ansodariy (OpenERP) 340638cac7 [IMP]:hr_timesheet default product set for employee
bzr revid: han@tinyerp.com-20110712092729-9cbpvum99sz57bu3
2011-07-12 14:57:29 +05:30
Hardik Ansodariy (OpenERP) 6352507b87 [IMP]: resove the conflict
bzr revid: han@tinyerp.com-20110712064250-r4fqf4t8h9gazm6v
2011-07-12 12:12:50 +05:30
Hardik Ansodariy (OpenERP) 2296b52568 [IMP]:improved hr module
bzr revid: han@tinyerp.com-20110711112329-72h3rbgs0n06pzs1
2011-07-11 16:53:29 +05:30
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
Quentin (OpenERP) 664ba7bba3 [MERGE] merge with main addons branch
bzr revid: qdp-launchpad@openerp.com-20110630133009-i0qxzrn9up9e0bog
2011-06-30 15:30:09 +02:00
Stéphane Bidoul f3bc8f3324 [FIX] hr_timesheet:Employee Timesheet report now uses unit factor correctly
lp bug: https://launchpad.net/bugs/788297 fixed

bzr revid: mtr@mtr-20110621095117-69bkgohrkkwv5n01
2011-06-21 15:21:17 +05:30
mtr b4945ac8ff [FIX] hr_timesheet: fixed employee and employees timesheet report, shows correct values(without using unit_factor)
lp bug: https://launchpad.net/bugs/788297 fixed

bzr revid: mtr@mtr-20110613062321-z23jvc1z5my3q08b
2011-06-13 11:53:21 +05:30
mtr bf78f7778d [MERGE] branch merged with main addons
bzr revid: mtr@mtr-20110609051851-exm51tq9i1rc5dzs
2011-06-09 10:48:51 +05:30
mtr eee73abb9d [FIX] hr_timesheet: changed the access rights for analytic journal user,employee can now encode his timesheet
lp bug: https://launchpad.net/bugs/767153 fixed

bzr revid: mtr@mtr-20110608133439-mx2v1fod5jczpamf
2011-06-08 19:04:39 +05:30
mayur maheshwari (Open ERP) 185a3bf824 [IMP]delivery,hr_timesheet,hr_holidays:Improvement is Done
bzr revid: mma@tinyerp.com-20110606055814-xa0t1idnl6zuyxy0
2011-06-06 11:28:14 +05:30
mayur maheshwari (Open ERP) 4447c691a2 [IMP]delivery,hr_timesheet,lunch,users_ldap:Improvement is Done and a installer in user_ldap
bzr revid: mma@tinyerp.com-20110604095246-vpd2gdecslk5wd73
2011-06-04 15:22:46 +05:30
mtr ac595331ac [FIX] hr_timesheet,hr_attendance: corrected demo data for analytic entries
lp bug: https://launchpad.net/bugs/751411 fixed

bzr revid: mtr@mtr-20110520053730-v4gl9ov634z6vt1e
2011-05-20 11:07:30 +05:30
ARA (OpenERP) bbdec831a7 [FIX] hr_timesheet: An employee cannot encode his own timesheet
lp bug: https://launchpad.net/bugs/767153 fixed

bzr revid: ara@tinyerp.com-20110517054158-83r20bep8hnhqaek
2011-05-17 11:11:58 +05:30
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp f08cf2f85f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110507045323-azozpfkhj7vaix3f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110507045352-2mjk93fx426eijy4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110508043753-3bcytaz1rrn2vvbh
bzr revid: launchpad_translations_on_behalf_of_openerp-20110509043658-oyhxuwreey6yc4r1
2011-05-09 04:36:58 +00:00
Launchpad Translations on behalf of openerp 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
ARA (OpenERP) 53ea40d8e9 [FIX] hr_timesheet:an employee shouldn't be able to see all timesheet line
lp bug: https://launchpad.net/bugs/755659 fixed

bzr revid: ara@tinyerp.com-20110411070035-rmd3l2a1g3zdfomt
2011-04-11 12:30:35 +05:30
Launchpad Translations on behalf of openerp 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
niv-openerp cf07e58016 [MERGE] Other improvements of descriptions in module manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
vro 437ed909c2 [IMP]: Module descriptions.
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
niv-openerp a898038b47 [MERGE] Merged module screenshots and improvements to module descriptions.
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
niv-openerp edbb2d7168 [MERGE] Improvements to manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
Launchpad Translations on behalf of openerp 8470bd7fb6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110316044753-r21w112simc911w5
2011-03-16 04:47:53 +00:00
Xavier Morel 4e6a9ea55c [REM] all @col and @colspan attributes on groups in search views: search views are not laid out by columns, therefore these attributes do not belong
bzr revid: xmo@openerp.com-20110315140859-uh9w3exdit84qz47
2011-03-15 15:08:59 +01:00
Quentin (OpenERP) 559e65c84e [MERGE] merged the dev branch related to the change of read() of osv_memory in order to work by batch (server side change, revno: 3369, revision-id: odo@openerp.com-20110315132628-uhhpf95b9iyin482). It will now return a tuple (id, name) for the m2o instead and thus the osv_memory objects have been changed accordingly
bzr revid: qdp-launchpad@openerp.com-20110315132726-dpwcxa08a2l12yy6
2011-03-15 14:27:26 +01:00
rch-openerp d4a24a415c [ADD]: Images of hr_timesheet,hr_timesheet_sheet and hr_timesheet_invoice.
bzr revid: rch@tinyerp.com-20110315083148-p16kdyfik5wryjhs
2011-03-15 14:01:48 +05:30
Launchpad Translations on behalf of openerp 68cea1f17c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110315045524-g1gk5txaht0rafmz
2011-03-15 04:55:24 +00:00
Rucha (Open ERP) 62b3abd6c0 [MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110314102742-xsankh8h4q562lv8
2011-03-14 15:57:42 +05:30