Christophe Matthieu
24480a2440
[FIX] product: access right. Resolve: Use Superuser in name_get method to fetch partners/sellers
...
bzr revid: chm@openerp.com-20140109124423-vq7u14q089xiqtt9
2014-01-09 13:44:23 +01:00
Darshan Kalola (OpenERP)
a9e87b56ce
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: dka@tinyerp.com-20140108093659-c9it34gll0ipcll2
2014-01-08 15:06:59 +05:30
Christophe Matthieu
3f0f6b820b
[FIX] website: Access rights and Access for: website_crm_partner_assign, website_customer, website_event, website_event_track, website_membership, website_partner, website_sale
...
bzr revid: chm@openerp.com-20140107135933-h622wxwfhwoulg7q
2014-01-07 14:59:33 +01:00
Christophe Matthieu
0293e7b707
[FIX] website/ir_rule: Access rights can be cached if they use the html session: remove session from access right evaluation, allow to read pricelist to evrybody and use superuser for saleorder in website_sale
...
bzr revid: chm@openerp.com-20140107095210-73zf5ah4jrfo3dg2
2014-01-07 10:52:10 +01:00
Christophe Matthieu
9fd7db5150
[WIP] website/ir_rule: remove session from access right evaluation, allow to read pricelist to evrybody and use superuser for saleorder in website_sale
...
bzr revid: chm@openerp.com-20140107085728-77mxlims6fa0li76
2014-01-07 09:57:28 +01:00
Thibault Delavallée
b6517bd5bd
[FIX] website_sale: product template
...
- fixed link to comments
- fixed Comments title + comment form not visible if no previous discussion on the prodcut
bzr revid: tde@openerp.com-20140106171813-rolti0md6xaz1dxd
2014-01-06 18:18:13 +01:00
Thibault Delavallée
1053f3c922
[IMP] website_sale: product website chatter: added a title-link for the comment section
...
bzr revid: tde@openerp.com-20140106164434-4d0ddzc1okmfwgrd
2014-01-06 17:44:34 +01:00
Thibault Delavallée
0ee7ffe282
[MERGE] [IMP] shop: added openchatter on product shop
...
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template
- added a css file for the openchatter embedded in the product website view
bzr revid: tde@openerp.com-20140106162706-v9a60ek6eazn9mm0
2014-01-06 17:27:06 +01:00
Thibault Delavallée
3aaa474d3c
[IMP] website_sale: website chatter: some styling on the attachments
...
bzr revid: tde@openerp.com-20140106154358-z3anh1xpdkcmd7wm
2014-01-06 16:43:58 +01:00
Christophe Matthieu
63e2da36a6
[FIX] website: some access right
...
bzr revid: chm@openerp.com-20140106141817-2tf0dpfchi5x6kjw
2014-01-06 15:18:17 +01:00
Thibault Delavallée
0b2d085c1b
[IMP] shop: added openchatter on product shop
...
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template
bzr revid: tde@openerp.com-20140106135727-uf0zaxav28pdx4sv
2014-01-06 14:57:27 +01:00
Christophe Matthieu
c4ea06327c
[FIX] website: typo
...
bzr revid: chm@openerp.com-20140106103855-vjd6ro0w4m0xkfrc
2014-01-06 11:38:55 +01:00
Fabien Pinckaers
9cbe77bc90
[IMP] several cleaning
...
bzr revid: fp@tinyerp.com-20140101154754-cp4m9u84okx7m057
2014-01-01 16:47:54 +01:00
ddm
4d24f84615
[IMP] Ensure correct parsing
...
bzr revid: ddm@openerp.com-20131231132100-jdddbzx2tzpiqmgi
2013-12-31 14:21:00 +01:00
ddm
f3ef0e15ff
[FIX] Fixed popovers in product tour
...
bzr revid: ddm@openerp.com-20131231104153-fy4sr9d7e0vwlef7
2013-12-31 11:41:53 +01:00
Thibault Delavallée
c1fb818999
[REV] Reverted commit 10363
...
bzr revid: tde@openerp.com-20131224151201-g8luax3t431t7ky4
2013-12-24 16:12:01 +01:00
Thibault Delavallée
dfd52bfc2c
[FIX] website_sale: fixed several access rights issue related to public user + billing / shipping partner_id of sale order badly set, retrieved and displayed in the checkout process
...
bzr revid: tde@openerp.com-20131224145845-q6255ll7n8wy0syv
2013-12-24 15:58:45 +01:00
Thibault Delavallée
f5f055340f
[MERGE] Merged demo homepage improvements
...
bzr revid: tde@openerp.com-20131224100630-x0r20pj1v2y1g5pg
2013-12-24 11:06:30 +01:00
Paramjit Singh Sahota
18d8368ee1
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
...
bzr revid: psa@tinyerp.com-20131224053125-3lrogsrgd3ccp0i6
2013-12-24 11:01:25 +05:30
Thibault Delavallée
348a2bda96
[FIX] website_sale: get_total_quantity -> get_number_of_products
...
[FIX] website_sale: fixed domain to find the shipping_partner_id
bzr revid: tde@openerp.com-20131219103732-84nrt5xlqyqbwsns
2013-12-19 11:37:32 +01:00
ajay javiya (OpenERP)
f00f358f77
[REM]: remove unwanted methods and clean code
...
bzr revid: aja@tinyerp.com-20131219101210-tlvhlogviruzyqvn
2013-12-19 15:42:10 +05:30
Thibault Delavallée
7a564f261e
[IMP] [FIX] [ADD] website_sale, website_sale_delivery: delivery + ecommerce code cleaning
...
- added a website_order_line on sale.order model, that are the lines to display
and use in the front-end. This allows to display only products (and not delivery
costs), and to have a correct badge for the number od products.
- cleaned ecommerce website code and method name. Still some cleaning to do
I think.
- fixed some issues in partner and shipping info management, now using CheckoutInfo
more cleanly
- fixed the process of choosing the carrier
bzr revid: tde@openerp.com-20131218132150-f4br0099p2caf43i
2013-12-18 14:21:50 +01:00
ajay javiya (OpenERP)
5567caa27d
[IMP]: overwrite record rule to allow public user to read sale.order data
...
bzr revid: aja@tinyerp.com-20131218055645-fb9izyc3029jtz0k
2013-12-18 11:26:45 +05:30
Thibault Delavallée
3805a86302
[IMP] website_sale_delivery: make the module effectively works.
...
- added JS / HTML to handle the choice of the carrier
- added override of payment controller in website_sale_delivery to handle the carrier
and recompute the amount and details
- some code cleaning
- added amount_delivery field in sale.order, that is the amount related to the
delivery
bzr revid: tde@openerp.com-20131217152605-0xoulnnlo0nn7j9o
2013-12-17 16:26:05 +01:00
ajay javiya (OpenERP)
63d3fd9742
[REV]revert:unwanted code
...
bzr revid: aja@tinyerp.com-20131217064930-bmyrhcf0iru9b21e
2013-12-17 12:19:30 +05:30
ajay javiya (OpenERP)
689606c2f6
[MERGE]: with main
...
bzr revid: aja@tinyerp.com-20131216053732-28d7ksu2tiyno6kf
2013-12-16 11:07:32 +05:30
Fabien Pinckaers
c62e8fc793
[IMP] Small improvements
...
bzr revid: fp@tinyerp.com-20131214192105-0ngdj4t6fz8xjd4q
2013-12-14 20:21:05 +01:00
Fabien Pinckaers
b5393c97e4
[IMP] slugify products/categories
...
bzr revid: fp@tinyerp.com-20131214115227-6g3w70pm6cotiqdk
2013-12-14 12:52:27 +01:00
Fabien Pinckaers
cbc4b5e7ff
[IMP] Product image improved layout
...
bzr revid: fp@tinyerp.com-20131214114625-uian4kh4gexpc6aa
2013-12-14 12:46:25 +01:00
Fabien Pinckaers
fd772ee527
[IMP] better css
...
bzr revid: fp@tinyerp.com-20131213213014-hz0x1tfxygrmev1o
2013-12-13 22:30:14 +01:00
Christophe Matthieu
b32dd93365
[IMP] website_sale: layout for all theme and mobile view
...
bzr revid: chm@openerp.com-20131213161850-le6823cp9njx8iny
2013-12-13 17:18:50 +01:00
Christophe Matthieu
aca3b51bf3
[IMP] website_sale: layout for all theme and mobile view
...
bzr revid: chm@openerp.com-20131213161642-e1ltxlidm9apg3l4
2013-12-13 17:16:42 +01:00
Thibault Delavallée
fab63158a1
[CLEAN] sale: removed code that should not lie here. website code has nothing to do in the base sale module. website_sale: renamed website_sale file into sale_order and added the get_website_data method.
...
bzr revid: tde@openerp.com-20131213110629-rhgpqpy2dj03ng8h
2013-12-13 12:06:29 +01:00
ajay javiya (OpenERP)
558e5fdf9b
[MERGE] : with main
...
bzr revid: aja@tinyerp.com-20131213051723-onb54coa8f2930sj
2013-12-13 10:47:23 +05:30
Christophe Matthieu
fbf71a27c5
[FIX] website_sale: checkout default partner is not the public user
...
bzr revid: chm@openerp.com-20131212122543-hcc53zjn6wlw5l80
2013-12-12 13:25:43 +01:00
Christophe Matthieu
c641d58610
[FIX] website_sale: address layout
...
bzr revid: chm@openerp.com-20131212120232-gsx1h0vk5t91wpcw
2013-12-12 13:02:32 +01:00
Christophe Matthieu
796b8bf362
[FIX] website_sale: layout; add push to top in grid
...
bzr revid: chm@openerp.com-20131212114731-9ivgwupic064o3x0
2013-12-12 12:47:31 +01:00
Christophe Matthieu
745a559c77
[IMP] website: Removing unnecessary spaces at beginning of line; website_sale: fix css
...
bzr revid: chm@openerp.com-20131212110740-4ofu3tebr3vgcrnd
2013-12-12 12:07:40 +01:00
Christophe Matthieu
730fdb904d
[FIX] website_sale: css
...
bzr revid: chm@openerp.com-20131212110626-5kj461y6erg5ddhq
2013-12-12 12:06:26 +01:00
Christophe Matthieu
ee370a837c
[IMP] website: Removing unnecessary spaces at beginning of line
...
bzr revid: chm@openerp.com-20131212105821-mqvxb7yc04cj5k2s
2013-12-12 11:58:21 +01:00
Christophe Matthieu
6655cd8ccd
[IMP] website_sale: product placeholder image must be bigger
...
bzr revid: chm@openerp.com-20131212104724-0jmsepf8k5gtl18h
2013-12-12 11:47:24 +01:00
ddm
76b5bef5fb
[FIX] Tour should not start 'uninvited'
...
bzr revid: ddm@openerp.com-20131212102807-ra4uon05udtp5twu
2013-12-12 11:28:07 +01:00
Christophe Matthieu
dfe3ca1172
[IMP] website_sale: Rename 'Incl Taxes' into Taxes
...
bzr revid: chm@openerp.com-20131212101442-k1abgkueua4t8iaa
2013-12-12 11:14:42 +01:00
Christophe Matthieu
fa217bba33
[IMP] website_sale, website_event: layout
...
bzr revid: chm@openerp.com-20131212101258-tzzyyuz74ysmfn6s
2013-12-12 11:12:58 +01:00
ddm
64794a8c3b
[FIX] Restore tutorial on module install
...
bzr revid: ddm@openerp.com-20131212095950-3675vfd0tjpzlsug
2013-12-12 10:59:50 +01:00
ddm
e84d9a7f85
[FIX] Shop tour
...
bzr revid: ddm@openerp.com-20131211181410-rfy68dlqps8oldll
2013-12-11 19:14:10 +01:00
Christophe Matthieu
350bda93a6
[IMP] website_sale: empty comment
...
bzr revid: chm@openerp.com-20131211160749-a9f0u00mn4fjx7oe
2013-12-11 17:07:49 +01:00
Christophe Matthieu
17e132bb01
[FIX] website: order of script for editor and tours
...
bzr revid: chm@openerp.com-20131211153345-6hand0upjjqba85f
2013-12-11 16:33:45 +01:00
Christophe Matthieu
2257e8d431
[IMP] website: change editable and use groups
...
bzr revid: chm@openerp.com-20131211145930-r0izxh9t0efjwhxh
2013-12-11 15:59:30 +01:00
Christophe Matthieu
5217c8ebe8
[IMP] website: remove secure_layout. Inherit with groups for js editor
...
bzr revid: chm@openerp.com-20131211144402-lpanprv3u362qvd7
2013-12-11 15:44:02 +01:00
ddm
6893a6ab15
[IMP] Improve automated tests
...
bzr revid: ddm@openerp.com-20131210163522-p23703mcu8pfdsl0
2013-12-10 17:35:22 +01:00
ajay javiya (OpenERP)
060fe3329c
[ADD]:Recommendation of related product
...
[IMP]: demo data
bzr revid: aja@tinyerp.com-20131210104442-1yqigjiwszjowogp
2013-12-10 16:14:42 +05:30
Fabien Pinckaers
59906a3af8
[IMP] allow users to change product price from CMS[FIX] small bug in reordering of PTT
...
bzr revid: fp@tinyerp.com-20131209210511-5w03vf2wt0pmgdew
2013-12-09 22:05:11 +01:00
Christophe Matthieu
6652856445
[FIX] website_sale: link; product: clean code and use product.template for supplierinfo
...
bzr revid: chm@openerp.com-20131209163254-k9dwxw48rcgz1hbs
2013-12-09 17:32:54 +01:00
Christophe Matthieu
6aface1bd0
[FIX] product.supplierinfo: product_id is a product.product fields. Rename fields into product_tmpl_id for many2one to product.template model
...
bzr revid: chm@openerp.com-20131209151135-q54g17zcq1vnshsl
2013-12-09 16:11:35 +01:00
ddm
5f0fcfb9be
[IMP] Tour improvements => automated tests
...
bzr revid: ddm@openerp.com-20131209112534-3ysihjgm20jj3d9k
2013-12-09 12:25:34 +01:00
Christophe Matthieu
229696111b
[FIX] website_sale: access for product.pricelist.item
...
bzr revid: chm@openerp.com-20131209091142-1pyz1tz64d0gh39r
2013-12-09 10:11:42 +01:00
ddm
9be1dbfe9e
[FIX] Regression in shop tour
...
bzr revid: ddm@openerp.com-20131206140940-v0rerf362fuj2tqz
2013-12-06 15:09:40 +01:00
ddm
74ed3d2e5f
[FIX] Make tour declarative to enable autotests
...
bzr revid: ddm@openerp.com-20131206133239-mrhduf2fi0sm8sh7
2013-12-06 14:32:39 +01:00
Christophe Matthieu
b2bd96340f
[FIX] website: create button and help (fix inherit_id in modules)
...
bzr revid: chm@openerp.com-20131205165340-ty0xybh7uz859gnm
2013-12-05 17:53:40 +01:00
Christophe Matthieu
1a88541ec5
[FIX] website_sale: filters and partner controller
...
bzr revid: chm@openerp.com-20131205162240-33wfteow79zlbdrn
2013-12-05 17:22:40 +01:00
Fabien Meghazi
7a3b490f46
[IMP] preload records and throw 404 if not exists for blog, event, product
...
bzr revid: fme@openerp.com-20131205155450-y6joi29l2cn9amkn
2013-12-05 16:54:50 +01:00
Thibault Delavallée
5a2ed4b4b4
[MERGE] [CLEAN] [FIX] payment_acquirer and acquirer implementation: code cleaning + misc bugfixing.
...
[ADD] payment_acquirer: in the rendering, now supported in the context :
- tx_url: the form action URL, that can be set by the context, otherwise fall back on the acquirer default tx URL
- submit_class and submit_txt: submit is now a button with an image, unless asked not to; used in the ecommerce to display a Pay Now button instead of the acquirer logo
- updated all acquirers accordingly.
[IMP] payment_acquirer: cleaned and improved form view, for acquirer and tx models.
[IMP] payment_acquirer: amount and fees are now (16,2) float fields. Updated code to handle this kind of floats. Probably those values should come from some config parameters, but it is still not the case.
[CLEAN] various acquirers: removed unnecessary fields, among other the fields holding URLs. URLs of an acquirer should be accessible through a method, but storing them in a field is wasted space. Updated all acquirers and code accordingly.
[FIX] various acquirers: fixed ckeckout and getting data back processes. Some fixed in the controllers, some fixes in the data management due to prior refactoring and improvements in website and acquirer model.
[IMP] website_sale: updated the choice of the acquirer. They are all displayed with a small image as radio input; a Pay Now button is present to activate the payment process. Actually each acquirer generated a Pay Now button, but only the one of the chosen acquirer is displayed. This rendering uses the new options added in the button rendering process described hereabove.
[REM] website_payment: removed most of the code that was present for testing purposes. Only some JS is kept, for future credit-card form rendering.
bzr revid: tde@openerp.com-20131204175715-gdbl0tp5vbnc6pxm
2013-12-04 18:57:15 +01:00
Christophe Matthieu
b1765e2834
[IMP] website: slip layout
...
bzr revid: chm@openerp.com-20131204161754-5dq4bt7gghnk878c
2013-12-04 17:17:54 +01:00
Thibault Delavallée
dbcdddd3d4
[MERGE] Sync with website-al, because sale was broken
...
bzr revid: tde@openerp.com-20131204130704-fa3pu4gnpku0frsj
bzr revid: tde@openerp.com-20131204144838-vu66z2lsybqtp4hm
2013-12-04 15:48:38 +01:00
Christophe Matthieu
edee3e5da3
[FIX] website_sale: shop/confirm_order: from_partner
...
bzr revid: chm@openerp.com-20131204141056-f4u5rqbbqfka95ka
2013-12-04 15:10:56 +01:00
Thibault Delavallée
9f0b5a7c53
[IMP] website_sale: improved the choice of acquirer.
...
Now all acquirer are displayed using a small icon; a Pay Now button is located on the right that
is the next step for the payment.
All acquirers are rendered with a Pay Now button, but only the currently chosen one is
displayed. This allows to display several acquirers without having to do javascript-based
hacks to tune the form, its action or content.
bzr revid: tde@openerp.com-20131204130628-eeqpfhoqaavhv6nk
2013-12-04 14:06:28 +01:00
Fabien Pinckaers
642fce4a5b
[IMP] speed improvement + small bug
...
bzr revid: fp@tinyerp.com-20131203171033-oe6pkzb9jal3ril8
2013-12-03 18:10:33 +01:00
Christophe Matthieu
bc4a7c81bc
[FIX] website_sale: fixes for access right with public user, and access to shopping cart, checkout... without passed by shop index, change url add_cart
...
bzr revid: chm@openerp.com-20131203154422-cwc12og1bgw9j9a8
2013-12-03 16:44:22 +01:00
Fabien Meghazi
a7738ab2ea
[IMP] Reorder menu
...
bzr revid: fme@openerp.com-20131203120910-yv82gwref4uikn7b
2013-12-03 13:09:10 +01:00
Fabien Meghazi
6745bb3fed
[FIX] font-awesome icons migration to v4
...
bzr revid: fme@openerp.com-20131203141632-ubc35ca7d4l80s7m
2013-12-03 15:16:32 +01:00
Christophe Matthieu
06f96e4dea
[FIX] website_sale: user going to /shop/payment/validate/ without pass by mycart and add to cart
...
bzr revid: chm@openerp.com-20131203133345-0e7k3ab87u1d3we7
2013-12-03 14:33:45 +01:00
ddm
63f63ef470
[IMP] Tour: advance on any snippet drop
...
bzr revid: ddm@openerp.com-20131203094704-h995gaoo7onhlqpv
2013-12-03 10:47:04 +01:00
Christophe Matthieu
c3660ba7b9
[FIX] website: product backend view with website_button widget
...
bzr revid: chm@openerp.com-20131202163010-9nksvoxmbuj9v8i1
2013-12-02 17:30:10 +01:00
Thibault Delavallée
37c3ed60f6
[IMP] [WIP] website_sale: beginning of cleaning acquirer choice (should be small icon + pay now button)
...
bzr revid: tde@openerp.com-20131202150218-i403w7ulnm3b7b1n
2013-12-02 16:02:18 +01:00
Fabien Meghazi
d376bd55ca
[IMP] url slug in templates
...
bzr revid: fme@openerp.com-20131202125723-aw66fidrinaolgyo
2013-12-02 13:57:23 +01:00
Christophe Matthieu
c1f306dd96
[WIP] website: add website_button widget in backend to publish and go back to the website. (need bootstrap 3 for layout)
...
bzr revid: chm@openerp.com-20131202124504-78zvm5t0p1hpsn53
2013-12-02 13:45:04 +01:00
Thibault Delavallée
b04c2a4a56
[FIX] website_sale: fixed order confirmation cleaning: self.pool -> request.registry
...
bzr revid: tde@openerp.com-20131202103124-9lf4up79uxjwdyxp
2013-12-02 11:31:24 +01:00
Thibault Delavallée
5b488cf2ec
[FIX] website_sale: fixed checkout cleaning: self.pool -> request.registry
...
bzr revid: tde@openerp.com-20131202102959-inj25wnqk1prv6qy
2013-12-02 11:29:59 +01:00
Christophe Matthieu
2ce50aeb2f
[FIX] website_sale: table_compute fill table ending holes
...
bzr revid: chm@openerp.com-20131202094229-tqggruo231po721m
2013-12-02 10:42:29 +01:00
Fabien Pinckaers
db8f3b4f40
[IMP] small bugfix
...
bzr revid: fp@tinyerp.com-20131201173208-r72mybhgek0aibfl
2013-12-01 18:32:08 +01:00
Fabien Pinckaers
d6f77f5853
[IMP] Speed improvements
...
bzr revid: fp@tinyerp.com-20131201172541-p8403347rv08uurh
2013-12-01 18:25:41 +01:00
Fabien Pinckaers
dd62046680
[IMP] renaming + comment
...
bzr revid: fp@tinyerp.com-20131201003520-nikzk23fwkkku2lg
2013-12-01 01:35:20 +01:00
Fabien Pinckaers
eeee49bfa8
[IMP] code cleaning '/shop' less SQL queries, WIP
...
bzr revid: fp@tinyerp.com-20131201002355-82l9yab5l4vilkun
2013-12-01 01:23:55 +01:00
Fabien Pinckaers
ed7623fc45
[IMP] Performance improvement: improved cache with context, better get_object
...
bzr revid: fp@tinyerp.com-20131130154659-uqis34x2cemmocly
2013-11-30 16:46:59 +01:00
ddm
36966d140f
[FIX] Shop tour was broken by change
...
bzr revid: ddm@openerp.com-20131129131529-seqk3hypzcka8qxi
2013-11-29 14:15:29 +01:00
Christophe Matthieu
32ec9cccdd
[IMP] website: views for drag and drop snippets
...
bzr revid: chm@openerp.com-20131128160851-xmepb4h6n0logclo
2013-11-28 17:08:51 +01:00
Christophe Matthieu
079aececdf
[FIX] website_sale: get_website_sale_domain overited in website_event
...
bzr revid: chm@openerp.com-20131128095142-3ez3vaiht8ppr4oh
2013-11-28 10:51:42 +01:00
Thibault Delavallée
c8142a4e8f
[FIX] website_sale: fixed call to website.get_order, located on website model
...
bzr revid: tde@openerp.com-20131127160154-v5qpxuh70axz9cck
2013-11-27 17:01:54 +01:00
Thibault Delavallée
0759dcb6c0
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131127152424-wq2gje9d01t2kw34
2013-11-27 16:24:24 +01:00
Thibault Delavallée
cea8f80476
[MOV] website_sale: moved payment_transaction code into its own model file
...
bzr revid: tde@openerp.com-20131127121820-tgulogxz5x0ikdxd
2013-11-27 13:18:20 +01:00
Christophe Matthieu
3bb30b1337
[IMP] website_sale: clean code and fix for website_event
...
bzr revid: chm@openerp.com-20131127111658-qkp3ovoa64n3dwp2
2013-11-27 12:16:58 +01:00
ddm
09a54b25de
[IMP] Tour: simplify modal handling
...
bzr revid: ddm@openerp.com-20131126141324-3aynn0r5sqpttc90
2013-11-26 15:13:24 +01:00
ddm
cbef8ac39b
[FIX] Various tour fixes and imps
...
bzr revid: ddm@openerp.com-20131126112246-tuj0wvruy2668fyi
2013-11-26 12:22:46 +01:00
Christophe Matthieu
c948374f06
[FIX] website_sale: add/remove product cart (json controller)
...
bzr revid: chm@openerp.com-20131126094320-4935pnkuhwfkw8j9
2013-11-26 10:43:20 +01:00
Xavier Morel
f5236dfdb0
[IMP] use dict.fromkeys when applicable
...
bzr revid: xmo@openerp.com-20131126085122-3axgsp11eb10yo05
2013-11-26 09:51:22 +01:00
Christophe Matthieu
d24f8e45b3
[FIX] website_sale: price is displayed twice
...
bzr revid: chm@openerp.com-20131125164506-oitajyqdjnmd02qg
2013-11-25 17:45:06 +01:00
ddm
1dd3026cf6
[FIX] Tour: modal bug fixes
...
bzr revid: ddm@openerp.com-20131125163844-qn6gxp59n094d6el
2013-11-25 17:38:44 +01:00
ddm
b2ebae427c
[FIX] Tour: modal bug fixes
...
bzr revid: ddm@openerp.com-20131125163622-4e6o0gzr2gocrcej
2013-11-25 17:36:22 +01:00
ddm
97fb6198dd
[IMP] Product tour: upload image
...
bzr revid: ddm@openerp.com-20131125160833-9pavzpff5akck451
2013-11-25 17:08:33 +01:00
Christophe Matthieu
4fe9f90495
[FIX] website_event: create sale order and pricelist init
...
bzr revid: chm@openerp.com-20131125160358-bxj3tx90bru3mywz
2013-11-25 17:03:58 +01:00
ddm
1a0b6a55e5
[FIX] Fixed product tour
...
bzr revid: ddm@openerp.com-20131125154953-9vyfdtrnmws6qm32
2013-11-25 16:49:53 +01:00
Christophe Matthieu
1ae1c0b170
[FIX] website_sale_delivery: inherit view
...
bzr revid: chm@openerp.com-20131125151405-f9k1lzu91ep48hwx
2013-11-25 16:14:05 +01:00
ddm
e18fafb8a8
[FIX] Tour: various fixes (leaks etc.)
...
bzr revid: ddm@openerp.com-20131125134754-i3j9qgovrqc22qn9
2013-11-25 14:47:54 +01:00
Xavier Morel
e997c622d4
[FIX] remove apparently pointless parameter
...
bzr revid: xmo@openerp.com-20131125123717-ahyzg4e682qtmwy6
2013-11-25 13:37:17 +01:00
ddm
0bda85949a
[IMP] Various tour imps
...
bzr revid: ddm@openerp.com-20131122173038-s9dfq8lxau3fadfl
2013-11-22 18:30:38 +01:00
ddm
6a307069b4
[IMP] Blog tour
...
bzr revid: ddm@openerp.com-20131122110154-fsjeahreh7skk0fj
2013-11-22 12:01:54 +01:00
Darshan Kalola (OpenERP)
9f2dce4fe0
[IMP]improve product template view and change necessary xpath
...
bzr revid: dka@tinyerp.com-20131122054850-8sfin7rypnyf17ip
2013-11-22 11:18:50 +05:30
Xavier Morel
14d15b95a5
[FIX] crap
...
* (1, '=', 1) is a noop domain section
* list.append. A thing.
* converting an int to an int is not useful
* search_count avoids having to fetch all product.template ids from
the database just to call len() on the result when it's not
necessary
* when using a dict value 5 times in a row, it's simpler to get it
just once and refer a local variable thereafter
bzr revid: xmo@openerp.com-20131121141647-2w9z2a7b8p5sek22
2013-11-21 15:16:47 +01:00
Thibault Delavallée
32897bf4ee
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131121132413-lyngpz4c23kocmye
2013-11-21 14:24:13 +01:00
Christophe Matthieu
dc8ef4da30
[FIX] website_sale: fix product editor and move edit code in website_sale.editor.js
...
bzr revid: chm@openerp.com-20131121132317-ysa25sdqqx8dg1wo
2013-11-21 14:23:17 +01:00
Christophe Matthieu
07819834bb
[FIX] website_sale: filter controller and shop/?category=37 --> shop/category/37
...
bzr revid: chm@openerp.com-20131121130529-1zs3ioih5156ceit
2013-11-21 14:05:29 +01:00
Thibault Delavallée
bc726e4da7
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131121120935-srk3s4qhxar0k5l5
2013-11-21 13:09:35 +01:00
Thibault Delavallée
2693636989
[IMP] website_sale: improved checkout process
...
- confirmation is now a page displaying a sale order, which polls on the
related transaction to have its status
- when receiving an incoming notification thorugh the acquirer controller
the sale order is updated, then the confirmation page is displayed
- this allows to have a confirmation page that is independant from the
rest of the checkout process
- cleaned confirmation page, removed order details
bzr revid: tde@openerp.com-20131121120902-fm8b7u94gmepohgi
2013-11-21 13:09:02 +01:00
ddm
56e19c374f
[FIX] Avoid reserved keywords as method names
...
bzr revid: ddm@openerp.com-20131121114922-w731pvjnnvqzxu42
2013-11-21 12:49:22 +01:00
ddm
77c60a94be
[IMP] Tour: method names
...
bzr revid: ddm@openerp.com-20131121112312-2n8kd2tja6upji3i
2013-11-21 12:23:12 +01:00
ddm
ec4372ac23
[IMP] Tour: better defaults
...
bzr revid: ddm@openerp.com-20131121111102-l66jzdysdkqm7fje
2013-11-21 12:11:02 +01:00
Thibault Delavallée
04818e7584
[FIX] website_sale: fixed some 'add cart' buttons not working
...
bzr revid: tde@openerp.com-20131121094816-w8ulontnt9kv5zbf
2013-11-21 10:48:16 +01:00
Thibault Delavallée
d5ac601823
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131120140414-zf1qiepxueyrhn4j
2013-11-20 15:04:14 +01:00
Thibault Delavallée
5dcb10fc01
[IMP] website_sale: end of checkout process improvements
...
- added a controller that validates the payment: confirm the quotation (if paid)
and send it by email
- some fixes in payment routes
- some cleaning in payment template, removed unnecessary code, added a class on a
div to ease the submit button management
bzr revid: tde@openerp.com-20131120140321-mderltwy8xp2vfn4
2013-11-20 15:03:21 +01:00
Christophe Matthieu
6b10be15b2
[IMP] website snippet: add group for styles snippets, add custom picture with style snippet, mouseover and mouseout preview, fix dark css class in demo data
...
bzr revid: chm@openerp.com-20131120115250-etqv5ofqguze0zsj
2013-11-20 12:52:50 +01:00
ddm
c706db9b79
[IMP] Tour code cleanup
...
bzr revid: ddm@openerp.com-20131120110757-lq4gnmxj9nf1e7p0
2013-11-20 12:07:57 +01:00
ddm
e8858b02a6
[IMP] Simplify tour declaration II
...
bzr revid: ddm@openerp.com-20131120110233-1hoc40q2wrs0739d
2013-11-20 12:02:33 +01:00
ddm
10e7a76ae4
[IMP] Simplify tour declaration
...
bzr revid: ddm@openerp.com-20131120105205-u5w4167rposrfazd
2013-11-20 11:52:05 +01:00
ddm
be6c14c5b6
[IMP] Shop tour code cleanup
...
bzr revid: ddm@openerp.com-20131120104107-hoiu7n6cq68qf69u
2013-11-20 11:41:07 +01:00
Thibault Delavallée
d1bc4d3766
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131120091851-mtln13mmv8amuau7
2013-11-20 10:18:51 +01:00
Christophe Matthieu
e41e8f3957
[IMP] website_hr_recruitment: clear url path
...
bzr revid: chm@openerp.com-20131119161403-wsqwgfi9w3ythjeg
2013-11-19 17:14:03 +01:00
Thibault Delavallée
38a9a3f480
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131119160204-1yvqbg4vgpc0bkqs
2013-11-19 17:02:04 +01:00
Thibault Delavallée
4f6e792733
[IMP] website_sale: improved checkout process
...
- now going to shop/confirmation when coming back from the acquirer
- added poll on the confirmation page to wait for data from acquirer
- misc cleaning of checkout process, order and transaction management
- added cancel state on payment.transaction, when canceled by the
customer
bzr revid: tde@openerp.com-20131119160129-fkwkhjvk1bh0uarf
2013-11-19 17:01:29 +01:00
ddm
e17d99988b
[FIX] Shop tutorial false start
...
bzr revid: ddm@openerp.com-20131119153908-8n1kse1y2js7v8oj
2013-11-19 16:39:08 +01:00
Christophe Matthieu
20add62aef
[IMP] website_sale: Remove new button
...
bzr revid: chm@openerp.com-20131119152903-r1h3slpy5vigfor4
2013-11-19 16:29:03 +01:00
Christophe Matthieu
cae5522196
[IMP] website_sale: breadcrum layout in my cart
...
bzr revid: chm@openerp.com-20131119152344-w2f56nmd2ce0spon
2013-11-19 16:23:44 +01:00
ddm
47295c4e0e
[FIX] Fixes to shop tour
...
bzr revid: ddm@openerp.com-20131119151059-8xl169vodupwy8xw
2013-11-19 16:10:59 +01:00
ddm
a89c3dff4c
[FIX] Missing double quotes
...
bzr revid: ddm@openerp.com-20131119122605-o6tjpfq7be5tn6zk
2013-11-19 13:26:05 +01:00
ddm
1ec2cb9331
[IMP] Shop tutorial continued
...
bzr revid: ddm@openerp.com-20131119122319-45fu90nooiwb7so7
2013-11-19 13:23:19 +01:00
Fabien Meghazi
3951af2ab5
[IMP] Content->New Product asks for name of product
...
bzr revid: fme@openerp.com-20131119113822-ve7bl516xowa7u1f
2013-11-19 12:38:22 +01:00
Christophe Matthieu
910c2657a9
[IMP] website: add a group_website_publisher to Display Editor Bar on Website and other editable option
...
bzr revid: chm@openerp.com-20131119103042-stdyd6r00e1zgli5
2013-11-19 11:30:42 +01:00
Thibault Delavallée
ba14bbe339
[MOV] website_sale: move get_order and get_current_order code into Website class
...
and into website specific file.
bzr revid: tde@openerp.com-20131119102921-ie03umd2ozasp798
2013-11-19 11:29:21 +01:00
ddm
4ba5cad0e3
[IMP] Improve tour registration
...
bzr revid: ddm@openerp.com-20131119094353-kg04ijualwtsz1lo
2013-11-19 10:43:53 +01:00
Thibault Delavallée
5a51562c18
[ADD] website_sale: added website file in controllers, for website specific code
...
bzr revid: tde@openerp.com-20131119093735-peyoz1ri2hv21w3v
2013-11-19 10:37:35 +01:00
Thibault Delavallée
4d84a4a627
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131119091935-2bhj417353diri9l
2013-11-19 10:19:35 +01:00
ddm
c40105ce18
[IMP] Start eCommerce tutorial on install
...
bzr revid: ddm@openerp.com-20131119090812-amjdzjfh5xwoouex
2013-11-19 10:08:12 +01:00
Christophe Matthieu
5a6a1efc79
[IMP] website_blog: add breadcrumb; [IMP] clean links
...
bzr revid: chm@openerp.com-20131118143530-5205sp6q7xp6lbj7
2013-11-18 15:35:30 +01:00
Thibault Delavallée
7237ae3a63
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131118100534-1pw762aklfdt2hwn
2013-11-18 11:05:34 +01:00
Paramjit Singh Sahota
5900672160
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: psa@tinyerp.com-20131118050254-oc3szg7ws2m75lu4
2013-11-18 10:32:54 +05:30
Fabien Pinckaers
b61ac1998e
[FIX] access right with sale with event crashed [NEW] website_sale_delivery module
...
bzr revid: fp@openerp.com-20131116224306-7is2hawhhpzazie3
2013-11-16 23:43:06 +01:00
Fabien Pinckaers
c69f31d82c
[iMP] Order of published/unpublished documents
...
bzr revid: fp@openerp.com-20131116095426-lqwfdid9z1asi2se
2013-11-16 10:54:26 +01:00
Christophe Matthieu
e61ec3f1cd
[FIX] website_sale: click on blank cd, add to cart -> I have a webcam instead
...
bzr revid: chm@openerp.com-20131115163048-i999l74bfd8t3zrh
2013-11-15 17:30:48 +01:00
Christophe Matthieu
85014499a5
[IMP] website_sale: domain to display product in shop, overwrited in website_event
...
bzr revid: chm@openerp.com-20131115160828-pjv3gessa5sxu2ap
2013-11-15 17:08:28 +01:00
Christophe Matthieu
419c7c6b32
[FIX] website_sale: ribon
...
bzr revid: chm@openerp.com-20131115160721-btxwlxaj7nf9se5n
2013-11-15 17:07:21 +01:00
Christophe Matthieu
b958ece1df
[IMP] website_sale: access rights
...
bzr revid: chm@openerp.com-20131115152716-86wb7yxq2s4hr633
2013-11-15 16:27:16 +01:00
Thibault Delavallée
9f38df4d57
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131115133635-66u5iuesqb5u6leq
2013-11-15 14:36:35 +01:00
Thibault Delavallée
28c864b00f
[IMP] website_sale: added basic management of acquirer button in sale.
...
The action of the rendered button is catched, re-routed to a custom controller in sale that
creates the payment.transaction, or fetch an already-existing one.
Once the transaction is found or created, the user is redirected to the acquirer
transaction url.
Next step: display the transaction status in the payment page.
bzr revid: tde@openerp.com-20131115133414-jiob0gkpv106db27
2013-11-15 14:34:14 +01:00
ddm
2dbb8f1730
[IMP] Rename shop tour
...
bzr revid: ddm@openerp.com-20131114180737-e0tcvj4wl753hk0d
2013-11-14 19:07:37 +01:00
ddm
a07adbfc5d
[IMP] Shop tour scaffholding
...
bzr revid: ddm@openerp.com-20131114171736-090vctn8zr30ne8g
2013-11-14 18:17:36 +01:00
Christophe Matthieu
3f1ff327ad
[FIX] website: access right for demo user
...
bzr revid: chm@openerp.com-20131114152212-jcmyzbf6zcpkp999
2013-11-14 16:22:12 +01:00
Christophe Matthieu
62f00f6941
[IMP] website_sale: remove product 'Service' from the shop list of products
...
bzr revid: chm@openerp.com-20131114113845-xgs79iq2eq2bqgmm
2013-11-14 12:38:45 +01:00
ddm
569b6dc220
[Oops] Sorry about that
...
bzr revid: ddm@openerp.com-20131113202732-0uak3vi7qkf8jts7
2013-11-13 21:27:32 +01:00
ddm
02217abc1f
[FIX] Checkout form almost functional
...
bzr revid: ddm@openerp.com-20131113184303-0i6rtjxbavb9znxz
2013-11-13 19:43:03 +01:00
Fabien Meghazi
7598bcdb98
[ADD] Content menu links splitted per modules
...
TODO: website.prompt() should be finished for Add a blog post link
Added @id=editable_scripts_hook in layout template so modules can easly add *.editor.js files
bzr revid: fme@openerp.com-20131113171438-3l0wo08ta5vsulq3
2013-11-13 18:14:38 +01:00
Thibault Delavallée
833adcec62
[FIX] website_sale: fixed template about acquirer, when displaying the form of an acquirer
...
bzr revid: tde@openerp.com-20131113140009-wpa69bbmswyncmoz
2013-11-13 15:00:09 +01:00
Thibault Delavallée
9b25f6eb42
[REV] website_sale: removed a change to lessen the diff
...
bzr revid: tde@openerp.com-20131113135947-fq7z0ci0ue92q11w
2013-11-13 14:59:47 +01:00
Thibault Delavallée
91ddcfefcc
[REV] website_sale: removed a space removal, to shorten the diff
...
bzr revid: tde@openerp.com-20131113104351-tly8h3buek6e1msd
2013-11-13 11:43:51 +01:00
Thibault Delavallée
72ff6562b6
[FIX] website_sale: fixed remaining TREE tag due to conflict
...
bzr revid: tde@openerp.com-20131113104333-5ulxae6vbcgc5al6
2013-11-13 11:43:33 +01:00
Thibault Delavallée
ac54e05a21
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131113093009-w6jih5xosequqowh
2013-11-13 10:30:09 +01:00
Christophe Matthieu
d96222ac4f
[FIX] website_sale: 'Product Description' overlaps with price
...
bzr revid: chm@openerp.com-20131112173502-gddstacuq8n32gdc
2013-11-12 18:35:02 +01:00
Christophe Matthieu
8a48f25446
[FIX] website_sale: list_view
...
bzr revid: chm@openerp.com-20131112172811-yc0tn0gfz2pvwpb0
2013-11-12 18:28:11 +01:00
Christophe Matthieu
34600660bf
[FIX] website_sale: access right for website.product.style
...
bzr revid: chm@openerp.com-20131112165415-c6o3c26djdtuaa2k
2013-11-12 17:54:15 +01:00
Fabien Meghazi
557d887496
[IMP] preprocess static @href|src|action, static url doesn't need t-href anymore
...
you need to pull server branch
bzr revid: fme@openerp.com-20131112144442-y9bw5q6kkoym8o1i
2013-11-12 15:44:42 +01:00
Fabien Meghazi
91ac20c28c
[FIX] Remove lang_code from kwargs
...
bzr revid: fme@openerp.com-20131112112150-ka9ner1bkqx6ioeg
2013-11-12 12:21:50 +01:00
Thibault Delavallée
92e72bb317
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131112095402-82v28vq537o6le8c
2013-11-12 10:54:02 +01:00
Paramjit Singh Sahota
be9553d6f1
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
...
bzr revid: psa@tinyerp.com-20131111063123-qysh7oyiscfy8ku9
2013-11-11 12:01:23 +05:30
ddm
0b16f685c1
[FIX] beware of multilang when removing **post
...
bzr revid: ddm@openerp.com-20131108172019-51yymatg4b1zanc1
2013-11-08 18:20:19 +01:00
ddm
4d5a8ed6ab
[IMP] cleanup product controller
...
bzr revid: ddm@openerp.com-20131108164917-0cn91vb1yn822bvi
2013-11-08 17:49:17 +01:00
Christophe Matthieu
9d9b2ed63c
[FIX] website_sale: Shopping Cart suggested products
...
bzr revid: chm@openerp.com-20131108155841-m4b6k02zx8h54ajf
2013-11-08 16:58:41 +01:00
Thibault Delavallée
35619dfe12
[MERGE] Sync with website-al main branch
...
bzr revid: tde@openerp.com-20131107172339-zjpa2xmtf2xql9eu
2013-11-07 18:23:39 +01:00
Christophe Matthieu
ec2a9776ab
[IMP] website_sale: move attributes under add to cart button in product view
...
bzr revid: chm@openerp.com-20131107164522-uauyelduq7o4sfj3
2013-11-07 17:45:22 +01:00
Christophe Matthieu
dd497b0ef2
[IMP] website_sale: change name of suggested product template
...
bzr revid: chm@openerp.com-20131107162916-ocm5q101psem5j2v
2013-11-07 17:29:16 +01:00
Christophe Matthieu
4ff0a207f6
[IMP] website_sale: some change for attributes
...
bzr revid: chm@openerp.com-20131107162101-82tl3ibbhxkbgjro
2013-11-07 17:21:01 +01:00
Fabien Meghazi
01a28b6e03
[FIX] Can't translate menus
...
context was not passed while setting request.website
forced to refactor a bit in order to make true model methods but stopped
because it will be duplicated work when migrating to the new api
bzr revid: fme@openerp.com-20131107151400-9dmtgz7xs34qmbmq
2013-11-07 16:14:00 +01:00
Christophe Matthieu
28b932a40d
[FIX] website_sale: highlight category
...
bzr revid: chm@openerp.com-20131107144828-0wa4vexo5nj41uh5
2013-11-07 15:48:28 +01:00
Christophe Matthieu
a4cea5c7eb
[IMP] website_sale: user can display filters without categories
...
bzr revid: chm@openerp.com-20131107143959-551ti1ces04toes0
2013-11-07 15:39:59 +01:00
ddm
821f703125
[IMP] use single template for search box in eCommerce
...
bzr revid: ddm@openerp.com-20131107135528-0hovrmuxk51xl8wo
2013-11-07 14:55:28 +01:00
Christophe Matthieu
25f6d1c83f
[IMP] website_sale: header change for user customization
...
bzr revid: chm@openerp.com-20131107135306-8jpe0gl4iqmgl51k
2013-11-07 14:53:06 +01:00
Christophe Matthieu
9ae2008115
[IMP] website: phone view, hide options and editor buttons
...
bzr revid: chm@openerp.com-20131107112533-o33ok38tbayrdbke
2013-11-07 12:25:33 +01:00
Christophe Matthieu
2ae05fb8de
[IMP] website_sale: display message when search returns no result
...
bzr revid: chm@openerp.com-20131107102935-r9212sq6avbhy2o2
2013-11-07 11:29:35 +01:00
ddm
b7a4c6d3f0
[FIX] eCommerve search + categories & filters
...
Hopefully this completely solves it. More testing required...
bzr revid: ddm@openerp.com-20131106175743-xxxswsc0vs5fh3x5
2013-11-06 18:57:43 +01:00
Fabien Meghazi
5ce5a2d877
[ADD] Added sequence field to website.menu data
...
bzr revid: fme@openerp.com-20131106154207-dd6g5jgpjt35ee9h
2013-11-06 16:42:07 +01:00
ddm
5f41d10ab5
[FIX] product links when browsing categories
...
bzr revid: ddm@openerp.com-20131105162558-4e1yua2hipvf5cly
2013-11-05 17:25:58 +01:00
Christophe Matthieu
67c437df77
[FIX] website_sale: access right for product.attribute.product; white list for filter link
...
bzr revid: chm@openerp.com-20131105161737-b1o41v17p7wsjl6v
2013-11-05 17:17:37 +01:00
ddm
b34bb11b2d
[FIX] avoid building urls manually if possible
...
bzr revid: ddm@openerp.com-20131105155627-ahyo9av7wh1aa7jl
2013-11-05 16:56:27 +01:00
Christophe Matthieu
fb5ae3cabf
[FIX] website_sale: mycart when the user haven't sale order
...
bzr revid: chm@openerp.com-20131105155410-pel99sbzka27zl4o
2013-11-05 16:54:10 +01:00
Xavier Morel
5ce1bfdddf
[FIX] more templates which aren't actually pages
...
bzr revid: xmo@openerp.com-20131105151404-olp8wvdqx9yxuxj9
2013-11-05 16:14:04 +01:00
Xavier Morel
bf602c18b7
[FIX] cart template is not a page
...
bzr revid: xmo@openerp.com-20131105094953-fdmm1j3k4z1abg92
2013-11-05 10:49:53 +01:00
Christophe Matthieu
475c77874b
[FIX] website_sale: add filter
...
bzr revid: chm@openerp.com-20131105151417-zas9dcz5jn0za8st
2013-11-05 16:14:17 +01:00
Christophe Matthieu
f318f99825
[IMP] website_sale: attributes/filter, fix access right, add default value for filter (for custom user ecommerce with category,label...)
...
bzr revid: chm@openerp.com-20131105150928-ps01ziqnfgd9hu46
2013-11-05 16:09:28 +01:00
Christophe Matthieu
7f5a60f13c
[FIX] website_sale: update total when the user change a product quantity
...
bzr revid: chm@openerp.com-20131105132747-figm8j11d6ul1v0k
2013-11-05 14:27:47 +01:00
Christophe Matthieu
a31847a432
[FIX] website_sale: add access rules for product.pricelist
...
bzr revid: chm@openerp.com-20131105092801-1vohr6w15cxqj4wp
2013-11-05 10:28:01 +01:00
Thibault Delavallée
420cdb13a2
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131031102749-mzn5bqcunwuo1hsf
2013-10-31 11:27:49 +01:00
Fabien Meghazi
90814d781a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20131030144813-xmjb6i9ayv23aqyi
2013-10-30 15:48:13 +01:00
Xavier Morel
3a1ed80b41
[FIX] creation of new products from products listing page
...
* fix creation controller to redirect to the id of the *product
template* implicitly created when the product is created, not to the
product, as "product" URLs actually display information about a
product template
* ensure the controller is only POST-ed to, not GET
* fix button to POST the creation request (use form and actual button,
not link)
* fix template (foreach -> t-foreach)
bzr revid: xmo@openerp.com-20131030133019-5pq3qekwu465x1k6
2013-10-30 14:30:19 +01:00
Fabien Meghazi
12801a8cbc
[MERGE] upstream
...
bzr revid: fme@openerp.com-20131030082046-13kxszts8g0ky4wr
2013-10-30 09:20:46 +01:00
Paramjit Singh Sahota
3065d4dc27
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
...
bzr revid: psa@tinyerp.com-20131029050653-528vjzg4rpbo3l62
2013-10-29 10:36:53 +05:30
ddm
2196a69a61
[FIX] eCommerce: duplicate product price
...
bzr revid: ddm@openerp.com-20131028145043-ek0rnvatu2ab4avx
2013-10-28 15:50:43 +01:00
Paramjit Singh Sahota
5d800abfdb
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
...
bzr revid: psa@tinyerp.com-20131022115302-t5a9ftki0yt2pxvk
bzr revid: psa@tinyerp.com-20131024051639-ijmy82htxvy3c23r
bzr revid: psa@tinyerp.com-20131028063631-7ndbt6c4x09ad283
2013-10-28 12:06:31 +05:30
Fabien Meghazi
eb7b1362cd
[WIP] Menu working from database (not yet multi-website)
...
bzr revid: fme@openerp.com-20131025152446-si9gsjujzcn40hip
2013-10-25 17:24:46 +02:00
Thibault Delavallée
15ec0ebb62
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131024131445-zaxaw5rpu681gwoz
2013-10-24 15:14:45 +02:00
Thibault Delavallée
2cc18c153e
[REV] Reverted a change in _openerp__.py in website_sale, because
...
this was just for local tests.
bzr revid: tde@openerp.com-20131024111453-tqjx4st6js5qnoz4
2013-10-24 13:14:53 +02:00
Thibault Delavallée
0467c8a5ab
[FIX] [WIP] website_sale: fix crash when having product templates without variant.
...
probably it should not be displayed, but as there does not seem to exist any
clue about what the controller / view should do, I added some protections.
[DOC] added some comments because some methods seems quite weird.
bzr revid: tde@openerp.com-20131024110453-uj4xnrtwst0fdcrb
2013-10-24 13:04:53 +02:00
Thibault Delavallée
258846a697
[FIX] [WIP] website_sale: Tries to fix method
...
that does things not commented on things that do not necessarily exist.
Does it hurt you to put some docstrings ?
bzr revid: tde@openerp.com-20131024105524-eattmf2s52ekztn3
2013-10-24 12:55:24 +02:00
ddm
3ff98b4050
[IMP] eCommerce: remove duplicate button
...
bzr revid: ddm@openerp.com-20131024092438-aelgmzbcpvwmf33p
2013-10-24 11:24:38 +02:00
ddm
bffc22b391
[IMP] Consistency
...
bzr revid: ddm@openerp.com-20131024092057-p26cnzy9q37zuc6s
2013-10-24 11:20:57 +02:00
ddm
d5379f3b7c
[FIX] eCommerce cart layout
...
Fixed 'Continue Shopping' button spacing when cart empty
bzr revid: ddm@openerp.com-20131023154639-j7385c9oaka2k3g1
2013-10-23 17:46:39 +02:00
Fabien Meghazi
7dd1934585
[FIX] option typo: unable_editor -> enable_editor
...
bzr revid: fme@openerp.com-20131023091152-h0hxw47hzfor2al8
2013-10-23 11:11:52 +02:00
ddm
3873868633
[FIX] Fixed eCommerce pager
...
bzr revid: ddm@openerp.com-20131022151655-erprk7ci7mrwmb18
2013-10-22 17:16:55 +02:00
Xavier Morel
3655f43e42
[IMP] warnings and shit
...
bzr revid: xmo@openerp.com-20131022151144-tblwba9rf77iuidl
2013-10-22 17:11:44 +02:00
ddm
7994ceb43d
[IMP] eCommerce: layout improvements
...
bzr revid: ddm@openerp.com-20131022142804-58oabf37w3zsg2pg
2013-10-22 16:28:04 +02:00
ddm
1888dea9b4
[IMP] eCommerce: Checkout summary moved to left (cf. apr's review)
...
bzr revid: ddm@openerp.com-20131022140119-82ex7kvrzeqc7jri
2013-10-22 16:01:19 +02:00
ddm
291ffdb515
[CMS] eCommerce: remove product list title (cf. apr's review)
...
bzr revid: ddm@openerp.com-20131022134409-g1qi25a96jvzby8s
2013-10-22 15:44:09 +02:00
Xavier Morel
31ba0b8b5a
[FIX] image t-field lost during a merge
...
bzr revid: xmo@openerp.com-20131022105955-i550clo5snyvnv26
2013-10-22 12:59:55 +02:00
Paramjit Singh Sahota
5d233599ce
contenteditable false.
...
bzr revid: psa@tinyerp.com-20131022063841-5vtzxns0ho2heuld
2013-10-22 12:08:41 +05:30
Paramjit Singh Sahota
4266d44b61
[IMP] Improvd the banners.
...
bzr revid: psa@tinyerp.com-20131022060436-39jpcp2rxrx8okq9
2013-10-22 11:34:36 +05:30
ddm
2771c47379
[FIX] Ace: proper template naming
...
bzr revid: ddm@openerp.com-20131021133957-7ktyfk21a0huj1vl
2013-10-21 15:39:57 +02:00
Paramjit Singh Sahota
6befd7d6c5
[IMP]Improved code.
...
bzr revid: psa@tinyerp.com-20131021132901-up1ianuz5rtg3hly
2013-10-21 18:59:01 +05:30
Paramjit Singh Sahota
32124e7db5
[IMP] Little Improvement.
...
bzr revid: psa@tinyerp.com-20131021085725-wls4ocyjo38tnq7w
2013-10-21 14:27:25 +05:30
Paramjit Singh Sahota
5f3aa19035
[IMP] Improved code and make file for demo data.
...
bzr revid: psa@tinyerp.com-20131021074817-3yren0baw8fqijie
2013-10-21 13:18:17 +05:30
Paramjit Singh Sahota
a8519350b9
[MERGE] Merged trunk-website-al
...
bzr revid: psa@tinyerp.com-20131018134347-gbvtw3diw1lrli6k
2013-10-18 19:13:47 +05:30
Paramjit Singh Sahota
7baf49139a
[IMP] Added event banner for homepage.
...
bzr revid: psa@tinyerp.com-20131018130256-gr9ikd0iiszvgsmg
2013-10-18 18:32:56 +05:30
Fabien Meghazi
0373662dd4
[NODISK] @ddm: Got no floppy disk so I push here
...
bzr revid: fme@openerp.com-20131018130034-vo6rgndvzv1ni6nu
2013-10-18 15:00:34 +02:00
Paramjit Singh Sahota
5732f1552e
[IMP]Added the demodata for homepage.
...
bzr revid: psa@tinyerp.com-20131018123244-ueuj25lto0ugs6mj
2013-10-18 18:02:44 +05:30
Christophe Matthieu
0445188ff2
[MERGE] sync from website-al
...
bzr revid: chm@openerp.com-20131018121050-vpk0lltaia4lka4l
2013-10-18 14:10:50 +02:00
Christophe Matthieu
666387a274
[WIP] payment_acquirer
...
bzr revid: chm@openerp.com-20131018111530-tjyhp3cu1qlabhij
2013-10-18 13:15:30 +02:00
Christophe Matthieu
fc43a53079
[FIX] product.attribute: store min and max
...
bzr revid: chm@openerp.com-20131017131604-x2xo963p9pq81hvf
2013-10-17 15:16:04 +02:00
Paramjit Singh Sahota
70dd2ebc14
[IMP] Improved path.
...
bzr revid: psa@tinyerp.com-20131017131321-uyyyp9nii5ab8ejx
2013-10-17 18:43:21 +05:30
Paramjit Singh Sahota
67b6faf955
[IMP]ADded banner for shop.
...
bzr revid: psa@tinyerp.com-20131017130421-fnir86hberl2t6qy
2013-10-17 18:34:21 +05:30
Christophe Matthieu
36675c3663
[WIP] payment_acquirer
...
bzr revid: chm@openerp.com-20131017110046-1b5pmju5q8x3gaz5
2013-10-17 13:00:46 +02:00
Paramjit Singh Sahota
e126969eab
For the sack removed the banner from homepage.
...
bzr revid: psa@tinyerp.com-20131017095125-uf4dm2jfy7a0sla4
2013-10-17 15:21:25 +05:30
Paramjit Singh Sahota
5b1268d5e7
[IMP] Improved the layout of homepage.
...
bzr revid: psa@tinyerp.com-20131017071144-k58tomhtjit4n126
2013-10-17 12:41:44 +05:30
ddm
ebdfbc58f1
[FIX] SEO for shop products
...
bzr revid: ddm@openerp.com-20131016160232-e5rxi1hoofm5anrw
2013-10-16 18:02:32 +02:00
Christophe Matthieu
6e4c0f9068
[WIP] website_sale use payment_acquirer
...
bzr revid: chm@openerp.com-20131016150837-1zo80gd1pmlvy2im
2013-10-16 17:08:37 +02:00
Fabien Meghazi
1cec2a5b6f
[REM] Obsolete route /admin
...
bzr revid: fme@openerp.com-20131016093248-2q2c8ppkxxhfx1su
2013-10-16 11:32:48 +02:00
Christophe Matthieu
110d2d1386
[FIX] website_sale: forgotten files
...
bzr revid: chm@openerp.com-20131015094505-g0n3g48megu96kh0
2013-10-15 11:45:05 +02:00
Christophe Matthieu
5dd919e930
[IMP] website_sale: replace sql search by openerp domain for attributes searching
...
bzr revid: chm@openerp.com-20131015093350-a4irzeqiwpn55gh4
2013-10-15 11:33:50 +02:00
Christophe Matthieu
03b360e19f
[FIX] website_sale: search by facets/attributes and category
...
bzr revid: chm@openerp.com-20131015083331-gypew1z1sb4m9jzt
2013-10-15 10:33:31 +02:00
Christophe Matthieu
f06566baa1
[IMP] website_sale: remove some args in t-keep-query xml attr
...
bzr revid: chm@openerp.com-20131015083010-sxslddq0l8hk174g
2013-10-15 10:30:10 +02:00
Christophe Matthieu
e6a831a1a2
[IMP] website: add facets/attributes on product template. Displayed in the left category menu in the ecommerce
...
bzr revid: chm@openerp.com-20131015082726-6f1tkyhoaju27p85
2013-10-15 10:27:26 +02:00
Fabien Meghazi
853cb1dd26
[MERGE] SEO meta data persistence. New template title handling
...
bzr revid: fme@openerp.com-20131014151509-6bnux7ncvqmy3tea
2013-10-14 17:15:09 +02:00
Xavier Morel
804f879518
[MERGE] new fields & field conversions in CMS
...
bzr revid: xmo@openerp.com-20131014100222-v73qz8dbrurc2eoq
2013-10-14 12:02:22 +02:00
Xavier Morel
2cdaa44b9e
[FIX] wrong end tag during merge
...
bzr revid: xmo@openerp.com-20131014095820-njd1v48lgljrj2q0
2013-10-14 11:58:20 +02:00
Fabien Meghazi
631b1cbc09
[MERGE] upstream
...
bzr revid: fme@openerp.com-20131014095642-qxl7ceqptfsj215l
2013-10-14 11:56:42 +02:00
Xavier Morel
2e352ce187
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20131014085459-dhbypq0hg3lzzf3j
2013-10-14 10:54:59 +02:00
Christophe Matthieu
2d719d3d7b
[MOVE] website_sale: py files to models/
...
bzr revid: chm@openerp.com-20131014081841-k8iz2b67voezgue4
2013-10-14 10:18:41 +02:00
Fabien Pinckaers
a21459d79f
[IMP] demo data
...
bzr revid: fp@openerp.com-20131013190105-5mwo51w7v62tkm89
2013-10-13 21:01:05 +02:00
Fabien Pinckaers
a128704b47
[IMP] demo data
...
bzr revid: fp@openerp.com-20131013154839-4fscqfpzohhevww5
2013-10-13 17:48:39 +02:00
Xavier Morel
1ad6132624
[IMP] span[text-decoration] -> del
...
bzr revid: xmo@openerp.com-20131011135550-q4s83cgbb7f8qgof
2013-10-11 15:55:50 +02:00
Xavier Morel
1208a5bcf5
[ADD] monetary widget use in website_sale
...
bzr revid: xmo@openerp.com-20131011131147-plqmc1r5ok4tcrge
2013-10-11 15:11:47 +02:00
Fabien Meghazi
6a37c2fb82
[IMP] Use view 'name' as title for main_object of type ir.ui.view
...
bzr revid: fme@openerp.com-20131010145525-417zbwltyqzbjolz
2013-10-10 16:55:25 +02:00
Fabien Meghazi
9b40e849d6
[WIP] new title managment in templates. expose main_object for seo
...
bzr revid: fme@openerp.com-20131010132907-xxmg96qmcw9j5f2d
2013-10-10 15:29:07 +02:00
Christophe Matthieu
7cfefd4795
[IMP] website_sale: small change in checkout view
...
bzr revid: chm@openerp.com-20131010085141-w6dfki153ob8ke4s
2013-10-10 10:51:41 +02:00
Christophe Matthieu
af5cc9c02a
[FIX] website_view: css price with position absolute for description
...
bzr revid: chm@openerp.com-20131009135914-nq5sr4qi7dc5wbsv
2013-10-09 15:59:14 +02:00
Christophe Matthieu
41bb68a87b
[FIX] website_view: css responsible < 600
...
bzr revid: chm@openerp.com-20131009134016-chus09j1h0zogbo2
2013-10-09 15:40:16 +02:00
Christophe Matthieu
6de0a5d34d
[FIX] website_sale: change view for new qweb security access
...
bzr revid: chm@openerp.com-20131009124848-1n3eiy7dbew6j2js
2013-10-09 14:48:48 +02:00
Christophe Matthieu
47e324e620
[FIX] website_sale: access rules
...
bzr revid: chm@openerp.com-20131008153302-09coejmzrcjns36u
2013-10-08 17:33:02 +02:00
Christophe Matthieu
20b6367ec5
[IMP] website_sale: better access rules and security
...
bzr revid: chm@openerp.com-20131008152233-zl3dxoyso9liahlm
2013-10-08 17:22:33 +02:00
Xavier Morel
426757ad92
[ADD] linked image fields
...
bzr revid: xmo@openerp.com-20131008120456-r8tqd5iyq1zfsdvi
2013-10-08 14:04:56 +02:00
Fabien Pinckaers
0665e77558
[IMP] cleaned picture
...
bzr revid: fp@openerp.com-20131004224827-fkn6srxkmwbfskxa
2013-10-05 00:48:27 +02:00
Fabien Pinckaers
264186c307
[IMP] icons
...
bzr revid: fp@openerp.com-20131004224358-7v3wjqr6v3lulfls
2013-10-05 00:43:58 +02:00
Christophe Matthieu
8e746c7a86
[FIX] website: replace snippet-id by data-snippet-id inside demo data
...
bzr revid: chm@openerp.com-20131004104534-txgubiz17px6adra
2013-10-04 12:45:34 +02:00
Christophe Matthieu
d96072fc3a
[IMP] website_sale: on error, label in red color
...
bzr revid: chm@openerp.com-20131003112720-maxy73xo323s3vgl
2013-10-03 13:27:20 +02:00
Christophe Matthieu
f5262b9c5c
[IMP] website_sale: icon for policies and Secure Payment; fix my cart label
...
bzr revid: chm@openerp.com-20131003112354-l146jewjuzhlzt7p
2013-10-03 13:23:54 +02:00
Christophe Matthieu
6f454c6b33
[IMP] website_sale: shop/mycart, My Cart, in the top
...
bzr revid: chm@openerp.com-20131003110411-9a1536dqwhuhabq7
2013-10-03 13:04:11 +02:00
Christophe Matthieu
16a3aa522b
[IMP] website_sale: variant change the price
...
bzr revid: chm@openerp.com-20131003104701-28mvvte5wa6q8mt7
2013-10-03 12:47:01 +02:00
Paramjit Singh Sahota
e74afb7d5f
[IMP]Improved
...
bzr revid: psa@tinyerp.com-20131003072514-tjnb7ey20x16uzzf
2013-10-03 12:55:14 +05:30
Paramjit Singh Sahota
a3a0d02d19
Added product description for the published products.
...
bzr revid: psa@tinyerp.com-20131003062124-veb3i998ouxianil
2013-10-03 11:51:24 +05:30
Christophe Matthieu
adef9bc3df
[FIX] website_sale: edit, suggested products
...
bzr revid: chm@openerp.com-20131002162810-cjo5r9itmuc0x71o
2013-10-02 18:28:10 +02:00
Christophe Matthieu
61d6d2dacd
[FIX] crappy publisher change
...
bzr revid: chm@openerp.com-20131002154528-yno7lqkuddidjbis
2013-10-02 17:45:28 +02:00
Christophe Matthieu
86159fe4b0
[IMP] website_sale: improve security: remove superuser_id and replace by request.uid
...
bzr revid: chm@openerp.com-20131002083750-ncyf7v7lip71cbuq
2013-10-02 10:37:50 +02:00
Christophe Matthieu
2ae84ed2e2
[FIX] website_sale: access right for public access for price
...
bzr revid: chm@openerp.com-20131002083018-gavt68w57t9wneu5
2013-10-02 10:30:18 +02:00
Christophe Matthieu
d2a743cbde
[IMP] website_sale: context, routes
...
bzr revid: chm@openerp.com-20131002071239-4glhz7g8iz1r9gea
2013-10-02 09:12:39 +02:00
Fabien Pinckaers
8da11482c4
[IMP] style
...
bzr revid: fp@openerp.com-20131001221431-5hde5uggcr9j0rjy
2013-10-02 00:14:31 +02:00
Fabien Pinckaers
315f9e03c3
[IMP] website_sale manifest
...
bzr revid: fp@openerp.com-20131001221253-lpa5lgu75wbiepsc
2013-10-02 00:12:53 +02:00
Christophe Matthieu
10c61ec2e9
[FIX] website_sale: editor grid
...
bzr revid: chm@openerp.com-20131001123216-bdvzgbpw30d188ps
2013-10-01 14:32:16 +02:00
Christophe Matthieu
aea15f9f6f
[IMP] website snippet: new change background
...
bzr revid: chm@openerp.com-20131001120335-kwyyodiwturplyfy
2013-10-01 14:03:35 +02:00
Christophe Matthieu
08a6ca9d21
[FIX] website_sale: checkout view for public user
...
bzr revid: chm@openerp.com-20131001095117-q9ykymxb2haibi65
2013-10-01 11:51:17 +02:00
Christophe Matthieu
8a9938333b
[FIX] website_sale: responsible design of grid of products for firefox
...
bzr revid: chm@openerp.com-20131001090800-i97ojnj2lmi2hg4v
2013-10-01 11:08:00 +02:00
Thibault Delavallée
726cda367e
[FIX] website and all derived addons: fixed imports broken when moving
...
website.py to models/ directory in website (revision 9491 revid:xmo@openerp.com-20130930145358-qh7xdicgg21prsk4).
bzr revid: tde@openerp.com-20131001085739-hoczgpqrv2nrr6lb
2013-10-01 10:57:39 +02:00
Fabien Pinckaers
635999b9e9
[IMP] top badge for my cart
...
bzr revid: fp@tinyerp.com-20131001072057-m3551lf4l68b2w1o
2013-10-01 09:20:57 +02:00
Fabien Pinckaers
656fcad3eb
[IMP] Payment Process Design
...
bzr revid: fp@openerp.com-20130930225105-0dses1tdzm2iysfp
2013-10-01 00:51:05 +02:00
Christophe Matthieu
af96efffc9
[IMP] website_sale: responsible design for products grid
...
bzr revid: chm@openerp.com-20130930084708-is68jozdizp1c9z9
2013-09-30 10:47:08 +02:00
Fabien Pinckaers
27c9ab5737
[FIX] typo
...
bzr revid: fp@tinyerp.com-20130930083759-gjc0gnv96w0n4kju
2013-09-30 10:37:59 +02:00
Fabien Pinckaers
3430cef9a4
[IMP] design shop
...
bzr revid: fp@openerp.com-20130929160635-ye56hhpj5ycbzltt
2013-09-29 18:06:35 +02:00
Fabien Pinckaers
2ecb96c061
[IMP] html fix: row missing
...
bzr revid: fp@openerp.com-20130929154204-xodhyzau24ms0wr6
2013-09-29 17:42:04 +02:00
Fabien Pinckaers
97c0c0d641
[IMP] Promo Ribbon for shop
...
bzr revid: fp@openerp.com-20130929153420-k01nqjj234tp6ovc
2013-09-29 17:34:20 +02:00
Fabien Pinckaers
0762fd9e93
[IMP] manifest improvements
...
bzr revid: fp@openerp.com-20130928132242-ndw3gu8z5yr95plc
2013-09-28 15:22:42 +02:00
Christophe Matthieu
8d3db3a13f
[IMP] website_sale: responsible design (css height)
...
bzr revid: chm@openerp.com-20130927152625-mrr0r2514qfwyisp
2013-09-27 17:26:25 +02:00
Christophe Matthieu
a5ac76bc2b
[FIX] website_sale: context pricelist and add demo data for discount
...
bzr revid: chm@openerp.com-20130927144636-hha4luhu6v4lvyc0
2013-09-27 16:46:36 +02:00
Christophe Matthieu
6e3a9e63b7
[FIX] website_sale: hack link with javascript
...
bzr revid: chm@openerp.com-20130927134028-f2nl4xinq0zd0rb7
2013-09-27 15:40:28 +02:00
Xavier Morel
4950703cd3
[FIX] crappy view
...
bzr revid: xmo@openerp.com-20130927124406-5zftzi5g0m0g1lds
2013-09-27 14:44:06 +02:00
Xavier Morel
3b431eec45
[IMP] file read
...
bzr revid: xmo@openerp.com-20130927121335-iixxhkft8qmii85x
2013-09-27 14:13:35 +02:00
Christophe Matthieu
45190a6f7d
[FIX] website_sale: reload page after edit size
...
bzr revid: chm@openerp.com-20130927110146-obp9tcolk8pdq82x
2013-09-27 13:01:46 +02:00
Christophe Matthieu
da8c4e1be1
[IMP] website_sale: sweeter style and size edition on view 'list'
...
bzr revid: chm@openerp.com-20130927103148-nwm0amgkn8buk4dd
2013-09-27 12:31:48 +02:00
Fabien Pinckaers
73faaabdc8
[IMP] Product Sale Views Cleanup
...
bzr revid: fp@openerp.com-20130927054910-lppoqz4hxmomckeg
2013-09-27 07:49:10 +02:00
Fabien Pinckaers
54419cf4de
[FIX] style in shop list view
...
bzr revid: fp@openerp.com-20130927053013-ca212xclwntv8ys2
2013-09-27 07:30:13 +02:00
Fabien Meghazi
e7d55014a4
[MERGE] multilang
...
bzr revid: fme@openerp.com-20130926165324-2jfo9s8q3u4teor1
2013-09-26 18:53:24 +02:00
Fabien Meghazi
6d47823121
[IMP] website_sale multilang
...
bzr revid: fme@openerp.com-20130926145448-lvrfd6ma755jf549
2013-09-26 16:54:48 +02:00
Christophe Matthieu
71a1b12e31
[IMP] website_sale + website_event: set order, first items = published
...
bzr revid: chm@openerp.com-20130926141935-1y8ts0y0n1i5tpun
2013-09-26 16:19:35 +02:00
Christophe Matthieu
9b538b3744
[FIX] website_sale: add to cart
...
bzr revid: chm@openerp.com-20130926140750-tmp5wexrpbkipt0w
2013-09-26 16:07:50 +02:00
Christophe Matthieu
9f58a5c082
[IMP] website_sale: add styles selector on product
...
bzr revid: chm@openerp.com-20130926130954-fxojimjdinepgpjq
2013-09-26 15:09:54 +02:00
Christophe Matthieu
c66c5d5b6a
[IMP] change publish button, fix website_sale product order + push top/bottom
...
bzr revid: chm@openerp.com-20130926111854-22ikjc2enj0hi0qu
2013-09-26 13:18:54 +02:00
Christophe Matthieu
b05cd31b59
[FIX] website_sale: add_to_cart inherit
...
bzr revid: chm@openerp.com-20130926091825-bfykta69vl3knbxh
2013-09-26 11:18:25 +02:00
Christophe Matthieu
437440e2c9
[IMP] website_sale: demo data and style size datas
...
bzr revid: chm@openerp.com-20130926081600-o6yp6mbkec8anfr2
2013-09-26 10:16:00 +02:00
Christophe Matthieu
cf79e61c36
[FIX] website_sale: inherit_option_id for list view and category view
...
bzr revid: chm@openerp.com-20130926075650-blc9d3fyj3gbcgoq
2013-09-26 09:56:50 +02:00
Christophe Matthieu
cd5a77788d
[IMP] website_sale: method get_bin_packing_products or get_products call inside the view
...
bzr revid: chm@openerp.com-20130926074644-d3bjd8te6ks82u7a
2013-09-26 09:46:44 +02:00
Christophe Matthieu
b8f1ffaafc
[IMP] website_sale: bin packing product for sweet layout
...
bzr revid: chm@openerp.com-20130925180538-qnq699csoof8jrt5
2013-09-25 20:05:38 +02:00
Xavier Morel
aae0a815d2
[IMP] replace instances of t[@t-field], they're a pain in the ass
...
bzr revid: xmo@openerp.com-20130925112803-ya54yb2kwdodj3y5
2013-09-25 13:28:03 +02:00
Christophe Matthieu
bd16487da1
[IMP] website_sale: change css and demo data
...
bzr revid: chm@openerp.com-20130924152639-v6hr0laatjcbxe39
2013-09-24 17:26:39 +02:00
Thibault Delavallée
0c040ae237
[MERGE] [IMP] [DEMO] event, website_event improvements
...
[IMP] [DEMO] event: cleaned demo data. Also renamed note field into description, and moved it out of groups_noone, in order to effectively use it to hold the html description of the event.
[IMP] event_sale: cleaned demo data
[ADD] website_mail: added mail_thread file that hold website_message_ids field, holding published comments. Use it for public objects. However as inheritance seems to be still buggy, this field is redefined in website_blog and website_event (at least) to be able to use it. Remove specific declarations when the bug is fixed.
[IMP] [ADD] website_event:
- added skeleton directory for doc
- added skeleton directory for tests
- added dependency towards website_mail module, to benefit from follow feature
- cleaned demo data
- use website_mail for follow / unfollow mechanism
- added website_message_ids field, use it in view
- some improvements in website view (title, event description)
[FIX] website_sales: somewhat fixed partner information fetch in checkout; whole code of those controllers is really obfuscated and very dubious.
bzr revid: tde@openerp.com-20130924130517-hzi2qm108ec65viq
2013-09-24 15:05:17 +02:00
Thibault Delavallée
39726ffe2d
[CLEAN] removed print statement
...
bzr revid: tde@openerp.com-20130924124426-7pz7a9cinllcnspn
2013-09-24 14:44:26 +02:00
Thibault Delavallée
ac2384ee47
[IMP] website_sale: basic cleaning of checkout method about getting partner data. In view, do not use get when the data, use brackets, this helps tracking issues in your process.
...
bzr revid: tde@openerp.com-20130924124253-gld6lwzm3dc8bhwn
2013-09-24 14:42:53 +02:00
Thibault Delavallée
90eba9e022
[MOVE] Do not be afraid to put different models in different files. Stop putting shit everywhere.
...
bzr revid: tde@openerp.com-20130924121944-ifjosr5yol6b9tsy
2013-09-24 14:19:44 +02:00
Xavier Morel
8b06e72716
[FIX] block-level links
...
bzr revid: xmo@openerp.com-20130924112402-twcgdh0b18vzdwru
2013-09-24 13:24:02 +02:00
Christophe Matthieu
51fae1fcf8
[IMP] website_sale display only non empty category in non editable mode
...
bzr revid: chm@openerp.com-20130924102834-op0bm475w20x35j4
2013-09-24 12:28:34 +02:00
Christophe Matthieu
abc273e9a1
[IMP] website_sale: change size y when category is displayed
...
bzr revid: chm@openerp.com-20130924085507-9m1gsdnlsfgn4fj4
2013-09-24 10:55:07 +02:00
Christophe Matthieu
458121ab5c
[IMP] website_sale: when the products is displayed from a search, use the same size x,y for all products
...
bzr revid: chm@openerp.com-20130924084100-y6pgvislcpdo9izx
2013-09-24 10:41:00 +02:00
Christophe Matthieu
b1cf178978
[MERGE] website_sale: add layout options and css
...
bzr revid: chm@openerp.com-20130924083349-1woicpx50668272g
2013-09-24 10:33:49 +02:00
Christophe Matthieu
9bb4af7d9f
[IMP] website snippet: add comment for auto set snippet and remove data-snippet-id in website_sale view
...
bzr revid: chm@openerp.com-20130924082423-ylzeprl3w4tlb83e
2013-09-24 10:24:23 +02:00
Paramjit Singh Sahota
8fc3877646
[IMP] Improved code to make small way to change to list view rather than writing the whole product template code twice.
...
bzr revid: psa@tinyerp.com-20130924064617-40ruht7l15c08p7y
2013-09-24 12:16:17 +05:30
Paramjit Singh Sahota
c931f60bd3
[MERGE] MERGED trunk-website-al
...
bzr revid: psa@tinyerp.com-20130923133137-heq2s7r9hjlm150g
2013-09-23 19:01:37 +05:30
Paramjit Singh Sahota
7a76a45a50
done the same changes in sass as in css.
...
bzr revid: psa@tinyerp.com-20130923131611-eoexbw2a9dbxxyum
2013-09-23 18:46:11 +05:30
Paramjit Singh Sahota
de41937cfb
[IMP] Improved the template id.
...
bzr revid: psa@tinyerp.com-20130923130238-4it782jesm211t6w
2013-09-23 18:32:38 +05:30
Paramjit Singh Sahota
f06f48ce52
[IMP] added list grid for shop.
...
bzr revid: psa@tinyerp.com-20130923124752-dhg0aao3diuh1isn
2013-09-23 18:17:52 +05:30
Xavier Morel
89fc31a633
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20130923120328-0wgd7wxhl1y5qyhr
2013-09-23 14:03:28 +02:00
Paramjit Singh Sahota
71ab933988
More customizable options:
...
Add to Cart must be in a inherit_option_id
Product sale_description must be in a inherit_option_id
bzr revid: psa@tinyerp.com-20130923111441-pxhn2u2ex1oh1cws
2013-09-23 16:44:41 +05:30
Christophe Matthieu
6788b91af4
[FIX] website: move demo data into website_sale
...
bzr revid: chm@openerp.com-20130923075147-n7ri551aatt81d3f
2013-09-23 09:51:47 +02:00
Fabien Pinckaers
7335353b89
[IMP] manifest website_*
...
bzr revid: fp@openerp.com-20130922210853-rs8jze1zuql94cyd
2013-09-22 23:08:53 +02:00
Fabien Pinckaers
b2726bf5b8
[IMP] manifest website_sale
...
bzr revid: fp@openerp.com-20130922210610-nq6t4dvr8yt71mz0
2013-09-22 23:06:10 +02:00
Fabien Pinckaers
765aa3587f
[IMP] Missing title
...
bzr revid: fp@openerp.com-20130922205737-xef9mf20oanmsdgn
2013-09-22 22:57:37 +02:00
Fabien Pinckaers
c59a8444f6
[IMP] product demo data
...
bzr revid: fp@openerp.com-20130922204023-z1htuze3mj7hpjf8
2013-09-22 22:40:23 +02:00
Fabien Pinckaers
0e96d8d38d
[IMP] demo data shop
...
bzr revid: fp@openerp.com-20130922195823-z5jpuh7n67u80hyl
2013-09-22 21:58:23 +02:00
Fabien Pinckaers
4c3121f87c
[IMP] product description ipad
...
bzr revid: fp@openerp.com-20130922194454-35xx0x1nx3mixl3a
2013-09-22 21:44:54 +02:00
Fabien Pinckaers
b705f1e627
[IMP] eCommerce Layouts
...
bzr revid: fp@openerp.com-20130922193356-gqfyqc9s8dg0wg8g
2013-09-22 21:33:56 +02:00
Fabien Pinckaers
a828535ce4
[IMP] mini improvement opacity
...
bzr revid: fp@openerp.com-20130922172957-rzt2ibr3mryz1m3c
2013-09-22 19:29:57 +02:00
Fabien Pinckaers
512a9970df
[IMP] Shop Improvements
...
bzr revid: fp@openerp.com-20130922172727-9zvivms9w9v5hv2q
2013-09-22 19:27:27 +02:00
Fabien Pinckaers
9fae3fbba8
[IMP] no border
...
bzr revid: fp@openerp.com-20130921233915-kutt3mfyqxvnnf56
2013-09-22 01:39:15 +02:00
Fabien Pinckaers
57495427f8
[IMP] Shop layout
...
bzr revid: fp@openerp.com-20130921233115-baaczyravkgxtuih
2013-09-22 01:31:15 +02:00
Fabien Pinckaers
a2376d8f08
[iMP] shops
...
bzr revid: fp@openerp.com-20130921233056-sy0oe5mzyetyn1lq
2013-09-22 01:30:56 +02:00
Fabien Pinckaers
d391d7b67d
[IMP] Shop better design
...
bzr revid: fp@openerp.com-20130921232827-2wlkjwh48547jwue
2013-09-22 01:28:27 +02:00
Fabien Pinckaers
1764bb9bde
[IMP] product categories hidden by default
...
bzr revid: fp@openerp.com-20130921061651-01mulu423e22kf5s
2013-09-21 08:16:51 +02:00
Paramjit Singh Sahota
3dadd6e729
Added product snippet for test and added the data-snippet-id in product of resizing product.
...
bzr revid: psa@tinyerp.com-20130920070643-cmdq57j04hgx764c
2013-09-20 12:36:43 +05:30
Paramjit Singh Sahota
27815589b4
[IMP] Added the fixed size of the product image.
...
bzr revid: psa@tinyerp.com-20130920050445-d6hz2t4169rmdi0i
2013-09-20 10:34:45 +05:30