Commit Graph

574 Commits

Author SHA1 Message Date
Thibault Delavallée aac03b547d [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120814152634-ix63oxwcyrfkku4t
2012-08-14 17:26:34 +02:00
Thibault Delavallée bc7ad9c405 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120814084936-04v0hywe2drc9qum
2012-08-14 10:49:36 +02:00
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Thibault Delavallée c2c27b1858 [FIX$] This time, it's the good fix.
bzr revid: tde@openerp.com-20120813111521-uws1uophrd39krfg
2012-08-13 13:15:21 +02:00
Thibault Delavallée f80c247812 [FIX] Still fixing stpid bugs.
bzr revid: tde@openerp.com-20120813105420-stxm7cjc981bj8fq
2012-08-13 12:54:20 +02:00
Thibault Delavallée e120d9a699 [REV] Reverted last fixes. Think it comes from outer space.
bzr revid: tde@openerp.com-20120813091719-6551uziq8ts4kj6a
2012-08-13 11:17:19 +02:00
Thibault Delavallée db7e49ca91 [FIX] project_timesheet tests: user creation should also have its partner.
bzr revid: tde@openerp.com-20120813081054-csyaq8p7lf7e1nvh
2012-08-13 10:10:54 +02:00
Thibault Delavallée 18aaed7f4f [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120813073105-pz2vdiz7gc27triz
2012-08-13 09:31:05 +02:00
Rucha (Open ERP) 5fd7ad04c1 [REM]: hr: Removed duplicate employee and department from demo
bzr revid: rpa@tinyerp.com-20120813072738-temucs10vhcubepv
2012-08-13 12:57:38 +05:30
Rucha (Open ERP) dd7a2972d8 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Thibault Delavallée 8e6cc3a924 [REF] addons: propagated change about context_lang and context_tz.
bzr revid: tde@openerp.com-20120810102257-g9r21nesh799kf7u
2012-08-10 12:22:57 +02:00
Stephane Wirtel 91f8b5439c [FIX] project*: Replace the labels with 'Partner' by Contact
bzr revid: stw@openerp.com-20120809105009-0f7mw99dnavgs01s
2012-08-09 12:50:09 +02:00
Twinkle Christian (OpenERP) fc1b1749a8 [IMP]Remove type field from the modules
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
Launchpad Translations on behalf of openerp e970ecd62c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
Olivier Dony 3fd9a77c83 [REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.

bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Rucha (Open ERP) 2347f44ab2 [FIX,IMP]: hr: Fixes and improvements for employee-user relation
bzr revid: rpa@tinyerp.com-20120808101305-dsqn337ngmcysm4z
2012-08-08 15:43:05 +05:30
Rucha (Open ERP) d597437dd7 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
Antonin Bourguignon a97687a420 [MERGE] latest trunk
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'

bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Antonin Bourguignon b0e8ae4c7d [IMP] error messages
fix errors ending with an exclamation point; use a point instead
remove uniques (or almost) error messages titles, like 'Encoding Error' (1 occurrence in addons), 'Integrity Error' (1 occurrence in addons), 'Report Name' (1 occurrence in addons), 'Value Error' (1 occurrence in addons), 'Wrong Period Code' (1 occurrence in addons); replace these with 'Error'
add newline character after some messages titles, when necessary
fix 'UserError': should be 'User Error'
remove spaces before exclamation marks
add capital letters to messages titles words (e.g.: 'Invalid action' becomes 'Invalid Action')

bzr revid: abo@openerp.com-20120807110616-u3nlnybtgaebro18
2012-08-07 13:06:16 +02:00
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
pso (OpenERP) 389f8d6803 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +05:30
Rucha (Open ERP) b7daa1fb31 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120803045532-wsgei101ogh0o44d
bzr revid: rpa@tinyerp.com-20120806050952-xecwmyhg4p2fs4id
2012-08-06 10:39:52 +05:30
Fabien Pinckaers ea52cfae17 [IMP] introducing new file type: html
bzr revid: fp@openerp.com-20120804143556-457q040g6q30x3fu
2012-08-04 16:35:56 +02:00
Fabien Pinckaers b363b1f622 fix
bzr revid: fp@openerp.com-20120804135631-9qqfgcz9513qsyzp
2012-08-04 15:56:31 +02:00
Fabien Pinckaers 4e69bdd6fc [IMP] improved menu tips - 10 firsts clicks
bzr revid: fp@openerp.com-20120804132136-2b18cfkwv0njsglj
2012-08-04 15:21:36 +02:00
Rucha (Open ERP) 01bea180bb [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120801064738-vcjdjnt3s57i2hgc
2012-08-01 12:17:38 +05:30
pso (OpenERP) 773c2d5c63 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
Quentin (OpenERP) e1b50e304d [MEGUEZ] merged the clean search view branch
bzr revid: qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01
2012-07-31 17:03:58 +02:00
Stephane Wirtel 8ab0a77cad [FIX] project_timesheet: Define the task_hrs field in the SQL view instead of function field
bzr revid: stw@openerp.com-20120731144704-8rvur011ycpc7w4f
2012-07-31 16:47:04 +02:00
vta vta@openerp.com 264d2c3365 [MERGE] Trunk.
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
Rucha (Open ERP) 780bdb4a29 [IMP]: product: Changed xml_id of product in data file from product_product_0 to product_product_consultant to identify this record easily when accessing from py
bzr revid: rpa@tinyerp.com-20120726113914-gvpo9rx7fan77w3f
2012-07-26 17:09:14 +05:30
Rucha (Open ERP) 4eb76030a6 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120726053855-8j8c70xqc0ynikx1
2012-07-26 11:08:55 +05:30
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Saurang Suthar(OpenERP) c7060ffa18 [IMP] Improved warning messages for project* modules
bzr revid: pso@tinyerp.com-20120725121605-rvid4ebeomtr0zzo
2012-07-25 17:46:05 +05:30
Turkesh Patel (Open ERP) a95e3ad66e [IMP] project_timesheet: improved search view.
bzr revid: tpa@tinyerp.com-20120723071003-snkgc4qt068ap9z2
2012-07-23 12:40:03 +05:30
pso (OpenERP) 8be94b1e93 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120722082152-l24vpuuxjb34126g
2012-07-22 13:51:52 +05:30
Purnendu Singh (OpenERP) ec27d7e44f [MERGE] merge with main branch
bzr revid: psi@tinyerp.com-20120720061203-c6cpwc7f8uaa939n
2012-07-20 11:42:03 +05:30
Quentin (OpenERP) 7b8c3788b1 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120719095420-llgnafgasfcwbwu9
2012-07-19 11:54:20 +02:00
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
Harry (OpenERP) 5ca4e7a371 [MERGE] upstream
bzr revid: hmo@tinyerp.com-20120716111343-z05o5wes4wj1apbo
2012-07-16 16:43:43 +05:30
Purnendu Singh (OpenERP) 2e2f7188d3 [MERGE, IMP] improve and merge cha branch to update desc formatting
bzr revid: psi@tinyerp.com-20120716094548-xx1ip3eljal3ffvl
2012-07-16 15:15:48 +05:30
pso (OpenERP) 8a1c029e1c [IMP] Improved warning messages/exceptions of project modules
bzr revid: pso@tinyerp.com-20120716093128-5m3683kojty2hs0n
2012-07-16 15:01:28 +05:30
Rucha (Open ERP) 64137a63cf [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120716090657-r7mlld3rsufel2ge
2012-07-16 14:36:57 +05:30
Launchpad Translations on behalf of openerp 8028996327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
2012-07-14 06:27:50 +00:00
Ajay Chauhan (OpenERP) 01981534f6 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120713093114-wzrprgaeo34tzjbx
2012-07-13 15:01:14 +05:30
Pinakin Nayi (OpenERP) ab00152169 [IMP]project-warning-message
bzr revid: pna@tinyerp.com-20120712095441-4xwox1hhog7je8oz
2012-07-12 15:24:41 +05:30
Rucha (Open ERP) 9dc752d788 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120712062623-cvhg4a2ewwqp9hcv
2012-07-12 11:56:23 +05:30
Launchpad Translations on behalf of openerp b0b5a5988f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120712044116-gnxo3c234xwbzacm
bzr revid: launchpad_translations_on_behalf_of_openerp-20120712045848-qoy4f00epmiytqw2
2012-07-12 04:58:48 +00:00
Launchpad Translations on behalf of openerp 6cbb04758a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120711051515-k67xt5ps6oe853qg
2012-07-11 05:15:15 +00:00
Kuldeep Joshi (OpenERP) b1dc0beb35 [IMP]account: change account.analytic.line view
bzr revid: kjo@tinyerp.com-20120709100903-da6v6cu2ekorm2o2
2012-07-09 15:39:03 +05:30