Gery Debongnie
c6f41caf99
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140409120604-tgc4o9zkkr69sf4q
bzr revid: ged@openerp.com-20140409150557-1wsyuvpw1ly75fhn
bzr revid: ged@openerp.com-20140410133251-k200ui19hjs6jnur
2014-04-10 15:32:51 +02:00
Cedric Snauwaert
964e94f8a8
[FIX]forgot to open a dialog
...
bzr revid: csn@openerp.com-20140410121122-y0a8l1hzd01af8bn
2014-04-10 14:11:22 +02:00
Richard Mathot (OpenERP)
ac8ada1a47
[MERGE] Sync with parent
...
bzr revid: rim@openerp.com-20140410120341-n1idn9rtnf2lmvcy
2014-04-10 14:03:41 +02:00
Kersten Jeremy
a3016b4d95
[FIX] Remove double return
...
bzr revid: jke@openerp.com-20140410114048-hw26q9x0dm11wbqc
2014-04-10 13:40:48 +02:00
Kersten Jeremy
986b445fed
[FIX] Website - Fix quantity not refresh when you add a product in your cart
...
bzr revid: jke@openerp.com-20140410113952-g0nvc9nfjma2t614
2014-04-10 13:39:52 +02:00
Raphael Collet
d67e63150e
[FIX] sql_db: forgotten attribute renaming _pool -> __pool
...
bzr revid: rco@openerp.com-20140410113950-71gcyz0t2rfuww57
2014-04-10 13:39:50 +02:00
Raphael Collet
3ba23748bc
[FIX] event_sale: fix non-closing tags in xml file
...
bzr revid: rco@openerp.com-20140410112922-wryrl5dw8aveyw27
2014-04-10 13:29:22 +02:00
Christophe Simonis
3a7e003656
[MERGE] forward port of branch saas-3 up to revid 9394 chs@openerp.com-20140410103638-x7vajn70ewsfp0ck
...
bzr revid: chs@openerp.com-20140410110424-enhdg6pufhii56ni
2014-04-10 13:04:24 +02:00
Denis Ledoux
9c074a67a5
[FIX] website_sale: Do not search and associate a company to the partner when an order is validated
...
This can be regarded as a security leak: You can associate your partner to an existing company, which you maybe do not really belong, and therefore potentially access data which you are not authorized to see
Use street for the company name, street2 for the actual street, meanwhile
bzr revid: dle@openerp.com-20140410105804-am2xjmr09u3jk36r
2014-04-10 12:58:04 +02:00
Vidhin Mehta (OpenERP)
9f6def6408
[TEST]for test on runbot.
...
bzr revid: vme@tinyerp.com-20140410105643-ndznhar8a6x6uevg
2014-04-10 16:26:43 +05:30
Christophe Simonis
e521085fff
[MERGE] forward port of branch saas-3 up to revid 3997 dle@openerp.com-20140409093616-3060or02z8zmv8tm
...
bzr revid: chs@openerp.com-20140410105525-m68vejubszroawfm
2014-04-10 12:55:25 +02:00
Christophe Simonis
15680c94e1
[MERGE] forward port of branch saas-3 up to revid 5115 chs@openerp.com-20140410102422-fcwxhjk40z0oy8x5
...
bzr revid: chs@openerp.com-20140410105454-6utwgruj80h8wdss
2014-04-10 12:54:54 +02:00
Turkesh Patel (Open ERP)
3b9ac48122
[ADD] added tooltip on some icons, improved string.
...
bzr revid: tpa@tinyerp.com-20140410104910-err7rc2efgvsxti7
2014-04-10 16:19:10 +05:30
Christophe Simonis
bd7804272b
[MERGE] forward port of branch 7.0 up to revid 9971 chs@openerp.com-20140410100027-5ug4801pfch9virt
...
bzr revid: chs@openerp.com-20140410103638-x7vajn70ewsfp0ck
2014-04-10 12:36:38 +02:00
Thibault Delavallée
e834e31bd9
[FIX] website_forum: light cleaning of website_forum tour naming
...
bzr revid: tde@openerp.com-20140410101911-lphs30dqs00hikrt
2014-04-10 12:19:11 +02:00
Thibault Delavallée
be72c379eb
[ADD] website_forum: added new backend views in openerp manifest
...
bzr revid: tde@openerp.com-20140410101842-pggqqhuax1gmvw10
2014-04-10 12:18:42 +02:00
Thibault Delavallée
b72e49419a
[FIX] website_forum: still fixing references to history
...
bzr revid: tde@openerp.com-20140410101820-x1gnf64f2xvbu2ld
2014-04-10 12:18:20 +02:00
Thibault Delavallée
57493c8963
[IMP] website_forum: cleaned subtypes + jump at install + cleaned post closing reasons
...
bzr revid: tde@openerp.com-20140410101801-h5pzk85tdhn7nf17
2014-04-10 12:18:01 +02:00
Thibault Delavallée
13d6b0047b
[FIX] website_forum: removed some reference to history
...
bzr revid: tde@openerp.com-20140410101720-ql3uo4omewuen5x1
2014-04-10 12:17:20 +02:00
Thibault Delavallée
67ef7ba855
[IMP] website_blog: moved res_users inheritance into its own file, and added
...
the field in the view.
Also added some fixes in the messag_post hwen creating an answer.
bzr revid: tde@openerp.com-20140410101658-a1o5h3g5ehlg0e8t
2014-04-10 12:16:58 +02:00
Thibault Delavallée
7ad7d5a943
[IMP] website_forum: added some backend views
...
bzr revid: tde@openerp.com-20140410101354-w64d671amudib05g
2014-04-10 12:13:54 +02:00
Thibault Delavallée
cb9bae8ba6
[IMP] website_forum: added an icon
...
bzr revid: tde@openerp.com-20140410101247-m4w7yga1c3kv40py
2014-04-10 12:12:47 +02:00
Cedric Snauwaert
e95ca69113
[REF]add bootstrap modal window based, cleaned, refactored from trunk-ui-to-boostrap-modal branch
...
bzr revid: csn@openerp.com-20140410100631-5v6a71oi5wyunbda
2014-04-10 12:06:31 +02:00
Christophe Simonis
c65832f8c6
[FIX] account: Chart Installer: new way to get apps server
...
bzr revid: chs@openerp.com-20140410100027-5ug4801pfch9virt
2014-04-10 12:00:27 +02:00
Christophe Simonis
52760fd424
[FIX] modules: install_from_urls: restrict to administrators. Urls must come from apps server.
...
[FIX] modules: download() method is now a no-op. This method was in fact already a no-op as the "url" field is never set explicitly in the code.
bzr revid: chs@openerp.com-20140410095817-bkni63g346wneybb
2014-04-10 11:58:17 +02:00
Denis Ledoux
694fb63dda
[FIX] website_sale: use commercial_partner_id instead of parent_id to have the company name of the artner in the checkout form
...
If the user is portal, its partner is a company and has a parent: a security rule prevent to read the parent_id
and the company which should be displayed is the closest company of the partner in the hierarchy, and, in this case, itself.
bzr revid: dle@openerp.com-20140410095814-x7hqymfelspvjdsw
2014-04-10 11:58:14 +02:00
Thibault Delavallée
ae1e7ed05e
[FIX] mail_thread: when the subtype does not exist anymore, avoid
...
crashing message_post; just ignore the subtype instead.
bzr revid: tde@openerp.com-20140410095143-05qpe3m2pbeg3fg5
2014-04-10 11:51:43 +02:00
Amit Dodiya
d50a5c7efc
[FIX] account_voucher & account_move_line: while we have partial payment and we cancel one payment it also unlink the reconcile/partial reconcile tag from other payment entries also
...
bzr revid: ado@tinyerp.com-20140410095132-wx29csixtxsf6gdv
2014-04-10 15:21:32 +05:30
Fabien Pinckaers
ec2ea6643b
[IMP] evnet
...
bzr revid: fp@tinyerp.com-20140410091747-mznpvuxdbi1uxj2d
2014-04-10 11:17:47 +02:00
Denis Ledoux
3f33b1e716
[FIX] payment: remove mail of dependance (as account already depends on it) and set auto_install
...
payment was added as dependance of portal_sale, which used to be auto installed when portal and sale were installed. With this new dependance, it wasnt the case anymore
With auto install of the payment module with the installation of account, this module is installed on the installation of sale (depends on account), and, therefore, on the installation of portal, portal_sale is now installed correctly
bzr revid: dle@openerp.com-20140410084846-78kxwc63nmv0rg9k
2014-04-10 10:48:46 +02:00
Denis Ledoux
9e1dc2a2bd
[FIX] website_quote: security fix, only salesman were able to read sale order options, while other users, like portal and public, obviously need to be able to read these options
...
bzr revid: dle@openerp.com-20140410081445-mcg075upmujpr5w1
2014-04-10 10:14:45 +02:00
Thibault Delavallée
107cc33d0e
[MERGE] Sync with upstram: trunk-website-forum-tpa
...
bzr revid: tde@openerp.com-20140410080459-b5ngtlg34dblbtyr
2014-04-10 10:04:59 +02:00
chm@openerp.com
9d187f9915
[IMP] ir_qweb: first tag 't' template of a view is added to qwebcontext.templates with id of ir_ui_view
...
bzr revid: chm@openerp.com-20140410080058-tx59gwh8nsefria3
2014-04-10 10:00:58 +02:00
Gery Debongnie
522d612b8c
[MERGE] readgroup signature has changed, so addons inheriting and modifying read_group need to be changed to make sure they call their parent's read_group with the correct signature
...
bzr revid: ged@openerp.com-20140410072039-mpkd4y8zf978ali3
2014-04-10 09:20:39 +02:00
Gery Debongnie
492f0d8942
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140409125731-wx1zjr58p2h5vaqn
bzr revid: ged@openerp.com-20140409150048-anl3mwq8raxsfmcz
bzr revid: ged@openerp.com-20140410071049-17ygqlc45ns3zp3a
2014-04-10 09:10:49 +02:00
Launchpad Translations on behalf of openerp
fc25f85b52
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140410064650-qqd9g5dsaf5dqm52
2014-04-10 06:46:50 +00:00
Turkesh Patel (Open ERP)
f040a97f9d
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20140410061630-k5x4rl2k6most05b
2014-04-10 11:46:30 +05:30
Turkesh Patel (Open ERP)
bc87989691
[MRG] improved string and fixed issue of not geeting karma on edit of answer.
...
bzr revid: tpa@tinyerp.com-20140410061428-htr3coosp04g2b5h
2014-04-10 11:44:28 +05:30
Sunil Sharma
75773982a4
[imp]:improve activity search or improve string or remove unused string
...
bzr revid: ssh@tinyerp.com-20140410060400-blapg8mz6kw5bvoi
2014-04-10 11:34:00 +05:30
Launchpad Translations on behalf of openerp
a8ab53566c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140409064154-4bbr668s262a11mn
bzr revid: launchpad_translations_on_behalf_of_openerp-20140410055655-a13zzhsch5dj1w5r
2014-04-10 05:56:55 +00:00
Fabien Pinckaers
80160ef79d
[IMP] gengo fix in callback
...
bzr revid: fp@tinyerp.com-20140409221121-8iwng0wmcp3fjasd
2014-04-10 00:11:21 +02:00
Fabien Pinckaers
6afe3b6447
[IMP] grouping jobs together
...
bzr revid: fp@tinyerp.com-20140409215927-gfu3v8dnrgeqnvvd
2014-04-09 23:59:27 +02:00
Fabien Pinckaers
d5599de606
[IMP] Gengo Fixes
...
bzr revid: fp@tinyerp.com-20140409214509-0ww46dnt3np66ncx
2014-04-09 23:45:09 +02:00
Richard Mathot (OpenERP)
e29174090a
[MERGE] Sync with trunk
...
bzr revid: richard_mathot_openerp-20140409194248-ii36xsv0lpr68rmt
2014-04-09 21:42:48 +02:00
Fabien Pinckaers
3705aa837f
[IMP] Gengo translation cron every 6 hours
...
bzr revid: fp@tinyerp.com-20140409185919-m01wz9sp3cynr6wf
2014-04-09 20:59:19 +02:00
Fabien Pinckaers
8970cefdd1
[IMP] track duration in hours
...
bzr revid: fp@tinyerp.com-20140409184334-ehkhowyhyqw6cdmx
2014-04-09 20:43:34 +02:00
Thibault Delavallée
73cb78e211
[CLEAN] website_forum: cleaned vote feature before merging
...
bzr revid: tde@openerp.com-20140409173941-4pc7p8bre5btgbhu
2014-04-09 19:39:41 +02:00
Fabien Pinckaers
65908c769b
[IMP] Event Agenda: merge with cleaning
...
bzr revid: fp@tinyerp.com-20140409172600-bwy97j8kr8dzrgg9
2014-04-09 19:26:00 +02:00
Thibault Delavallée
21e3164f94
[CLEAN] website_forum: views is now a simple counter, incremented each time
...
someone see the question. Also use message_is_follower instead of re-implementing its
feature by checking the followers.
Views is updated through a method on the post object, incrementing the views counter
by 1.
bzr revid: tde@openerp.com-20140409172522-pwehz1k9z5rf765s
2014-04-09 19:25:22 +02:00
Thibault Delavallée
1d5beb57ef
[MERGE] Sync with upstram: website-forum-tpa
...
bzr revid: tde@openerp.com-20140409165804-q4wi76e0m0c9ovzw
2014-04-09 18:58:04 +02:00