pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,206 Commits 1 Branch 0 Tags
72700a2cf97243da609fffcbc6c9e8fa834701cc
Commit Graph
83206 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Simonis a5fc14193d [FIX] website_mail: forbid access to email_designer routes to public user 
bzr revid: chs@openerp.com-20140228151544-ipoih9c924rsbqi1
 2014-02-28 16:15:44 +01:00
Christophe Simonis 47c4728f43 [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
 2014-02-28 15:22:33 +01:00
Kersten Jeremy 4954c0fa39 [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
 2014-02-28 15:39:30 +01:00
Kersten Jeremy 015083df09 [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
 2014-02-28 15:00:53 +01:00
Kersten Jeremy b2045b91ac [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
 2014-02-28 14:52:24 +01:00
Christophe Matthieu abcd7e4926 [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
 2014-02-28 14:25:07 +01:00
Christophe Matthieu ce1ff0a854 [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
 2014-02-28 14:17:38 +01:00
Christophe Simonis c8971214f9 [FIX] website_sale: allow validation of free orders (amount = 0) without payment transaction 
bzr revid: chs@openerp.com-20140228123414-4chmuemyi72rpwgf
 2014-02-28 13:34:14 +01:00
Christophe Matthieu 24f9dc348a [FIX] website_sale: long product title is over the price in grid view. 
bzr revid: chm@openerp.com-20140228102257-000435ykuv7000ub
 2014-02-28 11:22:57 +01:00
Christophe Matthieu c11f4f9352 [FIX] website: snippet: continue slide cycling when the user edit the content 
bzr revid: chm@openerp.com-20140228095531-8c735qyacmffryno
 2014-02-28 10:55:31 +01:00
Kersten Jeremy 80f5dd1322 [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
 2014-02-28 10:54:22 +01:00
Kersten Jeremy 7b91fa8920 [IMP] Hide seconds in demo data from event and event track module 
bzr revid: jke@openerp.com-20140228095052-nrf5tt38y7k9jr2v
 2014-02-28 10:50:52 +01:00
Christophe Simonis 783a8e22a9 [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
 2014-02-28 10:25:35 +01:00
Kersten Jeremy 01028e5260 [IMP] Remove the seconds on event demoo data 
bzr revid: jke@openerp.com-20140228090844-akorvc0ve71x0i4j
 2014-02-28 10:08:44 +01:00
Antony Lesuisse 1d227c0b24 [MERGE] data-dir, a single directory for file system assets 
use a single directory in the filesystem to store
- database filestore
- http sessions
- downloaded modules

By default the following platform specific location are used

Mac OS X:               ~/Library/Application Support/OpenERP
Unix:                   ~/.local/share/OpenERP    # or in $XDG_DATA_HOME, if defined
Win 7  (not roaming):   C:\Users\<username>\AppData\Local\OpenERP\OpenERP
Win 7  (roaming):       C:\Users\<username>\AppData\Roaming\OpenERP\OpenERP
Win XP (not roaming):   C:\Documents and Settings\<username>\Application Data\OpenERP\OpenERP
Win XP (roaming):       C:\Documents and Settings\<username>\Local Settings\Application Data\OpenERP\OpenERP

But this location can manually be set manually using --data-dir

bzr revid: al@openerp.com-20140227225333-d4q6tj74c7zhxiuv
 2014-02-27 23:53:33 +01:00
Christophe Simonis 91c278ad75 [FIX] payment_ogone: use utf8 version of orderstandard page 
bzr revid: chs@openerp.com-20140227214423-k0dz4769kibfgld4
 2014-02-27 22:44:23 +01:00
Simon Lejeune 7851c9f825 [MERGE] Report module: reporting using the QWeb rendering engine. Sale, purchase, mrp and mrp_repair reports are converted. 
bzr revid: sle@openerp.com-20140227170838-erkeann2ka4apznf
 2014-02-27 18:08:38 +01:00
Christophe Simonis 70f3ed09c5 merge upstream 
bzr revid: chs@openerp.com-20140227165817-wdgdl4rbmtnnqudt
 2014-02-27 17:58:17 +01:00
Simon Lejeune 03aa27fcca [IMP] Add link to wkhtmltopdf.org in the webclient notifications 
bzr revid: sle@openerp.com-20140227165509-qrdwy0s7xh044zf4
 2014-02-27 17:55:09 +01:00
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
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
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
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