Commit Graph
82144 Commits
Author SHA1 Message Date
Christophe Matthieu 8460122209 [MERGE] sync with trunk
bzr revid: chm@openerp.com-20131202150856-fzrfcoa8pmsjutau
2013-12-02 16:08:56 +01:00
Thibault Delavallée 19ea5b9674 [ADD] payment_acquirer_adyen: Adyen payment acquirer
Added support of adyen, only form-based. Please refer to adyen.com for more details
about the acquirer. This is a classic implementation of a form-based acquirer with
its controller, and alread integrated in the ecommerce.

Tests will be improved.

bzr revid: tde@openerp.com-20131202150342-191ipeoeru0jssah
2013-12-02 16:03:42 +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
jke-openerp 7c33148ceb [REF] Remove commented code and old import not used ... oups
bzr revid: jke@openerp.com-20131202145433-vfsytqfirrip26ea
2013-12-02 15:54:33 +01:00
jke-openerp 6a52c09e6c [REF] Remove commented code and old import not used
bzr revid: jke@openerp.com-20131202145242-9jp4q7bi2j9kjw91
2013-12-02 15:52:42 +01:00
jke-openerp c66444b2b1 [Merge] Mergie with trunk
bzr revid: jke@openerp.com-20131202144019-f6zu5ciyirorsjp6
2013-12-02 15:40:19 +01:00
jke-openerp 27a42cc6eb [IMP] google oAuth2 + start synchro calendar (insert ok, bug with recurrent)
bzr revid: jke@openerp.com-20131202143133-u6vi1xw1oa9w8qpf
2013-12-02 15:31:33 +01:00
jke-openerp fb9fed536c [Merge] Merge with trunk
bzr revid: jke@openerp.com-20131202142423-mpg3wg6dlr6wxxmp
2013-12-02 15:24:23 +01:00
Antony Lesuisse 753cb31804 [IMP] upgrade backbone to 1.1.0
bzr revid: al@openerp.com-20131202142240-ifh2rua2oiennfao
2013-12-02 15:22:40 +01:00
jke-openerp dbda9a879a [REF] Manage event color by css and not inline-style
bzr revid: jke@openerp.com-20131202142002-40tz3pslyxybib5q
2013-12-02 15:20:02 +01:00
Christophe Matthieu 3d01f870db [IMP] website_event_track: sponsor layout
bzr revid: chm@openerp.com-20131202141315-0j2b5lj5rr7yar3u
2013-12-02 15:13:15 +01:00
Antony Lesuisse 9b40c572ae [REM] gravatar support
bzr revid: al@openerp.com-20131202135414-kkm0wz06naitbp4y
2013-12-02 14:54:14 +01:00
Amit Bhavsar (Open ERP) ca6c085712 [imp] solved image issue when duplicate the product.
bzr revid: amb@tinyerp.com-20131202135105-0gy7pmxgdysi5a9p
2013-12-02 19:21:05 +05:30
Antony Lesuisse e057a64a02 [IMP] update fontawseome to 4.0.3
bzr revid: al@openerp.com-20131202133803-1muybwahwjo9e5sm
2013-12-02 14:38:03 +01:00
Antony Lesuisse 57ef91409a [MERGE] bootstrap3
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +01:00
Antony Lesuisse d6c6f31231 [MERGE] boostrap3 manually merged
bzr revid: al@openerp.com-20131202131943-b01fb56u0qsgcs53
2013-12-02 14:19:43 +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
Fabien Meghazi a5ed3f8b42 [ADD] slug() helper to rendering context
bzr revid: fme@openerp.com-20131202125652-5e30xd3ym6nww44o
2013-12-02 13:56:52 +01:00
Christophe Matthieu de0401e043 [IMP] website_hr_recruitment: add website_button widget in backend
bzr revid: chm@openerp.com-20131202125602-zqq9k8ivwkb7fh7c
2013-12-02 13:56:02 +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
ajay javiya (OpenERP) 3e5ae00690 [ADD]: Quote roller module
bzr revid: aja@tinyerp.com-20131202123437-zn6u2ckxbid3jknb
2013-12-02 18:04:37 +05:30
Fabien Pinckaers b51daf482b [IMP] 2SQL Queries less per query
bzr revid: fp@tinyerp.com-20131202122233-m9y37fr6nhh03a08
2013-12-02 13:22:33 +01:00
Christophe Simonis eba79e46a5 [FIX] mail: correct announcement bar
bzr revid: chs@openerp.com-20131202114516-u0u44l3xbkk1zcbx
2013-12-02 12:45:16 +01:00
Xavier Morel d53a289c5b [REM] leftover thing
bzr revid: xmo@openerp.com-20131202113825-c5jbqs17nihip81t
2013-12-02 12:38:25 +01:00
Xavier Morel fdfa7362ac [FIX] image fields getting overly dirty
the addition and removal of the [edit] button on hover would be caught
by the mutation observer and mark the image field as dirty, even when
it had not actually been altered, leaving to spurious save events for
said field.

bzr revid: xmo@openerp.com-20131202113304-xpgu43se5er1ho7y
2013-12-02 12:33:04 +01:00
Xavier Morel 52b1ac6a3e [FIX] alteration of image field without actually changing the image URL
UI allows changing corner even though corners are not saved...

bzr revid: xmo@openerp.com-20131202111720-oabkjado7n1jrt66
2013-12-02 12:17:20 +01:00
Amit Bhavsar (Open ERP) f70b33b5c0 [imp] solved traceback and improve copy method of product template.
bzr revid: amb@tinyerp.com-20131202111516-5010t3n3j4na270i
2013-12-02 16:45:16 +05:30
Christophe Simonis 56bb1b9869 [MERGE] forward port of branch saas-2 up to revid 4992 chs@openerp.com-20131202105848-33gcz1715w370rve
bzr revid: chs@openerp.com-20131127110757-5kaay2kcxq0ysb59
bzr revid: chs@openerp.com-20131127161639-yur4rdh3wx43kxle
bzr revid: chs@openerp.com-20131127180647-f8uws77gaym5kfvd
bzr revid: chs@openerp.com-20131202110030-gf20dv2uj5fqv7c2
2013-12-02 12:00:30 +01:00
Fabien Pinckaers 505e191e7e [iMP] Sponsorships
bzr revid: fp@tinyerp.com-20131202103838-kveu1lqkqav3x0n3
2013-12-02 11:38:38 +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
Xavier Morel a108af5cb8 [FIX] website: endpoint_is_enumerable
old version of @website.route would wrap the base method within a
decorator, and endpoint_is_enumerable had to dig into the decorator to
get the original function (and be able to inspect it).

@website.route has been simplified and no longer wraps the function,
just adds a pair of attributes to it (and so does the base
@http.route), so don't dig into anymore, inspect rule.endpoint
directly.

bzr revid: xmo@openerp.com-20131202102525-8jsondrr1649c8t8
2013-12-02 11:25:25 +01:00
Xavier Morel 103cea2da0 [FIX] change ManyToOne converter to use read on parent record and pass the browse_record's context through
avoids access rights issue, can be used for automagical formatting of address on res.partner

bzr revid: xmo@openerp.com-20131202095638-hoj7sxvax5808irc
2013-12-02 10:56:38 +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 Meghazi 3cf9c776de [FIX] default language
bzr revid: fme@openerp.com-20131202093500-xzz4q2u279uwunjo
2013-12-02 10:35:00 +01:00
Fabien Pinckaers 660b420696 [FIX] public user
bzr revid: fp@tinyerp.com-20131202090239-a4b1kkg5pni8ye3d
2013-12-02 10:02:39 +01:00
Fabien Pinckaers 3e26abe6ee [FIX] fix to support groups on tempaltes
bzr revid: fp@tinyerp.com-20131202085952-htkxqv3l3zdtecnu
2013-12-02 09:59:52 +01:00
Xavier Morel b67b3da6bf [FIX] may work better with the actual documentation added
bzr revid: xmo@openerp.com-20131202085158-k3xhbhrn9y1hwk8y
2013-12-02 09:51:58 +01:00
Fabien Pinckaers 2fee01f084 [IMP] removed a feature nobody used for a huge speed improvement (4 SQL Queries per search/read
bzr revid: fp@tinyerp.com-20131202084517-80d1vdwfwpbdsqdn
2013-12-02 09:45:17 +01:00
Xavier Morel a86a8e8431 [ADD] some doc for custom qweb converters
bzr revid: xmo@openerp.com-20131202084439-tytk83gjjutf3e52
2013-12-02 09:44:39 +01:00
Xavier Morel 228938ccba [ADD] formats support to date and datetime converters
bzr revid: xmo@openerp.com-20131202073313-tu79esduu5bvyaai
2013-12-02 08:33:13 +01:00
Launchpad Translations on behalf of openerp dfd010e48d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202052351-icrqefhleb8262tv
2013-12-02 05:23:51 +00:00
Fabien Pinckaers 114cf31244 [IMP] removed test code
bzr revid: fp@tinyerp.com-20131201173346-qodzx06i1wq7ec5i
2013-12-01 18:33:46 +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 d4fc95f1fe [FIX] small fixes
bzr revid: fp@tinyerp.com-20131130205834-ilds41gcktv7vchg
2013-11-30 21:58:34 +01:00
Fabien Pinckaers cf3ecb9ff0 [IMP] Huge speed improvements 64 SQL queries to render '/' --> 10 Queries
bzr revid: fp@tinyerp.com-20131130193739-095yd4p9llmj0kt1
2013-11-30 20:37:39 +01:00
Fabien Pinckaers 9701a52b59 [IMP] Remove unused code
bzr revid: fp@tinyerp.com-20131130161655-u6z91t3la1l1qhca
2013-11-30 17:16:55 +01:00