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
0c702bdfa7
Merge pull request #885 from odoo-dev/master-shop-fp
...
Fixes for perf issues /shop + cleaning pricelists & currencies
2014-07-02 20:34:21 +02:00
c0307f37d2
FIX
2014-07-02 19:20:30 +02:00
1ce0b70a02
Speed Improvements
2014-07-02 19:03:10 +02:00
5cc81dd64f
Fixes
2014-07-02 18:18:29 +02:00
21615e6b2b
[FIX] website_sale: change picture in function of the product selected
2014-07-02 14:45:37 +02:00
8914453a50
[FIX] website: enable test for blog, event...
2014-07-02 14:09:57 +02:00
78f87dce34
[FIX] website_sale_options: tour and filter by attributes
2014-07-02 13:00:13 +02:00
5a73fb7500
[FIX] tour.js: tour shop
...
wait that the snippets are loaded before clicking on the picture and open the media editor.
2014-07-01 10:57:38 +02:00
162ee61d4f
[FIX] website_sale: discount price is never hide
2014-06-30 13:53:25 +02:00
22f4c315a3
[IMP] automatic fiscal positions for simple cases
...
Add group of countries res.country.group
Add get_fiscal_position method a method to compute a fiscal position based on company_id, partner_id, delivery_id
The meaning of res.partner.fiscal_position is now a forced a fiscal position.
The default implementation should handle simple cases, like VAT in UE and sales
tax in the US, but the method can be overriden to handle more complex ficals
rules.
2014-06-30 02:12:41 +02:00
25d0a3ecb1
[FIX] phantomjs test remove injection
...
It's now deprecated, assets bundles should be used instead.
2014-06-28 19:59:59 +02:00
1f57528bc6
[MERGE] forward port of branch saas-5 up to 8dfd5ea
2014-06-27 16:14:40 +02:00
195fa93168
[MERGE] backend front end integration
...
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
2014-06-27 11:03:34 +02:00
368936df7c
[FIX] product, website_sale: Go in GB (Go is fr)
2014-06-26 23:31:57 +02:00
a7816a827f
[FIX] website_sale: assets xml id and jquery selector (unbind click for login page)
2014-06-25 15:05:48 +02:00
77a07670cf
[IMP] website: move custom scripts in the assets; fix website_sale_option to display modal in grid view
2014-06-25 14:03:23 +02:00
95c7cf8a68
[FIX] website_sale_options: tour for test use the modal
2014-06-25 12:39:21 +02:00
216456127d
[IMP] website_sale_options: clean code; add ondelete cascade for optional product on sale order
2014-06-25 12:00:27 +02:00
412a7593be
[IMP] website_sale_options
2014-06-25 11:31:39 +02:00
7505cce2e9
[WIP]
2014-06-24 17:37:13 +02:00
204a62499a
[IMP] website_sale_options
2014-06-24 15:11:53 +02:00
1d68662fb9
[IMP] website_sale: use geoip session key insead of import GeoIP
2014-06-24 11:02:52 +02:00
34815021b8
merge upstream
2014-06-24 10:13:11 +02:00
518feee650
[FIX] merge error
2014-06-24 08:17:12 +02:00
1d1b6e79b5
[FIX] website_sale: user can't edit the price.
2014-06-23 16:38:04 +02:00
e75d9525bb
merge upstream
2014-06-20 10:09:16 +02:00
5165b52b43
merge upstream
2014-06-19 18:46:49 +02:00
eef6330c55
[MERGE] forward port of branch saas-5 up to adf07a9
2014-06-19 16:23:32 +02:00
adf07a9490
[MERGE] forward port of branch saas-4 up to 5087612
2014-06-19 16:13:35 +02:00
5087612d1d
[MERGE] forward port of branch saas-3 up to bf53aed
2014-06-19 15:44:07 +02:00
5206eb16d5
merge upstream
2014-06-19 13:13:27 +02:00
54605acc65
[FIX] website_sale: demo data must set website_sequence insead of sequence
2014-06-19 13:12:09 +02:00
22d528c7a7
[IMP] website_sale: display the discount in the product template when the user select a variant
2014-06-19 13:12:08 +02:00
40840436f4
[FIX] website_sale: add shop/pricelist controller
2014-06-19 13:12:07 +02:00
43ca22d10c
[FIX] website_sale: access right for currency for public user
2014-06-19 13:12:07 +02:00
a6185caa18
[FIX] website_sale: display in currency of the user
2014-06-19 13:12:06 +02:00
7295a07c4a
[FIX] website_sale: display price with user curencie.
2014-06-19 13:12:06 +02:00
087bf22fb5
[IMP] website_sale: add GeoIP localisation for default value in checkout; display vat number if vat module is installed; fix labels
2014-06-19 13:12:05 +02:00
c3c922f84e
[IMP] website_sale: convert comma to dashed for url attrib
2014-06-19 13:12:05 +02:00
86c6cf7a68
[FIX] website_sale: display discount only if the price is lower than the standard price
2014-06-19 13:12:04 +02:00
bc3fc54fac
[IMP] Tour: add tour in web module; tour became available in backend.
2014-06-18 12:25:13 +02:00
7ae7a5315f
[FIX] website_sale: modal layout
2014-06-17 15:58:13 +02:00
0d9f3af113
[IMP] website_sale: optional product + fix forgotten line_id in website_event_sale
2014-06-17 15:49:48 +02:00
25c564d635
[FIX] website_sale: check ipod product insead of ipad because demo data of ipad was changed
2014-06-17 14:27:26 +02:00
9f77cb9d1f
[IMP] website_sale: optional product have all time the same quantity of the liked product.
2014-06-17 14:23:15 +02:00
9867d63b5d
[IMP] website_sale: add demo data for optional products
2014-06-17 12:01:36 +02:00
0ac338ea0a
[IMP] website_sale: display state function of selected country
2014-06-17 11:33:28 +02:00
dcce993958
[FIX] website_sale: typo and preview display all time in modal
2014-06-17 10:54:47 +02:00
474d63d6b9
[FIX] website_sale: fix keep query and clean code
2014-06-17 09:44:32 +02:00
45a6012f22
[FIX] product: remove unused values
2014-06-16 17:33:18 +02:00
a8497e07c9
[ADD] added instantclick library to load data faster in anonymous mode
2014-06-16 16:00:06 +05:30
7107b646f6
[IMP] Website Sale - ribbon - html class from product.style is not required, so we need to display it as empty in website to avoid an internal 500
2014-06-16 11:31:21 +02:00
0492e59314
[FIX] website_sale: rounding price; typo and search sequence of membership
2014-06-16 10:53:34 +02:00
e915f4ca4d
[FIX] website_sale: tour test customize
2014-06-13 18:32:56 +02:00
0f78e602d6
[FIX] website_sale: tour; product split kanban view of product and product template
2014-06-13 17:08:19 +02:00
98d9901c17
[FIX] website_sale: retur the browse record of category insead of int
2014-06-13 16:17:51 +02:00
b8d4cd277e
[FIX] website_sale: bind event with touch for ipad
2014-06-13 15:50:08 +02:00
f4474d7295
[FIX] website_sale: add steps to remove the confirm dialog box in tour test
2014-06-13 14:24:48 +02:00
13920b09f1
[IMP] website_sale: add a tour of test to check confirm dialog box
2014-06-13 14:10:53 +02:00
8fdfc68074
[IMP] website_sale: display variants choice in confirm dialog box
2014-06-13 13:59:28 +02:00
d8516bcfd8
[IMP] website_sale: optional quantity in product form
2014-06-13 12:47:54 +02:00
1e9c72f308
[MERGE] from master
2014-06-13 12:35:23 +02:00
57c59ddfac
[IMP] website_sale: confirm/options dialog box have same layout of my cart
2014-06-13 12:31:41 +02:00
8a24171996
[IMP] website_sale: display 'Product not available' message in product selector
2014-06-13 09:32:28 +02:00
9d363b8758
[FIX] website_sale: remove disabled attribute on button in the xml template for product without variants
2014-06-12 17:03:17 +02:00
f62673c266
[IMP] website_sale: Optional product with variant suggestion
2014-06-12 16:58:44 +02:00
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
8319356630
[IMP] website_sale: allow optional products in shop; In shop, it opens the modal jus after having clicked on the 'Add to cart'. The modal contains the optional products.
2014-06-11 12:50:41 +02:00
ef48c4d440
[FIX] website_sale: disable button does'nt work in the product template.
2014-06-06 10:57:50 +02:00
5f43d87a33
[IMP] website_sale: display image function of the selected product variant
2014-06-06 10:40:50 +02:00
489742873d
[FIX] website_sale: backport commit 3cc4785ba6 of master
...
This fix aimed saas-5, not master.
original Commit message:
display accessory field in form view and display the good accessory product inside ecommerce
This is related to previous rev 86055fb8cd
2014-06-04 11:25:51 +02:00
86055fb8cd
[FIX] website_sale: accessory_product_ids are product.product, not product.template
...
This many2many field should actually have product.template as relation
But, in a stable release, we cannot alter the database
Therefore, when displaying accessory products in the card, it display the product_tmpl_id of the product.product, not itself
This relation should be changed in trunk
+ Actually displaying this field in the backend
2014-06-04 10:44:56 +02:00
a5908c5812
[MERGE] forward port of branch saas-5 up to b1c0bc0
2014-06-03 20:02:00 +02:00
c5ab412acc
[FIX] website_sale: change template for product and variant selector (type color)
2014-06-03 15:38:11 +02:00
3cc4785ba6
[FIX] website_sale: display accessory field in form view and display the good accessory product inside ecommerce
2014-06-02 12:11:54 +02:00
e3bd7d953a
[FIX] website_sale: tour about customize don't check last step
2014-06-02 12:11:04 +02:00
9d33ce4900
[FIX] website_sale: missing openerp.tools import
2014-06-01 20:20:21 +02:00
285e1d5c38
[FIX] website_sale: so javascipt does not like tuples. use a list instead
2014-05-31 15:37:23 +02:00
960b86611e
[FIX] website_sale: remove invalid (and stupid) function field
2014-05-31 14:05:48 +02:00
29387c518e
[REV][FIX] Reverting regression introduced in forward-port
...
04211015fc
2014-05-30 15:20:18 +02:00
fb650ee92e
[MERGE] product: refactoring of product variants.
...
close PR #222
2014-05-30 10:22:36 +02:00
435b5b9ca3
[IMP] product: rename fields variant_ids into attribute_line_ids on the template and attribute_value_ids on the product.
2014-05-28 19:42:15 +02:00
d42840a6f8
Merge pull request #226 from odoo-dev/master-website_sale-add-vat-chm
...
[IMP] website_sale: add vat field on checkout + validate it if base_vat module is installed
2014-05-28 18:45:12 +02:00
f085274d5f
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. df0ae7e4d1
2014-05-28 14:53:32 +02:00
00dc3a59df
[FIX] website_sale: force changing pricelist on different account signin
...
opw-607517
2014-05-28 12:04:41 +02:00
c6f0699435
[FIX] website_sale: search attributes error when the user select a product with a search
2014-05-27 20:57:00 +02:00
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
585511d36e
[FIX] website_sale: inherit_option_id must be convert in optional='enabled'
2014-05-27 18:56:58 +02:00
abab5c2e94
[MERGE] from trunk
2014-05-27 18:28:40 +02:00
bb669f82c8
[FIX] website_sale: search by attributes not work for more of one selection
2014-05-27 18:20:42 +02:00
e987cd6c75
[FIX] website_sale: fix the product attribute templates to display the comma
2014-05-27 18:07:26 +02:00
d24aede8d7
[FIX] product: don't create new variants if the product.template is create by product.product.
2014-05-27 18:03:15 +02:00
e16233217c
[MERGE] Replace inherit_option_id by a selection field (PR #229 )
2014-05-27 17:57:33 +02:00
fd21abd847
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
2014-05-27 17:18:43 +02:00
0544fc2929
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
...
This reverts commit dd900408de4da882d48f
2014-05-27 16:12:52 +02:00
63b7f678f3
[FIX] website_sale: in the product grid, a product must have min size 1 and max size 4
2014-05-27 16:11:27 +02:00
2efb074733
[IMP] website_sale: use company vat_check_vies field to select the method to check the vat id base_vat is installed
2014-05-27 14:35:07 +02:00
4fecb29c51
[FIX] website_sale, website_event_sale: updated tests according to the new dom of the checkout page introduced in pull request 232
2014-05-27 14:22:29 +02:00
59be055c37
[IMP] website_sale: if base_vat is installed, when the use try to validate checkout, the vat is checked (VAT Information Exchange System)
2014-05-27 12:49:16 +02:00
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
b5a7156f7d
Merge pull request #224 from odoo-dev/master-payment-post-tde
...
[IMP] website_sale: correctly submit the payment form using a post request, correctly create the tx asynchronously
2014-05-27 12:09:01 +02:00
b5833591dc
[IMP] website_sale: add vat field on checkout
2014-05-27 12:05:41 +02:00
a6379e2e67
[IMP] payment addons: fixed submit buttons: now have type=submit (and not image or nothing) and removed name, because this may cause issues when trying to submit a form manually with type=submit and a name. Also improved js code in website_sale to correctly handle the click binding, the asynchronous call to the server to create the transaction, and then submit the form. As form submission is synchronous in javascript, we cannot use the deferred. Instead we prevent the click event from bubbling, wait for the server to create the transaction, adn then manually submit the form.
2014-05-27 11:35:32 +02:00
ed51e843a2
[IMP] website_sale: change 'pay now' button behavior.
...
Now: intercept the call, make an asynchronous call to create the tx, then continue to the acquirer. Previous this was done by
a redirection, leading to a get request beign done. However it should be a post request.
2014-05-27 11:35:32 +02:00
1744208928
Changed xpath expression from /t to .
2014-05-27 10:45:07 +02:00
af72adcd64
[DIRTY FIX] website_sale: make the runbot green
2014-05-27 10:01:58 +02:00
43977deb71
[IMP] product: refactoring of product variant. The main view became the view of product template and the product product (or product variant) are created with the variant values combinaison. Bom is splitted into bom and bom line and can use the variant combinaison.
2014-05-27 09:42:52 +02:00
d89064c73c
[IMP]Improved code
2014-05-27 10:45:04 +05:30
e137a7713b
[FIX] website_sale: test did not load js properly and failed
2014-05-26 16:58:14 +02:00
daba406886
[IMP]Move assetss to frontend template.
2014-05-23 18:31:01 +05:30
13ac3865d5
[CLEAN] Use none or false, but not both on two lines ...
2014-05-22 15:40:29 +02:00
15e874b5c8
[FIX] website_sale: still cleaning lost references to deleted code in website_sale ...
...
Fixed checkout redirection that was meant to clean the session (incorrect sale order or transaction) that may happen
when having issues with the payment.
2014-05-22 15:34:09 +02:00
35a07975de
[FIX] website_sale: add the parameter _mail_post_access on product.template
...
This parameter gives the possibility to post messages en product.template to
people having a read access. The website_sale giving the possibility to post
comments, people not belonging to the 'Sale Manager' group were not able to
post messages.
2014-05-22 12:15:45 +02:00
35efb5bf5f
[MERGE] upstream
2014-05-19 12:12:46 +02:00
721a3d4ed2
[MERGE] [IMP] Added a website salesteam, used to handle ecommerce quotations and
...
contact leads. Also added use_opportunities and use_quotations boolean fields on
sales team, like use_leads to ease the salesteam customization.
Also removed some dead code in website_sale_crm and website_sale_delivery.
2014-05-15 10:02:02 +02:00
37ccbada84
[FIX] website_sale, website_crm: website salesteam value in correct
...
module.
2014-05-14 17:34:43 +02:00
9b0b918ed6
[FIX] website_sale: removed now unnecessary dependency
...
towards crm for website-sale, as sales_team module is a dependancy of sale.
Also reverted some changes in comments.
2014-05-14 17:34:17 +02:00
ae89496bbc
[MERGE] Sync with trunk
2014-05-14 17:21:54 +02:00
28b20d312d
[FIX] Re-added code removed by al at rev 9421: website quotation email was not sent anymore.
2014-05-13 12:32:53 +02:00
e53c7748a0
[IMP] website_sale: toggle multi salesteam mode
2014-05-13 12:21:00 +02:00
a1e70ea0a4
[IMP] website_crm, website_sale: have only one salesteam to handle ecommerce and contact form.
...
The xml_id is now based on website.
2014-05-13 12:09:24 +02:00
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
3385300cb7
[IMP] website: sale_order: display acquirer only when set. The purpose is to
...
avoid maanging it from the sale order view; the website will set the acquirer
for ecommerce related orders. This way the acquirer and tx will be displayed
on the sale order linked to ecommerce sales, and not on other orders.
2014-05-13 11:01:18 +02:00
7ef0d94d6e
[IMP] website_sale: sale_order: add acquirer/tx data (to be improved)
2014-05-12 18:14:42 +02:00
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
2ac1156925
[MERGE] Merged lp:openobject-addons.
2014-05-12 10:31:53 +05:30
fe9b88a3ba
[REVERT] Reverted the changes of rev 9219.
2014-05-12 10:25:20 +05:30
54d30d5194
[IMP] clean sitemap, enumerate pages + fixes
...
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +02:00
2fe8beac28
Missed while merging.
2014-05-08 18:51:17 +05:30
f1dd083521
[MERGE] Merged lp:openobject-addons.
2014-05-08 18:41:39 +05:30
b8089a1521
[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
...
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
1091b24a0c
[MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
...
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
2014-05-07 18:00:23 +02:00
56eeefdfda
[MERGE] trunk-websit-al-refactor by chm
...
- allow fiscal position change on sale orders
- public user on website
- simplify website_sale sale.order and shopping cart code
- remove preprocess_request
bzr revid: al@openerp.com-20140507153223-q73u5lhyrfw98o3a
2014-05-07 17:32:23 +02:00
ee1fbd17c8
[FIX] jQuery.ui - boostrap conflict
...
bzr revid: fme@openerp.com-20140506153335-x2fwpajvthcru1cv
2014-05-06 17:33:35 +02:00
6b26a3896b
[FIX] website_sale: manifest typo
...
bzr revid: dle@openerp.com-20140506075126-mv6g869aqdl1yt5g
2014-05-06 09:51:26 +02:00
74a6bde093
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140505134608-hqcmqyo3d98y851j
2014-05-05 15:46:08 +02:00
d3678bf521
[FIX] website_sale: don't rewrite sale order partner_id with the public user
...
bzr revid: chm@openerp.com-20140505124702-cq6tvb6h3lgyst99
2014-05-05 14:47:02 +02:00
b0cbaf330a
[IMP] website: load website.xml templates only in editable mode
...
bzr revid: fme@openerp.com-20140505113800-wv5vh802us270oez
2014-05-05 13:38:00 +02:00
41ade23b09
[FIX] website_sale & website_event: create product (redirect with slug)
...
bzr revid: chm@openerp.com-20140505095724-mc9k6d2yf68ln9nq
2014-05-05 11:57:24 +02:00
06c63594be
[FIX] website_sale: message confirmation
...
bzr revid: chm@openerp.com-20140505093423-nrmou02ov1txod3k
2014-05-05 11:34:23 +02:00
5b839bea89
[IMP] website_sale: attribute's filters template unactive by default
...
bzr revid: chm@openerp.com-20140505092730-pxsdxlhxwuxoc3fr
2014-05-05 11:27:30 +02:00
9e176a977e
[FIX] website_sale: apply tax position on checkout signup
...
bzr revid: chm@openerp.com-20140505092300-l29tc4pum31nqd1h
2014-05-05 11:23:00 +02:00
1fd1114c69
[FIX] website_sale: access to the webite partner_id
...
bzr revid: chm@openerp.com-20140502160628-nbwzx28j4daj1ua8
2014-05-02 18:06:28 +02:00
939b2f2d44
[FIX] website_sale & tour
...
bzr revid: chm@openerp.com-20140502155124-98xz2b4gd2zzzrkx
2014-05-02 17:51:24 +02:00
bbfdc57ad9
[FIX] website_sale: add to cart product => quantity + 1
...
bzr revid: chm@openerp.com-20140502150842-nitu8tsxd02e6dnh
2014-05-02 17:08:42 +02:00
c10800f2f1
[FIX] website_event_sale: multi tickets
...
bzr revid: chm@openerp.com-20140502140152-hx7ktaf0cg2m7ija
2014-05-02 16:01:52 +02:00
5e3eb59d0f
[MERGE] Merged lp:openobject-addons.
2014-05-02 16:22:26 +05:30
ee16b014b1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
b1d3b2e524
[MERGE] Merged lp:openobject-addons.
2014-05-01 12:59:19 +05:30
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
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
1199b60d70
[IMP] website_sale: use street 2 to set company_name
...
bzr revid: chm@openerp.com-20140428134632-v3w7imtz7j3u3tp0
2014-04-28 15:46:32 +02:00
36fc910e48
[FIX] website_sale: apply new pricelist and fiscal position after signup.
...
bzr revid: chm@openerp.com-20140428102857-41lfs08v1crudnco
2014-04-28 12:28:57 +02:00
bb2ebf7cb9
[FIX] website_sale: apply fiscal position on change product id and update cart.
...
[IMP] sale: apply fiscal position of the partner if they are not fiscal position defined
bzr revid: chm@openerp.com-20140428093609-8z8my9vj322shcll
2014-04-28 11:36:09 +02:00
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
22edf72dc1
[FIX] website_sale: fiscal_position must be passed to product_id_change in order to compute taxes correctly
...
bzr revid: dle@openerp.com-20140425145739-3s7wgsc6l0re3lhe
2014-04-25 16:57:39 +02:00
edaed14f3f
[FIX] website_sale: apply tax
...
bzr revid: chm@openerp.com-20140425133403-g94w1yaj56k9whr5
2014-04-25 15:34:03 +02:00
cee3cabaa8
[IMP] website_sale: create new shipping address; company_name field; fix acquierer image
...
bzr revid: chm@openerp.com-20140425132049-kg4w68qn07eof47q
2014-04-25 15:20:49 +02:00
4f16d15120
[IMP] rename editor assets
...
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
46dd292c86
[FIX] website_sale: add to cart 1 item if number > 1 or set_number > 1
...
bzr revid: chm@openerp.com-20140425091232-m4j37y7ffo7o56db
2014-04-25 11:12:32 +02:00
3b49850d1a
[FIX] website_sale: filter redirect to 404 error if a category is selected. (url: /shopcategory/?filters=...). Add slash between shop and category
...
bzr revid: chm@openerp.com-20140425075304-qnlyb6n6hpyvttv1
2014-04-25 09:53:04 +02:00
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
3eb4fa3bac
[FIX] website_sale: taxes must be taken from the product_id_change method
...
So they are computed with the partner, fiscal_position, etc
bzr revid: dle@openerp.com-20140424151605-81t7v9pc2rou17s3
2014-04-24 17:16:05 +02:00
b1bc68d8eb
[FIX] website: tour inject sale/event
...
bzr revid: chm@openerp.com-20140423154530-rfc3glnp5xk50xoc
2014-04-23 17:45:30 +02:00
1d8400418e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +02:00
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
97711ed282
[ImP] Improved typo's AND searched the section_id direct from the xml id AND directly inserted the state on the 2nd position in sale.order rather than declaring the states again.
2014-04-17 10:45:01 +05:30
be8a180bc5
[ADD] Added a search view for the shopping_cart menu.
2014-04-16 17:09:32 +05:30
671cbe02e1
[IMP] remove unnecessary reference bcaz which id override on this modules
2014-04-16 15:58:08 +05:30
79fb080c0e
[REM] REmoveD the shopping cart fliter from the quotations search view bcz itz not need their.
2014-04-16 15:40:52 +05:30
9284bd4817
[FIX] website: tour test inject javascript
...
bzr revid: chm@openerp.com-20140416082138-rhwo2tl9l6jrko78
2014-04-16 10:21:38 +02:00
dbe1b81d15
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140416074634-jkcn3ae30q9uqnsi
2014-04-16 09:46:34 +02:00
7927f34339
[IMP] remove quotation domain in shopping cart state
2014-04-16 11:21:14 +05:30
3ef529f1a1
[MERGE] merged with lp:openobject-addons
2014-04-16 10:34:53 +05:30
61da3f4aba
[MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
...
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
a8c1649423
[MERGE] merged with lp:openobject-addons
2014-04-15 19:01:17 +05:30
7ceaefb106
[IMP] draft state replace with shopping_cart state and remove the condition of pending which convert a draft quotation into quotation sent
2014-04-15 18:55:12 +05:30
6925bdad96
[ADD] Added a menu for 'Shopping Cart' which is available after installing website_sale and all the quotations generated in shop are directly accessable through this menu.
2014-04-15 11:14:05 +05:30
5f34cb309f
[IMP] improved a code according to a data file
2014-04-14 16:34:49 +05:30
fdc61b6e60
[IMP] Highlight the confirm order button while the quotation in shopping cart state and added a Shopping Cart in search view.
2014-04-14 15:43:14 +05:30
635739ee11
[Fix] remove parseError for Extenal ID
2014-04-14 14:37:26 +05:30
4550b532ca
[FIX] website_sale: add product: customize img (forgotten merge)
...
bzr revid: chm@openerp.com-20140411115939-yw257u179wqbh6sy
2014-04-11 13:59:39 +02:00
1fc8f89bc1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411082050-lr7vtew6yvsqaon6
2014-04-11 10:20:50 +02:00
9932aa3b45
[FIX] website_sale: checkout_parse
...
bzr revid: chm@openerp.com-20140410153746-kp8rw92j89x0c7vp
2014-04-10 17:37:46 +02:00
7298130f31
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140410152925-ndajhnyh4rt8pkgu
2014-04-10 17:29:25 +02:00
db080813df
[FIX] website_sale: checkout prefix
...
bzr revid: chm@openerp.com-20140410151330-md9fq3zg8e6bliok
2014-04-10 17:13:30 +02:00
7751334d97
Fixed order.state
2014-04-10 20:42:29 +05:30
81cfa028e5
[FIX] website_sale: checkout shipping address; remove url terminal slash
...
bzr revid: chm@openerp.com-20140410143524-zrrsh6zvvrg9ntgz
2014-04-10 16:35:24 +02:00
a3016b4d95
[FIX] Remove double return
...
bzr revid: jke@openerp.com-20140410114048-hw26q9x0dm11wbqc
2014-04-10 13:40:48 +02:00
986b445fed
[FIX] Website - Fix quantity not refresh when you add a product in your cart
...
bzr revid: jke@openerp.com-20140410113952-g0nvc9nfjma2t614
2014-04-10 13:39:52 +02:00
3a7e003656
[MERGE] forward port of branch saas-3 up to revid 9394 chs@openerp.com-20140410103638-x7vajn70ewsfp0ck
...
bzr revid: chs@openerp.com-20140410110424-enhdg6pufhii56ni
2014-04-10 13:04:24 +02:00
9c074a67a5
[FIX] website_sale: Do not search and associate a company to the partner when an order is validated
...
This can be regarded as a security leak: You can associate your partner to an existing company, which you maybe do not really belong, and therefore potentially access data which you are not authorized to see
Use street for the company name, street2 for the actual street, meanwhile
bzr revid: dle@openerp.com-20140410105804-am2xjmr09u3jk36r
2014-04-10 12:58:04 +02:00
694fb63dda
[FIX] website_sale: use commercial_partner_id instead of parent_id to have the company name of the artner in the checkout form
...
If the user is portal, its partner is a company and has a parent: a security rule prevent to read the parent_id
and the company which should be displayed is the closest company of the partner in the hierarchy, and, in this case, itself.
bzr revid: dle@openerp.com-20140410095814-x7hqymfelspvjdsw
2014-04-10 11:58:14 +02:00
dfffd7cef1
[MERGE] MErged lp:openobject-addons.
2014-04-10 15:09:17 +05:30
e5229ee8c3
[IMP] Improved code by shifting the complete code to website_sale rather than doing in sale.
2014-04-10 14:26:13 +05:30
2df2f77818
Test commit
2014-04-09 18:39:42 +05:30
3ae307003a
[IMP] Improved code for confirm_order state in shopping_cart.
2014-04-09 12:27:12 +05:30
bd7a58adb3
[FIX] Website sale : cast quantity as flaot when forced by post input.
...
bzr revid: jke@openerp.com-20140408162432-21vbw3of9jd4c1sz
2014-04-08 18:24:32 +02:00
2cf1dad2a9
[FIX] Allow to pass qty in add_to_cart button (number and set_numer)
...
bzr revid: jke@openerp.com-20140408161107-0x7uxn68olvsjnnt
2014-04-08 18:11:07 +02:00
673dc5b1d7
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
2014-04-08 15:24:12 +02:00
e627f1da63
[MERGE] Merged lp:openobject-addons.
2014-04-08 14:31:51 +05:30
be5fe933ec
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
2014-04-08 10:07:36 +02:00
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
171dd23fa9
[MERGE] Merged lp:openobject-addons.
2014-04-07 10:34:00 +05:30
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
045a12c5c2
[FIX] website_sale: fixed post_msg, display only when having it (may have False, None, ..)
...
bzr revid: tde@openerp.com-20140404104918-cyszi1l333173d1t
2014-04-04 12:49:18 +02:00
368afae722
[FIX] website_sale: order data refresh problem
...
bzr revid: dle@openerp.com-20140404102512-72x74ys4k6whk8ss
2014-04-04 12:25:12 +02:00
a06d9099ea
[FIX] website_sale: fixed stupid test usign a title
...
bzr revid: tde@openerp.com-20140404094955-51zhadhaavpjvkzl
2014-04-04 11:49:55 +02:00
f0bc588710
[FIX] website_sale: fixed tour
...
bzr revid: tde@openerp.com-20140404085012-2h658158mm4ydkpq
2014-04-04 10:50:12 +02:00
7e9307e4d8
[IMP] payment_transfer: Transfer -> Wire Transfer + updated test
...
bzr revid: tde@openerp.com-20140404084528-sfdeyj7sl6dq4tm1
2014-04-04 10:45:28 +02:00
0e7d514a3e
[ADD] website_sale: added inherit of the transaction
...
form view to display the sale_order_id field.
bzr revid: tde@openerp.com-20140404084420-hhe0yd9npf8vox5h
2014-04-04 10:44:20 +02:00
ec318c33e1
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140404082228-g7g3b2ju06meqvq4
2014-04-04 10:22:28 +02:00
b5c0c3a5d2
[FIX] website_sale: order categories according to their sequence
...
bzr revid: dle@openerp.com-20140403112511-h4yi8jimf9hjucyl
2014-04-03 13:25:11 +02:00
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
e0d33ad3c5
[FIX] website editor: shop tour and media editor for field image
...
bzr revid: chm@openerp.com-20140331133340-vj67s9hlptum0h19
2014-03-31 15:33:40 +02:00
b28a32f6ef
[FIX] website: test_ui running
...
bzr revid: chm@openerp.com-20140326144442-ye2a51f03wyaxi8a
2014-03-26 15:44:42 +01:00
99ac3ff81b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140326105539-9hf1x7u6lvh2hq2f
2014-03-26 11:55:39 +01:00
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
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
62814f9c23
[FIX] website: activate new tour tests
...
bzr revid: chm@openerp.com-20140324081112-15n58puu29weydme
2014-03-24 09:11:12 +01:00
89a6bd0649
[IMP] website tour: fix auto test
...
bzr revid: chm@openerp.com-20140321123722-dmfdckh59cvot00i
2014-03-21 13:37:22 +01:00
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
60bdd78706
[IMP] website tour: refactoring and change api for create tour and test
...
bzr revid: chm@openerp.com-20140320083055-z5ys4oey5brd439v
2014-03-20 09:30:55 +01:00
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
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
f857905a61
[FIX] website tour: remove testPath from test buy event and product, who hide the real error
...
bzr revid: chm@openerp.com-20140319093338-f5l9mgmkw2yyl0fx
2014-03-19 10:33:38 +01:00
a762af1f21
[FIX] website_sale: payment get status url (ending slash); fix debbuger template url scripts
...
bzr revid: chm@openerp.com-20140319085700-b4v9iu51a9jtzty3
2014-03-19 09:57:00 +01:00
8db7982726
[IMP] website_sale: remove print
...
bzr revid: chm@openerp.com-20140319083054-x10c4m7ecxk9202o
2014-03-19 09:30:54 +01:00
ed2743f755
merge upstream
...
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
42ba805cc8
[WIP] rev me
...
bzr revid: chm@openerp.com-20140318153456-gwz47zs8il23rwii
2014-03-18 16:34:56 +01:00
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
5b722a036a
[PATCH] sle
...
bzr revid: chm@openerp.com-20140318123225-zgn83zslr65z0wej
2014-03-18 13:32:25 +01:00
f9c68abfb5
[FIX] website_sale: test must inject tour
...
bzr revid: chm@openerp.com-20140318115631-aiifjcqmtubiofb0
2014-03-18 12:56:31 +01:00
31893ce1bb
[FIX]
...
bzr revid: chm@openerp.com-20140318111830-pudmv5okc69lo8a5
2014-03-18 12:18:30 +01:00
bc578bd6a7
[IMP] website_sale: activate tests
...
bzr revid: chm@openerp.com-20140318103014-bfjkkqka98tc3hmv
2014-03-18 11:30:14 +01:00
abe8e7208e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
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
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
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
973ea59b28
[FIX] website_sale disabling tests while i rewrite Tour
...
bzr revid: al@openerp.com-20140316213304-gh0898xwonhca36z
2014-03-16 22:33:04 +01:00
c93b466d32
[FIX] website tour, prepare for manual injection
...
- reorder website.js in a choerent way
- remove injectable website.tour.test.js
We will do injection manually using website.inject_tour, in the mean time only
non injection test are supported, fully disable test needing inject, until fme
merge its fix.
bzr revid: al@openerp.com-20140316165442-p82wqwv82559oact
2014-03-16 17:54:42 +01:00
b370a4e695
[FIX] website: test tour: must inject tour in page
...
bzr revid: chm@openerp.com-20140314180705-fjx0uetgyug1diaw
2014-03-14 19:07:05 +01:00
d5ddf5152c
[FIX] website: remove backslash from redirect with enable_editor
...
bzr revid: chm@openerp.com-20140314180029-iaeq4i6735pcw100
2014-03-14 19:00:29 +01:00
410ec52276
[MERGE] website: add optional 'action' in managment edit button to laod one specific backend view
...
bzr revid: chm@openerp.com-20140314162909-ff0obqbw6j7lalmz
2014-03-14 17:29:09 +01:00
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
79e1813d6e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140314151011-xhhsovbsg1r0sbwk
2014-03-14 16:10:11 +01:00
ba63094b9b
[FIX] website_sale,website_event: can't create product and event. Why: controller and route are strict mode, remove / at the end of the route
...
bzr revid: chm@openerp.com-20140313132013-2foflswtdd5fp8hb
2014-03-13 14:20:13 +01:00
2390c9179b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140312140429-4x94dc1x70yfik1w
bzr revid: chm@openerp.com-20140313122048-1zrqhq6dbtv8jpad
2014-03-13 13:20:48 +01:00
Raphael Collet
Fabien Pinckaers
Christophe Matthieu
Antony Lesuisse
Christophe Simonis
Simon Lejeune
Denis Ledoux
Dharmraj Jhala
Jeremy Kersten
Fabien Meghazi
Denis Ledoux
Richard Mathot
Christophe Simonis
Olivier Dony
Thibault Delavallée
Xavier Morel
Mitesh Savani
Martin Trigaux
Paramjit Singh Sahota
Fabien Pinckaers
Christophe Simonis
chm@openerp.com
Mehul Mehta (OpenERP)
Kersten Jeremy