openerp-sle
650a0b021c
[FIX] website_membership: need to add website_sale in the dependancies list for membership sorting as website_sequence is defined there
...
bzr revid: openerp-sle@openerp-sle.home-20140130155802-f8kuvin9ih41gr48
2014-01-30 16:58:02 +01:00
Denis Ledoux
a2fba1c288
[FIX] website_membership: do not display '0' in country list head if there is no result
...
bzr revid: dle@openerp.com-20140130155600-bh412ye3sqsao56p
2014-01-30 16:56:00 +01:00
Denis Ledoux
369a88a5a1
[FIX] event_sale, website_event: copy paste errors in views
...
bzr revid: dle@openerp.com-20140130154910-xmg8dehh0zubgif8
2014-01-30 16:49:10 +01:00
Fabien Meghazi
dac3796177
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140130125458-rnhvcsgpafcaqftt
2014-01-30 13:54:58 +01:00
Fabien Meghazi
d5031cbee8
[ADD] POS: added cors argument to all routes
...
bzr revid: fme@openerp.com-20140130124606-wetmhcjqqvvkv5dy
2014-01-30 13:46:06 +01:00
Fabien Meghazi
9ce7c7d561
[IMP] Use CORS in pos (only two routes)
...
bzr revid: fme@openerp.com-20140130122752-kfgo7u0q0crn3tbr
2014-01-30 13:27:52 +01:00
Fabien Meghazi
b63b03abd0
[IMP] better handling of methods for CORS
...
bzr revid: fme@openerp.com-20140130122654-2p481p5hwn033mi7
2014-01-30 13:26:54 +01:00
Denis Ledoux
b3268a48c2
[FIX] event: put back country_id related field as needed in event itself (not just website_event)
...
bzr revid: dle@openerp.com-20140130122051-cm2u2hotlnfv4bxj
2014-01-30 13:20:51 +01:00
Fabien Meghazi
9cce88ab6a
[ADD] Cross-Origin Resource Sharing support as http.route() argument
...
bzr revid: fme@openerp.com-20140130121745-zjuuves1yhydydpx
2014-01-30 13:17:45 +01:00
jke-openerp
1176ef49c1
[FIX] Fix according ODO review : widget image, googlemap, social escape, ...
...
bzr revid: jke@openerp.com-20140130121244-tv840uvtorg0y3s1
2014-01-30 13:12:44 +01:00
Antony Lesuisse
20fc20a3f2
[IMP] http allow auth=none without db outside of web
...
bzr revid: al@openerp.com-20140130114535-0keldqr1eln8swm8
2014-01-30 12:45:35 +01:00
Denis Ledoux
18532330d4
[FIX] *: replace urllib calls by werkzeug calls, as werkzeug handles utf-8 encoding while urllib doesnt
...
bzr revid: dle@openerp.com-20140130112408-8pdju26jnkyxvlw2
2014-01-30 12:24:08 +01:00
jke-openerp
516a85cecc
[Fix] Use maps.google.com and not .be (as for thumbail who use the api .com).
...
[IMP] Add zoom 10 by default
[FIX] Escape False in address for google search
bzr revid: jke@openerp.com-20140130111349-l90w9larrntv83hh
2014-01-30 12:13:49 +01:00
jke-openerp
c38e65d343
[FIx] Convert # to %23 in url for twitter
...
bzr revid: jke@openerp.com-20140130111056-gf31rpb8wknyxm8d
2014-01-30 12:10:56 +01:00
jke-openerp
fd6d4d8303
[FIX] Set the good url redirect in "Sign In" button from the cart
...
bzr revid: jke@openerp.com-20140130104937-6rjt51rg3o9bz90k
2014-01-30 11:49:37 +01:00
Frédéric van der Essen
7119170b09
[MERGE] point_of_sale: receipt printing reliability improvements
...
bzr revid: fva@openerp.com-20140130103802-3rfo6r87dv5gotg5
2014-01-30 11:38:02 +01:00
Frédéric van der Essen
28642435ab
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140130103713-k21ji454zhup0row
2014-01-30 11:37:13 +01:00
Frédéric van der Essen
8cf2adf5e3
[IMP] point_of_sale: hold receipts until the printer is back online
...
bzr revid: fva@openerp.com-20140130103051-htsx7ts111axhhub
2014-01-30 11:30:51 +01:00
jke-openerp
ab8ee396ec
[TYPO] Add space between icon and button in cart "Continue Shopping"
...
bzr revid: jke@openerp.com-20140130094927-44b8szwtb602e180
2014-01-30 10:49:27 +01:00
Fabien Meghazi
e974e1fbea
[REM] remove disable_db and ensure_db() from addons
...
bzr revid: fme@openerp.com-20140130092308-s24a7h2mhzuaasf1
2014-01-30 10:23:08 +01:00
jke-openerp
7027ce6eda
[REF] website_sale : Add missing widget option in recommanded product, to display image
...
bzr revid: jke@openerp.com-20140130091813-hko16qlm4t8tmq37
2014-01-30 10:18:13 +01:00
Christophe Simonis
ec14f457c1
[FIX] website_event: correct ui test
...
bzr revid: chs@openerp.com-20140129213621-ynbxys4hmw0avhaw
2014-01-29 22:36:21 +01:00
Christophe Simonis
3d80e31012
[FIX] website: url_for() does not mess up anchor links
...
bzr revid: chs@openerp.com-20140129195025-i2ey682o6marp8k1
2014-01-29 20:50:25 +01:00
Christophe Simonis
c202dc1c52
merge upstream
...
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
Christophe Simonis
947fe0da24
[FIX] calendar: use correct xmlid
...
bzr revid: chs@openerp.com-20140129185229-d75g5fsv77468tih
2014-01-29 19:52:29 +01:00
Christophe Simonis
731019154a
[MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah
...
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
2014-01-29 19:47:03 +01:00
Christophe Matthieu
55fdaf0dd0
[FIX] website_sale: activate test tour
...
bzr revid: chm@openerp.com-20140129175038-663iuxiv0os6f9xt
2014-01-29 18:50:38 +01:00
Denis Ledoux
255fe082bd
[FIX] website_membership: membership displayed order depending on website_sequence
...
bzr revid: dle@openerp.com-20140129171554-h76n4579xquhdxxv
2014-01-29 18:15:54 +01:00
Fabien Meghazi
c4e48e2388
[REM] Removed auth='admin' from modules
...
bzr revid: fme@openerp.com-20140129171520-wkz8ot4pa63utoi3
2014-01-29 18:15:20 +01:00
Denis Ledoux
6cc096aebc
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9798 revid:dle@openerp.com-20140129163238-1s1t9oc814z4z7f3
...
bzr revid: dle@openerp.com-20140129171022-wf6244k90lpncmah
2014-01-29 18:10:22 +01:00
Olivier Dony
e6e8bb3789
[IMP] website_*: remove useless % chars surrounding ilike operand, this is the default
...
bzr revid: odo@openerp.com-20140129163557-0bb86mx8it57mcvi
2014-01-29 17:35:57 +01:00
Frédéric van der Essen
64822bd188
[MERGE] hw_escpos: moving list of supported printers to a separate file
...
bzr revid: fva@openerp.com-20140129163503-tvd69qd5u5nktjb9
2014-01-29 17:35:03 +01:00
Frédéric van der Essen
d88b10fd07
[IMP] hw_escpos: moved list of supported printers to a separate file
...
bzr revid: fva@openerp.com-20140129163259-xdarcaw4qcqprvt6
2014-01-29 17:32:59 +01:00
Denis Ledoux
08dfda9ec6
[FIX] purchase: on po confirm, avoid to write location_id on the chained stock move if the move is done
...
On purchase order confirmation, if the order_line comes from a procurement order created by a sale order,
it tried to write on the location_id, whatever the move state was, even done.
Or, sometimes, the stock move associated to the procurement order (from the so) was already done, for example because we forced the availability of the stock move.
It makes sense to not write the location_id if the move is already done, because the location_id is already good.
bzr revid: dle@openerp.com-20140129163238-1s1t9oc814z4z7f3
2014-01-29 17:32:38 +01:00
Olivier Dony
a09fa10c49
[FIX] website_mail: useless and expensive DISTINCT
...
bzr revid: odo@openerp.com-20140129162532-os3lzjyf87hg1ouc
2014-01-29 17:25:32 +01:00
Olivier Dony
0ac11b430f
[IMP] website_sale: spellchecking
...
bzr revid: odo@openerp.com-20140129162331-sjmquzz172h9dkp4
2014-01-29 17:23:31 +01:00
Christophe Matthieu
b7f88a58fb
[FIX] website:_mail: fix followers
...
bzr revid: chm@openerp.com-20140129170829-abmv73xswzl6ccm9
2014-01-29 18:08:29 +01:00
Antony Lesuisse
632c014b76
[FIX] fix werkzeug dependency on debian, misc changes
...
- add an more friendly syntax for images /website/image/<model>/<id>/<field>
- reorder methods based on their use case
- move new page to /website namespace
bzr revid: al@openerp.com-20140129163809-d4z4f8t3h11n5ozv
2014-01-29 17:38:09 +01:00
Frédéric van der Essen
83196be65e
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140129161802-14patbv206pqj68j
2014-01-29 17:18:02 +01:00
Christophe Matthieu
499f9164b8
[FIX] website: tour banner
...
bzr revid: chm@openerp.com-20140129161434-s5razyi3eqeq30vn
2014-01-29 17:14:34 +01:00
Christophe Matthieu
876b61f42c
[FIX] website: test tour and website_sale tour. Add ajax trigger to display popover when the ajax is complete and hmlt is loaded
...
bzr revid: chm@openerp.com-20140129160839-ijdcnuiny6ys8z6p
2014-01-29 17:08:39 +01:00
Fabien Meghazi
f31ddba8b3
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140129153718-b86vsyogxkr8lk19
2014-01-29 16:37:18 +01:00
Fabien Meghazi
9860ddd352
[REM] POS: Replaced auth="admin" by auth="none"
...
bzr revid: fme@openerp.com-20140129153408-d8zkyty1rcvvzqx3
2014-01-29 16:34:08 +01:00
openerp-sle
be6b038fb7
[FIX] website_customer: removed redundant template 'customer_contact', fixed the country-filtering and avoid showing 'false' when partner has not website_short_description
...
bzr revid: openerp-sle@openerp-sle.home-20140129150838-pj9hmexxl3sk89tp
2014-01-29 16:08:38 +01:00
openerp-sle
4183310021
[FIX] website_blog: correct comments anchors
...
bzr revid: openerp-sle@openerp-sle.home-20140129142034-6hl5s3vfzi5nuozj
2014-01-29 15:20:34 +01:00
Martin Trigaux
3a07e0a012
[FIX] attachement: display error message (removed inexistant template) and redraw the window (to avoid getting stucked)
...
bzr revid: mat@openerp.com-20140129141438-3883hhzdiwyoo19t
2014-01-29 15:14:38 +01:00
Christophe Simonis
378c908d4c
[MERGE] forward port of branch saas-2 up to revid 5006 chs@openerp.com-20140129140159-9vwkpr078shoonum
...
bzr revid: chs@openerp.com-20140129094847-4rsg0kjio0ed0rjk
bzr revid: chs@openerp.com-20140129141002-4p8fttm8ii0ogsse
2014-01-29 15:10:02 +01:00
Christophe Simonis
a69f789b41
[MERGE] forward port of branch 7.0 up to revid 5224 chs@openerp.com-20140206105141-7e8bv8ordqqsswh7
...
bzr revid: dle@openerp.com-20140205105045-j95kduyjiq83e57z
bzr revid: dle@openerp.com-20140114173613-ruxye1m7fxtcjfim
bzr revid: dle@openerp.com-20140116161158-u95vcs3os4tk2zob
bzr revid: dle@openerp.com-20140121172737-gzawfi3ssg7xifef
bzr revid: chs@openerp.com-20140129094554-c3abc8x3qz9mpszr
bzr revid: chs@openerp.com-20140129140159-9vwkpr078shoonum
bzr revid: chs@openerp.com-20140206110220-myn57cryam1y4k9v
2014-02-06 12:02:20 +01:00
Christophe Simonis
c234d8547d
[FIX] _(): avoid useless warning where translating string without a cursor
...
bzr revid: chs@openerp.com-20140206105141-7e8bv8ordqqsswh7
2014-02-06 11:51:41 +01:00
Martin Trigaux
b75c52f3ed
[IMP] reference fields: display a more user-friendly window title when open a chosen many2one record in reference field
...
bzr revid: mat@openerp.com-20140206102409-4lbx7ofsgz8speni
2014-02-06 11:24:09 +01:00