Commit Graph
81391 Commits
Author SHA1 Message Date
Thibault Delavallée 0624beb6af [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131205093609-3lj3hsxz2vsudhw3
2013-12-05 10:36:09 +01:00
Launchpad Translations on behalf of openerp 3a6953c1d0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131205061010-2jn37v8w04xqksgg
2013-12-05 06:10:10 +00: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
Thibault Delavallée fdff0bd361 [FIX] website_payment: fixed forgotten tag in view
bzr revid: tde@openerp.com-20131204174500-4cw5uef8a0xsh0xy
2013-12-04 18:45:00 +01:00
ddm 2db8e35792 [TODO] Re-enable when modules properly fixed (access rights)
bzr revid: ddm@openerp.com-20131204172334-9q0t4r4n5qd9w20b
2013-12-04 18:23:34 +01:00
Frédéric van der Essen d4e7b6eb96 [WIP] point_of_sale: more perf improvement, this time on the receipt and payment screen + lots of usability improvements and cleanups
bzr revid: fva@openerp.com-20131204172122-mzl4wg4uw51uzdfv
2013-12-04 18:21:22 +01:00
Thibault Delavallée 25ef3916d9 [REM] website_payment: removed unnecessary stuff: this module is mainly not necessayr anymore. Only kepts credit card form, and its js / css / library (jquery.payment) to be able to implement credit card forms and use server2server communications.
bzr revid: tde@openerp.com-20131204171830-yp1ra0ghjnnaeae4
2013-12-04 18:18:30 +01:00
Christophe Matthieu d9b40743b8 [FIX] website snippet: bootstrap dropdown (prevent default of click event)
bzr revid: chm@openerp.com-20131204171612-x32bxqzrul1c3zev
2013-12-04 18:16:12 +01:00
Christophe Matthieu 94f9d0d1e6 [IMP] website: editor remove secure_layout (filter in controler)
bzr revid: chm@openerp.com-20131204171534-17ermab23ndoklu3
2013-12-04 18:15:34 +01:00
Thibault Delavallée f4728616d1 [REV] Reverted commit 10171, because I would like to keep some HTML in a template. I will re-do the deletion right after.
bzr revid: tde@openerp.com-20131204171429-080i7cqhza7ig6bw
2013-12-04 18:14:29 +01:00
Thibault Delavallée a61ffa3d10 [FIX] [IMP] adyen: fixed controller (contacted with a GET request); added some data verification when processing the data coming back from adyen
bzr revid: tde@openerp.com-20131204170024-j2czn5nm9p56oosj
2013-12-04 18:00:24 +01:00
Thibault Delavallée 321d096186 [IMP] [FIX] ogone: fixed controller to manage ogone response, because it was not updated with last changes of payment_acquirer module. Also added some check on data coming from ogone. Also fixed return URL management: ogone does not handle json-based custom parameters.
bzr revid: tde@openerp.com-20131204165005-ldymrsf9hdpvfl65
2013-12-04 17:50:05 +01:00
Xavier Morel 04045c3699 [IMP] use ckeditor 4.3 final feature to disable widget draghandle entirely instead of relying on CSS
bzr revid: xmo@openerp.com-20131204162805-rikk5kbbx304tol6
2013-12-04 17:28:05 +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 e0d1233f48 [FIX] [IMP] paypal
- fixed controller: when using urlopen and read, the response is already a text (bug coming
from the removal of requests lib)
- cleaned and fixed paypal data validation, now working
- remove paypal_username field, not used; added paypal_seller_id that is the unique ID of the
seller, to check that paypal data is correct
- various code cleaning

bzr revid: tde@openerp.com-20131204160738-q9paazleyg5v5hjo
2013-12-04 17:07:38 +01:00
Thibault Delavallée 5e181a1694 [FIX] adyen: fixed form view of tx, forgot to remove a deleted field from the view
bzr revid: tde@openerp.com-20131204160543-zj2nb9xe3t795uee
2013-12-04 17:05:43 +01:00
Thibault Delavallée 3cd67b21bb [IMP] payment_acquirer: improved form view of tx
bzr revid: tde@openerp.com-20131204160506-fr65xqfydir4hqpe
2013-12-04 17:05:06 +01:00
Thibault Delavallée 362953b4a2 [FIX] payment_acquirer: manage amount and fees as float fields with 2 digits, update management in rendering process accordingly.
bzr revid: tde@openerp.com-20131204160451-dwd66tav4poaag2m
2013-12-04 17:04:51 +01:00
Martin Trigaux 0216a53a0f [FIX] convert: better error message when failed to load csv file (module name already in path, no need to append)
bzr revid: mat@openerp.com-20131204155244-sy223fbt0tmpeqw1
2013-12-04 16:52:44 +01:00
Denis Ledoux 0721a21966 [FIX] base: allow all users (including portals) to change their avatar
Force readonly="0" on field image in preferences view, otherwise the readonly can be set by access rights.
Preferences are written with the UID 1, if the fields are in the WRITEABLE FIELDS list of the object res_users.
This is why any users can edit their preferences even if they do not have the rights to write on res.users.
Forcing readonly="0" to make fields editable in the form.

bzr revid: dle@openerp.com-20131204145923-f7jwoah722q188d7
2013-12-04 15:59:23 +01:00
Fabien Meghazi ea037cc7d5 [ADD] status_code to website#render()
bzr revid: fme@openerp.com-20131204145728-ztv6ur760b3nru58
2013-12-04 15:57:28 +01:00
Fabien Meghazi cc49b88487 [ADD] status_code to LazyResponse constructor
bzr revid: fme@openerp.com-20131204145613-721x3ij2ylpykzgw
2013-12-04 15:56:13 +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
ddm 5179f6ecc8 [FIX] Remove broken button
bzr revid: ddm@openerp.com-20131204143538-3gs3m2owznge36b4
2013-12-04 15:35: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
ddm 67599578b6 [FIX] Removed param default value (fix sitemap)
bzr revid: ddm@openerp.com-20131204135549-qc5xtpx826bqb2ud
2013-12-04 14:55:49 +01:00
Denis Ledoux 41fe705943 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9674 rev-id: dle@openerp.com-20131204133633-t7wfbnipv3jtss82
bzr revid: chs@openerp.com-20131204125051-dexejzwigpu0z1yy
bzr revid: dle@openerp.com-20131204134400-50y7ojeb8pw7k56s
2013-12-04 14:44:00 +01:00
Christophe Matthieu d19c722da3 [FIX] website: language link use keep query
bzr revid: chm@openerp.com-20131204133804-7rzeofuwsa8uuk19
2013-12-04 14:38:04 +01:00
Denis Ledoux c0c971b87a [FIX] sale_crm: wizard crm_make_sale crash if partner_id not sent on the opp.
Because defaults get function of partner_id of wizard read the partner_id of the opp and return the first item of the tuple, but if there isnt a partner on the opp, the read return a false for this field, not a tuple. 
No return the first item of the tuple if the partner_id is set, else False

bzr revid: dle@openerp.com-20131204133633-t7wfbnipv3jtss82
2013-12-04 14:36:33 +01:00
Christophe Matthieu 03a373f8ef [FIX] website_event_track: access right
bzr revid: chm@openerp.com-20131204133038-lhgp3fkbqbzl3irk
2013-12-04 14:30:38 +01:00
ddm 8c03d4cd0d [FIX] Another blog URL bug
bzr revid: ddm@openerp.com-20131204132828-lnk5oe09t98wlh4r
2013-12-04 14:28:28 +01:00
Christophe Matthieu 58eb518155 [FIX] website snippet: slider
bzr revid: chm@openerp.com-20131204130740-mk8jtp8p6ip16q1a
2013-12-04 14:07:40 +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
Thibault Delavallée 88b7b449cb [IMP] acquirers: added support of context-based submit button customize + transaction url. Also removed all fields holding transaction URLS; calling a method should be sufficient. Also standardized acquirer buttons.
bzr revid: tde@openerp.com-20131204130505-webiutb22kb7t4il
2013-12-04 14:05:05 +01:00
Christophe Simonis 4ab77759cc [MERGE] forward port of branch saas-2 up to revid 9029 chs@openerp.com-20131204125051-dexejzwigpu0z1yy
bzr revid: chs@openerp.com-20131204130023-lgravuoxwlt39pek
2013-12-04 14:00:23 +01:00
Thibault Delavallée 77f6d91236 [IMP] payment_acquirer: improved backend views
bzr revid: tde@openerp.com-20131204125250-7p6gvofiu2sb89az
2013-12-04 13:52:50 +01:00
Thibault Delavallée b7e8b40fb2 [IMP] payment_acquirer: improvements:
- added acquirer_reference standard field on the transaction, valid for most of acquirers
- fixed computation of partner_data before rendering the button, was broken when giving a
partner_id
- added support of tx_url to specify the form URL for the rendered button
- added support of submit_txt and submit_class to customize the submit button of the
rendered form

bzr revid: tde@openerp.com-20131204125227-3g017gue72ujjyqz
2013-12-04 13:52:27 +01:00
Christophe Simonis 8fc992910e [FIX] auth_signup: set an alias for the template user
bzr revid: chs@openerp.com-20131204122609-oi2b8g4p8cy13dux
2013-12-04 13:26:09 +01:00
Christophe Matthieu 16a544fc6f [FIX] website snippet: usabillity
bzr revid: chm@openerp.com-20131204115424-p083i2nt5bbc43s6
2013-12-04 12:54:24 +01:00
Christophe Simonis 08ec6a3805 [FIX] mail: reset alias when copying users
bzr revid: chs@openerp.com-20131204112734-2h569udrxgsgw9kr
2013-12-04 12:27:34 +01:00
Denis Ledoux dea3fdeeed [FIX] im_livechat: many2one channel_id of im_session to the right model.
In im_session model, field channel_id was a many2one to im_user, or, obviously, this should be a many2one to im_livechat.channel
Well, obviously, this is a copy/paste error (or distraction, your choice!). This fix should normally not be pushed on a stable branch (like the current one, saas-2), but considering the severity of the problem, and the few changes in database (alter foreign key only), this is acceptable. Why such a big mistake has not been seen earlier ? Do you even test or read back what you write ?

bzr revid: dle@openerp.com-20131204122727-q0ch5j2v8rrli41e
2013-12-04 13:27:27 +01:00
ddm 3a5112426f [FIX] Test build error (cf. logs/test-js.txt)
bzr revid: ddm@openerp.com-20131204105924-ktiaxmp5j7dvknl9
2013-12-04 11:59:24 +01:00
Xavier Morel b79e56d1af [IMP] clarity of links edition
According to user tests, users have a hard time finding out how to
edit links. Thus, add same system as image edition (a small button
appearing when hovering the element).

Extract and unify these two to avoid redundancies between handlings as
they are broadly similar (only details such as label, positioning and
size of button relative to the element being hovered really change,
the lifecycle itself is the same).

The main setup still isn't very clean, there might be a better way to
do it.

bzr revid: xmo@openerp.com-20131204105212-u0a49nbvwilgtfst
2013-12-04 11:52:12 +01:00
Fabien Meghazi 31381c1469 [FIX] Disable form submition in editable mode
bzr revid: fme@openerp.com-20131204104225-2s3jp325731mqd92
2013-12-04 11:42:25 +01:00
ddm e2f37e7369 [FIX] Blog URL errors (cf. logs/test-js.txt)
bzr revid: ddm@openerp.com-20131204103814-m2r8c5vwuglqjyda
2013-12-04 11:38:14 +01:00
Christophe Simonis 51e05e068b [FIX] ir.http: catch all authentification errors
bzr revid: chs@openerp.com-20131204102430-qxqk8qtze5n5rqe8
2013-12-04 11:24:30 +01:00
Fabien Meghazi 415d24b48f [FIX] blog comment posting results in 404 error
bzr revid: fme@openerp.com-20131204094526-yx4uif5lqp8o8d8p
2013-12-04 10:45:26 +01:00
Launchpad Translations on behalf of openerp 379dc8bf98 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054445-5fy8zd7lvnn9mjp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055138-hq05otjnuktjpa48
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055601-tbzqqhperzffjbjt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055642-0rwynvhgvs0r14b3
2013-12-04 05:56:42 +00:00
Fabien Pinckaers 773d7a25d1 [IMP] huge speed improvement on computing prices of several products 916 SQL queries to 216. Still too much.
bzr revid: fp@tinyerp.com-20131203223910-l4hbew0f0iquii9x
2013-12-03 23:39:10 +01:00
Antony Lesuisse 5818b0b2d1 [MERGE] trunk
bzr revid: al@openerp.com-20131203220019-674d9hheqza1v8yb
2013-12-03 23:00:19 +01:00