Commit Graph

588 Commits

Author SHA1 Message Date
Launchpad Translations on behalf of openerp f659d305f7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103053838-8dc22w7xc4pekn1v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103053926-saljmu2wubie130o
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103053929-zhnxa8yb58llx12y
2013-01-03 05:39:29 +00:00
Thibault Delavallée e794672dd2 [IMP] Notification emails: link in signature improved. If access to document: direct link to document. If no document or not access: link to portal.
bzr revid: tde@openerp.com-20130102125902-xp3vcs1ay7oog1ke
2013-01-02 13:59:02 +01:00
Launchpad Translations on behalf of openerp fca02afad3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101051924-2q3t0sbo83ti3ooe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102052612-z5wooakbv4fnww9x
2013-01-02 05:26:12 +00:00
Launchpad Translations on behalf of openerp f1fcb4a994 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121230055105-9vbynsau05gi9gpg
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231051632-gx9ipbfrlpix1u7e
2012-12-31 05:16:32 +00:00
Launchpad Translations on behalf of openerp d2d4748277 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121227055339-126egwmnviv4o13g
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222073914-5tzk3pmley7xt65v
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223050927-7arwzs18xy60iz6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224051047-ousn2b5ahnsj1hrg
bzr revid: launchpad_translations_on_behalf_of_openerp-20121225051618-l19m8q9sq3067kv7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226051842-szu8p5q7lmtwx6tc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121227055344-qygiaxubtlootycb
2012-12-27 05:53:44 +00:00
Launchpad Translations on behalf of openerp f49cf3ad50 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222073731-s1qift4p97f9s1zf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223050857-vzu6pl7ttzy10603
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224051043-oxj4lz3tpjhai7hn
2012-12-24 05:10:43 +00:00
Olivier Dony 3815d22432 [I18N] Update translation templates for latest changes - ready for 7.0 release
bzr revid: odo@openerp.com-20121221172005-uuwfq58gslzikygl
2012-12-21 18:20:05 +01:00
Olivier Dony 49597f0e66 [MERGE] *: improved english wording, suggestions courtesy of OpenERP Community
bzr revid: odo@openerp.com-20121221164808-kdjrtcbgma4dr3on
2012-12-21 17:48:08 +01:00
Thibault Delavallée b4e1e32f0a [FIX] portal: fixed various mail_mail records created without specifying the 'type' field; however this may conflict with the context holdign default_type (i.e. opportunity), leading to type values not in the selection field.
bzr revid: tde@openerp.com-20121221115315-qni401mszwrkpvmj
2012-12-21 12:53:15 +01:00
Thibault Delavallée fa36ac76ee [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121220091908-7qy8excmhe3ussi0
2012-12-20 10:19:08 +01:00
Launchpad Translations on behalf of openerp 2315050bab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220044654-aygk0cmaxl26bs0f
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220045947-8j22pe4nm62kzq22
2012-12-20 04:59:47 +00:00
Thibault Delavallée ce5dfe8212 [IMP] Portal: removed warnings about non-existent fields.
bzr revid: tde@openerp.com-20121219164020-8g0d8pbg7jjfopr3
2012-12-19 17:40:20 +01:00
Khushboo Bhatt (Open ERP) 0843f19d0b [FIX]portal:menu string changed
bzr revid: kbh@tinyerp.com-20121219062813-mlijrqastnv1x63n
2012-12-19 11:58:13 +05:30
Launchpad Translations on behalf of openerp 56248183fc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219051749-jfkdv3ohgd61z9pq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219052238-gjyvmd0dp8pahk2c
2012-12-19 05:22:38 +00:00
Antony Lesuisse 891ea764fe [MERGE] trunk-improve_signup-vta
bzr revid: al@openerp.com-20121218161650-dp5t9ky39wpcp4b6
2012-12-18 17:16:50 +01:00
Raphael Collet 73980eba5f [MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
2012-12-18 09:59:14 +01:00
Launchpad Translations on behalf of openerp b2bb3eafbd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218045907-df0xw1q7dgw696s1
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050221-ab50rd40d94gd9a0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050832-5hvbj7p0bpsw6fp0
2012-12-18 05:08:32 +00:00
vta vta@openerp.com 8ed5b437b3 [FIX] Fixed anonymous groups access rights and rules
bzr revid: vta@openerp.com-20121217150458-eorlwiqob8ap75gr
2012-12-17 16:04:58 +01:00
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
vta vta@openerp.com 49dad6b17a [FIX] Do not show actions in message threads like news or jobs
bzr revid: vta@openerp.com-20121217094948-cv9orodo4rge0ev2
2012-12-17 10:49:48 +01:00
Launchpad Translations on behalf of openerp a7ddf7c689 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217044754-0kl222skaeva43lx
bzr revid: launchpad_translations_on_behalf_of_openerp-20121216050743-iza21869j5keaqi5
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217045834-1f6wbi5gkmzotgsl
2012-12-17 04:58:34 +00:00
Launchpad Translations on behalf of openerp bfb52002b6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121216044909-hd4l9dxtqvx85a3h
2012-12-16 04:49:09 +00:00
Thibault Delavallée 580f6f0551 [REM] portal: removed file adding because of merge conflict.
bzr revid: tde@openerp.com-20121214115053-mv089r9fk4g3vqhu
2012-12-14 12:50:53 +01:00
Thibault Delavallée 90062eb86a [MERGE] Sync with trunk. portal_security.xml file is back, holding a custom res_partner rule.
bzr revid: tde@openerp.com-20121214085639-8xrn4l413x1901n0
2012-12-14 09:56:39 +01:00
Launchpad Translations on behalf of openerp cc8025387b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053905-mac64ijay9566opr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214054902-12ndwftreb4g1964
2012-12-14 05:49:02 +00:00
vta vta@openerp.com e084ed51f3 [MERGE] Latest trunk
bzr revid: vta@openerp.com-20121212143932-sg99mw5npppocdos
2012-12-12 15:39:32 +01:00
vta vta@openerp.com f34b08c5df [FIX] Don't add trailing spacesbzr shelve portal_anonymous/static/src/js/portal_anonymous.js
bzr revid: vta@openerp.com-20121212141233-n4xeioj80kitji9p
2012-12-12 15:12:33 +01:00
vta vta@openerp.com 9a65ac3efc [FIX] Set data noupdate=1
bzr revid: vta@openerp.com-20121212133757-avxsyz1n63t7ancf
2012-12-12 14:37:57 +01:00
Thibault Delavallée 179f525dc7 [IMP] Portal: portal user has a read access on res_partner, but limited to its own partner.
bzr revid: tde@openerp.com-20121212133612-vvxs2a73tcak3k4s
2012-12-12 14:36:12 +01:00
Thibault Delavallée 347d0e5b46 [IMP] portal removed access rights of portal user on res_partner and derived tables. Updated several accesses to bypass the security issues. Updated portal tests to have a more complete test scenario.
bzr revid: tde@openerp.com-20121212125518-k0s07niojr8a1xtu
2012-12-12 13:55:18 +01:00
vta vta@openerp.com afad97f722 [IMP] Portal, now auto_install (also all of its dependencies)
bzr revid: vta@openerp.com-20121212112237-1uvr5kuwheyq0sri
2012-12-12 12:22:37 +01:00
vta vta@openerp.com 04a3aaec98 [FIX] Access rights on events for anonymous
bzr revid: vta@openerp.com-20121212110834-sxgr3uq0sr8mok0y
2012-12-12 12:08:34 +01:00
Thibault Delavallée fd8d728190 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121212084625-c5u7w3vh9t4rfm74
2012-12-12 09:46:25 +01:00
vta vta@openerp.com 20567b2131 [FIX] Small fixes related to access rights, and reordering of user/group definitions
bzr revid: vta@openerp.com-20121212081417-0zkbzs1ev6iu7hsf
2012-12-12 09:14:17 +01:00
Launchpad Translations on behalf of openerp 2e7f68e09f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212043903-maiyd94p4ifgdqew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212044145-k216g0bcavdlf2o3
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212045414-tgg69aaw4dz72b0p
2012-12-12 04:54:14 +00:00
Thibault Delavallée b541e7ce64 [MERGE] Sync with trunk. Cleaned a bit things lastly added in trunk/mail/tests.
bzr revid: tde@openerp.com-20121211161458-d7wv4lnkvs9s7srj
2012-12-11 17:14:58 +01:00
vta vta@openerp.com 72628c6fc6 [ADD] Add security rules to group_anonymous, removed unused files, and fixed descriptor of portal_anonymous
bzr revid: vta@openerp.com-20121211153218-kp88oqt9me5d7z7t
2012-12-11 16:32:18 +01:00
Christophe Matthieu c70f05cc77 [MERGE] catch and display error when there are an error in an attachment upload. Add mail/download_attachment controllers
bzr revid: chm@openerp.com-20121211152219-2hlw1npfq2jfzx88
2012-12-11 16:22:19 +01:00
vta vta@openerp.com 1063627459 [FIX] Move anonymous group and user definition to portal data
bzr revid: vta@openerp.com-20121211152006-albv2ozyxmpdydzc
2012-12-11 16:20:06 +01:00
vta vta@openerp.com 69cee985ff [FIX] Move portal group definition to data
bzr revid: vta@openerp.com-20121211151837-05brccm8xaebqjvu
2012-12-11 16:18:37 +01:00
Thibault Delavallée db32d98b7a [REF] [TESTS] mail, portal: refactored a bit the various mail and invite tests: moved some tests into dedicated files, added some new tests, removed duplicates.
bzr revid: tde@openerp.com-20121211144650-kpy7noe082e3xvoo
2012-12-11 15:46:50 +01:00
Thibault Delavallée bf40c23e00 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121211092156-hg62weec6a3yifsf
2012-12-11 10:21:56 +01:00
Vo Minh Thu 6072fd11af [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Christophe Matthieu ab2792850f [MERGE] from trunk
bzr revid: chm@openerp.com-20121210095325-84gkwkzvg3pfz42d
2012-12-10 10:53:25 +01:00
Thibault Delavallée 0e85b997ef [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121210083743-9xcv6bhxkh75ay66
2012-12-10 09:37:43 +01:00
Thibault Delavallée a4083348d5 [FIX] Portal: portal inbox domain fixed, favorite_user_ids does not exist anymore.é
bzr revid: tde@openerp.com-20121210083718-idod6rjgaasz001y
2012-12-10 09:37:18 +01:00
Launchpad Translations on behalf of openerp 7f1d5daf2f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210043931-72a32pz7q282df45
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210044428-d9bzm1dnqc26voci
2012-12-10 04:44:28 +00:00
Antony Lesuisse fb0ded57ff [MERGE] portal fixes groups, payments, shortcut
portal_stock has been removed from this merge, sale_order state is enough.

bzr revid: al@openerp.com-20121208230309-2rajdsjfrb5ddlch
2012-12-09 00:03:09 +01:00
Antony Lesuisse 045c04a3a2 [MERGE] trunk
bzr revid: al@openerp.com-20121208174511-a4dhw2odli43ftfp
2012-12-08 18:45:11 +01:00
Olivier Dony e7b30b164e [MERGE] Another batch of Bugfixes from 6.1
Up to 6.1 revision 6800 olt@tinyerp.com-20120516065727-ghvzjttnncj8ryj0

bzr revid: odo@openerp.com-20121207183024-adx8vnq9cytxi2lu
2012-12-07 19:30:24 +01:00
Christophe Matthieu 1737ac04f2 [MERGE] from trunk
bzr revid: chm@openerp.com-20121207082734-9u0jb9zqbmz49f43
2012-12-07 09:27:34 +01:00
Launchpad Translations on behalf of openerp c09b9cb5f9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121207043623-mrfjgzunwq1dlmmh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121207044755-avo3gbucdjj6i0ms
2012-12-07 04:47:55 +00:00
Olivier Dony 5db87bea9c [MERGE] Bugfixes from 6.1 until revision 6800
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
vta vta@openerp.com 5266d4fa7b [MERGE] Latest trunk.
bzr revid: vta@openerp.com-20121205144051-yqlopd68505neaza
2012-12-05 15:40:51 +01:00
Launchpad Translations on behalf of openerp aec7ff5024 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121205052048-tvbqvj40zdyoxtf0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121205054308-gayp86s3a2we62y7
2012-12-05 05:43:08 +00:00
Launchpad Translations on behalf of openerp 683f31e51b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055506-fin73s7n3o52fmuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055956-fsd4tp3felpk8pm5
2012-12-04 05:59:56 +00:00
Olivier Dony 308e4f1073 [I18N] Removed duplicated terms for inherited [_sql]_constraints -> 400 terms removed
bzr revid: odo@openerp.com-20121203162755-p71dnn0k0t2b98yp
2012-12-03 17:27:55 +01:00
Olivier Dony 5483897ad0 [I18N] Update translation templates for latest changes
bzr revid: odo@openerp.com-20121203155934-zmut8afc7hh82b02
2012-12-03 16:59:34 +01:00
Launchpad Translations on behalf of openerp 4c0ddb1f01 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121201050734-pfp8sbkds49ewcyv
bzr revid: launchpad_translations_on_behalf_of_openerp-20121201050910-yq8l30zsbpn4rbx8
2012-12-01 05:09:10 +00:00
Christophe Matthieu d19c8e5e2c [IMP] mail: don't show the record_name on link with option show_link=false
bzr revid: chm@openerp.com-20121130160157-0tkavi31bn72xwhg
2012-11-30 17:01:57 +01:00
vta vta@openerp.com c1a1f51ae5 [IMP] Portal auto_install, and all dependencies also.
bzr revid: vta@openerp.com-20121130151346-uyl4t6fr1990f756
2012-11-30 16:13:46 +01:00
Christophe Matthieu 61065b6d04 [IMP] mail: change access for create message for the attachments
bzr revid: chm@openerp.com-20121130110902-1qzmgvinhc0q0i3j
2012-11-30 12:09:02 +01:00
vta vta@openerp.com 5f5f3d9942 [FIX] Online payment ribbon display conditions.
bzr revid: vta@openerp.com-20121130094501-lz430j8fgin9cacj
2012-11-30 10:45:01 +01:00
Launchpad Translations on behalf of openerp f12df4e8ea Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121130050827-124dy1fyx1f113n9
bzr revid: launchpad_translations_on_behalf_of_openerp-20121130051820-ru59ffbuvhm96b8l
2012-11-30 05:18:20 +00:00
vta vta@openerp.com 76417f249f [MERGE] trunk-improve_portal-vta.
bzr revid: vta@openerp.com-20121129090801-mheiq7yb3h24onqf
2012-11-29 10:08:01 +01:00
vta vta@openerp.com ec116ef004 [FIX] Add show_link_partner option to news and jobs menus.
bzr revid: vta@openerp.com-20121128075008-jay8mzfavp60fnk3
2012-11-28 08:50:08 +01:00
vta vta@openerp.com 6dce879a15 [FIX] Correct action for Inbox menuitem.
bzr revid: vta@openerp.com-20121128074853-vlgqjijm0czv2dio
2012-11-28 08:48:53 +01:00
vta vta@openerp.com 49f9c9b9d9 [FIX] remove links from message threads???
bzr revid: vta@openerp.com-20121127150212-2kxecrfigcs7rfle
2012-11-27 16:02:12 +01:00
vta vta@openerp.com 37e5b882ef [FIX] views, access rights, ...
bzr revid: vta@openerp.com-20121127143713-03y7zpnj0118ikq5
2012-11-27 15:37:13 +01:00
vta vta@openerp.com fe993bca9c [FIX] FIxed several views.
bzr revid: vta@openerp.com-20121126133642-bvj4go984ec6acko
2012-11-26 14:36:42 +01:00
Launchpad Translations on behalf of openerp 828cce9be0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125063324-fjz8k77annh364u7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126044235-u20vi1440dgppikf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125064209-s515ia18188hl147
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126045508-rm6d2mx71a0sjqh9
2012-11-26 04:55:08 +00:00
Launchpad Translations on behalf of openerp 117bf937b9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124055830-p04ni2o2ogsch9zc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124065500-zwtkurcb1ic9ktqb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124070752-itto1xb6r6oao3z5
2012-11-24 07:07:52 +00:00
Olivier Dony 771b216118 [I18N] Update translation templates in preparation for 7.0 release
bzr revid: odo@openerp.com-20121124030804-9dvr1qwec830p8fc
2012-11-24 04:08:04 +01:00
vta vta@openerp.com 8374e20b10 [FIX] Fixed events, mail, and project (also related access rights).
bzr revid: vta@openerp.com-20121122120554-ja2c2fmhxqxdyjj5
2012-11-22 13:05:54 +01:00
Arnaud Pineux 1d335a7cdb [IMP] Re-set the sequence number for main menus
bzr revid: api@openerp.com-20121121162753-3mi0si4kf3rei42n
2012-11-21 17:27:53 +01:00
vta vta@openerp.com f079e012ac [MERGE] Latest trunk.
bzr revid: vta@openerp.com-20121121135805-8f6u8q5zywbqw3nu
2012-11-21 14:58:05 +01:00
vta vta@openerp.com 946a5e700d [FIX] Remove remaining message_followers widget.
bzr revid: vta@openerp.com-20121121135721-rqjd3x4d2bdu4a7i
2012-11-21 14:57:21 +01:00
vta vta@openerp.com 132f052e17 [FIX] Security rules, and conflicts after merging trunk.
bzr revid: vta@openerp.com-20121121123346-5wi4ko1e5ny57ki0
2012-11-21 13:33:46 +01:00
Olivier Dony f3bc4f4f41 [FIX] portal: typo makes prevents acquirer defaults from working
bzr revid: odo@openerp.com-20121121101210-1gtejd9u5blpb1o3
2012-11-21 11:12:10 +01:00
Olivier Dony ddc5d6804e [IMP] portal: unify wording as `Customer Portal` + make footer link translatable + cleanup
bzr revid: odo@openerp.com-20121121100434-wq5julc2njlee7t1
2012-11-21 11:04:34 +01:00
vta vta@openerp.com 9a15327d52 [MERGE] Latest trunk.
bzr revid: vta@openerp.com-20121121091133-svpmfiurclr7n69e
2012-11-21 10:11:33 +01:00
Olivier Dony b770240247 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121120113600-4oyx9sziigbxn8w8
bzr revid: odo@openerp.com-20121120163429-l4cf6r75vwqfvxty
2012-11-20 17:34:29 +01:00
vta vta@openerp.com 6c921f84eb [FIX] Minor fixes all around portal.
bzr revid: vta@openerp.com-20121120155010-rl1aei08bjm7v0wu
2012-11-20 16:50:10 +01:00
Thibault Delavallée 99a3ef8860 [CLEAN] Demo data: fixed some typos, cleaned a bit before merging.
bzr revid: tde@openerp.com-20121120102325-5xts5n801p9islgy
2012-11-20 11:23:25 +01:00
vta vta@openerp.com 73750e33b9 [FIX] Removed password from sent email. Fixed naming in order to pass runbot's test.
bzr revid: vta@openerp.com-20121120073948-1ojettqx7mjb1k75
2012-11-20 08:39:48 +01:00
vta vta@openerp.com d6ba13a394 [IMP] Minor improvements in portal views, such as contact and employees. Improved menus and string on empty views. Send the password when a partner is invited to portal via sidebar menu.
bzr revid: vta@openerp.com-20121116075305-4d0olu5zlvwsxeq8
2012-11-16 08:53:05 +01:00
Vo Minh Thu 724f452f1e [IMP] fleet/porta/account_budget: removed some initialization warnings.
bzr revid: vmt@openerp.com-20121115160643-lc0b07n6xiaq1rl3
2012-11-15 17:06:43 +01:00
Olivier Dony c558ac6272 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121114172252-q1xj3hdugqhky532
bzr revid: odo@openerp.com-20121115135141-ia8uf5649rapj0v7
2012-11-15 14:51:41 +01:00
Thibault Delavallée eb04795e28 [FIX] Fixed last fix...
bzr revid: tde@openerp.com-20121114141559-31w4389i22x7l7cd
2012-11-14 15:15:59 +01:00
Thibault Delavallée f7cb95db00 [FIX] email_template: fixed last revert. xml_id of user is now correct.
bzr revid: tde@openerp.com-20121114135515-y28jhsbmjcmln9gr
2012-11-14 14:55:15 +01:00
Thibault Delavallée 8dce388719 [REV] portal demo data: demo portal user xml_id back to its former value.
bzr revid: tde@openerp.com-20121114133422-3tb28n9rfdyh80d0
2012-11-14 14:34:22 +01:00
Olivier Dony b925d494b5 [IMP] acquirer: improved acquirer view explanations
bzr revid: odo@openerp.com-20121114120622-f3jr1chrt3snl42r
2012-11-14 13:06:22 +01:00
Thibault Delavallée fbccb823f8 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121112161523-yfp1dczcnmi85t8e
bzr revid: tde@openerp.com-20121114083900-qw40e8ii1rfl7gt1
2012-11-14 09:39:00 +01:00
Olivier Dony f5f6547fa7 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121113164544-21tmr4bmpt2n1mfl
2012-11-13 17:45:44 +01:00
Olivier Dony 5e4c4fe06e [IMP] portal,portal_sale: polish/cleanup acquirer settings
bzr revid: odo@openerp.com-20121113164435-ids77maq6h13crob
2012-11-13 17:44:35 +01:00
Thibault Delavallée 03cfda4feb [IMP] [DEMO] mail, portal: updated demo data.
bzr revid: tde@openerp.com-20121108101805-1sb1gcatj2oztq39
2012-11-08 11:18:05 +01:00
Hardik Ansodariya (OpenERP) 7c92b8ba00 [FIX]portal,share : fixed the translation issue of share document wizard
bzr revid: mma@tinyerp.com-20121108100319-qfukxayiz7siic39
2012-11-08 15:33:19 +05:30
Thibault Delavallée 3027b749ba [IMP] mail: signature in send notifications is now plaintext (as before), but htmlized (not inside a pre, but inside div and p, with entities escaped). Updated mail tests. Same for portal URL. Updated portal tests.
bzr revid: tde@openerp.com-20121107170241-0gjwraxkuhe0fm6p
2012-11-07 18:02:41 +01:00
Thibault Delavallée b7188293d7 [IMP] Portal: updated demo data.
bzr revid: tde@openerp.com-20121107164254-0ypt3sltc5e2vfkl
2012-11-07 17:42:54 +01:00