odoo/odoo.git
10 years ago[IMP] [MONKEY] Re-apply changes introduced at version 3328.
Thibault Delavallée [Wed, 5 Mar 2014 10:54:55 +0000 (11:54 +0100)]
[IMP] [MONKEY] Re-apply changes introduced at version 3328.
Original commit by chm.

[FIX] cleditor: When the DOM is modify, the event resize try to call refresh and refresh has not DOM available. Correction : If the DOM as no prent, don't call refresh.

bzr revid: tde@openerp.com-20140305105455-1ewix4pm9m5ob1bm

10 years ago[DUMMY] Void commit with a space change, because this cause a crash in bazaar.
Thibault Delavallée [Wed, 5 Mar 2014 10:49:31 +0000 (11:49 +0100)]
[DUMMY] Void commit with a space change, because this cause a crash in bazaar.

bzr revid: tde@openerp.com-20140305104931-xnftljkziznsi9qq

10 years ago[MERGE] Merged lp:~openerp/openerp-web/saas-3
Paramjit Singh Sahota [Wed, 5 Mar 2014 05:09:03 +0000 (10:39 +0530)]
[MERGE] Merged lp:~openerp/openerp-web/saas-3

bzr revid: psa@tinyerp.com-20140305050903-8n1prme78ou7n2h2

10 years ago[REM] REmoved the jquery.cleditor.min.js for the lib.
Paramjit Singh Sahota [Wed, 5 Mar 2014 05:06:12 +0000 (10:36 +0530)]
[REM] REmoved the jquery.cleditor.min.js for the lib.

bzr revid: psa@tinyerp.com-20140305050612-8z0jpohvg026l2xi

10 years ago[FIX] web: view form fieldselection, use name_search instead of cascading search...
Denis Ledoux [Tue, 4 Mar 2014 17:38:38 +0000 (18:38 +0100)]
[FIX] web: view form  fieldselection, use name_search instead of cascading search and name_get

One rpc call won
Moreover, res_company in server overwrite name_search for company field in res users preferences, to display all allowed companies of the user, and not just the one allowed by record rules, so the user can change to the companies he is allowed to.

bzr revid: dle@openerp.com-20140304173838-c7uimmey8gvi3b64

10 years ago[MERGE] [FIX] website_sale: effectively send the email of a draft or confirmed quotat...
Thibault Delavallée [Tue, 4 Mar 2014 16:16:59 +0000 (17:16 +0100)]
[MERGE] [FIX] website_sale: effectively send the email of a draft or confirmed quotation on the ecommerce after payment. Having the action is not sufficient, we have to trigger it manually. We do this by creating and sending a mail.compose.message, like what is done manually on a quotation when using the 'Send by email' button.

bzr revid: tde@openerp.com-20140304161659-9ueka2y4ctfk4okv

10 years ago[FIX] crm: convert lead to opp wizard, on change salesman choose default salesteam...
Denis Ledoux [Tue, 4 Mar 2014 15:44:42 +0000 (16:44 +0100)]
[FIX] crm: convert lead to opp wizard, on change salesman choose default salesteam if any

bzr revid: dle@openerp.com-20140304154442-o2zvun8ehv2ro6dl

10 years ago[FIX] website_sale: effectively send the email of a draft
Thibault Delavallée [Tue, 4 Mar 2014 15:44:33 +0000 (16:44 +0100)]
[FIX] website_sale: effectively send the email of a draft
or confirmed quotation on the ecommerce. Having the action is not sufficient
we have to trigger it manually.

bzr revid: tde@openerp.com-20140304154433-t9mo6bzsesx7z613

10 years ago[FIX] website_sale: fixed wrong method name, sale_reset_order is not defined anymore
Thibault Delavallée [Tue, 4 Mar 2014 14:34:26 +0000 (15:34 +0100)]
[FIX] website_sale: fixed wrong method name, sale_reset_order is not defined anymore

bzr revid: tde@openerp.com-20140304143426-0eaec0sr6y4ogta9

10 years ago[UPDATE] Updated the cleditor lib from v1.3.0 to v1.4.4 to fix the INTERNET EXPLORER...
Paramjit Singh Sahota [Tue, 4 Mar 2014 13:25:34 +0000 (18:55 +0530)]
[UPDATE] Updated the cleditor lib from v1.3.0 to v1.4.4 to fix the INTERNET EXPLORER issues.

bzr revid: psa@tinyerp.com-20140304132534-8dyuusqda5vsdcit

10 years ago[REV] backout xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f, schemas should not...
Xavier Morel [Tue, 4 Mar 2014 13:21:01 +0000 (14:21 +0100)]
[REV] backout xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f, schemas should not be altered in saas-3

bzr revid: xmo@openerp.com-20140304132101-qysq310wp1oo859n

10 years agoMERGE] [FIX] email_template: fix relative -> absolute url conversion
Thibault Delavallée [Tue, 4 Mar 2014 11:29:57 +0000 (12:29 +0100)]
MERGE] [FIX] email_template: fix relative -> absolute url conversion
Local URLs are converted into absolute URLs, notably because when using the
email designer, images are added using local URLs. Previously to this fix
the template was analyzed to find local URLs and make them absolute.
However this causes 2 issues :
- mako-based URLs are broken because a scheme is added before the mako that
generated the image src
- when changing the base url, the templates are not updated
The URLs are now converted dynamically when generating the content of the
html. This is done by passing a new parameter that enable the post processing
of the generated content.
Also fixed double body generation when using templates; fields parameter
was not propagated correctly.

bzr revid: tde@openerp.com-20140304112957-l9b10gyjqphs5fgc

10 years ago[ADD] tentative removal of attachments
Xavier Morel [Tue, 4 Mar 2014 11:07:16 +0000 (12:07 +0100)]
[ADD] tentative removal of attachments

Attachments ought be removed only if they are not used in an existing page/web
view.

Theoretically this could be set directly in unlink(), but:
* that would make a nice error message significantly harder
* the expenses of performing a text search in all view archs would be a bit expensive

Notes:
* the views set could be reduced to only "web" views
* the search is likely sensible to false negatives e.g. different order of
  query parameters. It *will* remove images still being used.

bzr revid: xmo@openerp.com-20140304110716-u14w6uo8fbkfa42i

10 years ago[FIX] website_hr_recruitment: missing required 'name', which leaded to crash, and...
Denis Ledoux [Mon, 3 Mar 2014 17:44:45 +0000 (18:44 +0100)]
[FIX] website_hr_recruitment: missing required 'name', which leaded to crash, and the phone field is partner_phone, not just phone. Do you even test what you do ?

bzr revid: dle@openerp.com-20140303174445-j733tpmccc9x855u

10 years ago[ADD] deduplication of website images being uploaded
Xavier Morel [Mon, 3 Mar 2014 15:38:55 +0000 (16:38 +0100)]
[ADD] deduplication of website images being uploaded

There is a deduplication in ir.attachment, but it's only for FS-stored content
*and* it only deduplicates storage not models (as there are access rights
issues involved).

The goal here is to always return the same attachment when a user uploads the
exact same image multiple times (because it's simpler or whatever).

Initially tried to use a binary field & digest(), but search() blows up
because it tries to utf-8 encode raw binary data. So use char & hexdigest
instead.

_compute_checksum returns None if the provided attachment data does not look
like a website image attachment.

Unhandled: multiple existing matches, maybe a UNIQUE constraint on the
checksum field would be a good idea just in case.

bzr revid: xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f

10 years ago[IMP] don't duplicate website_url function field of attachments
Xavier Morel [Mon, 3 Mar 2014 14:24:01 +0000 (15:24 +0100)]
[IMP] don't duplicate website_url function field of attachments

bzr revid: xmo@openerp.com-20140303142401-2jaxc3m31tmqw9qa

10 years ago[FIX] order of attachments in 'existing images' sub-dialog: put last uploaded first
Xavier Morel [Mon, 3 Mar 2014 13:54:26 +0000 (14:54 +0100)]
[FIX] order of attachments in 'existing images' sub-dialog: put last uploaded first

bzr revid: xmo@openerp.com-20140303135426-evouhwgjtwku3v2b

10 years ago[MERGE] Sync with saas-3
Thibault Delavallée [Mon, 3 Mar 2014 11:04:00 +0000 (12:04 +0100)]
[MERGE] Sync with saas-3

bzr revid: tde@openerp.com-20140303110400-arkw9yciv4eopb5a

10 years ago[IMP] email_template: relocate url rewritign stuff directly into the rendering method.
Thibault Delavallée [Mon, 3 Mar 2014 10:40:44 +0000 (11:40 +0100)]
[IMP] email_template: relocate url rewritign stuff directly into the rendering method.

bzr revid: tde@openerp.com-20140303104044-hgmii31ga6msf72z

10 years ago[FIX] Remove default tz from context, to allow website (Public user) to use correct...
Kersten Jeremy [Mon, 3 Mar 2014 10:31:41 +0000 (11:31 +0100)]
[FIX] Remove default tz from context, to allow website (Public user) to use correct timeZone. Now, module from website using date as event will be displayed with the TimeZone of "Public User" by default

bzr revid: jke@openerp.com-20140303103141-h76t3o075x2xgb25

10 years ago[FIX] Remove default tz from context, to allow website (Public user) to usecorrect...
Kersten Jeremy [Mon, 3 Mar 2014 09:41:59 +0000 (10:41 +0100)]
[FIX] Remove default tz from context, to allow website (Public user) to usecorrect timeZone. Now event (eg) will be displayed with the TimeZone of "Public User" by default

bzr revid: jke@openerp.com-20140303094159-sh4ixlr6f7uojlft

10 years ago[FIX]website: do not send False value to google map api to retrieve the image. Otherw...
Denis Ledoux [Fri, 28 Feb 2014 17:09:00 +0000 (18:09 +0100)]
[FIX]website: do not send False value to google map api to retrieve the image. Otherwise, you are in the middle of the ocean.

bzr revid: dle@openerp.com-20140228170900-lagmopkmkb58exqr

10 years ago[FIX] ir.http.authenticate: avoid discarding sessions when authentication status...
Olivier Dony [Fri, 28 Feb 2014 17:07:12 +0000 (18:07 +0100)]
[FIX] ir.http.authenticate: avoid discarding sessions when authentication status is unknown

In some cases the authentication check can fail
for an unknown reason (e.g. connection pool is
temporarily full). This should not be treated
as an authentication failure, as the status is
really unknown. Let those exceptions bubble up
instead.

bzr revid: odo@openerp.com-20140228170712-l8smq6u3cmvjtd5e

10 years ago[FIX]website: stop animation on focus (clean fix)
Denis Ledoux [Fri, 28 Feb 2014 16:31:12 +0000 (17:31 +0100)]
[FIX]website: stop animation on focus (clean fix)

bzr revid: dle@openerp.com-20140228163112-hru06zno1sl919uq

10 years ago[TYPO] Typo for demo calendar
Kersten Jeremy [Fri, 28 Feb 2014 16:06:11 +0000 (17:06 +0100)]
[TYPO] Typo for demo calendar

bzr revid: jke@openerp.com-20140228160611-uxq6y89bus33vehy

10 years ago[TYPO] website_hr_recruitment: s/Kraigslist/Craigslist/g
Christophe Simonis [Fri, 28 Feb 2014 15:16:48 +0000 (16:16 +0100)]
[TYPO] website_hr_recruitment: s/Kraigslist/Craigslist/g

bzr revid: chs@openerp.com-20140228151648-2f33zqeffg8ipcyg

10 years ago[FIX] website_mail: forbid access to email_designer routes to public user
Christophe Simonis [Fri, 28 Feb 2014 15:15:44 +0000 (16:15 +0100)]
[FIX] website_mail: forbid access to email_designer routes to public user

bzr revid: chs@openerp.com-20140228151544-ipoih9c924rsbqi1

10 years ago[FIX] mail,website_sale: rename file_type to file_type_icon to avoid name conflict...
Christophe Simonis [Fri, 28 Feb 2014 14:22:33 +0000 (15:22 +0100)]
[FIX] mail,website_sale: rename file_type to file_type_icon to avoid name conflict with file_type field added by document module

bzr revid: chs@openerp.com-20140228142233-i0mm9lav0czbydkk

10 years ago[FIX] Allow other users to read field recurrent_id_date from private event, else...
Kersten Jeremy [Fri, 28 Feb 2014 14:39:30 +0000 (15:39 +0100)]
[FIX] Allow other users to read field recurrent_id_date from private event, else we cannot see that this event is excluded from a recurrence

bzr revid: jke@openerp.com-20140228143930-3eeam1a3676kgv4i

10 years ago[FIX] Calendar - Tempalte Mail - Move the if condition who vas between table and...
Kersten Jeremy [Fri, 28 Feb 2014 14:00:53 +0000 (15:00 +0100)]
[FIX] Calendar - Tempalte Mail - Move the if condition who vas between table and tr into td, else wysiwig and some other sanitizers will move the if condition outside the table

bzr revid: jke@openerp.com-20140228140053-02952ews6aadfcjf

10 years ago[IMP] Improve dipslay of form_embedded_html for mail Template. Removed the big margin...
Kersten Jeremy [Fri, 28 Feb 2014 13:52:24 +0000 (14:52 +0100)]
[IMP] Improve dipslay of form_embedded_html for mail Template. Removed the big margin, and add scroll on overflow

bzr revid: jke@openerp.com-20140228135224-my13sabs7f7h3c60

10 years ago[FIX] website snippet: When duplicating a column, the column becomes a col-md-1 inste...
Christophe Matthieu [Fri, 28 Feb 2014 13:25:07 +0000 (14:25 +0100)]
[FIX] website snippet: When duplicating a column, the column becomes a col-md-1 instead of keeping existing width

bzr revid: chm@openerp.com-20140228132507-0s6y5k3vkbmusvf1

10 years ago[FIX] website snippet: Fix parallax with retro-compatibility; Crappy fix for carousel...
Christophe Matthieu [Fri, 28 Feb 2014 13:17:38 +0000 (14:17 +0100)]
[FIX] website snippet: Fix parallax with retro-compatibility; Crappy fix for carousel because bootstrap active cycling when user click on a bullet and don't stop when user edit a snippet inside a slider.

bzr revid: chm@openerp.com-20140228131738-il41640r8x9zesll

10 years ago[FIX] website_sale: allow validation of free orders (amount = 0) without payment...
Christophe Simonis [Fri, 28 Feb 2014 12:34:14 +0000 (13:34 +0100)]
[FIX] website_sale: allow validation of free orders (amount = 0) without payment transaction

bzr revid: chs@openerp.com-20140228123414-4chmuemyi72rpwgf

10 years ago[FIX] website_sale: long product title is over the price in grid view.
Christophe Matthieu [Fri, 28 Feb 2014 10:22:57 +0000 (11:22 +0100)]
[FIX] website_sale: long product title is over the price in grid view.

bzr revid: chm@openerp.com-20140228102257-000435ykuv7000ub

10 years ago[FIX] website: snippet: continue slide cycling when the user edit the content
Christophe Matthieu [Fri, 28 Feb 2014 09:55:31 +0000 (10:55 +0100)]
[FIX] website: snippet: continue slide cycling when the user edit the content

bzr revid: chm@openerp.com-20140228095531-8c735qyacmffryno

10 years ago[FIX] Check that redirect uri is distinct that original uri in fragment_to_query_stri...
Kersten Jeremy [Fri, 28 Feb 2014 09:54:22 +0000 (10:54 +0100)]
[FIX] Check that redirect uri is distinct that original uri in fragment_to_query_string, else with redirect to root website. That avoid a loop if some route calling this function are called without hash

bzr revid: jke@openerp.com-20140228095422-4xzxfsv20s4zepxq

10 years ago[IMP] Hide seconds in demo data from event and event track module
Kersten Jeremy [Fri, 28 Feb 2014 09:50:52 +0000 (10:50 +0100)]
[IMP] Hide seconds in demo data from event and event track module

bzr revid: jke@openerp.com-20140228095052-nrf5tt38y7k9jr2v

10 years ago[FIX] payment_ogone: ogone is so bad with encoding that they need to duplicate their...
Christophe Simonis [Fri, 28 Feb 2014 09:25:35 +0000 (10:25 +0100)]
[FIX] payment_ogone: ogone is so bad with encoding that they need to duplicate their code to handle utf8 correctly ಠ_ಠ

bzr revid: chs@openerp.com-20140228092535-1tfy5832rgq79ob9

10 years ago[IMP] Remove the seconds on event demoo data
Kersten Jeremy [Fri, 28 Feb 2014 09:08:44 +0000 (10:08 +0100)]
[IMP] Remove the seconds on event demoo data

bzr revid: jke@openerp.com-20140228090844-akorvc0ve71x0i4j

10 years ago[FIX] payment_ogone: use utf8 version of orderstandard page
Christophe Simonis [Thu, 27 Feb 2014 21:44:23 +0000 (22:44 +0100)]
[FIX] payment_ogone: use utf8 version of orderstandard page

bzr revid: chs@openerp.com-20140227214423-k0dz4769kibfgld4

10 years ago[FIX] website_sale: search filter with multi values for one attribute does not work...
Christophe Matthieu [Thu, 27 Feb 2014 16:47:56 +0000 (17:47 +0100)]
[FIX] website_sale: search filter with multi values for one attribute does not work. (and fix slider)

bzr revid: chm@openerp.com-20140227164756-846ezfa36fz3v4d9

10 years ago[IMP] Add options hide_seconds in widget datetime. If this option is set with another...
Kersten Jeremy [Thu, 27 Feb 2014 16:46:11 +0000 (17:46 +0100)]
[IMP] Add options hide_seconds in widget datetime. If this option is set with another value that False, seconds are removed from pattern to display only hours and minuts

bzr revid: jke@openerp.com-20140227164611-0tolnpzmaywhs15l

10 years ago[FIX] website_sale: do not write on public user
Christophe Simonis [Thu, 27 Feb 2014 16:40:00 +0000 (17:40 +0100)]
[FIX] website_sale: do not write on public user

bzr revid: chs@openerp.com-20140227164000-owh6217y3t5iyiow

10 years ago[IMP] auth_signup: email first in the signup form, as is regarded as the most importa...
Denis Ledoux [Thu, 27 Feb 2014 16:16:38 +0000 (17:16 +0100)]
[IMP] auth_signup: email first in the signup form, as is regarded as the most important variable

bzr revid: dle@openerp.com-20140227161638-5rp3bunjx77fbavu

10 years ago[FIX] web: login, autofocus if login is filled
Denis Ledoux [Thu, 27 Feb 2014 16:14:54 +0000 (17:14 +0100)]
[FIX] web: login, autofocus if login is filled

bzr revid: dle@openerp.com-20140227161454-sd6qxmpgv2bvslf7

10 years ago[FIX] website_sale: search filter with multi values for one attribute does not work...
Christophe Matthieu [Thu, 27 Feb 2014 16:05:19 +0000 (17:05 +0100)]
[FIX] website_sale: search filter with multi values for one attribute does not work. (and fix slider)

bzr revid: chm@openerp.com-20140227160519-eakqgm2zwrxseya7

10 years ago[FIX] email_template :
Thibault Delavallée [Thu, 27 Feb 2014 15:38:35 +0000 (16:38 +0100)]
[FIX] email_template :
- fixed composer using template that were rendering the body twice, once form the template and
once from the composer body. Only the latter one is used, so avoid generating the template body
that is not necessary
- fixed email_template generating values for a set of given fields, ignoring the field list
given into parameter
- fixed post processing of templates to transform local urls into absolute urls; now urls are
transformed after body generation, when sending email based on templates , or when generating
the content when using the composer.

bzr revid: tde@openerp.com-20140227153835-gmqnxrzed9fnbxhm

10 years ago[FIX] payment_paypal: create account with at least required fields
Christophe Simonis [Thu, 27 Feb 2014 15:19:59 +0000 (16:19 +0100)]
[FIX] payment_paypal: create account with at least required fields

bzr revid: chs@openerp.com-20140227151959-mpk2bjk9k8t0chqo

10 years ago[IMP] [FIX] email_template: do not sanitize the template content.
Thibault Delavallée [Thu, 27 Feb 2014 14:42:28 +0000 (15:42 +0100)]
[IMP] [FIX] email_template: do not sanitize the template content.
Indeed its content may contain invalid html that could be stripped by the
sanitizer. The content generated based on the template will be sanitized
when stored in the mail_mail or mail_message body field, thus after
rendering.

bzr revid: tde@openerp.com-20140227144228-d275lxz6ryarkg4t

10 years ago[FIX] Fix notification in calendar. All peoples had all notifs :(
Kersten Jeremy [Thu, 27 Feb 2014 14:29:33 +0000 (15:29 +0100)]
[FIX] Fix notification in calendar. All peoples had all notifs :(

bzr revid: jke@openerp.com-20140227142933-33bh05ozdb7uwjy5

10 years ago[FIX] website: editor: can not edit a label in edit mode, must prevent the default...
Christophe Matthieu [Thu, 27 Feb 2014 14:00:43 +0000 (15:00 +0100)]
[FIX] website: editor: can not edit a label in edit mode, must prevent the default click

bzr revid: chm@openerp.com-20140227140043-8iko13704pci9823

10 years ago[FIX] website_sale: 'Ship to a different address' not translatable
Christophe Matthieu [Thu, 27 Feb 2014 13:51:20 +0000 (14:51 +0100)]
[FIX] website_sale: 'Ship to a different address' not translatable

bzr revid: chm@openerp.com-20140227135120-drw0jha7gzqptdog

10 years ago[IMP] [FIX] email_template: do not sanitize the template content.
Thibault Delavallée [Thu, 27 Feb 2014 13:48:29 +0000 (14:48 +0100)]
[IMP] [FIX] email_template: do not sanitize the template content.
Indeed its content may contain invalid html that could be stripped by the
sanitizer. The content generated based on the template will be sanitized
when stored in the mail_mail or mail_message body field, thus after
rendering.
The template therefore holds html, but that is not sanitized. But that's
still html, therefore using an html field.

bzr revid: tde@openerp.com-20140227134829-te8mxeakc3s96fun

10 years ago[FIX] website: bootstrap: Fixed the sliding issue of carousel library in IE9. The...
Christophe Matthieu [Thu, 27 Feb 2014 13:33:47 +0000 (14:33 +0100)]
[FIX] website: bootstrap: Fixed the sliding issue of carousel library in IE9. The transition was not working in any snippet.

bzr revid: chm@openerp.com-20140227133347-6pk45n7ibyrx8imf

10 years ago[FIX] Fix loop when parse hash into get param with no hash
Kersten Jeremy [Thu, 27 Feb 2014 13:07:05 +0000 (14:07 +0100)]
[FIX] Fix loop when parse hash into get param with no hash

bzr revid: jke@openerp.com-20140227130705-jlvl157aio3o4df3

10 years ago[FIX] whitespace/indent lost by RTE
Xavier Morel [Thu, 27 Feb 2014 12:59:34 +0000 (13:59 +0100)]
[FIX] whitespace/indent lost by RTE

Didn't manage to find RTE settings to avoid losing leading whitespace of
lines, so reindeint arch after doing all integration, right before saving back
to view's field.

* html.fromstring(parser=HTMLParser(remove_blank_text=True) does not seem to
  work, so serialize to XML, and parse back with
  remove_blank_text. remove_blank_text necessary for lxml's pretty_print to
  work correctly.

* pretty_print only & always uses 2 spaces/indent level. Our files (and the
  HTML editor's Format button) uses 4 spaces -> need a second pass to double
  indents.

bzr revid: xmo@openerp.com-20140227125934-q8j3z440px2ic6kx

10 years ago[FIX]project: chosend beginning stage for new project_issue sequence <= 1 (instead...
Denis Ledoux [Thu, 27 Feb 2014 12:29:38 +0000 (13:29 +0100)]
[FIX]project: chosend beginning stage for new project_issue sequence <= 1 (instead of =, same behavior than in tasks)

bzr revid: dle@openerp.com-20140227122938-i0s6dfxd42pl6ov3

10 years ago[IMP] fields: html: now supports a sanitize argument, telling
Thibault Delavallée [Thu, 27 Feb 2014 12:02:54 +0000 (13:02 +0100)]
[IMP] fields: html: now supports a sanitize argument, telling
whether the content of the html field should be sanitized before storage. This parameter
is true by default.
Example of use: html of email template is considered as html content, but contains
mako strings that makes this content not valid html. Sanitizing the body content
can cause issues to the template; therefore storing it as html but not sanitized
allows to keep its content safe.

Added a test case to ensure this behavior.

bzr revid: tde@openerp.com-20140227120254-6m8gvkt4hf28nl0e

10 years ago[MERGE] Merged lp:~openerp/openobject-addons/saas-3
Paramjit Singh Sahota [Thu, 27 Feb 2014 11:42:02 +0000 (17:12 +0530)]
[MERGE] Merged lp:~openerp/openobject-addons/saas-3

bzr revid: psa@tinyerp.com-20140227114202-g2yw8pmsn4v0lm05

10 years ago[FIX] website editor: Editor bar is showing border in ie.
Christophe Matthieu [Thu, 27 Feb 2014 11:17:26 +0000 (12:17 +0100)]
[FIX] website editor: Editor bar is showing border in ie.

bzr revid: chm@openerp.com-20140227111726-s1545ii3exjqjkxz

10 years ago[FIX] website: editor: pointer-events:none for ie doesn't work (because ie). Change...
Christophe Matthieu [Thu, 27 Feb 2014 11:10:38 +0000 (12:10 +0100)]
[FIX] website: editor: pointer-events:none for ie doesn't work (because ie). Change snippet overlay to fix this ie bug

bzr revid: chm@openerp.com-20140227111038-0hodseqys6pnz841

10 years ago[FIX] website snippet: pointer-ie
Christophe Matthieu [Thu, 27 Feb 2014 10:09:17 +0000 (11:09 +0100)]
[FIX] website snippet: pointer-ie

bzr revid: chm@openerp.com-20140227100917-wq54xrkgii7uhacl

10 years ago[FIX] website: editor: pointer-events:none for ie doesn't work (because ie). Change...
Christophe Matthieu [Wed, 26 Feb 2014 17:55:58 +0000 (18:55 +0100)]
[FIX] website: editor: pointer-events:none for ie doesn't work (because ie). Change snippet overlay to fix this ie bug

bzr revid: chm@openerp.com-20140226175558-2gyix2zgdawf87yz

10 years ago[REVERT] rev 8788.1.1769: The exchange rate of the currency of the pricelist should...
Denis Ledoux [Wed, 26 Feb 2014 17:23:00 +0000 (18:23 +0100)]
[REVERT] rev 8788.1.1769: The exchange rate of the currency of the pricelist should not be applied as this price computation method does not depends of any pricelist

bzr revid: dle@openerp.com-20140226172300-z2okr3vpjuwxs4mz

10 years ago[FIX] website: website settings should inherit of res.config.settings and not base...
Denis Ledoux [Wed, 26 Feb 2014 17:11:14 +0000 (18:11 +0100)]
[FIX] website: website settings should inherit of res.config.settings and not base.config.settings, as it create a new page settings, instead of extending one

bzr revid: dle@openerp.com-20140226171114-jwthykyud66l7o6x

10 years ago[FIX] mail: notification url: only web, not login
Thibault Delavallée [Wed, 26 Feb 2014 17:00:02 +0000 (18:00 +0100)]
[FIX] mail: notification url: only web, not login

bzr revid: tde@openerp.com-20140226170002-ndr090idip3cyx3n

10 years ago[MERGE] web_graph: multiple fixes to search facet sync + performance optimizations...
Gery Debongnie [Wed, 26 Feb 2014 15:57:11 +0000 (16:57 +0100)]
[MERGE] web_graph: multiple fixes to search facet sync + performance optimizations and cleanup

bzr revid: odo@openerp.com-20140226155711-fx9pgaa72buyu7gi

10 years ago[FIX] web: bootstrap template rendered using request uid
Christophe Simonis [Wed, 26 Feb 2014 15:55:36 +0000 (16:55 +0100)]
[FIX] web: bootstrap template rendered using request uid

bzr revid: chs@openerp.com-20140226155536-5z7r50bzxxackg1d

10 years ago[IMP] Do not dismiss server errors on calendar notifications
Fabien Meghazi [Wed, 26 Feb 2014 15:47:27 +0000 (16:47 +0100)]
[IMP] Do not dismiss server errors on calendar notifications

bzr revid: fme@openerp.com-20140226154727-dafw83hf9b9a8gpz

10 years ago[FIX] Webkit created spurious spans with inline style when joining lines
Xavier Morel [Wed, 26 Feb 2014 15:20:04 +0000 (16:20 +0100)]
[FIX] Webkit created spurious spans with inline style when joining lines

Post process to manually unwrap node if it only has purely looks-oriented CSS
properties set inline.

ref:
https://code.google.com/p/chromium/issues/detail?id=226941
https://bugs.webkit.org/show_bug.cgi?id=114791
http://dev.ckeditor.com/ticket/9998
http://www.neotericdesign.com/blog/2013/3/working-around-chrome-s-contenteditable-span-bug

bzr revid: xmo@openerp.com-20140226152004-9ybbki1op80lpxin

10 years ago[FIX] adds a missing semicolon... :/ (addon web_graph)
Gery Debongnie [Wed, 26 Feb 2014 14:40:32 +0000 (15:40 +0100)]
[FIX] adds a missing semicolon... :/ (addon web_graph)

bzr revid: ged@openerp.com-20140226144032-st0eqbkzco8n2unk

10 years ago[IMP] this commit adds two css classes (graph_pivot_mode and graph_chart_mode) to...
Gery Debongnie [Wed, 26 Feb 2014 14:39:19 +0000 (15:39 +0100)]
[IMP] this commit adds two css classes (graph_pivot_mode and graph_chart_mode) to better separate the ui from the code in graph view (addon web_graph)

bzr revid: ged@openerp.com-20140226143919-cejqoq2kd4iwrq04

10 years ago[IMP] optimizes pivot table so that it doesn't reload data when the groupbys have...
Gery Debongnie [Wed, 26 Feb 2014 13:04:24 +0000 (14:04 +0100)]
[IMP] optimizes pivot table so that it doesn't reload data when the groupbys have been changed in such a way that it should only fold some headers (addon web_graph)

bzr revid: ged@openerp.com-20140226130424-rtb5iof0c14caf56

10 years ago[FIX] fixes various problems with the graph view and the filters in the searchbar...
Gery Debongnie [Wed, 26 Feb 2014 11:17:10 +0000 (12:17 +0100)]
[FIX] fixes various problems with the graph view and the filters in the searchbar.  Now, it should properly compute and update the groupby/col_groupby in the search bar (addon web_graph)

bzr revid: ged@openerp.com-20140226111710-q11qx1tb2l0nryxf

10 years ago[FIX] Fix bug with filter when date are between 2 months. If an event was starting...
Kersten Jeremy [Tue, 25 Feb 2014 23:42:50 +0000 (00:42 +0100)]
[FIX] Fix bug with filter when date are between 2 months. If an event was starting before the current month, but ending this month or later... it was not always displayed

bzr revid: jke@openerp.com-20140225234250-2lx3tc9ktwume7a9

10 years ago[FIX] Set event from hr_holiday with a class confidential by default.
Kersten Jeremy [Tue, 25 Feb 2014 21:31:21 +0000 (22:31 +0100)]
[FIX] Set event from hr_holiday with a class confidential by default.

bzr revid: jke@openerp.com-20140225213121-hyz46xpsiqtao18o

10 years ago[FIX] Use event.display_time and not event.date in mail template. This function field...
Kersten Jeremy [Tue, 25 Feb 2014 20:03:42 +0000 (21:03 +0100)]
[FIX] Use event.display_time and not event.date in mail template. This function field use the timezone !

bzr revid: jke@openerp.com-20140225200342-6f96u6dkrknbzjsn

10 years ago[MERGE] Fix bug in send_mail_to_attendee of calendar where we passed browse_list...
Kersten Jeremy [Tue, 25 Feb 2014 17:38:08 +0000 (18:38 +0100)]
[MERGE] Fix bug in send_mail_to_attendee of calendar where we passed browse_list and not dict(ids), typo controller calendarr PEP8

bzr revid: jke@openerp.com-20140225173808-60stzxubljuambd4

10 years ago[MERGE] Merge with saas-3-calendar-jke. - Fix filters
Kersten Jeremy [Tue, 25 Feb 2014 17:30:55 +0000 (18:30 +0100)]
[MERGE] Merge with saas-3-calendar-jke. - Fix filters

bzr revid: jke@openerp.com-20140225173055-01uouh0prhyni3i0

10 years ago[FIX] fix bug in send_mail_to_attendee of calendar where we passed browse_list and...
Kersten Jeremy [Tue, 25 Feb 2014 16:58:59 +0000 (17:58 +0100)]
[FIX] fix bug in send_mail_to_attendee  of calendar where we passed browse_list and not dict(ids), typo controller calendarr PEP8

bzr revid: jke@openerp.com-20140225165859-1vyjtirgjmbhoij4

10 years ago[FIX] website: error managment in ace editor for ie9
Christophe Matthieu [Tue, 25 Feb 2014 16:57:20 +0000 (17:57 +0100)]
[FIX] website: error managment in ace editor for ie9

bzr revid: chm@openerp.com-20140225165720-c451gumsd5mce5ya

10 years ago[FIX] dataset.read_ids should always return records in the order of the parameter ids
Xavier Morel [Tue, 25 Feb 2014 16:28:13 +0000 (17:28 +0100)]
[FIX] dataset.read_ids should always return records in the order of the parameter ids

BufferedDataSet.read_ids assumes the input and output orders are the same, and
returns wonky results when not the case, which in turns fucks up its cache as
it associates ids and records incorrectly.

bzr revid: xmo@openerp.com-20140225162813-8ofxpiy1012eehgk

10 years ago[FIX] website: fix for ie: add bootstrap class in website_sale and bind click for...
Christophe Matthieu [Tue, 25 Feb 2014 16:21:36 +0000 (17:21 +0100)]
[FIX] website: fix for ie: add bootstrap class in website_sale and bind click for editor

bzr revid: chm@openerp.com-20140225162136-5xdt7n498qxf9myw

10 years ago[REF] Refactoring all filters. Now, calendar remember if the filter is checked betwee...
Kersten Jeremy [Tue, 25 Feb 2014 15:41:37 +0000 (16:41 +0100)]
[REF] Refactoring all filters. Now, calendar remember if the filter is checked between each do_search and event_source refresh

bzr revid: jke@openerp.com-20140225154137-45tr7l50xlceom2b

10 years ago[FIX] Transform get_default_options of calendar into a function, to be instancied...
Kersten Jeremy [Tue, 25 Feb 2014 15:39:26 +0000 (16:39 +0100)]
[FIX] Transform get_default_options of calendar into a function, to be instancied after date.js

bzr revid: jke@openerp.com-20140225153926-ltwubk1sxfi3heuv

10 years ago[FIX] crm: lead to opportunity convertion: pass id instead of browse record object
Christophe Simonis [Tue, 25 Feb 2014 10:28:30 +0000 (11:28 +0100)]
[FIX] crm: lead to opportunity convertion: pass id instead of browse record object

bzr revid: chs@openerp.com-20140225102830-1za1ei2xlr1oc4nv

10 years ago[FIX] tags edition breakage in website_event_track
Xavier Morel [Tue, 25 Feb 2014 13:12:28 +0000 (14:12 +0100)]
[FIX] tags edition breakage in website_event_track

* remove some nodes from the $editables set, ``li`` really does not like being
  widgetified. Remove a few others just in case

* split fa outside of li to make it safely (ish) editable

* simplify upcast function for icons cke widget

bzr revid: xmo@openerp.com-20140225131228-2m75itgi4zbj5xfh

10 years ago[FIX] website_event_track: employees should not be restricted to public events only
Olivier Dony [Tue, 25 Feb 2014 11:57:42 +0000 (12:57 +0100)]
[FIX] website_event_track: employees should not be restricted to public events only

Also switched rule to noupdate. A manual fix of existing installations
will be necessary, as is usually the case for ir.rules changes.
This module has not made it into a LTS version yet, so it is acceptable.
+ Added a _description for the event.track model to avoid it being
replaced by inherited descriptions.

bzr revid: odo@openerp.com-20140225115742-ghnt3khn6hvycnnw

10 years ago[FIX] t-ignore should remove injected sub-view branding below the ignore flag
Xavier Morel [Tue, 25 Feb 2014 11:47:06 +0000 (12:47 +0100)]
[FIX] t-ignore should remove injected sub-view branding below the ignore flag

bzr revid: xmo@openerp.com-20140225114706-j8q44cubs59tuwby

10 years ago[MERGE] point_of_sale: fixing duplicated orders, fixing crash when selling goods...
Frédéric van der Essen [Tue, 25 Feb 2014 11:01:42 +0000 (12:01 +0100)]
[MERGE] point_of_sale: fixing duplicated orders, fixing crash when selling goods with lot tracking, accept ean13 barcodes with a stripped leading zero

bzr revid: fva@openerp.com-20140225110142-oklvhmvh79u9ymuv

10 years ago[IMP] unbrand t-raw and t-esc as keeping them branded makes very little sense
Xavier Morel [Tue, 25 Feb 2014 11:00:46 +0000 (12:00 +0100)]
[IMP] unbrand t-raw and t-esc as keeping them branded makes very little sense

they can't be edited in any situation

bzr revid: xmo@openerp.com-20140225110046-90rdevm13pp4m51s

10 years ago[MERGE] from upstream
Frédéric van der Essen [Tue, 25 Feb 2014 10:59:24 +0000 (11:59 +0100)]
[MERGE] from upstream

bzr revid: fva@openerp.com-20140225105924-1r2c9ha7703zlfxz

10 years ago[FIX] mail: fixed sign-in URL in notification emails, use the new web/login controlle...
Thibault Delavallée [Tue, 25 Feb 2014 09:50:54 +0000 (10:50 +0100)]
[FIX] mail: fixed sign-in URL in notification emails, use the new web/login controller introduced in saas-3.

bzr revid: tde@openerp.com-20140225095054-kswinebsgsj5fex1

10 years ago[IMP] in view tests, replace tostring() and string comparisons by custom lxml.etree...
Xavier Morel [Tue, 25 Feb 2014 09:28:42 +0000 (10:28 +0100)]
[IMP] in view tests, replace tostring() and string comparisons by custom lxml.etree comparator

bzr revid: xmo@openerp.com-20140225092842-sc6whhm173azurtt

10 years ago[FIX] mail_thread: when reading subscription data, add a protection
Thibault Delavallée [Tue, 25 Feb 2014 09:06:37 +0000 (10:06 +0100)]
[FIX] mail_thread: when reading subscription data, add a protection
against not planned subtype data (coming from error in subtype relationship
table, or for undisplayed subtypes, old subtypes, ...).

bzr revid: tde@openerp.com-20140225090637-mnztroc05nk7l2sl

10 years ago[TYPO] PEP7 - Module calendar (no E501)
Kersten Jeremy [Mon, 24 Feb 2014 22:02:22 +0000 (23:02 +0100)]
[TYPO] PEP7 - Module calendar (no E501)

bzr revid: jke@openerp.com-20140224220222-dp26lvbv2bfljxvt

10 years ago[MERGE] point of sale fixes
Christophe Simonis [Mon, 24 Feb 2014 17:21:13 +0000 (18:21 +0100)]
[MERGE] point of sale fixes

bzr revid: chs@openerp.com-20140224172113-gj1t8hi7a8hr60gq

10 years ago[FIX] injected views need branding distribution too
Xavier Morel [Mon, 24 Feb 2014 17:03:01 +0000 (18:03 +0100)]
[FIX] injected views need branding distribution too

forgot to set it up after installed injected view skipping during distribution of injectee

bzr revid: xmo@openerp.com-20140224170301-b4ta04zqsd5d2956

10 years ago[MERGE] from upstream
Frédéric van der Essen [Mon, 24 Feb 2014 16:09:09 +0000 (17:09 +0100)]
[MERGE] from upstream

bzr revid: fva@openerp.com-20140224160909-ezk3re38imtq2eo1