Commit Graph

76753 Commits

Author SHA1 Message Date
Christophe Matthieu 4456594d40 [FIX] website snippet: carousel
bzr revid: chm@openerp.com-20131125093056-7rvp01yvy63evejp
2013-11-25 10:30:56 +01:00
Fabien Pinckaers a205becbd1 [FIX] small fix in view inheritancy
bzr revid: fp@tinyerp.com-20131125085552-7c2jfxjf23dj5n0r
2013-11-25 09:55:52 +01:00
Fabien Pinckaers d19b85f873 [IMP] new featuers for complex events
bzr revid: fp@tinyerp.com-20131124223802-20rpekho195fu2l5
2013-11-24 23:38:02 +01:00
Fabien Pinckaers 5ee03592cf [FIX] misc fixes in new event devs
bzr revid: fp@tinyerp.com-20131124214257-pg9bsbzzydoz6z1a
2013-11-24 22:42:57 +01:00
Fabien Pinckaers 105fc16c11 [IMP] events improvements
bzr revid: fp@tinyerp.com-20131124210221-hwalp7983olmrhew
2013-11-24 22:02:21 +01:00
Fabien Pinckaers fb0abe39bc [WIP] EVENT: new features required for community days/big events
Manage tracks/talks
	Allow a dedicated menu per event
	Allow a blog per event, to announce stuff
	A "Call for Proposal" page

bzr revid: fp@tinyerp.com-20131124185434-hwyluq90e2g4g7tj
2013-11-24 19:54:34 +01:00
Fabien Pinckaers 056177feea [IMP] fixes
bzr revid: fp@tinyerp.com-20131123215156-bzq6c4el1lz7mfxt
2013-11-23 22:51:56 +01:00
Fabien Pinckaers e79536f6c9 [IMP] some fixes
bzr revid: fp@tinyerp.com-20131123214938-yozqgcs9x8wzavqx
2013-11-23 22:49:38 +01:00
Fabien Pinckaers 1d0e4515e7 [FIX] misc fixes
bzr revid: fp@tinyerp.com-20131123212928-m7ppyl46nny8w0vd
2013-11-23 22:29:28 +01:00
Fabien Pinckaers 9d2cb4e0ec [IMP] misc menu reordering
bzr revid: fp@tinyerp.com-20131123110311-dpplsi7euexpdvtt
2013-11-23 12:03:11 +01:00
Fabien Pinckaers 66b721e848 [FIX] misc fixes
bzr revid: fp@tinyerp.com-20131123105650-ucwfuqf7o6qtpszc
2013-11-23 11:56:50 +01:00
Fabien Pinckaers 677bb87a6c [FIX] misc fixes on website_event_track
bzr revid: fp@tinyerp.com-20131123104757-cbdm5hq6d5y4vrr7
2013-11-23 11:47:57 +01:00
Fabien Pinckaers 95c0865283 [FIX] misc fixes
bzr revid: fp@tinyerp.com-20131123104607-ndbx420pq35fsvud
2013-11-23 11:46:07 +01:00
Fabien Pinckaers 57585307fa [NEW] Adding tracks management for events (community meeting)
bzr revid: fp@tinyerp.com-20131123092728-jo2f197rjnt39z7g
2013-11-23 10:27:28 +01:00
Fabien Pinckaers 2b4f2a0599 [IMP] Removed deprecated module due to website_event
bzr revid: fp@tinyerp.com-20131122204542-i05xh9u6kb333d3q
2013-11-22 21:45:42 +01:00
ddm 0bda85949a [IMP] Various tour imps
bzr revid: ddm@openerp.com-20131122173038-s9dfq8lxau3fadfl
2013-11-22 18:30:38 +01:00
ddm de554f8d78 [IMP] Tour: publish and save blog post
bzr revid: ddm@openerp.com-20131122170542-pf9rchtu3dr175xd
2013-11-22 18:05:42 +01:00
Xavier Morel 53793703de [ADD] dropdown for link style
bzr revid: xmo@openerp.com-20131122151124-1n7cnwldm3ej6wz7
2013-11-22 16:11:24 +01:00
ddm 6a307069b4 [IMP] Blog tour
bzr revid: ddm@openerp.com-20131122110154-fsjeahreh7skk0fj
2013-11-22 12:01:54 +01:00
Xavier Morel 411cd6aa21 [IMP] add img and img-responsive to image fields
bzr revid: xmo@openerp.com-20131122104148-dpo63pg6mpn1315c
2013-11-22 11:41:48 +01:00
Xavier Morel 264fe7d98b [ADD] small transparency when hovering editable images, so [Edit] button stands out more
bzr revid: xmo@openerp.com-20131122102322-s776o3f80bku3f4a
2013-11-22 11:23:22 +01:00
Xavier Morel 1f2a40e3f7 [FIX] horizontal centering of edition button on images centered with margin: 0 auto in webkit-based browsers
bzr revid: xmo@openerp.com-20131122101154-fsae9uz33smy2ja9
2013-11-22 11:11:54 +01:00
ddm 73d16d6d9b [IMP] Blog tour imps
bzr revid: ddm@openerp.com-20131122094942-au6yn70qdqvcu11u
2013-11-22 10:49:42 +01:00
Xavier Morel 233e460b52 [FIX] forgot to tell ckeditor not to load removed bootstrap combo plugin
bzr revid: xmo@openerp.com-20131121160516-a29x498ode34p1ml
2013-11-21 17:05:16 +01:00
Xavier Morel 32147fbffc [REM] bootstrap link configuration combo, it has served its testing purposes
bzr revid: xmo@openerp.com-20131121154501-vrs26caromm6ebgb
2013-11-21 16:45:01 +01:00
Fabien Meghazi a337d0dc2c [FIX] kanban broken by lazyrenderer
bzr revid: fme@openerp.com-20131121154213-71hb70c9326gtafb
2013-11-21 16:42:13 +01:00
Xavier Morel 74c63fe9a0 [FIX] website_membership: unfuck delegation to self.members
should really redirect instead, delegation makes no bloody sense

bzr revid: xmo@openerp.com-20131121143216-qyvf1koz4bwldcpd
2013-11-21 15:32:16 +01:00
Xavier Morel 7da6b2e074 [IMP] website_membership: simplify partner_ref, move to model converter
bzr revid: xmo@openerp.com-20131121143127-1fm1e8xuz1da13tr
2013-11-21 15:31:27 +01:00
Xavier Morel 1ce9f8539b [IMP] style and domain fixes
bzr revid: xmo@openerp.com-20131121142839-aotrh21l5d416hu3
2013-11-21 15:28:39 +01:00
Xavier Morel 61431d0384 [IMP] product: avoid redundant work
bzr revid: xmo@openerp.com-20131121142252-laxz8z457yyebayj
2013-11-21 15:22:52 +01:00
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 53252152bc [ADD] payment_acquirer, transfer, ogone and paypal integration into ecommerce
[ADD] payment_acquirer module, holding :
- payment.acquirer model: models the acquirer with the various credentials (e.g. paypal, ogone). payment_acquirer only contains basic fields. Each acquirer can add fields through inheritance. See payment.acquirer model for more details.
- payment.transaction model: models the transaction itself. Inheritance is done by calling custom methods prefixed by the acquirer name. See payment.transaction model for more details.

[ADD] payment_acquirer_ogone, payment_acquirer_paypal and payment_acquirer_transfer modules. Those are specific implementations for ogone, paypal and basic money transfer. They contain dummy account data, to avoid committing real accounts. Will have to be cleaned before final merge. Those module contain tests but some tests will not work without real account creadentials. To be cleaned.

[ADD] website_payment: a test module for payment. Will have to be cleaned.

[IMP] website_sale: added support of payments in the checkout process. Improved checkout process. Confirmation is now basically a view on a sale.order, and a polling on a transaction to see its status. Context / Session are better managed, but still require some cleaning. Also fixed some links in the shop.

[TODO]
- some cleaning in paypal / ogone about form methods
- improve some tests
- clean checkout process after more tests
- cleaning in ogone server2server + tests

bzr revid: tde@openerp.com-20131121134140-3somglek7dk1o6t1
2013-11-21 14:41:40 +01:00
Thibault Delavallée a64c16aac5 [FIX] payment.acquirer: now passing xml_id instead of id for the template to render.
Indeed render accepts view ID, but the qweb engine does not handle
IDs, only xml_ids. Using the view xml_id field allows to avoid
having a hack in the server.

bzr revid: tde@openerp.com-20131121133309-qq2alstapq5sonkm
2013-11-21 14:33:09 +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
Christophe Matthieu 31f64313c0 [IMP] website snippet: create website.snippet.StyleEditor to add styles with html class and other logical process into snippet options
bzr revid: chm@openerp.com-20131121123439-wvvcdegvc1bornux
2013-11-21 13:34:39 +01:00
Xavier Morel a9b228880b [FIX] hacky image edit button to be less hacky, fix image fields edition/save
bzr revid: xmo@openerp.com-20131121121731-4ux9gxt8ltluw9e5
2013-11-21 13:17:31 +01:00
Xavier Morel 82b40bf84c [FIX] urlparse.parse_qs returns a dict *of lists*, eq test on values with a string is always false
bzr revid: xmo@openerp.com-20131121121235-hafy7n61h3v6kb0k
2013-11-21 13:12:35 +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
Thibault Delavallée 3ee84c32d2 [IMP] payment_acquirer_transfer: better logging
bzr revid: tde@openerp.com-20131121120745-1j7p7pl5u6yv1g20
2013-11-21 13:07:45 +01:00
Thibault Delavallée bfc226c4ae [REM] payment_acquirer: removed name field, only using reference
bzr revid: tde@openerp.com-20131121120722-uxjqdn5ibnrs0k10
2013-11-21 13:07:22 +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 135345bf2a [IMP] Tour: better modal handling
bzr revid: ddm@openerp.com-20131121113507-qmz5inlge2ixkib8
2013-11-21 12:35:07 +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
Xavier Morel fee8cb0fff [FIX] reimplement [Edit] button on images
Button implementation turned out to be crap:

* Didn't work at all in Firefox (!)

* Unreliable in webkit, some types of image selection wouldn't
  correctly activate the button

->

* changed RTEImageDialog to take an (optional) image element, used as
  the "source element" if provided. This allows greater reliability
  for events which may leave selection in debatable or variable
  (across browsers) state

* setup and teardown button on hover, using selection triggered issues
  with oe_overlay thing where e.g. the first click on the button would
  work but the second one would not (it'd be intercepted by the
  overlay as far as I can tell).

  This also saves a click for user, they will see the [Edit] button
  immediately when putting the cursor over the image.

bzr revid: xmo@openerp.com-20131121110748-s5e2ne3etpzwi2a6
2013-11-21 12:07:48 +01:00
Xavier Morel 2985681366 [FIX] fixup snippets json controller for lazyresponse changes
bzr revid: xmo@openerp.com-20131121095959-lwi6mnge684pxi1q
2013-11-21 10:59:59 +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