Xavier Morel
0271062a80
[FIX] clear cache on method with a cache
...
bzr revid: xmo@openerp.com-20131203073429-g8vqg1dqltgtc4r6
2013-12-03 08:34:29 +01:00
4fd98907ce
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054550-w0k8alfqs2bigurx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055222-2u7o99e48254dceu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203061621-hyqqh11jt7g0ilqh
2013-12-03 06:16:21 +00:00
3e94f7ab1b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203054049-9sioco00f1s4dxvt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203054124-0db72b59pfm46z0f
2013-12-03 05:41:24 +00:00
Christophe Matthieu
1bf1f0de8f
[FIX] forgotten fix for fields_view_get in orm.py (moved to ir_ui_view.py): [MERGE] forward port of branch saas-2 up to revid 4987 chs@openerp.com-20131127105828-ng8z4by1tszmj9d2
...
bzr revid: chm@openerp.com-20131202191411-edf01rvvpngyezok
2013-12-02 20:14:11 +01:00
Fabien Meghazi
b78f196362
[IMP] cached website's default_lang and language_ids
...
bzr revid: fme@openerp.com-20131202172110-h7s023xv4ohq31tw
2013-12-02 18:21:10 +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
Christophe Matthieu
bab3b3b8d4
[IMP] css small change for bootstrap
...
bzr revid: chm@openerp.com-20131202162839-9fa0jc7vhyxltje3
2013-12-02 17:28:39 +01:00
Thibault Delavallée
b642afe710
[MERGE] [IMP] payment_acquirer: added fees computation possibility + paypal: added fees computation
...
- acquirer model: added fees_active and fees_* fields: fix and variable
fees, for domestic and international transactions.
- updated views accordingly + cleaned paypal form view.
- updated tests
- updated form, adding handling input in the paypal button that is the input controlling
the fees in the tx process.
bzr revid: tde@openerp.com-20131202162630-lj0hu16qm0zj2y1f
2013-12-02 17:26:30 +01:00
Thibault Delavallée
39e6267049
[FIX] paypal: correctly compute fees
...
bzr revid: tde@openerp.com-20131202162517-39jdtg83l08yxdxm
2013-12-02 17:25:17 +01:00
Frédéric van der Essen
7d062a0b45
[WIP] point_of_sale: improved performance of the product screen & order widget + ongoing cleanup
...
bzr revid: fva@openerp.com-20131202162144-6se3s0wjwz0jdfih
2013-12-02 17:21:44 +01:00
Thibault Delavallée
7896d2e745
[MOV] payment_acquirer: moved paypal_fee_* fields to fees_*, standard fields for an acquirer.
...
bzr revid: tde@openerp.com-20131202155941-b8nbujgwf57fol2v
2013-12-02 16:59:41 +01:00
Thibault Delavallée
3a96d971fa
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131202154935-t8wcgt180bbop8yy
2013-12-02 16:49:35 +01:00
Thibault Delavallée
b54ec1c5a2
[MERGE] [ADD] payment: added Adyen acquirer. See adyen.com for more details about this acquirer.
...
Only the form-based acquirer is implemented. Server2server communications will not
be supported. This is a classic implementation, like the paypal or ogone one.
bzr revid: tde@openerp.com-20131202154444-ptr0uj9g19xpaoqc
2013-12-02 16:44:44 +01:00
Antony Lesuisse
da6fee2ac1
[FIX] session expired
...
bzr revid: al@openerp.com-20131202154206-6efsbeeg0mq7s67z
2013-12-02 16:42:06 +01:00
Thibault Delavallée
f47c5d367f
[CLEAN] payment_acquirer_adyen: cleaned tests: removed code pasted from paypal, updated tests. Tests should be added, but will be done in a few days.
...
bzr revid: tde@openerp.com-20131202152958-em5tq1x20y2rlo9q
2013-12-02 16:29:58 +01:00
Christophe Matthieu
60a55f1077
[MERGE] sync with trunk (to rev 3893)
...
bzr revid: chm@openerp.com-20131202151847-4sf0ww58meql0e4z
2013-12-02 16:18:47 +01:00
Xavier Morel
ef08d834f6
[IMP] add warning re. changed behavior of backbone which may be changed in the client
...
bzr revid: xmo@openerp.com-20131202151838-z26qnz0xpt3tigrd
2013-12-02 16:18:38 +01:00
Xavier Morel
0dff8277cc
[FIX] breakage due to backbone change: in 1.0+, this.reset() will call this.add()
...
in 0.9, this.add would only be called if items were provided to
reset(), changed in commit cf6e862.
bzr revid: xmo@openerp.com-20131202151037-xxmvu5790p2jsxz6
2013-12-02 16:10:37 +01:00
Christophe Matthieu
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
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