Fabien Pinckaers [Sun, 16 Sep 2012 16:37:53 +0000 (18:37 +0200)]
fix
bzr revid: fp@openerp.com-
20120916163753-cg9qz0eio5qjmn8l
Fabien Pinckaers [Sun, 16 Sep 2012 16:34:41 +0000 (18:34 +0200)]
[MERGE] product form view
bzr revid: fp@openerp.com-
20120916163441-xf3ipgkpiu3rmy31
Fabien Pinckaers [Sun, 16 Sep 2012 16:27:30 +0000 (18:27 +0200)]
[MERGE] Contracts and tempaltes
bzr revid: fp@openerp.com-
20120916162730-qhws87nvbx4qdx8h
Fabien Pinckaers [Sun, 16 Sep 2012 16:15:48 +0000 (18:15 +0200)]
[MERGE] UoM config wizard
bzr revid: fp@openerp.com-
20120916161548-a01rvf23gqi2ziib
Fabien Pinckaers [Sun, 16 Sep 2012 16:09:53 +0000 (18:09 +0200)]
[MERGE] HR
bzr revid: fp@openerp.com-
20120916160953-8bssla7rcll6gf8g
Fabien Pinckaers [Sun, 16 Sep 2012 15:23:19 +0000 (17:23 +0200)]
[MERGE] better HR messages
bzr revid: fp@openerp.com-
20120916152319-z1trkemgvcqelfk2
Fabien Pinckaers [Sun, 16 Sep 2012 15:18:26 +0000 (17:18 +0200)]
[MERGE] fix HR
bzr revid: fp@openerp.com-
20120916151826-8h6icwvujl6oegjz
Fabien Pinckaers [Sun, 16 Sep 2012 15:13:22 +0000 (17:13 +0200)]
[MERGE] google import
bzr revid: fp@openerp.com-
20120916151322-dccd8q6bsn70amj2
Fabien Pinckaers [Sun, 16 Sep 2012 15:10:38 +0000 (17:10 +0200)]
[IMP] thunderbird plugin
bzr revid: fp@openerp.com-
20120916151038-oqh8f9kak8eap8t9
Fabien Pinckaers [Sun, 16 Sep 2012 15:05:17 +0000 (17:05 +0200)]
[MERGE] purchase + [FIX] misc sale order without delivery orders
bzr revid: fp@openerp.com-
20120916150517-16vr5lp419b0kpid
Fabien Pinckaers [Sun, 16 Sep 2012 14:47:45 +0000 (16:47 +0200)]
[FIX] open menu
bzr revid: fp@openerp.com-
20120916144745-nnn134spv0fctc6a
Fabien Pinckaers [Sun, 16 Sep 2012 14:45:29 +0000 (16:45 +0200)]
[MERGE] sale fixes
bzr revid: fp@openerp.com-
20120916144529-ho1p72gtake7j2in
Fabien Pinckaers [Sun, 16 Sep 2012 11:42:49 +0000 (13:42 +0200)]
[IMP] cleaned ir.actions.todo to launch newly installed application
bzr revid: fp@openerp.com-
20120916114249-5px8shvbm3tzhidh
Fabien Pinckaers [Sun, 16 Sep 2012 11:42:41 +0000 (13:42 +0200)]
[IMP] cleaned ir.actions.todo to launch newly installed application
bzr revid: fp@openerp.com-
20120916114241-5egamdewksxg3jdc
Launchpad Translations on behalf of openerp [Sun, 16 Sep 2012 04:39:10 +0000 (04:39 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120915045546-04wd8t9lh32zubmg
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120916043910-4mdhgae8w7eamg54
Antony Lesuisse [Fri, 14 Sep 2012 16:12:46 +0000 (18:12 +0200)]
[FIX] module loading
bzr revid: al@openerp.com-
20120914161246-lswl83lwnwyextk6
Antony Lesuisse [Fri, 14 Sep 2012 15:40:32 +0000 (17:40 +0200)]
[FIX] tbody list trails in body
bzr revid: al@openerp.com-
20120914154032-akax8tuyflb03vmy
Antony Lesuisse [Fri, 14 Sep 2012 14:28:48 +0000 (16:28 +0200)]
[FIX] always load translation
bzr revid: al@openerp.com-
20120914142848-266hixovtus3gnbc
Vo Minh Thu [Fri, 14 Sep 2012 14:01:48 +0000 (16:01 +0200)]
[FIX] project_issue, crm: removed colon in YAML comment.
bzr revid: vmt@openerp.com-
20120914140148-sqoxc9yb0den8fa4
Vo Minh Thu [Fri, 14 Sep 2012 13:30:45 +0000 (15:30 +0200)]
[MERGE] removed a few warnings.
bzr revid: vmt@openerp.com-
20120914133045-syjyr7ozlm3gxle4
Vo Minh Thu [Fri, 14 Sep 2012 12:53:59 +0000 (14:53 +0200)]
[IMP] report: added TTF font path (used in e.g. Arch Linux).
bzr revid: vmt@openerp.com-
20120914125359-knl1t3motsiw4vgb
amami [Fri, 14 Sep 2012 10:28:07 +0000 (15:58 +0530)]
[FIX] Auth_rest_pwd : removed constrain for user_email field. (this has to be chnaged in future as user_email is depricatd field)
bzr revid: amami-
20120914102807-afkjduzp9iefog51
Amit Patel [Fri, 14 Sep 2012 10:04:50 +0000 (15:34 +0530)]
[MERGE]:trunk
bzr revid: apa@tinyerp.com-
20120914100450-ird48ki9hec642kv
Jigar Amin - OpenERP [Fri, 14 Sep 2012 09:49:50 +0000 (15:19 +0530)]
[Merge] lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-fix-tpa
bzr revid: jam@tinyerp.com-
20120914094950-eyd2hmd4u8tt3c8m
Harry (OpenERP) [Fri, 14 Sep 2012 08:45:10 +0000 (14:15 +0530)]
[MERGE]
bzr revid: hmo@tinyerp.com-
20120914084510-mc6bpxg80xga7j1a
Harry (OpenERP) [Fri, 14 Sep 2012 08:44:05 +0000 (14:14 +0530)]
[MERGE]
bzr revid: hmo@tinyerp.com-
20120914084405-0ho0ian16bp2zgqh
Harry (OpenERP) [Fri, 14 Sep 2012 08:39:17 +0000 (14:09 +0530)]
[MERGE]
bzr revid: hmo@tinyerp.com-
20120914083917-tshl4wvhbhjrbtvv
Raphael Collet [Fri, 14 Sep 2012 07:49:13 +0000 (09:49 +0200)]
[MERGE] trunk-improve_setting_wizard-mma (fix capitalization of field labels in settings)
bzr revid: rco@openerp.com-
20120914074913-lbuv41yw3u3snmqy
Raphael Collet [Fri, 14 Sep 2012 07:45:36 +0000 (09:45 +0200)]
[FIX] purchase/res_config.py: typo
bzr revid: rco@openerp.com-
20120914074536-u9aelmlv9j82c9mm
Turkesh Patel (Open ERP) [Fri, 14 Sep 2012 05:52:48 +0000 (11:22 +0530)]
[IMP] remove unnecessary changes.
bzr revid: tpa@tinyerp.com-
20120914055248-zhpzklpwrur0s76m
Amit Patel [Fri, 14 Sep 2012 05:16:12 +0000 (10:46 +0530)]
[MERGE]:trunk
bzr revid: apa@tinyerp.com-
20120913051727-m8omyh3gudlj5pxd
bzr revid: apa@tinyerp.com-
20120914051612-pwys78387fhgab7n
Turkesh Patel (Open ERP) [Fri, 14 Sep 2012 05:15:25 +0000 (10:45 +0530)]
[IMP] remove unnecessary changes.
bzr revid: tpa@tinyerp.com-
20120914051525-k8ksmrjmodmla352
Harry (OpenERP) [Fri, 14 Sep 2012 05:11:47 +0000 (10:41 +0530)]
[MERGE]
bzr revid: hmo@tinyerp.com-
20120914051147-3yckhyqvv1mfbv10
Amit Patel [Fri, 14 Sep 2012 05:07:33 +0000 (10:37 +0530)]
[MERGE]:trunk
bzr revid: apa@tinyerp.com-
20120914050733-9euo3vftm8fee6sq
Launchpad Translations on behalf of openerp [Fri, 14 Sep 2012 05:06:08 +0000 (05:06 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120914050608-ym2xpjycz25pvge9
Amit Patel [Fri, 14 Sep 2012 05:06:04 +0000 (10:36 +0530)]
[MERGE]:trunk
bzr revid: apa@tinyerp.com-
20120914050604-lbks22ofgr6emor0
Amit Patel [Fri, 14 Sep 2012 05:03:42 +0000 (10:33 +0530)]
[MERGE]:trunk
bzr revid: apa@tinyerp.com-
20120914050342-0ru5hcbfgggkgr54
Mayur Maheshwari (OpenERP) [Fri, 14 Sep 2012 05:02:33 +0000 (10:32 +0530)]
[MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-
20120914050233-abnyaijtxlw9zsxy
Amit Patel [Fri, 14 Sep 2012 05:01:30 +0000 (10:31 +0530)]
[MERGE]:trunk
bzr revid: apa@tinyerp.com-
20120914050130-c9qugrxlnwude0s7
Jigar Amin - OpenERP [Fri, 14 Sep 2012 04:27:25 +0000 (09:57 +0530)]
[MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-
20120912044315-t7gtrwck9fc3h9vd
bzr revid: jam@tinyerp.com-
20120913045246-iuvrqt992b60tekt
bzr revid: jam@tinyerp.com-
20120914042725-jiagjctwti0vd68m
Antony Lesuisse [Thu, 13 Sep 2012 19:27:59 +0000 (21:27 +0200)]
[MERGE] developper mode print workflow for nel
bzr revid: al@openerp.com-
20120913192759-f1t3r9j58zwvba10
Fabien Pinckaers [Thu, 13 Sep 2012 18:52:31 +0000 (20:52 +0200)]
[FIX] clean error message when creating a user froma partner form
bzr revid: fp@tinyerp.com-
20120913185231-efkupz42kovrekpx
Fabien Pinckaers [Thu, 13 Sep 2012 18:27:36 +0000 (20:27 +0200)]
[IMP] better layout for BE address
bzr revid: fp@tinyerp.com-
20120913182736-t22gg05mu202b1b2
Fabien Pinckaers [Thu, 13 Sep 2012 18:22:56 +0000 (20:22 +0200)]
fix
bzr revid: fp@tinyerp.com-
20120913182256-p7crbo4889pcgg45
Fabien Pinckaers [Thu, 13 Sep 2012 18:21:56 +0000 (20:21 +0200)]
[IMP] rename coutnries
bzr revid: fp@tinyerp.com-
20120913182156-dh0wnc9qe0mcb5qc
Fabien Pinckaers [Thu, 13 Sep 2012 18:19:52 +0000 (20:19 +0200)]
[IMP] address format of leads according to country
bzr revid: fp@tinyerp.com-
20120913181952-h19q4v0vu6geungq
Fabien Pinckaers [Thu, 13 Sep 2012 18:16:38 +0000 (20:16 +0200)]
[IMP] address format according to user's country
bzr revid: fp@tinyerp.com-
20120913181638-lrxd1hrgikl6purj
Fabien Pinckaers [Thu, 13 Sep 2012 17:57:09 +0000 (19:57 +0200)]
[IMP] address format according to country of user on partners
bzr revid: fp@tinyerp.com-
20120913175709-tu1zg2efa70ayen7
Thibault Delavallée [Thu, 13 Sep 2012 16:36:25 +0000 (18:36 +0200)]
[MERGE] OpenChatter "Invite Yur Mummy" Invite branch
Featuring :
- Invite wizard, to add followers to a document, and to send them an email
- Invite button in Chatter, that calls the Invite wizard
- each send notification is a distinct email, one for each partner to have to receive a notification. Changes in mail_followers and mail_mail to handle this. If send receives a notifier_ids parameter, it uses it instead of the mail_mail.email_to field, and send an email to each partner. Overriding some of the methods allow to somewhat personnalize the email
- Portal: add the signin url in notifications send to portal users
- Tests: made a class for tests using emails, defining and removing mockups for the gateway. Updated mail tests, added an invite test in portal.
bzr revid: tde@openerp.com-
20120913163625-7ewt7j3m63ii71jf
Thibault Delavallée [Thu, 13 Sep 2012 16:13:24 +0000 (18:13 +0200)]
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-
20120913161324-nuc2mo1kynis151u
Thibault Delavallée [Thu, 13 Sep 2012 16:12:26 +0000 (18:12 +0200)]
[IMP] Portal: generate_portal_url -> generate_signin_url; slughty udpated portal tests to 1. test the generated URL 2. consider it is correct for future tests.
bzr revid: tde@openerp.com-
20120913161226-y02gg43lua10s0k4
Thibault Delavallée [Thu, 13 Sep 2012 16:11:21 +0000 (18:11 +0200)]
[FIX] mail.xml: fixed &, now classic ands.
bzr revid: tde@openerp.com-
20120913161121-qc4m3ijwz1tbrmld
Thibault Delavallée [Thu, 13 Sep 2012 16:03:29 +0000 (18:03 +0200)]
[FIX] follower widget: fixed multiple calls to events, due to a bind_events placed in set_value instead of start.
bzr revid: tde@openerp.com-
20120913160329-uycrwvahbpmdlyxg
Thibault Delavallée [Thu, 13 Sep 2012 15:48:44 +0000 (17:48 +0200)]
[CLEAN] mail: cleaned mail-invite before merging. Updated some methods and var names; updated some comments.
bzr revid: tde@openerp.com-
20120913154844-i5tikncn3sxepk34
Frédéric van der Essen [Thu, 13 Sep 2012 15:40:20 +0000 (17:40 +0200)]
[MERGE] point_of_sale : debug window and various fixes
bzr revid: fva@openerp.com-
20120913154020-pn308mkkk2lp1e9j
Frédéric van der Essen [Thu, 13 Sep 2012 15:14:34 +0000 (17:14 +0200)]
[MERGE] from trunk
bzr revid: fva@openerp.com-
20120913151434-y30kfigwj20w3y58
Frédéric van der Essen [Thu, 13 Sep 2012 15:09:13 +0000 (17:09 +0200)]
[FIX] point_of_sale: demo data ean match the debug window defaults
bzr revid: fva@openerp.com-
20120913150913-bq96hvr3cmbgijjg
Antonin Bourguignon [Thu, 13 Sep 2012 14:46:41 +0000 (16:46 +0200)]
[FIX] fields_get check_access_right
bzr revid: abo@openerp.com-
20120913144641-ybtrvd4vyf7nfium
Raphael Collet [Thu, 13 Sep 2012 14:34:22 +0000 (16:34 +0200)]
[MERGE] trunk-res_rml_footer-rco (adapt to api change in res.partner.bank)
bzr revid: rco@openerp.com-
20120913143422-liapp9mr5xayap7y
Raphael Collet [Thu, 13 Sep 2012 14:31:50 +0000 (16:31 +0200)]
[MERGE] trunk-res_rml_footer-rco (improve onchange on res.company form)
bzr revid: rco@openerp.com-
20120913143150-kt34zk9yd58dthus
niv-openerp [Thu, 13 Sep 2012 14:12:56 +0000 (16:12 +0200)]
[IMP] made linked in module more tolerant about some linked in errors
bzr revid: nicolas.vanhoren@openerp.com-
20120913141256-4jny0rfl0t976ko7
Frédéric van der Essen [Thu, 13 Sep 2012 14:03:10 +0000 (16:03 +0200)]
[IMP] point_of_sale: scan and search in products packagings
bzr revid: fva@openerp.com-
20120913140310-4z9bxo1d0r13ep76
Harry (OpenERP) [Thu, 13 Sep 2012 13:44:55 +0000 (19:14 +0530)]
[FIX] account_budget: access right
bzr revid: hmo@tinyerp.com-
20120913134455-p83c7d8ku023tvym
Harry (OpenERP) [Thu, 13 Sep 2012 13:18:08 +0000 (18:48 +0530)]
[FIX] sale: should not create the invoice directly, make as on demands
bzr revid: hmo@tinyerp.com-
20120913131808-rr6bfu9chszdn533
Raphael Collet [Thu, 13 Sep 2012 13:15:57 +0000 (15:15 +0200)]
[MERGE] from trunk
bzr revid: rco@openerp.com-
20120913131557-pn9b9utz2s89trzw
Antonin Bourguignon [Thu, 13 Sep 2012 13:15:48 +0000 (15:15 +0200)]
[MERGE] trunk-bug-999315-rmu: recurring line's model form view
properly set a company id when a journal is selected and, therefore, correctly display available accounts
lp bug: https://launchpad.net/bugs/999315 fixed
bzr revid: abo@openerp.com-
20120913131548-rggrjah0ux5iu1kv
Mayur Maheshwari (OpenERP) [Thu, 13 Sep 2012 12:57:45 +0000 (18:27 +0530)]
[IMP]account : improve tool tip
bzr revid: mma@tinyerp.com-
20120913125745-k4deap3rlva45oik
Raphael Collet [Thu, 13 Sep 2012 12:57:31 +0000 (14:57 +0200)]
[FIX] base: replace rml_footer in base.xml
bzr revid: rco@openerp.com-
20120913125731-ta2gxwtv80fh54gs
Olivier Dony [Thu, 13 Sep 2012 12:54:14 +0000 (14:54 +0200)]
[REM] web_{rpc,dashboard,mobile}: remove web modules re-added by LP, after disabling the template in LP translations
bzr revid: odo@openerp.com-
20120913125414-n4fxnmn5wjspdzea
Antonin Bourguignon [Thu, 13 Sep 2012 12:52:28 +0000 (14:52 +0200)]
[IMP] code cleaning
bzr revid: abo@openerp.com-
20120913125228-mb17mk4m6dqbm5rt
Mayur Maheshwari (OpenERP) [Thu, 13 Sep 2012 12:51:54 +0000 (18:21 +0530)]
[IMP]account : improve string
bzr revid: mma@tinyerp.com-
20120913125154-75dc3d48yk1atujy
Vo Minh Thu [Thu, 13 Sep 2012 12:44:48 +0000 (14:44 +0200)]
[MERGE] fix: renamed thousand_sep to thousands_sep in test_impex, removed rml_footer1 and rml_footer2 from data as the fields were removed.
bzr revid: vmt@openerp.com-
20120913124448-ba4kgi0brmyldkaf
Raphael Collet [Thu, 13 Sep 2012 12:43:32 +0000 (14:43 +0200)]
[IMP] account: in settings, open the company form to change bank accounts (and company footer)
bzr revid: rco@openerp.com-
20120913124332-hooc2b9pxuqjrpmj
Mayur Maheshwari (OpenERP) [Thu, 13 Sep 2012 12:37:36 +0000 (18:07 +0530)]
[IMP]account : improve tool tip
bzr revid: mma@tinyerp.com-
20120913123736-87k2n9a595qej21x
Thibault Delavallée [Thu, 13 Sep 2012 12:32:50 +0000 (14:32 +0200)]
[MERGE] [FIX] Fixed image sharpening in tools; this requires an image converted into RGB.
bzr revid: tde@openerp.com-
20120913123250-e2ueblluch4aa41p
Mayur Maheshwari (OpenERP) [Thu, 13 Sep 2012 12:26:49 +0000 (17:56 +0530)]
[MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-
20120913122649-oe7fq5q0ntwinoss
Antonin Bourguignon [Thu, 13 Sep 2012 12:23:12 +0000 (14:23 +0200)]
[FIX] recurring line's model form view
properly set a company id when a journal is selected and, therefore, correctly display available accounts
bzr revid: abo@openerp.com-
20120913122312-v2zz8m4r8wcxovtx
Raphael Collet [Thu, 13 Sep 2012 12:20:11 +0000 (14:20 +0200)]
[IMP] res.company: rewrite onchange method to compute rml_footer
bzr revid: rco@openerp.com-
20120913122011-h9qsqizhmsibndf3
Raphael Collet [Thu, 13 Sep 2012 12:18:30 +0000 (14:18 +0200)]
[IMP] res.partner.bank: make _prepare_name_get more robust (field 'id' not required)
bzr revid: rco@openerp.com-
20120913121830-fzkkdekrxwdq421w
Thibault Delavallée [Thu, 13 Sep 2012 12:11:10 +0000 (14:11 +0200)]
[FIX] mail_message: fixed record_name, because we could call a name_get on a document we can not see (if we are in the recipints of a document we can not access). name_get is therefore inside a try/except statement, getting a void string as result if AccessDenied is raised. Updated JS to avoid displaying the record name on a void string.
bzr revid: tde@openerp.com-
20120913121110-bd0syf813h0e39gk
Thibault Delavallée [Thu, 13 Sep 2012 11:49:17 +0000 (13:49 +0200)]
[IMP] email_template: now inherit from TestMailMockups test class.
bzr revid: tde@openerp.com-
20120913114917-na341w0ja7n0ditu
Raphael Collet [Thu, 13 Sep 2012 11:46:09 +0000 (13:46 +0200)]
[IMP] account: adapt _prepare_name_get() of res.partner.bank to its new api
bzr revid: rco@openerp.com-
20120913114609-pff1x0spvb0gja2u
Raphael Collet [Thu, 13 Sep 2012 11:44:03 +0000 (13:44 +0200)]
[IMP] res.partner.bank: change _prepare_name_get() to make it usable by onchange methods
bzr revid: rco@openerp.com-
20120913114403-ny6h6vpijymj6o4s
Thibault Delavallée [Thu, 13 Sep 2012 11:36:55 +0000 (13:36 +0200)]
[FIX] tools.image: added an image conversion before sharpening; otherwise the filter could crash.
bzr revid: tde@openerp.com-
20120913113655-t5o3wk3r0tkp203m
Frédéric van der Essen [Thu, 13 Sep 2012 10:46:21 +0000 (12:46 +0200)]
[IMP] point_of_sale: some improvements to the debug window
bzr revid: fva@openerp.com-
20120913104621-zryga82o3d4vq174
Thibault Delavallée [Thu, 13 Sep 2012 10:35:29 +0000 (12:35 +0200)]
[IMP] mail, portal: improved tests. A new TestMailMockup class has been defined, holding the various mockups for the mail gateway, to avoid having duplicate code in tests using emails. Added tests in portal about the invite mechanism.
bzr revid: tde@openerp.com-
20120913103529-410g9sk32sbbmkgn
Thibault Delavallée [Thu, 13 Sep 2012 10:34:01 +0000 (12:34 +0200)]
[FIX] portal invite wizard: generated URL improvement (partner_id and portal_group_id should be correct now).
bzr revid: tde@openerp.com-
20120913103401-waepkmjq8flsu13j
Thibault Delavallée [Thu, 13 Sep 2012 10:33:19 +0000 (12:33 +0200)]
[IMP] mail_wizard_invite: message is now an html field, and default values embedded inside a div. Added a subject to email sent to newly added followers.
bzr revid: tde@openerp.com-
20120913103319-6jg5moa0tl9p6ujn
Amit Patel [Thu, 13 Sep 2012 10:26:48 +0000 (15:56 +0530)]
[MERGE]:merged timetracking changes.
bzr revid: apa@tinyerp.com-
20120913102648-dom11isset01lj4w
Harry (OpenERP) [Thu, 13 Sep 2012 10:22:21 +0000 (15:52 +0530)]
[MERGE] issue of send mail after finish import data
bzr revid: hmo@tinyerp.com-
20120913102221-5bp2tli2hy70v1by
Antonin Bourguignon [Thu, 13 Sep 2012 10:06:28 +0000 (12:06 +0200)]
[FIX] remove previous erroneous bugfix
bzr revid: abo@openerp.com-
20120913100628-oojngjznaeu0txyb
Antonin Bourguignon [Thu, 13 Sep 2012 09:50:02 +0000 (11:50 +0200)]
[MERGE] latest trunk
bzr revid: abo@openerp.com-
20120913095002-oohnjqtm0bvkmjax
Pinakin Nayi (OpenERP) [Thu, 13 Sep 2012 09:37:17 +0000 (15:07 +0530)]
[IMP]send mail
bzr revid: pna@tinyerp.com-
20120913093717-8lh5k3ntmzof2fnd
Jigar Amin - OpenERP [Thu, 13 Sep 2012 09:36:22 +0000 (15:06 +0530)]
Merge lp:~openerp-dev/openobject-addons/trunk-addons9-contract-apa-contract-kbh
bzr revid: jam@tinyerp.com-
20120913093622-71bbdyz3l7ilb2ls
Pinakin Nayi (OpenERP) [Thu, 13 Sep 2012 09:34:44 +0000 (15:04 +0530)]
[MERGE]:with parent branch
bzr revid: pna@tinyerp.com-
20120913093444-n06lxdnyrap84w3x
Thibault Delavallée [Thu, 13 Sep 2012 09:33:20 +0000 (11:33 +0200)]
[IMP] mail_wizard_invite: updated default message. An override of default_get allows to have a more precise message.
bzr revid: tde@openerp.com-
20120913093320-mhwp43kkgoqd0h33
Thibault Delavallée [Thu, 13 Sep 2012 09:32:46 +0000 (11:32 +0200)]
[IMP] mail_group: when deleting a mail_group, delete also the related menu entry.
bzr revid: tde@openerp.com-
20120913093246-kkxjqspupbq7j7z8
Thibault Delavallée [Thu, 13 Sep 2012 08:41:19 +0000 (10:41 +0200)]
[FIX] mail, portal: fixed tests to remove mockups at tearDown. Otherwise, when using tests, no email could be send because of the mockups installed during tests.
bzr revid: tde@openerp.com-
20120913084119-6ligp3o864vtzlmz
Harry (OpenERP) [Thu, 13 Sep 2012 08:32:43 +0000 (14:02 +0530)]
[MERGE]
bzr revid: hmo@tinyerp.com-
20120913083243-15bi38mbhp3yq3sw
Harry (OpenERP) [Thu, 13 Sep 2012 08:25:35 +0000 (13:55 +0530)]
[FIX] plugin: first search message_id than search parent message if not found
bzr revid: hmo@tinyerp.com-
20120913082535-syibk95l0kmz60nw