Commit Graph
76395 Commits
Author SHA1 Message Date
Thibault Delavallée b2ea74e4e6 [REF] payment: moved paypal and ogone stuff into their dedicated modules.
Added payment_acquirer_paypal and .._ogone modules. Those modules hold
the model / data / controllers related to the specific acquirer.

Also updated website_payment, to use website.menu instead of custom change
in header, as menus are now editable.

bzr revid: tde@openerp.com-20131107180444-bbzobquqq9o6pctv
2013-11-07 19:04:44 +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
Thibault Delavallée f586b49e58 [ADD] website_payment: basically, a module to test
payments. Just to have a basic interface to click and see what happen.

bzr revid: tde@openerp.com-20131107172305-giegilb90zll82x6
2013-11-07 18:23:05 +01:00
Thibault Delavallée 7fe8885216 [ADD] payment_acquirer: first implementation of paypal and ogone acquirers.
paypal: only form is currently implemented. Method name and call order will change.
However the basic mechanism is impelmented. IPN is implemented (paypal contact us
back after the transaction with transaction details).

ogone: form and server2server are implemented. Method names and call order will
change. Based on chs / dle / ... implementation for ogone server2server.

basic addition of tests, still wip.

This commit is not a clean commit but a WIP commit. Please excuse me
but it's time to commit.

bzr revid: tde@openerp.com-20131107172236-chmg198305crgrud
2013-11-07 18:22:36 +01:00
Thibault Delavallée 3d0ac6643e [IMP] payment_acquirer: continuing base model.
Two main models : payment.acquirer and payment.transaction.

payment.acquirer models the acquirer: paypal, ogone. Each specific
acquirer will inherit from the class and add specific fields.

payment.transaction models the transaction itself. It has basic fields
for a transaction: date, partner, partner fields (to hold data at
transaction time), reference, state and its message, amount, currency.

Class methods are not finished and still quite WIP.

payment.acqurier has a render method that is used to render
its form. The form is the 'pay now' button with the specific
sementic of each acquirer.

This model is supposed to work on form-based and server-to-server
implementation methods.

bzr revid: tde@openerp.com-20131107171558-jrwrj3ll9kol6bav
2013-11-07 18:15:58 +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 777a4ba2c2 [FIX] Editing menu t-fields fails
Problem lays in ir.ui.view#save()
meanwhile used t-ignore as a workaround

bzr revid: fme@openerp.com-20131107160656-sf728j65kcyg82cc
2013-11-07 17:06:56 +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 5ec0f27cde [IMP] website: real custom footer (no dynamic datas)
bzr revid: chm@openerp.com-20131107131949-3uotg47a79r4vml6
2013-11-07 14:19:49 +01:00
Christophe Matthieu eae3d77a24 [IMP] website: change name of cutom footer pages
bzr revid: chm@openerp.com-20131107125434-c54n3bv54gon3m43
2013-11-07 13:54:34 +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
Xavier Morel ea65573b48 [ADD] image edition button v0
bzr revid: xmo@openerp.com-20131107092018-66tae9nu1kcft21g
2013-11-07 10:20:18 +01:00
Christophe Matthieu 11c54b7d75 [IMP] website_event: move the option publish/unpublish
bzr revid: chm@openerp.com-20131107101206-dwueji94ailuo5zs
2013-11-07 11:12:06 +01:00
Christophe Matthieu 1052081b50 [IMP] website_project: t-field for bottom project link
bzr revid: chm@openerp.com-20131107094919-ip04lruh68lerfbh
2013-11-07 10:49:19 +01:00
Christophe Matthieu ef86f6d12a [FIX] website snippet: the 'insert block' button is loaded before the editor widget -> confusing in slow connectivity
bzr revid: chm@openerp.com-20131107094256-nqp5coey0fy732pl
2013-11-07 10:42:56 +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
Christophe Matthieu d98f7b0918 [FIX] website snippet: cta dark background
bzr revid: chm@openerp.com-20131106173404-ma3sqc3tw9pmwbw6
2013-11-06 18:34:04 +01:00
Christophe Matthieu 418ea510f4 [FIX] website_crm_partner_assign: Selecting 'All Grades' => exception
bzr revid: chm@openerp.com-20131106172251-aejb1b9lcwwv9o3h
2013-11-06 18:22:51 +01:00
Christophe Matthieu bc5772ab7e [FIX] website snippet: editor overlay (bounce, display after click on insert block)
bzr revid: chm@openerp.com-20131106163927-vdqxfamnkspnb193
2013-11-06 17:39:27 +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
Xavier Morel 20899155c5 [IMP] during image upload, disable save button
hide it and replace it with a button telling the user what we're
currently doing (uploading the image).

Leave the possibility of discarding the whole thing and going away
though.

bzr revid: xmo@openerp.com-20131106152412-eb283vghb18aafyr
2013-11-06 16:24:12 +01:00
Christophe Matthieu 21ffca33c5 [FIX] website snippet carousel: new slide editable
bzr revid: chm@openerp.com-20131106152126-lzop8daui959k0gc
2013-11-06 16:21:26 +01:00
Fabien Meghazi 1aaf0eaa4c [FIX] Multiple fixes to url_for
url_for now accepts a path or an uri
correctly handling shemeless uri's
url params are shadowed by keep_query

bzr revid: fme@openerp.com-20131106151752-sdov6zynz2g80uro
2013-11-06 16:17:52 +01:00
Christophe Matthieu cdd7f70308 [FIX] website snippet: banner editor
bzr revid: chm@openerp.com-20131106133917-ira7oirkv8gfrlgq
2013-11-06 14:39:17 +01:00
Xavier Morel 841a5e7c2d [FIX] db handling being a pain in the ass
On runbot the base url dispatches into a unknown void of no db being
selected and the CMS thus 404s. For human beings there are additional
links to special subdomains setting the right db in the right place
(or maybe the right dbfilter, whatever) but that doesn't work right
for the crawler test suite.

Instead go through /web/ with a forced db selection, this *should* set
the db correctly in the user's session even if he's anonymous and thus
allows us to browse said db.

No idea if this fevered idea is actually going to work.

bzr revid: xmo@openerp.com-20131106115547-0ozlex09svkecrhb
2013-11-06 12:55:47 +01:00
Fabien Meghazi 2d81712e2c [FIX] Prevent dropdown closing when a contenteditable children is focused
bzr revid: fme@openerp.com-20131106115754-lyt6hd8pnrfv7vfi
2013-11-06 12:57:54 +01:00
Fabien Meghazi 937fa8ab99 [ADD] Added custom bootstrap version
Temporary using a custom branch of bootstrap until the feature
is merged upstream.

The pull request is pending :
https://github.com/twbs/bootstrap/pull/11373/files

bzr revid: fme@openerp.com-20131106114827-gdlb53k4l42h5vq4
2013-11-06 12:48:27 +01:00
Fabien Pinckaers f385e3af01 [IMP] Text for translate dialog
bzr revid: fp@tinyerp.com-20131106110819-yflp80pdqehwp9gy
2013-11-06 12:08:19 +01:00
Xavier Morel b754d4999c [FIX] enable auth'd crawling of CMS
bzr revid: xmo@openerp.com-20131105161345-257bebtxce4wa217
2013-11-05 17:13:45 +01:00
Fabien Pinckaers 5a425dda78 [IMP] More explicit; where is the Edit button
[IMP] remove "Create a free website if logged", see usertesting
[IMP] Advanced view editor -> "HTML Editor"
[IMP] Footer: editable zone grouped in a <div> for efficient distribute branding

bzr revid: fp@tinyerp.com-20131106083833-cz4xc2ast5d9ao19
2013-11-06 09:38:33 +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
Christophe Matthieu 0503a5cf5e [FIX] website_hr: img method for hr.employee to display picture for public user
bzr revid: chm@openerp.com-20131105160617-wqdz3xg7bb1que8k
2013-11-05 17:06:17 +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
Christophe Matthieu bd3993ce06 [IMP] website_blog: replace duplicate link by a javascript for not to be followed by the robot
bzr revid: chm@openerp.com-20131105154722-l3v5chlf1osn4pdd
2013-11-05 16:47:22 +01:00
Xavier Morel 1308726046 [FIX] use config's xmlrpc_port during auth
bzr revid: xmo@openerp.com-20131105154414-wdfmu70m5gf2sjea
2013-11-05 16:44:14 +01:00
Xavier Morel a9193cf2ec [FIX] use db_name from tools.config to know where to auth
auth's currently disabled so it doesn't matter much really

bzr revid: xmo@openerp.com-20131105154131-35lqg2l6tdccgvp7
2013-11-05 16:41:31 +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 496431b4f0 [ADD] CMS crawling case, with a bunch of hardcoded values to fix
bzr revid: xmo@openerp.com-20131105145047-4ccrchj79lohry5q
2013-11-05 15:50:47 +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
Xavier Morel dc82072a41 [FIX] the sitemap template is not actually a page
bzr revid: xmo@openerp.com-20131104163614-9h9vp2i2qkycbkof
2013-11-04 17:36:14 +01:00
ddm be8ec21441 [IMP] future reminders
bzr revid: ddm@openerp.com-20131105152747-5l8fko6qjz17w9qs
2013-11-05 16:27:47 +01:00