Commit Graph

816 Commits

Author SHA1 Message Date
Divyesh Makwana (Open ERP) 1853da8952 [IMP] hr_timesheet : Removed all filters related to a date field and added the related date field in the search view.
bzr revid: mdi@tinyerp.com-20120522072026-bq40iydnu2hb44ke
2012-05-22 12:50:26 +05:30
Tejas Tank f6a6e9b3e1 Merged with latest trunk
bzr revid: tta@openerp.com-20120521083938-clo8mcb25esbyo3z
2012-05-21 14:09:38 +05:30
Mayur Maheshwari (OpenERP) 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
Kuldeep Joshi (OpenERP) 39031e052e [IMP] remove reporting menu
bzr revid: kjo@tinyerp.com-20120516132536-minpa12j813vcoi8
2012-05-16 18:55:36 +05:30
Launchpad Translations on behalf of openerp 742124c840 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120516045107-v494g863893yktqz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120516051016-e707dlnmnhgrraoo
2012-05-16 05:10:16 +00:00
Raphael Collet 9c6f104d86 [MERGE] trunk-v62_config (improve and complete new config wizards)
bzr revid: rco@openerp.com-20120515144630-j6qltq8e2t7grxj2
2012-05-15 16:46:30 +02:00
Kuldeep Joshi (OpenERP) 11edf8df8a [IMP] change HR Menu
bzr revid: kjo@tinyerp.com-20120515114538-cja1xnu64scpm0um
2012-05-15 17:15:38 +05:30
Launchpad Translations on behalf of openerp acd27e307a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120515045100-blop38vai6b1d56a
bzr revid: launchpad_translations_on_behalf_of_openerp-20120515045134-xkrcggf358df9hxo
bzr revid: launchpad_translations_on_behalf_of_openerp-20120515050709-5k34536hh0akkbqt
2012-05-15 05:07:09 +00:00
Raphael Collet bcb9291df3 [MERGE] from trunk
bzr revid: rco@openerp.com-20120514150926-osvdmdyopi6ynn6o
2012-05-14 17:09:26 +02:00
Launchpad Translations on behalf of openerp 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
Harry (OpenERP) 79bfa8e45c [FIX] hr_timesheet: In hr.sign.in.project, correct args in attendance_action_change
bzr revid: hmo@tinyerp.com-20120511082614-4iitswji8dgwsbst
2012-05-11 13:56:14 +05:30
Raphael Collet 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
Amit (OpenERP) 7cc6d92d16 [FIX] hr_timesheet : user allow to delete his own timesheet line
lp bug: https://launchpad.net/bugs/939294 fixed

bzr revid: amp@tinyerp.com-20120430100828-fxpbkij4igmi36io
2012-04-30 15:38:28 +05:30
Mayur Maheshwari (OpenERP) c71446957f [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120426091833-ocminkwzjkntdkde
2012-04-26 14:48:33 +05:30
Jagdish Panchal (Open ERP) 75c8ceb9b0 [MERGE] branch merged with lp:openobject-addons
bzr revid: jap@tinyerp.com-20120426044931-h8p2ynkxef02jp19
2012-04-26 10:19:31 +05:30
Raphael Collet e4efcb808d [IMP] hr*: remove group_extended
bzr revid: rco@openerp.com-20120425141135-9jgai7os8mxj80go
2012-04-25 16:11:35 +02:00
Jagdish Panchal (Open ERP) 479d238076 [IMP] HR:UOM to Unit of Measure change everywhere
bzr revid: jap@tinyerp.com-20120425073257-78ys80zqw8piahvi
2012-04-25 13:02:57 +05:30
Mayur Maheshwari (OpenERP) 9e59ce8812 [IMP]all: Improve all typos
bzr revid: mma@tinyerp.com-20120424060532-ohrf0sxwq8rpq6ls
2012-04-24 11:35:32 +05:30
Launchpad Translations on behalf of openerp 75daaf4123 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120419043835-l1vrldcmgh9o6s0c
2012-04-19 04:38:35 +00:00
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 2c142dbf9a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120411043845-u9qzudbzv8f2rjw1
bzr revid: launchpad_translations_on_behalf_of_openerp-20120412045015-2apvwlwz55imfseq
bzr revid: launchpad_translations_on_behalf_of_openerp-20120413052641-bemik21eklltd9l0
2012-04-13 05:26:41 +00:00
Raphael Collet 3feee280ec [IMP] hr*: remove deprecated ir.actions.todo
bzr revid: rco@openerp.com-20120410121239-0p6z87d34yqqkdk3
2012-04-10 14:12:39 +02:00
Launchpad Translations on behalf of openerp d60ca9a5fa Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120407045605-5anp5gdq7lknrlzu
bzr revid: launchpad_translations_on_behalf_of_openerp-20120409045650-vb086pw3whwuub1e
bzr revid: launchpad_translations_on_behalf_of_openerp-20120410045646-c2eyze1zzi2rjspi
2012-04-10 04:56:46 +00:00
Launchpad Translations on behalf of openerp b7f2284d7f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120328044619-mysiqxktsyz9yvhk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120329043542-rsvb6ox4tf09j7d5
2012-03-29 04:35:42 +00:00
Jagdish Panchal (Open ERP) 70c7af2e7d [IMP] hr: add new menu Leaves and Leaves by Department in Reporting
bzr revid: jap@tinyerp.com-20120306063418-x7gfvebgtupf24yi
2012-03-06 12:04:18 +05:30
Meera Trambadia (OpenERP) cd7948d5f1 [IMP] hr_timesheet, hr_timesheet_invoice:-reorganised timesheet reports
bzr revid: mtr@tinyerp.com-20120305130810-x3tkpil9ua4uijzq
2012-03-05 18:38:10 +05:30
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
Olivier Dony da84f36eb4 [FIX] all: update context_today calls after API change
See also server revision 4053
revision-id: odo@openerp.com-20120214122413-rznpdyqajrzswk4o

bzr revid: odo@openerp.com-20120214122520-f4lyaoolw1sik7zo
2012-02-14 13:25:20 +01:00
Olivier Dony 5fc1a9fc7b [FIX] all: use newly introduced fields.date.context_today
Following the introduction of fields.date.context_today,
correct the main cases where we need to use the user's
timezone instead of the default UTC one.
There are probably many minor cases where this may be
useful, but those cases should be easy to fix now
that there is a common way to fix them.

lp bug: https://launchpad.net/bugs/925361 fixed

bzr revid: odo@openerp.com-20120213180741-4hvd4p7wsep0fomf
2012-02-13 19:07:41 +01:00
Launchpad Translations on behalf of openerp 2aa2378015 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120211050953-f8t9zos3qjzmnj3t
bzr revid: launchpad_translations_on_behalf_of_openerp-20120212044319-nxuw0h7g5aqrqy4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120213045042-jyku2inv3wkcae91
2012-02-13 04:50:42 +00:00
Raphael Collet cb24ebd4b1 [MERGE] from trunk
bzr revid: rco@openerp.com-20120209092258-34b70pu6547la8hq
2012-02-09 10:22:58 +01: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
Kuldeep Joshi (OpenERP) 580bd71dc7 [FIX] base_module_record,base_module_doc_rst: change to osv.osv_memory
bzr revid: kjo@tinyerp.com-20120202102713-a0y7medo4izgrd71
2012-02-02 15:57:13 +05:30
Kuldeep Joshi (OpenERP) c7013988a2 [IMP] base_report_creator: add blank selection
bzr revid: kjo@tinyerp.com-20120201104016-7k7kmttcg5rxsopf
2012-02-01 16:10:16 +05:30
Kuldeep Joshi (OpenERP) 096d19e398 [FIX] base_report_creator: add osv.osv_memory wizard
bzr revid: kjo@tinyerp.com-20120201065101-tfu7kwocz8dk9ubn
2012-02-01 12:21:01 +05:30
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
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 a61762c71f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120114051310-6sj2xkv5gwq8cr0p
2012-01-14 05:13:10 +00:00
Jagdish Panchal (Open ERP) c7c2322d52 [FIX] in all hr features remove the default search on user_id
lp bug: https://launchpad.net/bugs/909724 fixed

bzr revid: jap@tinyerp.com-20120103121938-83er0zgqvgkxs11x
2012-01-03 17:49:38 +05:30
Launchpad Translations on behalf of openerp 052223704b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111224055617-x2dcy2sqyou2g9ux
2011-12-24 05:56:17 +00:00
Olivier Dony 2b82a004dc [I18N] account,l10n_*: update translation template, remove spurious terms
Due to the presence of the new l10n_multilang module,
a lot of spurious terms where introduced in the account
template and all l10n_* templates. This should now be
cleaned up

bzr revid: odo@openerp.com-20111223102710-1dbii84mesfgchy9
2011-12-23 11:27:10 +01: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 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
Thibault Delavallée 35f64fe1e4 [MERGE] hr: fixed bug 899234: added noupdate to hr data files
bzr revid: tde@openerp.com-20111221124532-har6wmsdiwu57koe
2011-12-21 13:45:32 +01:00
Raphael Collet bc40611002 [IMP] hr_timesheet: small code and test cleanup
bzr revid: rco@openerp.com-20111221105214-kgwedzef47lvoii8
2011-12-21 11:52:14 +01:00
Raphael Collet d87f491178 [MERGE] trunk
bzr revid: rco@openerp.com-20111221104055-n3b6jhdo6xishboh
2011-12-21 11:40:55 +01:00
Hemendra Paregi (Open ERP) 98cf8b318c [IMP] Improvement in YML
bzr revid: hpa@tinyerp.com-20111220065042-m4ebxsy2tl04yzf1
2011-12-20 12:20:42 +05:30
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
Fabien Pinckaers 81c1bf7fcb [IMP] better manifests for modules
bzr revid: fp@tinyerp.com-20111212142244-cm6e3um1adizu3kz
2011-12-12 15:22:44 +01:00
Hemendra Paregi (Open ERP) 540134eff2 [MERGE]Improvement in yml file
bzr revid: hpa@tinyerp.com-20111209064132-88p4ym4t451xqrwf
2011-12-09 12:11:32 +05:30
Bharat (OpenERP) 89ac634188 [FIX] hr : made data noupdate=1 for hr_holidays/hr_holidays_data.xml, hr_timesheet/hr_timesheet_data.xml, and hr_timesheet_sheet/hr_timesheet_sheet_data.xml
lp bug: https://launchpad.net/bugs/899234 fixed

bzr revid: bde@tinyerp.com-20111207061840-baww72jt9iwm3p60
2011-12-07 11:48:40 +05:30
Fabien Pinckaers 4e0befa1f4 [IMP] better manifests on modules
bzr revid: fp@tinyerp.com-20111206120355-h5vufbibzovtvf0j
2011-12-06 13:03:55 +01:00
Numerigraphe - Lionel Sausin 779fa653c1 [IMP] Added missing vim mode lines
lp bug: https://launchpad.net/bugs/524279 fixed

bzr revid: ls@numerigraphe.fr-20111122085138-x6u2lcl6vrpyybp9
2011-11-22 09:51:38 +01:00
Fabien Pinckaers e58a82c2b3 [IMP] hr_timesheet & project bugfixes
bzr revid: fp@tinyerp.com-20111117082810-zzwsg5c2e3l83epz
2011-11-17 09:28:10 +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
Ujjvala Collins (OpenERP) 1c37d6d169 [IMP] hr, hr_xxx: Improved yamls to save data fetched from on change methods.
bzr revid: uco@tinyerp.com-20111108093329-sgfisy6uyb6dr2bi
2011-11-08 15:03:29 +05:30
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 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
Olivier Dony b3664a2c49 [FIX] hr_timesheet: fix YAML test so it works at any hour of the day
bzr revid: odo@openerp.com-20111103005234-sg70d1zdd32yqqnl
2011-11-03 01:52:34 +01: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) c829e12bd2 [FIX] moved product_consultant data into the module product, as the hr_timesheet module is not the only one using it (sale do as well)
lp bug: https://launchpad.net/bugs/877495 fixed

bzr revid: qdp-launchpad@openerp.com-20111018153152-s7op06lppfu2p0up
2011-10-18 17:31:52 +02:00
Antony Lesuisse b574f20012 [IMP] board module and hr dashboard cleanups
split board.board object (almost unsed) xml's from actual board definitions
board module defines 2 boards: the admin one, the homepage
clean hr board definitions
remove hr menuitems from administration menu
remove useless menuitem definitions

bzr revid: al@openerp.com-20111011212017-qd3d2xp9mfneagqq
2011-10-11 23:20:17 +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
Quentin (OpenERP) 5d8e9b91e5 [MERGE] lp:856422
bzr revid: qdp-launchpad@openerp.com-20111007142236-krddiikdzwkrdavs
2011-10-07 16:22:36 +02:00
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
Ujjvala Collins (OpenERP) 060b488478 [FIX] hr_xxx: Improved record rules for HR Officer to give him rights to see timesheet, attendance, expense and holidays of other users.
lp bug: https://launchpad.net/bugs/856422 fixed

bzr revid: uco@tinyerp.com-20110929092802-ohpa8xt6at02h449
2011-09-29 14:58:02 +05:30
Ujjvala Collins (OpenERP) bc75893824 [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20110928113535-55grblizb5c2ckrw
2011-09-28 17:05:35 +05:30
Ujjvala Collins (OpenERP) d013972d77 [IMP] hr_timesheet: Improved yaml.
bzr revid: uco@tinyerp.com-20110923065817-drhlcx5raa2am1y0
2011-09-23 12:28:17 +05:30
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
aag (OpenERP) 7cb99c6031 [IMP] hr,hr_timesheet:add one func _no_of_expected_employees ans change string analytic account
bzr revid: aag@tinyerp.co.in-20110311122345-g1ufdl0i4ogzwbe2
2011-03-11 17:53:45 +05:30
Els Van Vossel a69c473f52 [IMP] Changed all module categories, limited number of categories
bzr revid: evv@openerp.com-20110309100505-mwxe08davyzdkfis
2011-03-09 11:05:05 +01:00
Launchpad Translations on behalf of openerp 1e681a15bc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110305045627-sks4s3i42qo2oj3p
bzr revid: launchpad_translations_on_behalf_of_openerp-20110306045008-pcson59t3bl9r6ax
bzr revid: launchpad_translations_on_behalf_of_openerp-20110307044936-g60qlnsbhllrba7h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110308044752-1i8vh7qa5baootby
bzr revid: launchpad_translations_on_behalf_of_openerp-20110309044026-i5o7lki6yoc0wwol
2011-03-09 04:40:26 +00:00
Launchpad Translations on behalf of openerp d1683be192 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110303043944-epd83p1wfzk0zt2b
2011-03-03 04:39:44 +00:00
ron@tinyerp.com de02305285 [REF]account,hr_timesheet,product,point_of_sale,project:isinstance remove
bzr revid: ron@tinyerp.com-20110301124841-5fc80dgsnwm76590
2011-03-01 18:18:41 +05:30
Rucha (Open ERP) 68b1f5ee11 [REVERT]: Reverted merge with trunk-dev-addons2 at rev-id: rha@tinyerp.com-20110215062118-pcdwql1vc0cyqkui
bzr revid: rpa@tinyerp.com-20110228073511-2b1cj4wq3qhuqh7s
2011-02-28 13:05:11 +05:30
Quentin (OpenERP) f1e62cf560 [MERGE] bugfix of bug number 720627
bzr revid: qdp-launchpad@openerp.com-20110225133259-qy3a7b11tuktgfb1
2011-02-25 14:32:59 +01:00
ARA (OpenERP) d81f6de6f9 [FIX]hr_timesheet:HR - Format of the quantity field is not the same for timesheet lines of My current Timesheet and for working hours
lp bug: https://launchpad.net/bugs/720623 fixed

bzr revid: ara@tinyerp.com-20110218121435-edyh72deqzxebidx
2011-02-18 17:44:35 +05:30
ARA (OpenERP) 46d143e483 [FIX]hr_timesheet:Different names for the same object : Timesheet Lines vs Working hour
lp bug: https://launchpad.net/bugs/720627 fixed

bzr revid: ara@tinyerp.com-20110218115330-7v6nw6yf8ez2996o
2011-02-18 17:23:30 +05:30
Launchpad Translations on behalf of openerp 5eb533a415 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110216050027-qh55wef1rwb8hc9y
bzr revid: launchpad_translations_on_behalf_of_openerp-20110215043802-u5lpwzvi9tsp5qbj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110216050338-aj0ab43kdrpgrh0r
bzr revid: launchpad_translations_on_behalf_of_openerp-20110217043649-3o2fe7rz274hzokb
2011-02-17 04:36:49 +00:00
ksa (Open ERP) c1cd88b1d9 [IMP]: Task-2009 improve osv memory wizard
bzr revid: ksa@tinyerp.co.in-20110215103943-uj1pse2yv0dncpfi
2011-02-15 16:09:43 +05:30
Olivier Dony 07f520a856 [MERGE] merged bugfixes from 6.0 up to revision 4401
bzr revid: odo@openerp.com-20110214114507-8uwohpcblsfhgjae
2011-02-14 12:45:07 +01:00
Launchpad Translations on behalf of openerp 30bfcd2574 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110211045958-qw2uif8guhebh48q
2011-02-11 04:59:58 +00:00
Launchpad Translations on behalf of openerp 7f5b7235ce Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110210043610-mqxp4vpb886lcdrj
2011-02-10 04:36:10 +00:00
Jay Vora (OpenERP) 591782def9 [FIX] Hr_Timesheet : Timesheet report should be available for those employees who have user associated with them.
bzr revid: jvo@tinyerp.com-20110207113837-ajxt2kis1xpa6rk8
2011-02-07 17:08:37 +05:30
Launchpad Translations on behalf of openerp 89933f4c30 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110205045946-ngssapvavvzymfc4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206045319-cjbcpcr7k0jw8v8f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110205050201-5kxv4wvlb171y4ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206045419-syxas10vfjwq4nw9
bzr revid: launchpad_translations_on_behalf_of_openerp-20110207052017-1qsba36kfnjc0zkj
2011-02-07 05:20:17 +00:00
Launchpad Translations on behalf of openerp bbfa775055 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110202044205-3ws4pqp0lavgg5c5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110203044526-s8t9nmtqd7do7yy4
2011-02-03 04:45:26 +00:00
Launchpad Translations on behalf of openerp 7a59b73896 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131060829-cw2n1p0rxt186agi
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129054416-mqjy6dbh74m5srtu
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130055001-gehu37plrrjaogxb
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131060928-xs2u6nr3y2x0h9db
2011-01-31 06:09:28 +00:00
Launchpad Translations on behalf of openerp c456ff0d76 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110127043453-7iocd8dbvj0edxzt
bzr revid: launchpad_translations_on_behalf_of_openerp-20110126044003-z1ltdzbzu9trb8qo
bzr revid: launchpad_translations_on_behalf_of_openerp-20110127043733-5jad7vpuuti1my8y
2011-01-27 04:37:33 +00:00
Launchpad Translations on behalf of openerp f432535386 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110125070908-zuisvtekjxpi6dny
2011-01-25 07:09:08 +00:00
Launchpad Translations on behalf of openerp 217e21b620 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110125045659-am7jb132fuddnag8
2011-01-25 04:56:59 +00:00
Launchpad Translations on behalf of openerp b54fbb4957 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110121043831-eluknu6abf6pkaf0
bzr revid: launchpad_translations_on_behalf_of_openerp-20110121044107-0jtepgcibqnai8il
2011-01-21 04:41:07 +00:00
Launchpad Translations on behalf of openerp 8274154d42 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110119044710-j9kqtr7v8wqqgu6i
2011-01-19 04:47:10 +00:00
qdp-launchpad@tinyerp.com 717ea6f930 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110117180222-rvby5kh871sxfoyh
2011-01-17 19:02:22 +01:00
Mustufa Rangwala ae717cd9ac [MERGE] [6.0RC1][hr_timesheet] Problems printing timesheet reports
bzr revid: mra@mra-laptop-20110117111333-yieqqvd0ljh3c8mf
2011-01-17 16:43:33 +05:30
Mustufa Rangwala 2f09faba42 [MERGE] an employee shouldn't be able to see expenses and holidays of others employee
bzr revid: mra@mra-laptop-20110117102556-evp00eqczxuy5l5z
2011-01-17 15:55:56 +05:30
mtr bfea6901f1 [IMP] hr_timesheet:added space(Enter)
bzr revid: mtr@mtr-20110117094353-1eaz08p2ckgmjquo
2011-01-17 15:13:53 +05:30
mtr 00683a79af [IMP] hr_timesheet:again removed extra space
bzr revid: mtr@mtr-20110117093644-692ixf9oxk0jkn4i
2011-01-17 15:06:44 +05:30
mtr 60acda9965 [IMP] hr_timesheet: removed the extra space
bzr revid: mtr@mtr-20110117092604-sy4hkiugo3prx3pe
2011-01-17 14:56:04 +05:30
ARA (OpenERP) 2ee52c73f3 [FIX]hr_timesheet: Problems printing timesheet reports
lp bug: https://launchpad.net/bugs/695960 fixed

bzr revid: ara@tinyerp.com-20110117090955-ofb3iiabb99e3zqt
2011-01-17 14:39:55 +05:30
mtr d24d1f6a45 [IMP] hr_timesheet: uncommit the changes made for Bug #695960
bzr revid: mtr@mtr-20110117051337-9ge2j1n6waoodvqm
2011-01-17 10:43:37 +05:30
Launchpad Translations on behalf of openerp 0c96f19b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110115055903-i9kqtkstdk8j0hnz
2011-01-15 05:59:03 +00:00
Launchpad Translations on behalf of openerp 62f28364e5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110114045237-gdlm32e67rdh70kr
bzr revid: launchpad_translations_on_behalf_of_openerp-20110114055119-e9fpaxlistgondmp
2011-01-14 05:51:19 +00:00
qdp-launchpad@tinyerp.com 2df4a68377 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak
2011-01-14 01:11:01 +01:00
Alberto Luengo Cabanillas (Pexego) 0d842d2fa2 [FIX] hr_timesheet:print reports having employee name/surname with accents
lp bug: https://launchpad.net/bugs/695960 fixed

bzr revid: mtr@mtr-20110113114909-q19c08vax7dxgy1v
2011-01-13 17:19:09 +05:30
Mustufa Rangwala afb6515047 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110112054702-493i7dt0emwfv80z
2011-01-12 11:17:02 +05:30
Launchpad Translations on behalf of openerp 6098beab56 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110112045846-8uu2xx0dqvamh2rf
2011-01-12 04:58:46 +00:00
Mustufa Rangwala 3d11cc2351 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110111121832-dq30dncvyjx3v7pc
2011-01-11 17:48:32 +05:30
Olivier Dony 9e4d49c5ca [I18N] all: updated translation templates after latest changes
bzr revid: odo@openerp.com-20110111112150-nlr78yxgufuqd6yl
2011-01-11 12:21:50 +01:00
Mustufa Rangwala b6177f80a8 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110110120924-b1vs539xou7wt6l1
bzr revid: mra@mra-laptop-20110110124817-7zne2i3c7hbaxqar
bzr revid: mra@mra-laptop-20110111044415-e0xo335fvdxvh4rw
2011-01-11 10:14:15 +05:30
Launchpad Translations on behalf of openerp f8c860f789 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110109045048-tv4cf28i2wv0d0na
bzr revid: launchpad_translations_on_behalf_of_openerp-20110110051507-c4s836t09vgn60zu
bzr revid: launchpad_translations_on_behalf_of_openerp-20110109045451-cvr6hytqd4l4a0ns
bzr revid: launchpad_translations_on_behalf_of_openerp-20110110051937-hc1vn7052zwl4vxu
2011-01-10 05:19:37 +00:00
Mustufa Rangwala 0865685512 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110107120501-3cyo4o3y8jlgc0cp
bzr revid: mra@mra-laptop-20110110043524-711jubrometl0d25
2011-01-10 10:05:24 +05:30
mtr c1b65fd3b9 [IMP] hr_timesheet:removed unused import library of datetime from test_hr_timesheet.yml
bzr revid: mtr@mtr-20110107053226-0l54q6lplok65p75
2011-01-07 11:02:26 +05:30
mtr d0cfb16cd0 [IMP] hr_timesheet:changed static date of 2010 to current date value in test_hr_timesheet.yml
bzr revid: mtr@mtr-20110107051941-ve972vw2n9hh42ep
2011-01-07 10:49:41 +05:30
Mustufa Rangwala 3e2473f7a5 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110106075212-m18yq1v5l6d7rbm0
2011-01-06 13:22:12 +05:30
Launchpad Translations on behalf of openerp 35fa7cd34e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110106043500-7v9lu0vz6rw06og9
bzr revid: launchpad_translations_on_behalf_of_openerp-20110106053849-1bfeq2m1gsv0j789
2011-01-06 05:38:49 +00:00
Mustufa Rangwala a124598535 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110104132853-5p0d124psvzni9nu
2011-01-04 18:58:53 +05:30
Mustufa Rangwala 1fa0c16e6c [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110104050755-shpnclijhsa7kuh4
2011-01-04 10:37:55 +05:30
Sbh (OpenERP) e1a001b64e [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110103041826-atjzj7zbs8ayxrl1
bzr revid: sbh@tinyerp.com-20110104050350-ht7063oddesu3esy
2011-01-04 10:33:50 +05:30
Olivier Dony 67d825b03e [I18N] all: updated translation templates after latest changes (again)
bzr revid: odo@openerp.com-20110103172053-wc4dgcphwp3g7y18
2011-01-03 18:20:53 +01:00
Olivier Dony 64ce199e17 [I18N] all: updated translation templates after latest changes
bzr revid: odo@openerp.com-20110103161550-1rp408wtnl2vd1xi
2011-01-03 17:15:50 +01:00
Mustufa Rangwala 3bdca04e28 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110103090825-h3f9ie8qu7l09ceb
2011-01-03 14:38:25 +05:30
Launchpad Translations on behalf of openerp 81ca85beff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110101050531-khdl20dn77zc2jmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110102050226-71740ifoogqdko3a
2011-01-02 05:02:26 +00:00
Sbh (OpenERP) 93c221d296 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101231071411-p0pft257rwt189s5
2010-12-31 12:44:11 +05:30
Launchpad Translations on behalf of openerp c5f275ee73 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101231052837-svzr899wp8yqpvj3
2010-12-31 05:28:37 +00:00
Sbh (OpenERP) a329a57bdd [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101230131110-8l42t3b4hituf7aj
bzr revid: sbh@tinyerp.com-20101231045926-gqkspd1jgoglv2qj
2010-12-31 10:29:26 +05:30
Francois Degrave e494a992dd [IMP ]added shortcuts to demo user, modified visibility of elements in employee views
bzr revid: fde@openerp.com-20101230170800-drbr5ie19trv0nxj
2010-12-30 18:08:00 +01:00
husen f433b959c2 merged with trunk
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
2010-12-30 15:28:09 +05:30
Sbh (OpenERP) 8197975a4a [Merge] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101230050317-vuvnpvgz2wwvglc9
2010-12-30 10:33:17 +05:30
Fabien Pinckaers b34751af5c fix
bzr revid: fp@tinyerp.com-20101229170759-1xpngqs623mttj3r
2010-12-29 18:07:59 +01:00
apa-tiny 1ee479f973 [IMP/MERGE]:improved and merged from trunk
bzr revid: apa@tinyerp.com-20101229134355-y9yzo1n0chgxr5ft
2010-12-29 19:13:55 +05:30
François Degrave fb250aaa6a [IMP] HR access rights
bzr revid: fde@openerp.com-20101229130758-hs1xxnj8zm45fl6c
2010-12-29 14:07:58 +01:00
Sbh (OpenERP) 3bdcba5523 [MERGE] merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101229084639-nvp49rexyd7d6lge
bzr revid: sbh@tinyerp.com-20101229091035-wzih8xzz59lov7gy
2010-12-29 14:40:35 +05:30
Harry (OpenERP) 20ab1d1df4 [FIX] account: security
bzr revid: hmo@tinyerp.com-20101229085716-y13ctpn3ptenrfl0
2010-12-29 14:27:16 +05:30
apa-tiny 00c8da07a3 [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20101229085352-c3ui6wb0or9smsjr
2010-12-29 14:23:52 +05:30
Sbh (OpenERP) d13abf368f [Merge] lp:~openerp-dev/openobject-addons/uco-dev-addons1
bzr revid: sbh@tinyerp.com-20101229063508-rg8rmi6237nocp64
2010-12-29 12:05:08 +05:30
Sbh (OpenERP) 25b82fa0e9 [MERGE] merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101229054736-bc28tl8s98tv6a9n
2010-12-29 11:17:36 +05:30
Launchpad Translations on behalf of openerp 67e8c91c3b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101229044038-xv05sco0rtuoe3cm
bzr revid: launchpad_translations_on_behalf_of_openerp-20101229045841-67lol5w1iaobouap
2010-12-29 04:58:41 +00:00
uco (OpenERP) c3098f4f43 [FIX] account..l10n_ch: Pass return {'type': 'ir.actions.act_window_close'} instead of return {} in osv_memory/normal wizards.(lp:691544)
bzr revid: uco@tinyerp.com-20101228104445-h5q9jg8mq7dmdc51
2010-12-28 16:14:45 +05:30
Mustufa Rangwala bf7769c820 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101228102652-a6a060tcw7ie3ehp
2010-12-28 15:56:52 +05:30
Sbh (OpenERP) a35f4c079a [Merge] Merg with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101228051443-cakt4uwndxlbpi0w
2010-12-28 10:44:43 +05:30
Launchpad Translations on behalf of openerp 635e68beff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101228043943-yn9g7d3fwe9zzqi1
bzr revid: launchpad_translations_on_behalf_of_openerp-20101228044349-82c2r8qkjdh917at
2010-12-28 04:43:49 +00:00
uco (OpenERP) 062e74ccd3 [MERGE]
bzr revid: uco@tinyerp.com-20101227110612-5yx410cxu0gbrd7k
2010-12-27 16:36:12 +05:30
Sbh (OpenERP) 5aec3a612d [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20101227065345-nx77uqseiu9apvzk
2010-12-27 12:23:45 +05:30
uco (OpenERP) 0fbb5d3b7b [MERGE]
bzr revid: uco@tinyerp.com-20101227064033-f01qypl6j6vbhcyw
2010-12-27 12:10:33 +05:30