Commit Graph

369 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 18aaed7f4f [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120813073105-pz2vdiz7gc27triz
2012-08-13 09:31:05 +02:00
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 620b7e9b11 [IMP] Addons: user_email -> email.
bzr revid: tde@openerp.com-20120810144339-30ro9omgfxtjtjyz
2012-08-10 16:43:39 +02:00
Antonin Bourguignon ee4fd16e94 [FIX] remove the option from the user_id fields
we want users to be openable !
also improve indentation and remove some useless whitespaces

bzr revid: abo@openerp.com-20120809163529-8adlpszt3n6lhszi
2012-08-09 18:35:29 +02:00
Antonin Bourguignon 24f6e09c45 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120809143919-qrn9nm5ut5vlm8hw
2012-08-09 16:39:19 +02:00
Twinkle Christian (OpenERP) 2d6aae609b [IMP]Remove type field from the views
bzr revid: tch@tinyerp.com-20120808121950-r4tux6lfej82bi2h
2012-08-08 17:49:50 +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
Mayur Maheshwari (OpenERP) ff612f9d02 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120808094005-o7v0l6u15ide75za
2012-08-08 15:10: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
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
Antonin Bourguignon d928b07ace [IMP] rephrase some error and warning messages in caldav and crm
remove exclamation marks at the end of messages
remove first person usage ('I' and 'We')
remove unjustified capital letters

bzr revid: abo@openerp.com-20120806170732-nr7hhhgww1br2hem
2012-08-06 19:07:32 +02:00
Mayur Maheshwari (OpenERP) 7c51b1811d [FIX]all :set a no_open widget in this filed(country_id,state_id,title,context_id,timebox_id,user_id)
bzr revid: mma@tinyerp.com-20120806110307-nj7qipixr14puhub
2012-08-06 16:33:07 +05:30
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
Twinkle Christian (OpenERP) cb1c6c08af [IMP]Improve search view in all modules
bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
2012-07-31 16:58:04 +05:30
Jigar Amin - OpenERP 2a7e9cecab [FIX] crm_partner_assign : fixed the wrong conflct reslove by vta on trunk merge
bzr revid: jam@tinyerp.com-20120731060202-c90tj0mxtnnfem00
2012-07-31 11:32:02 +05:30
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) f10270c64a [IMP]: crm*: Improved xml_id of demo cases so it can be generic
bzr revid: rpa@tinyerp.com-20120730102352-wv3g29qk556mx5zc
2012-07-30 15:53:52 +05:30
Rucha (Open ERP) 9be1dc63e5 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120730052105-tjzeohx0hyi43qi4
2012-07-30 10:51:05 +05:30
Launchpad Translations on behalf of openerp 0c581831b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120728045741-hrbggtt37yutrbpx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120729043802-x7m56po0nxue0jb0
2012-07-29 04:38:02 +00:00
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
Rucha (Open ERP) 82d9cae64a [FIX]: crm_partner_assign: Fixed yml based on new changes of partners
bzr revid: rpa@tinyerp.com-20120725105039-ddyyg5d1x1r2qszj
2012-07-25 16:20:39 +05:30
Turkesh Patel (Open ERP) 8a81855312 [IMP] Improved code.
bzr revid: tpa@tinyerp.com-20120723053123-rrb3qo66dbdd5lqb
2012-07-23 11:01:23 +05:30
Turkesh Patel (Open ERP) a2c23b58e9 [IMP] crm_partner_assign: improved search views.
bzr revid: tpa@tinyerp.com-20120720091950-4lp3v5cao65908ky
2012-07-20 14:49:50 +05:30
pso (OpenERP) 524e378d34 [IMP] Improved warning messages/exceptions of crm modules
bzr revid: pso@tinyerp.com-20120716092231-q8xt8fr4yy6sx2wf
2012-07-16 14:52:31 +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
Divyesh Makwana (Open ERP) 0443db5f9d [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120712043845-ing7eipsv3z20ps5
bzr revid: mdi@tinyerp.com-20120713044825-1wwxd80yp7cv2325
bzr revid: mdi@tinyerp.com-20120716043444-cfqjeo5rmnrj295x
2012-07-16 10:04:44 +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
Pinakin Nayi (OpenERP) ea721d65af [IMP]crm-warning-msg
bzr revid: pna@tinyerp.com-20120712055038-06rgow7j1sgae6v6
2012-07-12 11:20:38 +05:30
Rucha (Open ERP) 63bdc1851d [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120711052537-mjxlznfhrt4feee9
2012-07-11 10:55:37 +05:30
Divyesh Makwana (Open ERP) 770df36345 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120711045811-fi5t79g6kk20wn8v
2012-07-11 10:28:11 +05:30
Fabien Pinckaers 64a9321d56 [IMP] footer on forms
bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
2012-07-10 18:40:11 +02:00
Divyesh Makwana (Open ERP) c8e12c4858 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120710041526-5djib3iw46vsnd9q
2012-07-10 09:45:26 +05:30
Rucha (Open ERP) a6ff1de18a [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120709065757-9myg5025dqps8q65
2012-07-09 12:27:57 +05:30
Launchpad Translations on behalf of openerp e9c288b4bf Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120707051326-0nn73he814pbmz14
bzr revid: launchpad_translations_on_behalf_of_openerp-20120708044140-ev3j10bquy9p89t7
bzr revid: launchpad_translations_on_behalf_of_openerp-20120709045113-mh0kg5l420xs8ux4
2012-07-09 04:51:13 +00:00
Divyesh Makwana (Open ERP) c4061ea6aa [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120709043027-l037rvy3z7h0hk9y
2012-07-09 10:00:27 +05:30
Divyesh Makwana (Open ERP) 1997c06b2e [IMP] crm_partner_assign : Change the field defination of 'categ_id' to many2many and its related changes.
bzr revid: mdi@tinyerp.com-20120706113834-gf1kzma4gyy6pomx
2012-07-06 17:08:34 +05:30
Launchpad Translations on behalf of openerp 5babd88330 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120706045835-psdlu6pet8cabwna
bzr revid: launchpad_translations_on_behalf_of_openerp-20120706050751-xzq60elhr5ajn5i6
2012-07-06 05:07:51 +00:00
Rucha (Open ERP) 953dff0367 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120702054353-ertcuzo8gmqu98wp
2012-07-02 11:13:53 +05:30
Quentin (OpenERP) 6fe94bd4bc [MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
2012-06-29 14:36:18 +02:00
Raphael Collet 37601079a9 [MERGE] trunk-red-button (highlight the right buttons in all form views)
bzr revid: rco@openerp.com-20120629101954-i11jwpaussdeyc5d
2012-06-29 12:19:54 +02:00
Raphael Collet 5133bee1d5 [FIX] in form views, replace class 'oe_highlight_on_dirty' by 'oe_highlight'
bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
2012-06-29 10:30:24 +02:00
Rucha (Open ERP) 3c285a6194 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120629070441-o61czak5knl0adgy
2012-06-29 12:34:41 +05:30
Launchpad Translations on behalf of openerp 3c6d5dabfb Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120629043853-120u6x3erpg73gq2
2012-06-29 04:38:53 +00:00
Raphael Collet 1debe0efcd [MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
2012-06-28 15:12:10 +02:00