Frédéric van der Essen
a78af30755
[FIX] hw_escpos: company logo was not centered on the first receipt
...
bzr revid: fva@openerp.com-20140206151432-avaz87emjzqyvu9t
2014-02-06 16:14:32 +01:00
Christophe Matthieu
64eb4376ee
[MERGE] from saas-3
...
bzr revid: chm@openerp.com-20140206150121-drs3ybhgx5837zt2
2014-02-06 16:01:21 +01:00
Quentin (OpenERP)
dfa126d47a
[REF] refactoring made during code review
...
bzr revid: qdp-launchpad@openerp.com-20140206145741-ee776b9ttcx4r9wb
2014-02-06 15:57:41 +01:00
Thibault Delavallée
2f682975bc
[FIX] website: fixed call to slugify
...
- python-slugify: max_length is an optional keyword
- slugify library also exists and does not accepts max_length -> if this very simple library is used, fall
back on our own implementation
bzr revid: tde@openerp.com-20140206145638-entdcqsawrqf1nnq
2014-02-06 15:56:38 +01:00
Thibault Delavallée
989a4f3103
[FIX] website_mail: also depends on email_template
...
bzr revid: tde@openerp.com-20140206145524-bafdhe3gc62oya2c
2014-02-06 15:55:24 +01:00
Thibault Delavallée
93a5122ac5
[IMP] website_mail: improve email_template link for front-end edition didsplay
...
bzr revid: tde@openerp.com-20140206145510-y4mangyhhmwcofa7
2014-02-06 15:55:10 +01:00
Quentin (OpenERP)
05ea06a814
[MERGE] main trunk-wms branch
...
bzr revid: qdp-launchpad@openerp.com-20140206145444-tiyk53rvxfqekil8
2014-02-06 15:54:44 +01:00
Christophe Matthieu
14b4efcd28
[FIX] tour and translate title
...
bzr revid: chm@openerp.com-20140206145236-vwdq74yyz21qvyzu
2014-02-06 15:52:36 +01:00
Fabien Meghazi
b112d5d2f1
[FIX] ir ui view should have rendering context on request.website_enabled
...
bzr revid: fme@openerp.com-20140206143919-f6vz8rpx9mb4798g
2014-02-06 15:39:19 +01:00
Frédéric van der Essen
008e3c1ab0
[FIX] point_of_sale: receipt header & footer could overflow outside of ticket
...
bzr revid: fva@openerp.com-20140206143648-z1bsknelzznf0jqj
2014-02-06 15:36:48 +01:00
Christophe Matthieu
e8964f896c
[FIX] website: tour, test and test_runner
...
bzr revid: chm@openerp.com-20140206140746-jmeyx8q9qxv7sz1j
2014-02-06 15:07:46 +01:00
Frédéric van der Essen
ec4dd7389b
[IMP] point_of_sale: try harder to connect to proxy when the ip is already known
...
bzr revid: fva@openerp.com-20140206140645-uo82x3tf60wlhytj
2014-02-06 15:06:45 +01:00
Christophe Matthieu
0677fda79e
[FIX] website tours: fix and translate
...
bzr revid: chm@openerp.com-20140206140643-z3b2fu2v9uaozc1z
2014-02-06 15:06:43 +01:00
Frédéric van der Essen
a9226e3d5b
[FIX] hw_scanner, hw_escpos: prevent driver threads from deadlocking when woken by two simultaneous requests
...
bzr revid: fva@openerp.com-20140206140524-ur51ghcpdzwxv1yr
2014-02-06 15:05:24 +01:00
Christophe Matthieu
052bcacd5f
[FIX] website_sale template; snippet editor
...
bzr revid: chm@openerp.com-20140206140258-l3hriceuksx0c061
2014-02-06 15:02:58 +01:00
Christophe Matthieu
d819d494f1
[IMP] website: add debugger template used to create nex tours/tests (display in customize menu in debug mode)
...
bzr revid: chm@openerp.com-20140206135036-geq8fubtz39pxp20
2014-02-06 14:50:36 +01:00
Parth Gajjar (Open ERP)
34f14e357c
[ADD] added filter for matrix and choice
...
bzr revid: pga@tinyerp.com-20140206134053-mjlfe7qdf07bk8me
2014-02-06 19:10:53 +05:30
Mahendra Barad (OpenERP)
353ea9fb22
[ADD]lib for paragraph level comment
...
bzr revid: mba@tinyerp.com-20140206133539-n9iisqwgexifty6u
2014-02-06 19:05:39 +05:30
Quentin (OpenERP)
0a74a775c5
[MERGE] fixing the dropshipping picking type data
...
lp bug: https://launchpad.net/bugs/1274907 fixed
bzr revid: qdp-launchpad@openerp.com-20140206132121-1fvw50fjq8kdjpk9
2014-02-06 14:21:21 +01:00
Christophe Simonis
1e4d99eede
[MERGE] backport trunk revisions
...
* 9094 fva@openerp.com-20140203144847-21cv7pt7lnlxdsve
* 9095 fva@openerp.com-20140203153233-zj12w2o1uxyz5hoq
bzr revid: chs@openerp.com-20140206132039-y1whtc8qqqs8ey92
2014-02-06 14:20:39 +01:00
Quentin (OpenERP)
7796000e3d
[MERGE] branch fixing the return picking wizard
...
lp bug: https://launchpad.net/bugs/1269421 fixed
bzr revid: qdp-launchpad@openerp.com-20140206131638-tlwdnhzdtkfkb727
2014-02-06 14:16:38 +01:00
Quentin (OpenERP)
73aa65cb7f
[MERGE] stock, usabiltiy: when a picking is done, don't let the user modify it anymore
...
lp bug: https://launchpad.net/bugs/1274511 fixed
bzr revid: qdp-launchpad@openerp.com-20140206131412-n8dda0fix5r8wwe7
2014-02-06 14:14:12 +01:00
Christophe Simonis
9289a2608d
[MERGE] forward port of branch saas-3 up to revid 5060 chs@openerp.com-20140206131116-we6rlic5fu09xh8q
...
bzr revid: chs@openerp.com-20140206131219-9rpwsfe9vc7uf0cr
2014-02-06 14:12:19 +01:00
Christophe Simonis
5a022d6ab3
[MERGE] backport trunk revision 5053 fva@openerp.com-20140206110134-jk5zbd8cc6x1ebh5
...
bzr revid: chs@openerp.com-20140206131116-we6rlic5fu09xh8q
2014-02-06 14:11:16 +01:00
Quentin (OpenERP)
fb091e110a
[MERGE] stock, usability: show the inventory value of a quant in form view as well...
...
lp bug: https://launchpad.net/bugs/1274505 fixed
bzr revid: qdp-launchpad@openerp.com-20140206130625-xsjkeen9cagax1se
2014-02-06 14:06:25 +01:00
Christophe Simonis
73d675a73d
[FIX] ir.ui.view: avoid infinite loop when applying multiple inheritance inside a single view (use of <data> tag)
...
bzr revid: chs@openerp.com-20140206130349-19v4ah0lwy87t50o
2014-02-06 14:03:49 +01:00
Quentin (OpenERP)
a18b00d93c
[MERGE] don't reuse quants that have been scrapped, used in production or returned to supplier
...
lp bug: https://launchpad.net/bugs/1272005 fixed
bzr revid: qdp-launchpad@openerp.com-20140206125903-kexaqvb7sgk6h8ed
2014-02-06 13:59:03 +01:00
Quentin (OpenERP)
3753eb2524
[MERGE] fix of stock_change_product_qty wizard
...
lp bug: https://launchpad.net/bugs/1271991 fixed
bzr revid: qdp-launchpad@openerp.com-20140206124937-dx4j3vraziu5wmp6
2014-02-06 13:49:37 +01:00
Antony Lesuisse
4a5b4a8c3f
[IMP] sale_eval break continue raise control flow opcodes
...
bzr revid: al@openerp.com-20140206124019-07in9p9capmznlo2
2014-02-06 13:40:19 +01:00
Quentin (OpenERP)
06d41e195a
[FIX] stock, return picking wizard: several bugs fixed (see details bellow) and removal of feature to recreate or cancel chained operations (because it was totally bugged, not easily achievable and it's a new feature).
...
bugs fixed:
1) do_unreserve() on stock.move was setting back to 'confirmed' state also moves in 'done' or 'cancel' state
2) in return picking wizard, unreservation of quants was made only on the chained operation regardless if it had been split before or not
3) lot management in return picking wizard
4) new implementation or return picking wizard in order to only allow a manual fixing
5) uom support in return picking wizard
bzr revid: qdp-launchpad@openerp.com-20140206123852-g22nkgcxud0c9tzr
2014-02-06 13:38:52 +01:00
Martin Trigaux
f79172c7b5
[MERGE] [FIX] mail: mail: backport of saas-2 revision 9065 and 9081 and security improvements.
...
Add followers before super call in mail_thread creation.
This allows to have a value for the _set_followers call and be able to have record rules based on followers at creation.
Set the priority of message_follower_ids fields to -10 (default is 0) to be sure it will be executed before other function fields using these followers (eg: _set_stage_per_user from note.note does a browse which would trigger record rules to read the note)
Context hack to avoid checking read access at creation of the record (check create rules instead)
lp bug: https://launchpad.net/bugs/1259913 fixed
bzr revid: mat@openerp.com-20140206121438-epghqo042ync24v5
2014-02-06 13:14:38 +01:00
Martin Trigaux
5ebcb64c34
[IMP] mail: in case of creation, still check creation access rights for subscription
...
bzr revid: mat@openerp.com-20140206120109-6h2vz1ulu33t1509
2014-02-06 13:01:09 +01:00
Christophe Simonis
79caa8e186
[IMP] extract save/get session actions as methods on session object
...
bzr revid: chs@openerp.com-20140206115253-ed7ahi6j83mgpw4y
2014-02-06 12:52:53 +01:00
Christophe Simonis
94162667dd
[IMP] http: extract save/get session actions as methods on session object
...
bzr revid: chs@openerp.com-20140206115209-naleunin0mleghda
2014-02-06 12:52:09 +01:00
Thibault Delavallée
4420bdf831
[FIX] mail: followers widget: is_follower was not computed if the current user
...
was not in the first 10 displayed followers of the document. Compute is_follower
based on all followers, not just the first 10.
bzr revid: tde@openerp.com-20140206112145-ibir7cj6wxe1ksgt
2014-02-06 12:21:45 +01:00
Christophe Simonis
500fea28b7
[MERGE] forward port of branch saas-2 up to revid 5007 chs@openerp.com-20140206110220-myn57cryam1y4k9v
...
bzr revid: chs@openerp.com-20140206110423-qe4h5ip2dg6dm7ph
2014-02-06 12:04:23 +01:00
Martin Trigaux
922836d8cd
[IMP] mail: check at least access_rights in case of creation
...
bzr revid: mat@openerp.com-20140206110327-zar4yl03r1lympx6
2014-02-06 12:03:27 +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
Frédéric van der Essen
13a4c3fec9
[IMP] cors rpc: enable preflight request caching, vastly improves rpc performance
...
bzr revid: fva@openerp.com-20140206110134-jk5zbd8cc6x1ebh5
2014-02-06 12:01:34 +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
7407f3c888
[FIX] mail: backport of saas-2 revision 9065 and 9081.
...
Make sure the user is subscribed before the super() call in mail_thread. This allows to have follower based record rules working (eg: note.note)
bzr revid: mat@openerp.com-20140206104714-anpehaik4wajnfrw
2014-02-06 11:47:14 +01:00
Denis Ledoux
f487fbb298
[FIX] website: urljoin from urlparse cannot handle unicode. Therefore, We decode before passing the arg to urljoin then we (re-)encode the result
...
bzr revid: dle@openerp.com-20140206103929-oe289oilz08n1msk
2014-02-06 11:39:29 +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
Thibault Delavallée
763496be49
[IMP] mail: added message_last_update field. This field is a datetime
...
field, updated everytime message_post in called. This allows to build filters, search or
actions based on the last message date, for reporting for example.
bzr revid: tde@openerp.com-20140206094831-nvyds6nqz0v25t59
2014-02-06 10:48:31 +01:00
Martin Trigaux
7950914c69
[IMP] ir_fields: no need to sanitize the _str_to_html as it is already done in the _symbol_set of html fields. This avoids doing twice the sanitization.
...
bzr revid: mat@openerp.com-20140206094628-umx2rfb9rcim7v82
2014-02-06 10:46:28 +01:00
Fabien Meghazi
3bdc08a2c2
[ADD] Link module between website and auth_signup
...
bzr revid: fme@openerp.com-20140206093826-cmw5fm0xan9m5tzr
2014-02-06 10:38:26 +01:00
ajay javiya (OpenERP)
4fa2b4efc6
[IMP] : display a random next blog
...
-> blog cover with full screen
-> animation on click next page
bzr revid: aja@tinyerp.com-20140206093823-gs4asrkpwr1e0uf6
2014-02-06 15:08:23 +05:30
Fabien Meghazi
55c61046b9
[FIX] Do not allow signup and reset_password when no token given and opt-in has not been done in config
...
bzr revid: fme@openerp.com-20140206091722-xc8dv4whp1eb07z4
2014-02-06 10:17:22 +01:00
Martin Trigaux
909ff6e368
[MERGE] [FIX] ir_fields: allow convertion from string to html using sanitize function
...
This is required to be able to import csv file containing html fields
lp bug: https://launchpad.net/bugs/1093800 fixed
bzr revid: mat@openerp.com-20140206084708-j63kpkr9apd3j01j
2014-02-06 09:47:08 +01:00
Thibault Delavallée
6280ba8f10
[MERGE] [IMP] ir_actions: server action: the context used to evaluate python code (condition, code server action) is prepared in its own method. This eases the inheritance process and allow s other modules to add new items in the evaluation context. An example of use is to add the request object in the website module, allowing some server action to be accessible through the website front-end.
...
bzr revid: tde@openerp.com-20140206083938-byoxo7o0uvcmj18d
2014-02-06 09:39:38 +01:00