pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,218 Commits 1 Branch 0 Tags
77be55fcc7de35c9a9de6451fe056e94de7fe2d6
Commit Graph
103218 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Lejeune ff97011b3a [MERGE] Trunk 
bzr revid: sle@openerp.com-20140227164907-pvd92tw2bmg4d0w8
 2014-02-27 17:49:07 +01:00
Christophe Matthieu 5e509d07df [FIX] website_sale: search filter with multi values for one attribute does not work. (and fix slider) 
bzr revid: chm@openerp.com-20140227164756-846ezfa36fz3v4d9
 2014-02-27 17:47:56 +01:00
Kersten Jeremy 7917c495e9 [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
 2014-02-27 17:46:11 +01:00
Fabien Meghazi 312991ca1e [FIX] ensure_db() on inherited /web/login controllers 
bzr revid: fme@openerp.com-20140227164141-1sblr0g6ta66q1em
 2014-02-27 17:41:41 +01:00
Fabien Meghazi e76c36d704 [FIX] Database selector issue 
ensure_db() If the request.session.db is different than
the computed db abort and redirect in order to properly
dispatch on computed db

bzr revid: fme@openerp.com-20140227164018-iukowle122spr2c5
 2014-02-27 17:40:18 +01:00
Christophe Simonis 3e2c1b1be3 [FIX] website_sale: do not write on public user 
bzr revid: chs@openerp.com-20140227164000-owh6217y3t5iyiow
 2014-02-27 17:40:00 +01:00
Antony Lesuisse 8fec899f9b [FIX] move appsdirs to tools 
bzr revid: al@openerp.com-20140227163259-asal833qjv3gylit
 2014-02-27 17:32:59 +01:00
Antony Lesuisse 38d1ca1ff2 [MERGE] trunk 
bzr revid: al@openerp.com-20140227161819-p9chmskfifo0rygs
 2014-02-27 17:18:19 +01:00
Denis Ledoux ee67a1ae39 [IMP] auth_signup: email first in the signup form, as is regarded as the most important variable 
bzr revid: dle@openerp.com-20140227161638-5rp3bunjx77fbavu
 2014-02-27 17:16:38 +01:00
Denis Ledoux 82fceb4620 [FIX] web: login, autofocus if login is filled 
bzr revid: dle@openerp.com-20140227161454-sd6qxmpgv2bvslf7
 2014-02-27 17:14:54 +01:00
Josse Colpaert 753c125024 [IMP] No pack operations create needed at force_assign 
bzr revid: jco@openerp.com-20140227161020-happi4qshw2uoabo
 2014-02-27 17:10:20 +01:00
Josse Colpaert bd0fcb70b7 [IMP] name_get of product should not ask for seller_ids if not necessary 
bzr revid: jco@openerp.com-20140227160808-m53f0kkgbqno1ea8
 2014-02-27 17:08:08 +01:00
Christophe Matthieu b994ae4938 [FIX] website_sale: search filter with multi values for one attribute does not work. (and fix slider) 
bzr revid: chm@openerp.com-20140227160519-eakqgm2zwrxseya7
 2014-02-27 17:05:19 +01:00
Fabien Meghazi 152e70e9fa [IMP] seperation of auth_signup's reset password and signup routes 
bzr revid: fme@openerp.com-20140227154955-tnxyzw1ynuwlo5mj
 2014-02-27 16:49:55 +01:00
Fabien Meghazi 6aa24d0896 [IMP] Improve login for auth_signup/oauth seperation 
bzr revid: fme@openerp.com-20140227154921-2fqr8p8bhczn37xa
 2014-02-27 16:49:21 +01:00
Simon Lejeune 27a232596c [IMP] Add notification on the web client when wkhtmltopdf is not present or too old 
bzr revid: sle@openerp.com-20140227154046-hxnhyho6v096hjx8
 2014-02-27 16:40:46 +01:00
Thibault Delavallée a9a4767d17 [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
 2014-02-27 16:38:35 +01:00
Christophe Simonis 8b81179d45 [FIX] payment_paypal: create account with at least required fields 
bzr revid: chs@openerp.com-20140227151959-mpk2bjk9k8t0chqo
 2014-02-27 16:19:59 +01:00
Simon Lejeune 4f979046ed [MERGE] trunk 
bzr revid: sle@openerp.com-20140227145225-sygkyqft99tux3jm
 2014-02-27 15:52:25 +01:00
Simon Lejeune a82c186611 [IMP] Added a route to check presence and version of wkhtmltopdf. If the soft is not present, qweb-pdf fallback on qweb-html mode. 
bzr revid: sle@openerp.com-20140227144810-d14iwu5pudmrshh9
 2014-02-27 15:48:10 +01:00
Thibault Delavallée a17c09afff [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
 2014-02-27 15:42:28 +01:00
Kersten Jeremy 2b7de6164f [FIX] Fix notification in calendar. All peoples had all notifs :( 
bzr revid: jke@openerp.com-20140227142933-33bh05ozdb7uwjy5
 2014-02-27 15:29:33 +01:00
Fabien Meghazi a210c5f534 [MERGE] upstream 
bzr revid: fme@openerp.com-20140227142022-fgqnvfzkkqeh99l3
 2014-02-27 15:20:22 +01:00
Christophe Matthieu d96cf8c54c [FIX] website: editor: can not edit a label in edit mode, must prevent the default click 
bzr revid: chm@openerp.com-20140227140043-8iko13704pci9823
 2014-02-27 15:00:43 +01:00
Christophe Matthieu 6a9d3326db [FIX] website_sale: 'Ship to a different address' not translatable 
bzr revid: chm@openerp.com-20140227135120-drw0jha7gzqptdog
 2014-02-27 14:51:20 +01:00
Thibault Delavallée b1f88d634d [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
 2014-02-27 14:48:29 +01:00
Christophe Matthieu f462d1564f [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
 2014-02-27 14:33:47 +01:00
Josse Colpaert 0f52affe0b [IMP] When reserved quants are ok, no need to rereserve quants 
bzr revid: jco@openerp.com-20140227131237-du11dk5fu71nfnex
 2014-02-27 14:12:37 +01:00
Fabien Pinckaers 100cc571cd [IMP] Event Security Fix + Publish Track 
bzr revid: fp@tinyerp.com-20140227131144-8rq3woldpl1zbppj
 2014-02-27 14:11:44 +01:00
Kersten Jeremy 49a92c376a [FIX] Fix loop when parse hash into get param with no hash 
bzr revid: jke@openerp.com-20140227130705-jlvl157aio3o4df3
 2014-02-27 14:07:05 +01:00
Xavier Morel 6b857b6eeb [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
 2014-02-27 13:59:34 +01:00
Turkesh Patel (Open ERP) 801d9d429b [ADD] add code to edit answer and dont show template to post answer if user allready given answer just show button to edit answer. 
bzr revid: tpa@tinyerp.com-20140227125701-90m6mpigjq1npvub
 2014-02-27 18:27:01 +05:30
Stephane Wirtel 855836e96e [IMP] Move the netsvc.dispatch_rpc function from netsvc to openerp.http 
bzr revid: stw@openerp.com-20140227125648-kunaefr22y28honx
 2014-02-27 13:56:48 +01:00
Denis Ledoux e28677f727 [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
 2014-02-27 13:29:38 +01:00
Fabien Meghazi 075640848e [FIX] signup and rest password links 
bzr revid: fme@openerp.com-20140227121032-2nj47kqc5bwwpo23
 2014-02-27 13:10:32 +01:00
Thibault Delavallée 42e2676f4b [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
 2014-02-27 13:02:54 +01:00
Mantavya Gajjar 081a1c0925 [IMP]: improve main page of forum module 
bzr revid: mga@tinyerp.com-20140227115237-ho3spisd0zh60t0j
 2014-02-27 17:22:37 +05:30
Paramjit Singh Sahota 89de7d9f25 [MERGE] Merged lp:~openerp/openobject-addons/saas-3 
bzr revid: psa@tinyerp.com-20140227114202-g2yw8pmsn4v0lm05
 2014-02-27 17:12:02 +05:30
Christophe Matthieu 6a777b9e62 [FIX] website editor: Editor bar is showing border in ie. 
bzr revid: chm@openerp.com-20140227111726-s1545ii3exjqjkxz
 2014-02-27 12:17:26 +01:00
Christophe Matthieu 5f70ca61b6 [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
 2014-02-27 12:10:38 +01:00
Fabien Meghazi c1d9449a57 [MERGE] upstream 
bzr revid: fme@openerp.com-20140227101745-k6iseaz765qnflnm
 2014-02-27 11:17:45 +01:00
Fabien Meghazi 2868e9a6ac [MERGE] upstream 
bzr revid: fme@openerp.com-20140227101725-7egd9xq859jasnhj
 2014-02-27 11:17:25 +01:00
Christophe Matthieu 01a898ab8b [FIX] website snippet: pointer-ie 
bzr revid: chm@openerp.com-20140227100917-wq54xrkgii7uhacl
 2014-02-27 11:09:17 +01:00
Josse Colpaert 634d0f3ff8 [IMP] Do not search quants when source location requires to create quants 
bzr revid: jco@openerp.com-20140227100401-axy57wrto0ex2xf7
 2014-02-27 11:04:01 +01:00
Richard Mathot (OpenERP) d263942189 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140227093043-y4dj5naxd0wve2ri
 2014-02-27 10:30:43 +01:00
Josse Colpaert 23128a26ae [IMP] Put remaining qty in variable not to calculate multiple times 
bzr revid: jco@openerp.com-20140227084509-cr589ynshxltt2fv
 2014-02-27 09:45:09 +01:00
Turkesh Patel (Open ERP) 013d7514bb [IMP] improved code to search quetion 
bzr revid: tpa@tinyerp.com-20140227061514-5vs4p9604f9lf2fi
 2014-02-27 11:45:14 +05:30
Mantavya Gajjar 9239554cf0 [IMP]: improve template 
bzr revid: mga@tinyerp.com-20140227045828-akovbnya0bqk8bw3
 2014-02-27 10:28:28 +05:30
Mantavya Gajjar b49a1f840a [NOTE]: search function may break, need to reimplement it, put form tag in view again 
bzr revid: mga@tinyerp.com-20140226194829-3h9khcsdhx8bwyv2
 2014-02-27 01:18:29 +05:30
Mantavya Gajjar acce8d2b2b [IMP]: improve view 
bzr revid: mga@tinyerp.com-20140226194605-mjzzuv8lyjotbvk7
 2014-02-27 01:16:05 +05:30