Commit Graph
103218 Commits
Author SHA1 Message Date
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
Quentin (OpenERP) f940756881 [MERGE] stock: inventory refactoring. Easier and less error prone. Constraints on quants dropped as well
bzr revid: qdp-launchpad@openerp.com-20140410104818-ljy8esv512t1hpuu
2014-04-10 12:48:18 +02:00
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
DJ Patel 63e8f9efc7 [IMP] stock_landed_costs : Improved the onchange on product.
bzr revid: mdi@tinyerp.com-20140410102825-xy44ot6b4fn9pia3
2014-04-10 15:58:25 +05:30
Paramjit Singh Sahota 51c1d1c4bb [FIX] Issue of trunk reD. 2014-04-10 15:57:00 +05:30
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
Fabien Meghazi 8e878a8e01 [WIP] bundle minify
bzr revid: fme@openerp.com-20140410101847-srs54wvf39rjjf2j
2014-04-10 12:18:47 +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
Fabien Meghazi c4c110c3c6 [WIP] bundle css and js route
bzr revid: fme@openerp.com-20140410101816-jg5pdlistgowu2zo
2014-04-10 12:18:16 +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
Quentin (OpenERP) c8e1b778b0 [IMP] stock, inventory: improving the usability
bzr revid: qdp-launchpad@openerp.com-20140410101404-uvufnxi4p6s4aicu
2014-04-10 12:14:04 +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
Josse Colpaert 3be80cbbce [WIP] Add Dashboard for warehouse
bzr revid: jco@openerp.com-20140410100849-tkx0amovy8d1v16b
2014-04-10 12:08:49 +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
DJ Patel cabc401513 [ADD] stock_landed_costs : Added the functionality to add landed costs in cost of quants.
bzr revid: mdi@tinyerp.com-20140410094933-9w8ch4izzaf1tq01
2014-04-10 15:19:33 +05:30
Kunal Chavda (Open ERP) 0be5ebf9d6 [MERGE]with latest trunk.
bzr revid: kch@tinyerp.com-20140410094107-27ey4hms034mob6k
2014-04-10 15:11:07 +05:30
Paramjit Singh Sahota dfffd7cef1 [MERGE] MErged lp:openobject-addons. 2014-04-10 15:09:17 +05:30
Kunal Chavda (Open ERP) ae8f388ded [FIX]forgot to change variable name.
bzr revid: kch@tinyerp.com-20140410092901-3422iz7nam26xr9c
2014-04-10 14:59:01 +05:30
Fabien Pinckaers ec2ea6643b [IMP] evnet
bzr revid: fp@tinyerp.com-20140410091747-mznpvuxdbi1uxj2d
2014-04-10 11:17:47 +02:00
Paramjit Singh Sahota e5229ee8c3 [IMP] Improved code by shifting the complete code to website_sale rather than doing in sale. 2014-04-10 14:26:13 +05:30
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
Jitendra Prajapati (OpenERP) 76d284ab8e [IMP]set python string is translated
bzr revid: jpr@tinyerp.com-20140410083655-6m993y17nckk7mfz
2014-04-10 14:06:55 +05:30
Quentin (OpenERP) 9f19f13b5c [REF] stock: inventory refactoring. Keep it simple and easy
bzr revid: qdp-launchpad@openerp.com-20140410081530-mzxr2laqewqmgeyb
2014-04-10 10:15:30 +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
Mansi Kariya (OpenERP) c3869dc5fb [FIX] Fixed issues got when merged with main
bzr revid: mka@tinyerp.com-20140410070617-rwxia7tf4hkgm398
2014-04-10 12:36:17 +05:30
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
DJ Patel 66a62da61a [ADD] stock_landed_costs : Added the function to compute former cost per unit.
bzr revid: mdi@tinyerp.com-20140410054901-xhh85tdnom8t5x21
2014-04-10 11:19:01 +05:30
DJ Patel b81d0d0436 [FIX] stock_landed_costs : Fixed the onchange method on product.
bzr revid: mdi@tinyerp.com-20140410053041-227rgrwi9uzyc16w
2014-04-10 11:00:41 +05:30
DJ Patel 62341f2e7e [ADD] stock_landed_costs : Added the logic to compute landed costs.
bzr revid: mdi@tinyerp.com-20140410052146-die56ht7xv0ezooy
2014-04-10 10:51:46 +05:30
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