Commit Graph

67159 Commits

Author SHA1 Message Date
Denis Ledoux 0e4cfe0add [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9157 revid:dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: chs@openerp.com-20140320134212-9nbuc7uqla4uiyf7
bzr revid: dle@openerp.com-20140320112958-slajf0ho0jtl7u60
bzr revid: dle@openerp.com-20140320161349-olyte7xt35nfj3dg
bzr revid: dle@openerp.com-20140320181737-68q9xh9jhfjynjip
2014-03-20 19:17:37 +01:00
Kersten Jeremy 9bf6f0310e [FIX] Move default value in the _defaults of model and not in default_get.
Don't override the location_id if the super get_default don't retrun a value. 

Else it is impossible to set a default value, because the ir_values is always overrided with stock_location_stock as location_id

bzr revid: jke@openerp.com-20140320180240-un42lptu3pjnsmxq
2014-03-20 19:02:40 +01:00
Denis Ledoux abf8e0d54f [ADD] crm: mass convert lead to opp, add force assignation checkbox, to force the salesman/salesteam on converted/merged lead/opps or leave the existing salesman/salesteam
bzr revid: dle@openerp.com-20140320175129-2lj2pu86l3rjoulw
2014-03-20 18:51:29 +01:00
Denis Ledoux be81326ee3 [FIX] survey: report not stored on filesystem
bzr revid: dle@openerp.com-20140320174835-kdha7ivs64vsvizt
2014-03-20 18:48:35 +01:00
Frédéric van der Essen b206261dd5 [IMP] hw_escpos: re-enabled image printing in xml receipts
bzr revid: fva@openerp.com-20140320170955-ekgya8pcv2wljhl8
2014-03-20 18:09:55 +01:00
Simon Lejeune 246ec6854b [MERGE] trunk
bzr revid: sle@openerp.com-20140320170806-3mfsm4nmhiq1ujk7
2014-03-20 18:08:06 +01:00
Simon Lejeune ad50d5fcfe [FIX] Multiple improvements in report including giving formatlang a cursor and a uid via a lambda method, cleaning of some comments and restoring the page numbering
bzr revid: sle@openerp.com-20140320165841-21clvch4ujak1y3m
2014-03-20 17:58:41 +01:00
Frédéric van der Essen a4afb910e9 [IMP] hw_escpos / point_of_sale: print receipt with an xml template
bzr revid: fva@openerp.com-20140320164530-odpeuf1igh7wkrms
2014-03-20 17:45:30 +01:00
Denis Ledoux 84eeb79875 [FIX] point_of_sale: add multi-companies rules on pos.config
bzr revid: dle@openerp.com-20140320154436-ygqhvvyhe6otv70p
2014-03-20 16:44:36 +01:00
Simon Lejeune b6bd0e8b8a [FIX] fix the print purchase button
bzr revid: sle@openerp.com-20140320154226-tpx3d8a0xrmuxwrr
2014-03-20 16:42:26 +01:00
Thibault Delavallée 50ca5202a0 [REF] website_mail_group: refactored controllers and views
- now using post arguments instead of hardcoded path items like mode;
- unfucked the date archives that was basically now working;
- keep user choices through the navigation (mode, dates);
- various small fixes in the views

bzr revid: tde@openerp.com-20140320151114-1mmk9x48i1lwc6qv
2014-03-20 16:11:14 +01:00
Thibault Delavallée 6af6575efb [IMP] website_mail: added not stored function field
on mail.message that is a short description of the message, either
the subject if present, of the beginning of the plain-text version
of the body. Used whenever messages 'subject' for all messages
is necessary.

bzr revid: tde@openerp.com-20140320151004-qq57s9r8qcpue0rs
2014-03-20 16:10:04 +01:00
Thibault Delavallée 2bc87a67eb [IMP] mail_group: as they are now mailing list, avoid having automatic
creation message, this is quite ugly.

bzr revid: tde@openerp.com-20140320150855-a0ich2zgzn320wj0
2014-03-20 16:08:55 +01:00
Fabien Meghazi 5d107cfaa0 [IMP] static file injected in ir.attachment
bzr revid: fme@openerp.com-20140320143346-nimxg7c61lm1253x
2014-03-20 15:33:46 +01:00
Simon Lejeune d941bce076 [FIX] Adapted mrp bom structure (exit controller, added model)
bzr revid: sle@openerp.com-20140320142520-3qapc7039q46eg9k
2014-03-20 15:25:20 +01:00
Simon Lejeune 52522bf0f9 [FIX] get_pdf can be called on is own (no need to call get_html before on particular controller-report) and make the multiple ids work
bzr revid: sle@openerp.com-20140320140609-7ozly6f55sgeow7k
2014-03-20 15:06:09 +01:00
Frédéric van der Essen 5596413901 [MERGE] from trunk
bzr revid: fva@openerp.com-20140320134017-wi6qdofziia3q12l
2014-03-20 14:40:17 +01:00
Simon Lejeune 221d2a6eeb [FIX] Reports not using the generic controller should not declare a controller anymore. They are now openerp models and are availabel either trough openerp model 'report' with get_html, get_pdf or through a controller. Adapted report_vat this way.
bzr revid: sle@openerp.com-20140320133425-z04ewof8ktjanmn9
2014-03-20 14:34:25 +01:00
Parth Gajjar (Open ERP) 0660bf99af [IMP] move js to head
bzr revid: pga@tinyerp.com-20140320132800-mnnknhayjqnhbwns
2014-03-20 18:58:00 +05:30
Christophe Simonis 03c31de4dd [FIX] web: when filtering out context, also strip *_view_ref keys
bzr revid: chs@openerp.com-20140320131014-3v5qfjxq9unqu5fs
2014-03-20 14:10:14 +01:00
Parth Gajjar (Open ERP) ac8babe0e5 [IMP] minor changes
bzr revid: pga@tinyerp.com-20140320120758-ojgqpqb8sakdhkbb
2014-03-20 17:37:58 +05:30
Frédéric van der Essen 53f02309ed [IMP] hw_escpos: print_xml_receipt() controller allows you to print an xml defined receipt
bzr revid: fva@openerp.com-20140320112720-ldshe2764z3fyfvi
2014-03-20 12:27:20 +01:00
Denis Ledoux 287aae3942 [FIX] stock: force form_view_ref to False in context of actions track_line and scrap_move to avoid context propagation of stock picking views
bzr revid: dle@openerp.com-20140320110741-pg8se5c02p87yi1y
2014-03-20 12:07:41 +01:00
Kersten Jeremy f609f1cdf9 [FIX] calendar: properly credit Valentin Laab as author of a part of the new calendar module
Cfr. https://github.com/0k/web_fullcalendar

bzr revid: jke@openerp.com-20140320104755-am7qsyd3c43u6ugo
2014-03-20 11:47:55 +01:00
Antony Lesuisse 520e10d4b4 [FIX] account invoice analysis exclude proforma from invoiced
bzr revid: al@openerp.com-20140320101555-hw2bgaqs2kw0b7of
2014-03-20 11:15:55 +01:00
Parth Gajjar (Open ERP) e45d9bc7b0 [IMP] removed unnecessary code
bzr revid: pga@tinyerp.com-20140320094434-4zp7x6dmd27wfza2
2014-03-20 15:14:34 +05:30
Parth Gajjar (Open ERP) a378f547f4 [IMP] minor changes
bzr revid: pga@tinyerp.com-20140320092643-1pw62dmbj9h6sjh4
2014-03-20 14:56:43 +05:30
Olivier Dony 42518c339a [FIX] subscription: missing required dependency on `base`
bzr revid: odo@openerp.com-20140320091349-74zykqzf2ols3ja1
2014-03-20 10:13:49 +01:00
Thibault Delavallée 97a6372937 [CLEAN] website_mail: use already-existing template for subscription
instead of copy-and-pasting everything. Please re-use existing things -_-.

bzr revid: tde@openerp.com-20140320090931-r17typzrvvsx03ay
2014-03-20 10:09:31 +01:00
Gery Debongnie 3a0fb18035 [IMP] removes the shadow in stat buttons, to give them the 'flat' look (addon web)
bzr revid: ged@openerp.com-20140320082129-o9jrdb962uuso4kb
2014-03-20 09:21:29 +01:00
Parth Gajjar (Open ERP) b7a68828ed [IMP] improved statistics, added sendbox options for testing, improved UI
bzr revid: pga@tinyerp.com-20140320071028-adyh8d89o7dij81o
2014-03-20 12:40:28 +05:30
Dharmraj Jhala (OpenERP) 9f51a6d453 [IMP] removed terminal slash from url and route
bzr revid: dizzy.zala@gmail.com-20140320063728-kuie1id6t7shvbc7
2014-03-20 12:07:28 +05:30
Launchpad Translations on behalf of openerp 1f3c4f852f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319063002-sd17jxb37ycogrrz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061944-bwpy0lt1bp5ee0y2
2014-03-20 06:19:44 +00:00
Simon Lejeune 1c5a57a129 [FIX] email_template now use the new get_pdf method on the report model in order to avoid the blocking bug of generating a pdf with a public request.session
bzr revid: sle@openerp.com-20140319185350-5t8iuvnzikwfajei
2014-03-19 19:53:50 +01:00
Simon Lejeune 060a171a26 [WIP] Refactoring report module to avoid using request in OpenERP models : the generation of the html/pdf is now done on the model side and not on the controller side anymore => it is possible to generate a pdf python-side without making a request to an url, request that can be refused because of access right in the request object at this precise moment
bzr revid: sle@openerp.com-20140319183614-vibnmm6kkh2h6piu
2014-03-19 19:36:14 +01:00
Fabien Meghazi 13504b180e [FIX] Broken portal test
bzr revid: fme@openerp.com-20140319173204-8a93hww2clvw3ljy
2014-03-19 18:32:04 +01:00
Fabien Meghazi aeb52af1fd [FIX] signup/reset urls and redirect if already logged in and redirect in request.params
bzr revid: fme@openerp.com-20140319155333-zt0np33m1361pyk3
2014-03-19 16:53:33 +01:00
Denis Ledoux 8d52e36fd8 [FIX] crm: convert to opportunity (single lead) display losts
bzr revid: dle@openerp.com-20140319153956-iilonexkeng1fudl
2014-03-19 16:39:56 +01:00
Fabien Meghazi 0ce08c6f20 [IMP] /web/login redirects if already logged in and redirect is present in request.params
bzr revid: fme@openerp.com-20140319153345-n2u9zfovts89a340
2014-03-19 16:33:45 +01:00
Thibault Delavallée 38ae695d00 [IMP] payment modules: added provider selection field that is different
from the name. This allows to distinguish name and provider. Provider is a more
technical field, used to call some specific methods (<provider>_method_name). The
name field is used for display on the website.

Code and views udpated accordingly.

bzr revid: tde@openerp.com-20140319144608-0i4rv520l0bh53f0
2014-03-19 15:46:08 +01:00
Kersten Jeremy 310bcc4d68 [IMP] Aged Partner Balance - Add selection in wizard to allow to choose the target_move. Customer was unable to make an aged balance with all payments move but only with the move validated.
bzr revid: jke@openerp.com-20140319143346-h3f4y77d736w5lc1
2014-03-19 15:33:46 +01:00
Denis Ledoux b245af63b5 [FIX] website_sale: do not display product categories with no products
bzr revid: dle@openerp.com-20140319141130-dease119j9b2l2fh
2014-03-19 15:11:30 +01:00
Simon Lejeune 874658f4b0 [MERGE] trunk
bzr revid: sle@openerp.com-20140319134710-8npwgn2oylqiaft9
2014-03-19 14:47:10 +01:00
Thibault Delavallée 10babec89d [MERGE] [FIX] Merged branch holding some fixes for the newly
(badly ?) introduced module website_mail_group: subscribe / unsubscribe now working,
pager now working. Some redesign will probably land in trunk if we have time
as the current layout is not very efficient.

bzr revid: tde@openerp.com-20140319133309-33vni7479w5q5tu0
2014-03-19 14:33:09 +01:00
Parth Gajjar (Open ERP) b8d87606f0 [IMP] added gengo statistics, displayed inprogress elements
bzr revid: pga@tinyerp.com-20140319133121-31umju0ea84sm93y
2014-03-19 19:01:21 +05:30
Kersten Jeremy 0b237def4d [FIX] Add tack_visibility on field 'name' from model : project. That's allow to know which Project is concerned by the subtype.
bzr revid: jke@openerp.com-20140319115057-55h9fh7y7x2nu9ik
2014-03-19 12:50:57 +01:00
Thibault Delavallée b484da7e73 [FIX] [IMP] website_mail: improved and fixed the 'subscribe button'.
This button is used to perform a 'message_subscribe' or 'message_unsubscribe' on some
documents. It is notably used to add a 'Subscribe' button in some pages that subscribe
the user to a mailing list (aka mail.group).
This branch fixes some subscribe/unsubscribe issues, better manages the public user,
use the session to remember whether a public user has subscribe to a mailing list,
and uses already-existing code to manage partners.

bzr revid: tde@openerp.com-20140319113129-qd2bok52hvf1ybiu
2014-03-19 12:31:29 +01:00
Dharmraj Jhala (OpenERP) 6f57d45b12 [IMP] improved code as suggested
bzr revid: dizzy.zala@gmail.com-20140319112737-b6vwgwff8w9ywy9f
2014-03-19 16:57:37 +05:30
chm@openerp.com 00aa1b69dc [FIX] website tour: don't hide error in test mode if openerp don't exist
bzr revid: chm@openerp.com-20140319102348-rb1tkgd14nca6o15
2014-03-19 11:23:48 +01:00
chm@openerp.com f857905a61 [FIX] website tour: remove testPath from test buy event and product, who hide the real error
bzr revid: chm@openerp.com-20140319093338-f5l9mgmkw2yyl0fx
2014-03-19 10:33:38 +01:00
chm@openerp.com b80d06d327 [FIX] website tour: reset tour before console.log 'ok' or 'error' who close phantomjs tour
bzr revid: chm@openerp.com-20140319092012-v83w99ts6z0apgl0
2014-03-19 10:20:12 +01:00
Gery Debongnie 8ac730074a [MERGE] merge from trunk into local branch
bzr revid: ged@openerp.com-20140319090153-aczgy9uqqw72702x
2014-03-19 10:01:53 +01:00
Dharmraj Jhala (OpenERP) e07861bb19 [MERGE] with latest trunk addons
bzr revid: dizzy.zala@gmail.com-20140319090139-1eaj26atlah94n7y
2014-03-19 14:31:39 +05:30
Gery Debongnie f4cfed3f0e [IMP] improves the look of the stat buttons in form view: the statinfo widget displays the information on two lines, the padding/margin/width have been adjusted. (addon web)
bzr revid: ged@openerp.com-20140319085718-9v1l3pb43ee6qws6
2014-03-19 09:57:18 +01:00
chm@openerp.com a762af1f21 [FIX] website_sale: payment get status url (ending slash); fix debbuger template url scripts
bzr revid: chm@openerp.com-20140319085700-b4v9iu51a9jtzty3
2014-03-19 09:57:00 +01:00
Fabien Meghazi 40fdb08a7d [WIP] base_import_module
bzr revid: fme@openerp.com-20140319085343-zkee3rmqc9dzpa7h
2014-03-19 09:53:43 +01:00
chm@openerp.com 8db7982726 [IMP] website_sale: remove print
bzr revid: chm@openerp.com-20140319083054-x10c4m7ecxk9202o
2014-03-19 09:30:54 +01:00
Launchpad Translations on behalf of openerp edf0f26d59 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319055226-bk4bs5tp612t236j
2014-03-19 05:52:26 +00:00
Kersten Jeremy 758d467982 [FIX] In mail text2Html, replace url (http or ftp) before the replacement of return line, else some return line was sometimes considered as the link.
Eg : <a href="http://www.google.com<br/><br/>Puis">http://www.google.com<br/><br/><br/>Puis</a>

bzr revid: jke@openerp.com-20140318203051-lk92fjgwltkwbk68
2014-03-18 21:30:51 +01:00
Kersten Jeremy 66918d6e32 [FIX] Force recompute the size of column for calendar, else on small screen, the size of columns for the last day is not the same that others.
lp bug: https://launchpad.net/bugs/1290942 fixed

bzr revid: jke@openerp.com-20140318174445-rjv3xq2rcxr3n5y9
2014-03-18 18:44:45 +01:00
Kersten Jeremy e50b3bf7ff [FIX] Only set table-row for kanban view (for drag and drop), Else the switch between eg view Calendar and view form (without pass by another view (on IE)) does not work properly.
lp bug: https://launchpad.net/bugs/1294059 fixed
lp bug: https://launchpad.net/bugs/1097219 fixed

bzr revid: jke@openerp.com-20140318165622-kb4j5zz899lciz8v
2014-03-18 17:56:22 +01:00
chm@openerp.com ed2743f755 merge upstream
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
chm@openerp.com 42ba805cc8 [WIP] rev me
bzr revid: chm@openerp.com-20140318153456-gwz47zs8il23rwii
2014-03-18 16:34:56 +01:00
Denis Ledoux cac0c9600a [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9154 revid:dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: dle@openerp.com-20140318152621-l6jxc0bbbofm7fzg
2014-03-18 16:26:21 +01:00
Denis Ledoux 1225c8b530 [FIX] purchase: for drop shipping po, the supplier of the picking was the customer address, which is obviously wrong, it should be the supplier of the po
bzr revid: dle@openerp.com-20140318151456-qw896i1t55wgwhkm
2014-03-18 16:14:56 +01:00
Kersten Jeremy 9d65ff69da [FIX] Hack css for graph view
The best way will be to set svg height, but IE9 does not understand height="xxx". So we override the overflow set by bootstrap.css to fix it.

bzr revid: jke@openerp.com-20140318150059-nd6bdd58uvr1s4um
2014-03-18 16:00:59 +01:00
Parth Gajjar (Open ERP) c49befd59f [ADD] added website_gengo module
bzr revid: pga@tinyerp.com-20140318133036-j1hcrz7bybolw44u
2014-03-18 19:00:36 +05:30
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
Dharmraj Jhala (OpenERP) ac8b0fcfc5 [IMP] improved code as suggested
bzr revid: dizzy.zala@gmail.com-20140318130903-6u2t94bfvh98jby7
2014-03-18 18:39:03 +05:30
Kersten Jeremy af8147fc95 [FIX] Display placeholder on IE9.
The hack was not working since we migrate jQuery 1.8 to 1.9 because $.browser has been removed.

bzr revid: jke@openerp.com-20140318130655-yqgj851enc0293hr
2014-03-18 14:06:55 +01:00
chm@openerp.com 1395c9ee0e [IMP] website: snippet editor: change size automatic button into a cross between resize handler
bzr revid: chm@openerp.com-20140318130414-yb29wtm7oo4bammz
2014-03-18 14:04:14 +01:00
Christophe Simonis a2f9619e26 [MERGE] forward port of branch saas-3 up to revid 3975 chs@openerp.com-20140318115516-sn3laxqseam1oz3f
bzr revid: chs@openerp.com-20140318124050-ul3reev0vvmgqxz8
2014-03-18 13:40:50 +01:00
chm@openerp.com 5b722a036a [PATCH] sle
bzr revid: chm@openerp.com-20140318123225-zgn83zslr65z0wej
2014-03-18 13:32:25 +01:00
chm@openerp.com f9c68abfb5 [FIX] website_sale: test must inject tour
bzr revid: chm@openerp.com-20140318115631-aiifjcqmtubiofb0
2014-03-18 12:56:31 +01:00
Christophe Simonis 541a5d3f82 [MERGE] forward port of branch saas-2 up to revid 3904 chs@openerp.com-20140318112743-tqv492026y2pnbff
bzr revid: chs@openerp.com-20140318115516-sn3laxqseam1oz3f
2014-03-18 12:55:16 +01:00
Christophe Simonis acb010a985 [MERGE] forward port of branch 7.0 up to revid 4162 launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0
bzr revid: chs@openerp.com-20140129095637-mbfz82r5pyz4dctc
bzr revid: dle@openerp.com-20140210140818-5mtk1qhheo219bm1
bzr revid: dle@openerp.com-20140214114445-krexrwm9o2nrxepk
bzr revid: mat@openerp.com-20140219111353-cxo860z7ctz7om30
bzr revid: dle@openerp.com-20140221120519-1pj3wc8kqgkr5uda
bzr revid: chs@openerp.com-20140318112743-tqv492026y2pnbff
2014-03-18 12:27:43 +01:00
chm@openerp.com 31893ce1bb [FIX]
bzr revid: chm@openerp.com-20140318111830-pudmv5okc69lo8a5
2014-03-18 12:18:30 +01:00
chm@openerp.com f9579073fe [FIX] website: color of Edit Master link for themes. CSS less specific
bzr revid: chm@openerp.com-20140318111442-mbrhrmtnwy3uxc5y
2014-03-18 12:14:42 +01:00
chm@openerp.com bc578bd6a7 [IMP] website_sale: activate tests
bzr revid: chm@openerp.com-20140318103014-bfjkkqka98tc3hmv
2014-03-18 11:30:14 +01:00
chm@openerp.com abe8e7208e [MERGE] from trunk
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
chm@openerp.com 3624a3beb2 [IMP] website_mail: refactor follow button; add partner_id in session for public user
bzr revid: chm@openerp.com-20140318101505-4yivw8h5oujyhm9b
2014-03-18 11:15:05 +01:00
Kersten Jeremy 77622d3b24 [FIX] Fix css which make unusable the option dropdown for unpublished product. When an user was hover on a product not published and was trying to go in submenu, he had lost cursor, because he was changing div due to opacoty little than 1.
bzr revid: jke@openerp.com-20140318092341-ncgb173y0xfiaj87
2014-03-18 10:23:41 +01:00
Gery Debongnie 373cb908ca [FIX] correctly handle the case where a 'stat button' has a string attribute (it needs to be displayed in a div instead of a span) (addon web)
bzr revid: ged@openerp.com-20140318085525-vllzeycht9841g41
2014-03-18 09:55:25 +01:00
ajay javiya (OpenERP) f2b51c7b69 [FIX] : subscribe/unsubscribe button not work
[IMP]: layout

bzr revid: aja@tinyerp.com-20140318083559-jwc196mypc67p5x4
2014-03-18 14:05:59 +05:30
Dharmraj Jhala (OpenERP) 3566b69374 [MERGE] with latest trunk addons
bzr revid: dizzy.zala@gmail.com-20140318065716-m8wxkwonpu7gpp3a
2014-03-18 12:27:16 +05:30
Launchpad Translations on behalf of openerp 596cc96b7e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062135-gqvoka8hm41pe762
2014-03-18 06:21:35 +00:00
Denis Ledoux ea4e924208 [FIX] crm: remove the fact that the convert to opp button is hidden if the lead has probability 100: this is possible that you want to convert it anyway
bzr revid: dle@openerp.com-20140317172415-f5thfl78sxx2cb1z
2014-03-17 18:24:15 +01:00
Denis Ledoux 112fe22347 [FIX] point_of_sale: prevent duplicated order posting
bzr revid: dle@openerp.com-20140317164131-eewyqmzz5niebz2a
2014-03-17 17:41:31 +01:00
Gery Debongnie e8198d74b6 [IMP] various tweaks to stat_button, to fix issues mentioned in code review. This is mostly cosmetic cleanups, only notable change is that stat_button is now a proper html button instead of a label (addon web)
bzr revid: ged@openerp.com-20140317152710-c33q8kua33o001la
2014-03-17 16:27:10 +01:00
Xavier Morel 5196cd6e8c [FIX] website: set inherit_branding in test contexts to trigger generation of relevant edition attributes
bzr revid: xmo@openerp.com-20140317152502-6a2agi1xjooi516e
2014-03-17 16:25:02 +01:00
chm@openerp.com 479da40e2d [IMP] website snippet: add onblur, onfocus, onremove, onclone method on snippet options. Change data-class into data-value for designer comprehention; fix slider unique id
bzr revid: chm@openerp.com-20140317144610-153lbizujkccu5en
2014-03-17 15:46:10 +01:00
chm@openerp.com d87bc392ce [IMP] website snippet option: rename data-class into data-value
bzr revid: chm@openerp.com-20140317144254-18cscu2yx5thmb89
2014-03-17 15:42:54 +01:00
chm@openerp.com b8071f8bc7 [MERGE] from trunk
bzr revid: chm@openerp.com-20140317142550-53fky76kjdc04s4h
2014-03-17 15:25:50 +01:00
chm@openerp.com 363bbd00db [FIX] website_sale: display empty message for public user and allow admin to edit 'no product found' message
bzr revid: chm@openerp.com-20140317141749-vmsx9x1kkmygnc61
2014-03-17 15:17:49 +01:00
chm@openerp.com d3111df3aa [FIX] website: The user does not see the content menu because of the tutorial is hover
bzr revid: chm@openerp.com-20140317141324-th65fhx512h2p1fa
2014-03-17 15:13:24 +01:00
Xavier Morel cd4f83122a [FIX] reduce span of paragraph spacer thing to not break layout
bzr revid: xmo@openerp.com-20140317135144-hvuxshfp4cjudnbh
2014-03-17 14:51:44 +01:00
chm@openerp.com 25732de9ce [FIX] website tour: typo for banner (from usertest feedback)
bzr revid: chm@openerp.com-20140317133700-8xrneej6aytua4j4
2014-03-17 14:37:00 +01:00
Frédéric van der Essen d5a730a0b3 [WIP] hw_escpos: printing client-side defined xml templates
bzr revid: fva@openerp.com-20140317132906-uyr7h1oce8pptny9
2014-03-17 14:29:06 +01:00
Fabien Meghazi 4c5d238191 [FIX] website translation won't properly find inherited view's id
bzr revid: fme@openerp.com-20140317132416-nu10ltrskc8d0orf
2014-03-17 14:24:16 +01:00
Xavier Morel d3c7750b96 [FIX] inject WORD JOINER inside p so they don't seemingly disappear after saving
bzr revid: xmo@openerp.com-20140317124056-kg2jngp2mg769v7m
2014-03-17 13:40:56 +01:00
Denis Ledoux d8d312768c [FIX] product: overwritten name_search of product.pricelist ignored lang translations. It worked prior to saas-3 because the pricelist filter in the searchview used a selection widget, which did not care about translations
bzr revid: dle@openerp.com-20140317120126-qx4wrkqfdu3nr3sp
2014-03-17 13:01:26 +01:00
chm@openerp.com 19aacaaea8 [FIX] website: readability block with container css
bzr revid: chm@openerp.com-20140317114956-j5sqt6flie5fla31
2014-03-17 12:49:56 +01:00
chm@openerp.com 44bebab682 [FIX] website: typo: message let the user think that he can change the mobile view while he cannot
bzr revid: chm@openerp.com-20140317114938-3ghhwm0km3u5wyu1
2014-03-17 12:49:38 +01:00
Xavier Morel 8ffc4d0a5a [ADD] support for presized fields in website/image
also add presized field to attachments (automatically computed from datas)

bzr revid: xmo@openerp.com-20140317104251-ddsa9cfpq1vkk2k1
2014-03-17 11:42:51 +01:00
chm@openerp.com eddd7884d0 [IMP] website tour: add href when time overlaps
bzr revid: chm@openerp.com-20140317094543-xwxmx63emzn5gmrh
2014-03-17 10:45:43 +01:00
chm@openerp.com 34b6fac77a [FIX] website_sale: test tour shop_buy_product (step: 'select ipod 32Go'): remove teminal backslash in products grid view
bzr revid: chm@openerp.com-20140317094118-5gsddsfhmisi7xs3
2014-03-17 10:41:18 +01:00
chm@openerp.com 89eb355069 [FIX] website tour: create a stub for bootstrap tour in automatic/test mode (need for full test and hide real bug for tour test)
bzr revid: chm@openerp.com-20140317083442-imylv9v5fafjxhwr
2014-03-17 09:34:42 +01:00
chm@openerp.com 83f4c339b7 [IMP] website: tour: create a stub for bootstrap tour in automatic/test mode (because no need all time, and hide sometime the real bug)
bzr revid: chm@openerp.com-20140317080313-e8uern0s3wwua52h
2014-03-17 09:03:13 +01:00
chm@openerp.com 6fc418883e [FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140317080145-6l5mk4q05uf639li
2014-03-17 09:01:45 +01:00
chm@openerp.com 4aed1443fd [FIX] website_membership: ending backslash link
bzr revid: chm@openerp.com-20140317061419-h26ynajfnfia799w
2014-03-17 07:14:19 +01:00
Launchpad Translations on behalf of openerp 9965b2c434 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315072920-dmiymtbhrgu87wm0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316060652-akf1fti2hc1a9vmm
bzr revid: launchpad_translations_on_behalf_of_openerp-20140317050959-2xx2aoylhn6a28fo
2014-03-17 05:09:59 +00:00
Launchpad Translations on behalf of openerp e7ae07cb09 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140317044820-8pliqfbb7gbu8bbr
2014-03-17 04:48:20 +00:00
Antony Lesuisse 973ea59b28 [FIX] website_sale disabling tests while i rewrite Tour
bzr revid: al@openerp.com-20140316213304-gh0898xwonhca36z
2014-03-16 22:33:04 +01:00
Antony Lesuisse ddf66c0621 [FIX] website_mail_group remove demo from manifest
bzr revid: al@openerp.com-20140316181851-qn8cuk5lwqec5fts
2014-03-16 19:18:51 +01:00
Antony Lesuisse af1c00ac3b [FIX] typo remove import
bzr revid: al@openerp.com-20140316173911-e4z89t8bgoxvz6bl
2014-03-16 18:39:11 +01:00
Antony Lesuisse af216148ca [REM] separate command to run test, as --test-enable now works
bzr revid: al@openerp.com-20140316173406-ow8q7kayp1mw42b6
2014-03-16 18:34:06 +01:00
Antony Lesuisse c93b466d32 [FIX] website tour, prepare for manual injection
- reorder website.js in a choerent way
- remove injectable website.tour.test.js

We will do injection manually using website.inject_tour, in the mean time only
non injection test are supported, fully disable test needing inject, until fme
merge its fix.

bzr revid: al@openerp.com-20140316165442-p82wqwv82559oact
2014-03-16 17:54:42 +01:00
Antony Lesuisse 0772c99bcb [FIX] website test, remove useless test, waitfor banner fix
bzr revid: al@openerp.com-20140316144546-agpgmlwxa532xxmb
2014-03-16 15:45:46 +01:00
Antony Lesuisse e23ce63133 [FIX] website tests crawler, admin password != super admin password
bzr revid: al@openerp.com-20140316142302-7xm0sputqgadihs0
2014-03-16 15:23:02 +01:00
Antony Lesuisse 5cc7237f63 [REM] useless jsonrpc tests and controllers
bzr revid: al@openerp.com-20140316141228-0c35ymruttd5mx2j
2014-03-16 15:12:28 +01:00
Fabien Pinckaers f497f319a0 [MERGE] Mailing List Archives for Website
bzr revid: fp@tinyerp.com-20140316123800-bqbk34ixeiure75d
2014-03-16 13:38:00 +01:00
Fabien Pinckaers 21cb5da695 [IMP] removed unsed files
bzr revid: fp@tinyerp.com-20140316123407-snoyaoybyl45l6xl
2014-03-16 13:34:07 +01:00
Fabien Pinckaers d143e09ff5 [IMP] Mailing List Fixes
bzr revid: fp@tinyerp.com-20140316123220-5hq7e3f6p7fzbr96
2014-03-16 13:32:20 +01:00
Fabien Pinckaers d5c63e3205 [MERGE] trunk
bzr revid: fp@tinyerp.com-20140316122101-angijeo5fmr5j8v7
2014-03-16 13:21:01 +01:00
Fabien Pinckaers 675a71b2b8 [IMP] attachments on messages
bzr revid: fp@tinyerp.com-20140316113742-odae0ph3a1qrqn12
2014-03-16 12:37:42 +01:00
Fabien Pinckaers 9d9e6007fe [IMP] Clean CTA
bzr revid: fp@tinyerp.com-20140316110240-g9esx75vt2qmxcic
2014-03-16 12:02:40 +01:00
Fabien Pinckaers fb64b578e8 [IMP] Cleaning Archives
bzr revid: fp@tinyerp.com-20140316104022-fps64jlo8rpssf9m
2014-03-16 11:40:22 +01:00
Launchpad Translations on behalf of openerp 948799e259 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315070651-iyi1g70tarcqvhdc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315064235-n9sb0125g9bboyb4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316054224-hr4a70bglfizxqyy
2014-03-16 05:42:24 +00:00
chm@openerp.com b370a4e695 [FIX] website: test tour: must inject tour in page
bzr revid: chm@openerp.com-20140314180705-fjx0uetgyug1diaw
2014-03-14 19:07:05 +01:00
chm@openerp.com d5ddf5152c [FIX] website: remove backslash from redirect with enable_editor
bzr revid: chm@openerp.com-20140314180029-iaeq4i6735pcw100
2014-03-14 19:00:29 +01:00
Kersten Jeremy 7c8e468dee [FIX] Convert offset aware into offset naive before to use timedelta. That remove traceback when we try to get notification (notif or mail) for a recurrent event
bzr revid: jke@openerp.com-20140314165641-6bwyxe3wej4upqzh
2014-03-14 17:56:41 +01:00
chm@openerp.com b9ff076c73 [FIX] css: add important in .fa class for FontAwesome font. The font can't be overwrited by themes and custom css without important arguments
bzr revid: chm@openerp.com-20140314164244-siih3eo271govt27
2014-03-14 17:42:44 +01:00
chm@openerp.com d0e2834c2d [FIX] website: css fixes for themes
bzr revid: chm@openerp.com-20140314164028-em7mrfse2dx9doao
2014-03-14 17:40:28 +01:00
chm@openerp.com b220dc926e [FIX] website: can't see edit button because css with overflow hidden for all tag. Aplly css only on carousel, paralax and blockquote
bzr revid: chm@openerp.com-20140314163639-l086jn568rtti5mv
2014-03-14 17:36:39 +01:00
chm@openerp.com 410ec52276 [MERGE] website: add optional 'action' in managment edit button to laod one specific backend view
bzr revid: chm@openerp.com-20140314162909-ff0obqbw6j7lalmz
2014-03-14 17:29:09 +01:00
chm@openerp.com 353bbdc2c3 [FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
2014-03-14 17:23:46 +01:00
Martin Trigaux 4bf3a10056 [MERGE] [FIX] stock: add some missing context, courtesy of Lionel Sausin (Numérigraphe)
bzr revid: mat@openerp.com-20140314160938-px91g81280qff635
2014-03-14 17:09:38 +01:00
chm@openerp.com 79e1813d6e [MERGE] from trunk
bzr revid: chm@openerp.com-20140314151011-xhhsovbsg1r0sbwk
2014-03-14 16:10:11 +01:00
chm@openerp.com 264186541b [IMP] website: remove css .fa and write important in font fa in web branch
bzr revid: chm@openerp.com-20140314150446-9g4n4ixws4cedfxp
2014-03-14 16:04:46 +01:00
Olivier Dony 6a14fddc35 [MERGE] Forward port of saas-2 fixes up to rev 9152 rev-id odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: odo@openerp.com-20140314143911-c2mxesg31xezeyr9
2014-03-14 15:39:11 +01:00
chm@openerp.com 8820d9f188 [FIX] website: can't edit baner image. Add contentEditable on image tag.
bzr revid: chm@openerp.com-20140314143049-8sp1q32i4x4q76ga
2014-03-14 15:30:49 +01:00
chm@openerp.com 10af6ef168 [rev] website: remove js fix from this branch
bzr revid: chm@openerp.com-20140314142244-efpgx9cohx3k337s
2014-03-14 15:22:44 +01:00
Gery Debongnie af61fd53bc [IMP] removes the tooltip when mouse hovers over a 'percentpie' widget (addon web)
bzr revid: ged@openerp.com-20140314142155-u8suij5tikxwd0zi
2014-03-14 15:21:55 +01:00
chm@openerp.com 62f0b963af [ADD] missing css file
bzr revid: chm@openerp.com-20140314141910-f19pz5js5yatw2y4
2014-03-14 15:19:10 +01:00
chm@openerp.com 8b94f855b6 [FIX] website theme css
bzr revid: chm@openerp.com-20140314134642-2yhbgcd5gxb4xw0r
2014-03-14 14:46:42 +01:00
Gery Debongnie d849c6521d [IMP] removes the 'stat_button' widget and modifies button to fulfill that role. Now, a button with a class 'oe_stat_button' will be displayed differently (look in form views) (addon web). Also removes the useless widget x2many
bzr revid: ged@openerp.com-20140314134456-wy6ya3zz72zx3yo2
2014-03-14 14:44:56 +01:00
Martin Trigaux 53922c9593 [FIX] pager: revert of revision 4159, the pager was disapearing when going in editable mode (which is more problematic that the issue rev 4159 was trying to fix)
bzr revid: mat@openerp.com-20140314132854-8ie8sosx9xecuww4
2014-03-14 14:28:54 +01:00
Olivier Dony a9f98e4990 [FIX] pad: improve pad bootstrap, prevent creating useless empty pads, avoid edition warning in read-only mode for new pads, translate messages
Added a small method to detect the proper server configuration,
and make it degrade gracefully if the method is not present.
This avoids having to force a pad URL generation in order to
test the config (possibly creating useless pads).
Add a user-friendly message when the pad has not yet been
initialized for a given record, in read-only mode.

bzr revid: odo@openerp.com-20140314131849-rnjvk1pqpiyvtc1c
2014-03-14 14:18:49 +01:00
Christophe Simonis b93ae13482 [FIX] share wizard: delete wizard lines in cascade
bzr revid: chs@openerp.com-20140314115936-8y6eg51tzmsdlb85
2014-03-14 12:59:36 +01:00
Christophe Simonis 5af434260f [FIX] calendar: correct test: select1 field has been renamed
bzr revid: chs@openerp.com-20140314113955-acyplukwyu2f7142
2014-03-14 12:39:55 +01:00
chm@openerp.com 51a0bb001b [IMP] website snippet: add onfocus, onblur, onclone and onremove on snippet options; fix banner id
bzr revid: chm@openerp.com-20140314113510-dqj70i85z41q5j0k
2014-03-14 12:35:10 +01:00
Martin Trigaux 08e07af590 [FIX] pager: do not try to toggle the visibility if the pager do not exists yet
bzr revid: mat@openerp.com-20140314112709-0sqq6tcpmza34q1e
2014-03-14 12:27:09 +01:00
Christophe Simonis b3bb47076b [MERGE] forward port of branch saas-2 up to revid 9151 chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: chs@openerp.com-20140314105753-7a7wh9a1z99azgfj
2014-03-14 11:57:53 +01:00
Olivier Dony 9e002d9233 [FIX] mail.thread: avoid error if `message_unread_count` has been popped 1 line earlier
bzr revid: odo@openerp.com-20140314104605-qi7eqj2g37dvxvc3
2014-03-14 11:46:05 +01:00
Christophe Simonis 44a99c0976 [FIX] calendar: correct recurrency end date computation
bzr revid: chs@openerp.com-20140314094809-0wuus62tob8vtyi0
2014-03-14 10:48:09 +01:00
Launchpad Translations on behalf of openerp aba3459889 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140314065823-xdw7aa9ye4j200pp
bzr revid: launchpad_translations_on_behalf_of_openerp-20140314065836-tn2fv9smot0omj8f
2014-03-14 06:58:36 +00:00
Launchpad Translations on behalf of openerp 9bc57fdc08 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140314063654-damk0l1vy2i2bk34
2014-03-14 06:36:54 +00:00
Fabien Pinckaers 55ec0feba2 [IMP] Subscribe data
bzr revid: fp@tinyerp.com-20140313194801-24f5f9s03rk663d6
2014-03-13 20:48:01 +01:00
Kersten Jeremy 808e55d25c [FIX] Revert commit 9208 - Calendar is a module auto install. So we dont need to redirect
bzr revid: jke@openerp.com-20140313184043-8vy1252h3wpghx12
2014-03-13 19:40:43 +01:00
Denis Ledoux 477a87e2b1 [FIX] web: widget selection on many2one in search view is deprecated, it was used in some cases but it is now pointless as the basic many2one handle these cases
bzr revid: dle@openerp.com-20140313182004-symalqn8m9offm14
2014-03-13 19:20:04 +01:00
Christophe Simonis c4a6bb75ff [FIX] calendar: rename leftover crm.meeting into calendar.event forgotten during previous commit
bzr revid: chs@openerp.com-20140313175427-wbzt8innt0d874xy
2014-03-13 18:54:27 +01:00
Christophe Simonis ee8174806e [MERGE] forward port of branch saas-2 up to revid 9149 chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: mat@openerp.com-20140313091920-bahej198pu339e28
bzr revid: chs@openerp.com-20140313170940-yoqg6izfw74s2i3a
2014-03-13 18:09:40 +01:00
Martin Trigaux 5fa7e40a9f [MERGE] [FIX] base_calendar: correct the set method for rrule (opw 605088)
- create hook method to fix the invalid call while keeping the signature of the old methdo
- remove undeclared variable
- force the 'byday' field (type selection) to be a string value instead of an integer

bzr revid: mat@openerp.com-20140313155131-e90stgoh8bz8tgvg
2014-03-13 16:51:31 +01:00
Martin Trigaux 32befa63e8 [FIX] pager show the pagger earlier in the loading process to avoid to mix the list and form pagers when fast switching (and slow network)
bzr revid: mat@openerp.com-20140313154228-70jytisdwlf3sfbo
2014-03-13 16:42:28 +01:00
Martin Trigaux 219e1a6218 [IMP] add test
bzr revid: mat@openerp.com-20140313153757-nj9nn52u7kxpfg8i
2014-03-13 16:37:57 +01:00
Christophe Simonis b43ffa52c2 [FIX] pad: use server to get pad content
bzr revid: chs@openerp.com-20140313153535-ogyip9tfm2hkwn1f
2014-03-13 16:35:35 +01:00
Martin Trigaux 125261499d [FIX] if only one id, convert to list
bzr revid: mat@openerp.com-20140313151612-saoc3a73x1cwvgbg
2014-03-13 16:16:12 +01:00
Martin Trigaux 3e7b873987 [FIX] base_calendar: correct the invert call to the function field rrule.
Create new hook method with valid signature.
Keep the old one for compatibility reasons.
Force the value of 'byday' (type selection) to be a string instead of integer.

bzr revid: mat@openerp.com-20140313150823-vba9qulj549v37t9
2014-03-13 16:08:23 +01:00
chm@openerp.com aa412d99ec [FIX] website tour: create a stub for bootstrap tour in automatic/test mode
bzr revid: chm@openerp.com-20140313142258-wblpqpwp9oubboc9
2014-03-13 15:22:58 +01:00
Gery Debongnie 500fc0790c [IMP] chooses better color for the percentpie widget in form view
bzr revid: ged@openerp.com-20140313141216-o3w9ykphm0nuo61q
2014-03-13 15:12:16 +01:00
Christophe Simonis fc1607071a [FIX] stock: use fully qualified xmlid in *_view_ref context keys
bzr revid: chs@openerp.com-20140313134438-jcwhrm3demu4i99q
2014-03-13 14:44:38 +01:00
Simon Lejeune 77e56eea05 [REF] Changed seek(0) to flush when manipulating files and reordered the impors
bzr revid: sle@openerp.com-20140313133459-y3zvhhjby8pysew1
2014-03-13 14:34:59 +01:00
chm@openerp.com ba63094b9b [FIX] website_sale,website_event: can't create product and event. Why: controller and route are strict mode, remove / at the end of the route
bzr revid: chm@openerp.com-20140313132013-2foflswtdd5fp8hb
2014-03-13 14:20:13 +01:00
chm@openerp.com 9c24ebbaff [IMP] website snippet: remove data-snippet-id and use only jquery selectors. Snippets became only dom item and options is transversal. Create dynamic snippet
bzr revid: chm@openerp.com-20140313130907-mpxzhdvkrr6w6uq3
2014-03-13 14:09:07 +01:00
chm@openerp.com 9496d823e9 [FIX] website: snippet dropdown options
bzr revid: chm@openerp.com-20140313130556-u3m9gbdjwi0zo2v1
2014-03-13 14:05:56 +01:00
Gery Debongnie f4519c11f2 [IMP] css tweaks to stat buttons
bzr revid: ged@openerp.com-20140313124855-h8ez7ajj31u1x9vf
2014-03-13 13:48:55 +01:00
Gery Debongnie d2637811de [IMP] adds PercentPie and X2Many widgets to formview. PercentPie takes a field 'float' and displays a read-only pie chart to visualize the corresponding percent. X2Many takes a 1tomany or a manytomany field and display a read only string '<number of records> <label>'
bzr revid: ged@openerp.com-20140313124843-d4tc5zdz3lx2r8kt
2014-03-13 13:48:43 +01:00
Martin Trigaux 71d8f8f1c4 [FIX] pager: show the pagger earlier to avoid slow loading to mix list and form pagers when fast switching
bzr revid: mat@openerp.com-20140313123811-ej7lu53xp51kn6gu
2014-03-13 13:38:11 +01:00
chm@openerp.com 2390c9179b [MERGE] from trunk
bzr revid: chm@openerp.com-20140312140429-4x94dc1x70yfik1w
bzr revid: chm@openerp.com-20140313122048-1zrqhq6dbtv8jpad
2014-03-13 13:20:48 +01:00
Kersten Jeremy b92001f1d8 [IMP] Calendar - Add redirect to calendar module after the install of it
bzr revid: jke@openerp.com-20140313110002-m645txvytcrb40lr
2014-03-13 12:00:02 +01:00
chm@openerp.com e9fc839785 [FIX] website: css themes
bzr revid: chm@openerp.com-20140313102140-37okt41sx5nchx50
2014-03-13 11:21:40 +01:00
chm@openerp.com caa33bbbbf [FIX] website: edit banner image
bzr revid: chm@openerp.com-20140313102119-nh6byvyeosqsosfn
2014-03-13 11:21:19 +01:00
Lionel Sausin 8ee8e3668c [FIX] Add missing context to some calls
lp bug: https://launchpad.net/bugs/1291874 fixed

bzr revid: ls@numerigraphe.com-20140313095054-3506f3tan8eyqc61
2014-03-13 10:50:54 +01:00
Xavier Morel b1cd54f5e9 [FIX] CSS of link style pane
bzr revid: xmo@openerp.com-20140313093822-kpkufmmya0e21my2
2014-03-13 10:38:22 +01:00
Xavier Morel cd0434fb2a [IMP] context-sensitivity of toolbar commands (kinda, attempted)
bzr revid: xmo@openerp.com-20140313093707-gpaz7gmsd5zt2ck5
2014-03-13 10:37:07 +01:00
Xavier Morel 0308b7968c [IMP] don't allow HTML formatting in non-HTML fields
bzr revid: xmo@openerp.com-20140313093202-02s734ucabvkckli
2014-03-13 10:32:02 +01:00
ajay javiya (OpenERP) 633ceff7fc [IMP] : join group button is visible to public user if public user will click on join group will ask to login
[IMP] : button color
[ADD] : 'Mailing List' menu in footer

bzr revid: aja@tinyerp.com-20140313092505-yr2uwmxafudtdju9
2014-03-13 14:55:05 +05:30
Denis Ledoux 2b762083a3 [FIX] website_sale: only display payment acquirers of the company of the quotation, or payment acquirers not linked to any company
bzr revid: dle@openerp.com-20140313085107-ie4ptew82p4rq9cy
2014-03-13 09:51:07 +01:00
Martin Trigaux 6abd78e753 [FIX] base_import: avoid name clash when importing ir.translation records. Call the orm method directly.
This hack is needed in 7.0 to avoid changes in the API.
Renaming the load method of ir.translation is the proper solution for trunk (done in server revision 5018)

bzr revid: mat@openerp.com-20140313082813-afjsj912q2idrhl5
2014-03-13 09:28:13 +01:00
Launchpad Translations on behalf of openerp ba823b0a63 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140313071540-nhiuwlanpkvorb8h
2014-03-13 07:15:40 +00:00
Launchpad Translations on behalf of openerp 584a88294f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140313061654-qs7tba29pn3cenc7
2014-03-13 06:16:54 +00:00
Fabien Pinckaers a8f130a2a8 [IMP] layout
bzr revid: fp@tinyerp.com-20140312211726-wnho0pedhl4u1qv8
2014-03-12 22:17:26 +01:00
Antony Lesuisse 84bd0f0581 [MERGE] db dump/restore new zip based file format
bzr revid: al@openerp.com-20140312182118-4u93tqmlfvofrz8p
2014-03-12 19:21:18 +01:00
Antony Lesuisse b0888ec29b [MERGE] db dump/restore new zip based file format
bzr revid: al@openerp.com-20140312181724-hs26iumd4na2avns
2014-03-12 19:17:24 +01:00
chm@openerp.com 4093259ec2 [WIP] website: fix css layout for themes
bzr revid: chm@openerp.com-20140312175519-o1ld0jo983ao7aaa
2014-03-12 18:55:19 +01:00
Denis Ledoux e13ac3153f [FIX] crm: get duplicated leads use email_split from tools
bzr revid: dle@openerp.com-20140312164459-gi7ol7huxx3gcbxi
2014-03-12 17:44:59 +01:00
Denis Ledoux 387dc3c911 [FIX] crm: crm to opp, get duplidated leads does not take losts and deads. + search algorithm imp
bzr revid: dle@openerp.com-20140312155453-fj9ngb988advvn8s
2014-03-12 16:54:53 +01:00
Fabien Meghazi a8f513f4f2 [MERGE] upstream
bzr revid: fme@openerp.com-20140312152942-egbzui0drs85wt7i
2014-03-12 16:29:42 +01:00
Denis Ledoux 5bf1608278 [FIX] crm_partner_assign: remove readonly of partner latitude and longitude, otherwise it is not possible to set the geolocation manually, and impossible to reset the geolocation if it is wrong
bzr revid: dle@openerp.com-20140312150736-r1orwkwzjy37tchp
2014-03-12 16:07:36 +01:00
Martin Trigaux 82692f11a0 [MERGE] [FIX] one2many fields: when sortign on a column of type m2o (format (id, name)), instead of sorting on the tuple (and then id), sort on the name_get value to match what is shown on the screen
bzr revid: mat@openerp.com-20140312150435-shq9hy3b9njkhxsn
2014-03-12 16:04:35 +01:00