Commit Graph

349 Commits

Author SHA1 Message Date
Fabien Meghazi 1c4e2cfd22 [IMP] bundlify addons (except website)
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
Xavier Morel 74d4d1f58d [CHG] bundlify website
CKEDITOR_BASEPATH has to be defined, by default ckeditor will load its files
relative to "itself" (the file which executes it). After bundling, the path is
incorrect and ckeditor looks for its files (e.g. en.js) in the wrong place.

bzr revid: xmo@openerp.com-20140418121503-4nsja7enutney2vn
2014-04-18 14:15:03 +02:00
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Kersten Jeremy 9226642436 [FIX] Ecomm - login to post a comment if not logged
bzr revid: jke@openerp.com-20140404135005-4uz7qtzyke58sgy2
2014-04-04 15:50:05 +02:00
Denis Ledoux 368afae722 [FIX] website_sale: order data refresh problem
bzr revid: dle@openerp.com-20140404102512-72x74ys4k6whk8ss
2014-04-04 12:25:12 +02:00
Thibault Delavallée ec318c33e1 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140404082228-g7g3b2ju06meqvq4
2014-04-04 10:22:28 +02:00
Denis Ledoux ad680380b8 [FIX] website_sale*: not possible to process order if no delivery methods available
bzr revid: dle@openerp.com-20140402144520-ulfex2r3q9wwd3ig
2014-04-02 16:45:20 +02:00
chm@openerp.com 13d7cfe86c [MERGE] from trunk
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
Kersten Jeremy 356e4f595a [FIX] Redirect user to /web/login and not /web. The redirect is now compatible with the rev web:3983 (needto be retrocompatible), but the good practice should be to always redirect to login. It is to login controller to redirect if user is alreayd logged.
bzr revid: jke@openerp.com-20140321115524-j3vk6lovuphnaods
2014-03-21 12:55:24 +01:00
Thibault Delavallée 38ae695d00 [IMP] payment modules: added provider selection field that is different
from the name. This allows to distinguish name and provider. Provider is a more
technical field, used to call some specific methods (<provider>_method_name). The
name field is used for display on the website.

Code and views udpated accordingly.

bzr revid: tde@openerp.com-20140319144608-0i4rv520l0bh53f0
2014-03-19 15:46:08 +01:00
Denis Ledoux b245af63b5 [FIX] website_sale: do not display product categories with no products
bzr revid: dle@openerp.com-20140319141130-dease119j9b2l2fh
2014-03-19 15:11:30 +01:00
chm@openerp.com ed2743f755 merge upstream
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
chm@openerp.com abe8e7208e [MERGE] from trunk
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
chm@openerp.com 363bbd00db [FIX] website_sale: display empty message for public user and allow admin to edit 'no product found' message
bzr revid: chm@openerp.com-20140317141749-vmsx9x1kkmygnc61
2014-03-17 15:17:49 +01:00
chm@openerp.com 34b6fac77a [FIX] website_sale: test tour shop_buy_product (step: 'select ipod 32Go'): remove teminal backslash in products grid view
bzr revid: chm@openerp.com-20140317094118-5gsddsfhmisi7xs3
2014-03-17 10:41:18 +01:00
chm@openerp.com 6fc418883e [FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140317080145-6l5mk4q05uf639li
2014-03-17 09:01:45 +01:00
chm@openerp.com 353bbdc2c3 [FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
2014-03-14 17:23:46 +01:00
chm@openerp.com 384f398090 [IMP] website: publish button use action for url to backend
bzr revid: chm@openerp.com-20140311171941-1fwhholwlsuncjyh
2014-03-11 18:19:41 +01:00
chm@openerp.com f75f09db92 [FIX] website_sale: set height for empty cell in grid
bzr revid: chm@openerp.com-20140311160419-a9d4dylm0spt4rf3
2014-03-11 17:04:19 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
chm@openerp.com 3353305a6f [FIX] website_sale: remove filter of rows process grid, layout need to create empty tr for rowspan
bzr revid: chm@openerp.com-20140311093050-4p75rrdh5bg8mpqy
2014-03-11 10:30:50 +01:00
chm@openerp.com d41ea1cfdc [FIX] website_sale: grid view remove rowspan if colspan=4
bzr revid: chm@openerp.com-20140310163329-nglj6dxpulzcl5qn
2014-03-10 17:33:29 +01:00
chm@openerp.com 832e6ad2d6 [FIX] website_sale: resize big image if size 1x1 for loading faster; (don't use image_medium who break some layout customisation like 'image full'
bzr revid: chm@openerp.com-20140310152847-xjilnu4cxhs3c73b
2014-03-10 16:28:47 +01:00
chm@openerp.com 3195913272 [FIX] website_sale: grid view don't display empty cells
bzr revid: chm@openerp.com-20140307153718-2nlw8mtntfkm7ehu
2014-03-07 16:37:18 +01:00
chm@openerp.com dfc428a6a1 [FIX] website_sale: Remove the oe_shadow from product Description; fix description editing; fix resize shopping cart.
bzr revid: chm@openerp.com-20140307134551-kxxp703sgep5eacv
2014-03-07 14:45:51 +01:00
chm@openerp.com c0d20af756 [FIX] Fix bug where button with contenteditable does not work in cross browser. Fix : replace tag 'button' by 'a' with class 'a-submit'; forgotten part
bzr revid: chm@openerp.com-20140307125141-gfvnwq0rnjyqbbvp
2014-03-07 13:51:41 +01:00
chm@openerp.com 23eca80556 [MERGE] from trunk
bzr revid: chm@openerp.com-20140307104233-fqz4jwzf5yj6jtm2
2014-03-07 11:42:33 +01:00
chm@openerp.com 0b92d30081 [FIX] Replace t-esc in t-field for amount_untaxed in checkout of website_sale. Else display monetary does not work
bzr revid: chm@openerp.com-20140307103702-lsfj0iehm5kg4z29
2014-03-07 11:37:02 +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
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
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
Denis Ledoux 70d3f251a3 [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
2014-02-26 18:23:00 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Christophe Matthieu 1e2a5ddfa6 [FIX] website: fix for ie: add bootstrap class in website_sale and bind click for editor
bzr revid: chm@openerp.com-20140225162136-5xdt7n498qxf9myw
2014-02-25 17:21:36 +01:00
Christophe Matthieu a7e5025f29 [FIX]website_sale: crappy fix for view product: branding error => can't edit guarantee part when the product_attributes inherit is apply
bzr revid: chm@openerp.com-20140212152842-6ymg8kund5l2v7yk
2014-02-12 16:28:42 +01:00
Christophe Matthieu ed785f0783 [FIX] website_sale: pager and breadcrum keep search and filter. Filter keep search and category. Links for category
bzr revid: chm@openerp.com-20140212115516-3izdv7cszgh2n3l4
2014-02-12 12:55:16 +01:00
Christophe Matthieu 5b8ea0803a [FIX] website: crappy layout when use click on edit in the shop. Microforma error. Don't use meta tag in page content: ckeditor bug report 8117.
bzr revid: chm@openerp.com-20140211135610-0xhf2yiuwfc8k0ss
2014-02-11 14:56:10 +01:00
Antony Lesuisse 87172d90d2 [MERGE] saas-3
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
2014-02-09 15:03:15 +01:00
Christophe Matthieu b21bb08c22 [ADD] website: test login, backend, go back, branding, edit, logout
bzr revid: chm@openerp.com-20140207125231-3zd0i1axdwuht5g4
2014-02-07 13:52:31 +01:00
Christophe Matthieu 22a27ed953 [MERGE] Microformats (microdata) support for improved SEO.
Supported formats:
 - Organization
   https://support.google.com/webmasters/answer/146861?hl=en&ref_topic=1088474
   http://schema.org/Organization
 - Event
   https://support.google.com/webmasters/answer/164506?hl=en&ref_topic=1088474
   http://schema.org/Event
 - Product+Offer
   https://support.google.com/webmasters/answer/146750#offer_properties
   http://schema.org/Product
   http://schema.org/Offer

Tested with http://www.google.com/webmasters/tools/richsnippets

bzr revid: chm@openerp.com-20140207113721-klunj6bf9qp4b2cx
2014-02-07 12:37:21 +01:00
Christophe Matthieu 052bcacd5f [FIX] website_sale template; snippet editor
bzr revid: chm@openerp.com-20140206140258-l3hriceuksx0c061
2014-02-06 15:02:58 +01:00
Christophe Matthieu d819d494f1 [IMP] website: add debugger template used to create nex tours/tests (display in customize menu in debug mode)
bzr revid: chm@openerp.com-20140206135036-geq8fubtz39pxp20
2014-02-06 14:50:36 +01:00
Fabien Pinckaers 4dbcf24f19 [IMP] Empty product page
bzr revid: fp@tinyerp.com-20140205212452-ktjjx4qcufzlmlqc
2014-02-05 22:24:52 +01:00
ddm@openerp.com 706881ab38 [FIX] Proper ticket price micodata
bzr revid: ddm@openerp.com-20140205075141-xxedwfwf3lz2v0ej
2014-02-05 08:51:41 +01:00
ddm@openerp.com af2db3b19d [IMP] Microdata for product
bzr revid: ddm@openerp.com-20140203174422-tah5bx94y9mctlei
2014-02-03 18:44:22 +01:00
ddm@openerp.com 9e12243350 [IMP] Microdata for product list (+description)
bzr revid: ddm@openerp.com-20140203165853-g3nt28nzbe59gbvl
2014-02-03 17:58:53 +01:00
ddm@openerp.com 2d4d872300 [IMP] Microdata for product list
bzr revid: ddm@openerp.com-20140203165536-5wxskybc50fdd8x3
2014-02-03 17:55:36 +01:00
jke-openerp c18d350468 [FIX] Fix bug where button with contenteditable does not work in cross browser. Fix : replace tag 'button' by 'a' with class 'a-submit'
bzr revid: jke@openerp.com-20140201204741-ygdxaauq0m5axttg
2014-02-01 21:47:41 +01:00