Commit Graph

64 Commits

Author SHA1 Message Date
Olivier Dony 495ec92251 [I18N] Update translations from Launchpad 8.0 branches 2015-01-21 15:36:54 +01:00
Olivier Dony 39f00b3637 [I18N] Update translation templates with latest terms
Total new terms: 270
Total deleted terms: 82
Total identical terms: 19653
Old total number of terms: 19735
New total number of terms: 19923
2015-01-21 15:31:22 +01:00
Olivier Dony a6d24db305 [I18N] Update translations from Launchpad 8.0 branches 2014-11-19 17:49:12 +01:00
Raphael Collet b8071bbaca [FIX] addons: incorrect new-api invocation of method write() with context
This fixes #3411.
2014-11-13 13:34:55 +01:00
Olivier Dony 7439421ad2 [I18N] Update translations from Launchpad 8.0 branches 2014-10-08 17:52:25 +02:00
Denis Ledoux 38668fd404 [FIX] website_sale*: handle no delivery methods in website
Display a user friendly message instead of crashing when there is not delivery method available for a specific order
2014-10-08 15:38:16 +02:00
Olivier Dony 1c5b5e4290 [I18N] Update translations from Launchpad 8.0 branches
server: rev. 26 rev-id launchpad_translations_on_behalf_of_openerp-20140923072744-tkfs0yinu8msjh09
addons: rev. 39 rev-id launchpad_translations_on_behalf_of_openerp-20140923072715-5j7qvnuvmmb1zzy1
web: rev. 23 rev-id launchpad_translations_on_behalf_of_openerp-20140923072757-jvh9l6r2x0vfcyhb
2014-09-23 13:42:05 +02:00
Olivier Dony 53aa92d3c9 [I18N] Update translations from Launchpad branches 2014-09-18 11:47:16 +02:00
Olivier Dony fac96241df [I18N] Update 8.0 translations with latest changes from Launchpad 2014-09-08 19:04:25 +02:00
Fabien Pinckaers 8aca457e34 [IMP] Updated website urls on modules and info page 2014-08-26 21:40:18 +02:00
Olivier Dony 50ef63881a [I18N] Update 8.0 translation with latest source code 2014-08-14 17:01:54 +02:00
Olivier Dony e11eddf753 [MERGE] Forward-port of saas-5 up to 20cc18d 2014-08-13 20:46:47 +02:00
Justin Warren 7d78bc1e14 [FIX] website_sale_delivery: selection of non-available delivery method
Instead of disabling non-available method, hide it to avoid confusing the user
Fixes #1720
2014-08-11 17:23:37 +02:00
Martin Trigaux 6dc94f0c4e Forward port of branch saas-5 up to eda2f06 2014-07-28 16:37:56 +02:00
Jeremy Kersten 451d2de355 [FIX] website_sale: fix error in tracking_last_order which was using the field is_delivery from module delivery 2014-07-24 11:07:46 +02:00
Olivier Dony ef53a831c6 [MERGE] Forward-port saas-5 up to a5f7891 2014-07-23 16:58:00 +02:00
Martin Trigaux 36fcfc66c4 [FIX] website_sale_delivery: avoid selecting unavailable delivery method
If somebody selects a delivery method not matching any criteria, the server would crash (500 for the user). This is due to error raised in get_price_from_picking which is triggered by the function field 'price' on the 'delivery.carrier' object.
To avoid this, add field 'available' on the carrier that will be False when no delivery gird is found or when the error is raised. In this case, the delivery choice is disabled. opw 610210
2014-07-22 17:03:02 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
Olivier Dony e7665864be [FIX] website_sale_delivery: bundlify JS file inclusion 2014-07-05 02:24:43 +02:00
Olivier Dony e328ae8a2e [FIX] website_sale_delivery: missing refactoring related to a5ca54fd5b 2014-06-29 02:13:34 +02:00
Denis Ledoux f5641739a6 [FIX] website_sale_delivery: Should be installable
Has been set as not install-able for testing purposes, in commit ff37d0ebca
2014-06-27 17:26:03 +02:00
Antony Lesuisse c05584a4d9 [FIX] website_sale and website_event imports
missing import prevent cli help display
2014-05-29 23:19:24 +02:00
Fabien Meghazi 0544fc2929 Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
This reverts commit dd900408de, reversing
changes made to 4da882d48f.
2014-05-27 16:12:52 +02:00
Fabien Meghazi 1744208928 Changed xpath expression from /t to . 2014-05-27 10:45:07 +02:00
Mitesh Savani daba406886 [IMP]Move assetss to frontend template. 2014-05-23 18:31:01 +05:30
Fabien Meghazi 35efb5bf5f [MERGE] upstream 2014-05-19 12:12:46 +02:00
Fabien Meghazi 8eed143112 [IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty 2014-05-13 11:35:45 +02:00
Thibault Delavallée 2b8739cf8b [IMP] website sales salesteam: refactored implementation
- now having a website sales sales team in website_sale;
- temporarily crm accepted as a dependency of website_sale (will be improved when sales team are
taken out of crm);
- removed website_sale_crm unnecessary module + dead code
- removed shopping cart state + its management
- added acquirer and transaction fields on sale order
- azdded use_opportunities and use_quotations fields on sales team like use_leads
2014-05-12 17:52:10 +02:00
chm@openerp.com ee16b014b1 [MERGE] from trunk
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
Denis Ledoux 79d4c57877 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
2014-04-29 13:27:38 +02:00
Denis Ledoux b54e49b291 [FIX] website_sale, website_sale_delivery, delivery: price computation on quantity change
bzr revid: dle@openerp.com-20140425152541-qiabb4sa7y2skgql
2014-04-25 17:25:41 +02:00
chm@openerp.com 7298130f31 [MERGE] from trunk
bzr revid: chm@openerp.com-20140410152925-ndajhnyh4rt8pkgu
2014-04-10 17:29:25 +02:00
Denis Ledoux 3b821e0854 [FIX] website_sale_delivery: list pop actually takes as arg the index in the list, not the item (+ check that carrier id is not false)
bzr revid: dle@openerp.com-20140404130302-mvm2tzhsc2a58p11
2014-04-04 15:03:02 +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
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
Denis Ledoux 9e92e40da3 [FIX] websit_sale: checking grid need some more access rights, therefore need to using superuser_id
bzr revid: dle@openerp.com-20140402152814-0x90lrp05houblqh
2014-04-02 17:28:14 +02:00
Denis Ledoux e3f90b7399 [FIX] website_sale: do not try to check order if order is nontype
bzr revid: dle@openerp.com-20140402152043-2vl7pwlwso4tf2dp
2014-04-02 17:20:43 +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
Denis Ledoux 166c4d2751 [FIX] website_sale_delivery: avoid displaying or choosing non available delivery methods for torder
bzr revid: dle@openerp.com-20140402114815-b42pvgk914r0at1d
2014-04-02 13:48:15 +02: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
Antony Lesuisse ff37d0ebca website sale refactor
bzr revid: al@openerp.com-20140130233951-55ttup4ohmp4i0nf
2014-01-31 00:39:51 +01:00
jke-openerp f1204ee9c3 [FIX] Fix bug with demo data from delivery module. We create a grid, but without specify to "use_detailed_pricelist"
bzr revid: jke@openerp.com-20140130214944-c5fg5mp8bitt86uy
2014-01-30 22:49:44 +01:00
jke-openerp 1fb3cccef4 [FIX] Use only published carrier_delivery
bzr revid: jke@openerp.com-20140130212748-57udob0yxz73775r
2014-01-30 22:27:48 +01:00
jke-openerp 420e819b1f [FIX] Recompute price at each updates of cart, Fix bug with carrier at payment.
bzr revid: jke@openerp.com-20140130173705-wevz607c5djid9ux
2014-01-30 18:37:05 +01:00
Fabien Pinckaers 1486e52927 [IMP] better apps names
bzr revid: fp@tinyerp.com-20140129095132-fl2fnhxlk4pxanj8
2014-01-29 10:51:32 +01:00
Christophe Matthieu 6f859860e9 [FIX] website_sale_delivery: don't raise (for the website customer) if they are no carrier; return true if they aren't need of carrier or if the carrier is good
bzr revid: chm@openerp.com-20140124115723-nblyb3qknxym9817
2014-01-24 12:57:23 +01:00
Christophe Simonis 2090330b67 [FIX] move function field `amount_delivery` from delivery module to website_sale_delivery module
bzr revid: chs@openerp.com-20140123174208-yzlod98ez4xn72lv
2014-01-23 18:42:08 +01:00
Christophe Matthieu 4e68fff52e [FIX] website_sale: demo data, test, delivery, context pricelist
bzr revid: chm@openerp.com-20140123104705-679zt0odq0pseu7p
2014-01-23 11:47:05 +01:00
Fabien Meghazi 14bb6060d7 [REM] Removed @website.route() decorator
Need trunk-website-al Rev#5151

bzr revid: fme@openerp.com-20140120153733-ve3dn2kwvha7n3yl
2014-01-20 16:37:33 +01:00
Christophe Matthieu 379f3fa3ff [FIX] website_sale: auto set or remove carrier in function of product (service or not)
bzr revid: chm@openerp.com-20140117173836-s5mpospo9g5xifew
2014-01-17 18:38:36 +01:00