874658f4b0
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140319134710-8npwgn2oylqiaft9
2014-03-19 14:47:10 +01:00
edf0f26d59
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319055226-bk4bs5tp612t236j
2014-03-19 05:52:26 +00:00
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
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
02459f8d4a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
...
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
6d60e0ee29
[FIX] project: on project template duplication, keep original tasks stages
...
bzr revid: dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
2014-03-25 11:49:21 +01:00
91c3673949
[MERGE] [FIX] purchase_requisition: when getting the price based on the pricelist for a supplier, pass the missing supplier id (useful for pricelist based on supplier price) (opw 601890)
...
bzr revid: mat@openerp.com-20140325104613-t79wxl4y38ll82h0
2014-03-25 11:46:13 +01:00
38c255627e
[MERGE] l10n_fr: remove obsolete French taxes, following 2014 rate update, courtesy of Alexis de Lattre (Akretion)
...
bzr revid: odo@openerp.com-20140325104323-xtxthbopkhk350r4
2014-03-25 11:43:23 +01:00
8310cd1920
[FIX] sale: make invoice for SO grouped by partner based on partner_invoice_id instead of just partner_id
...
For two sale order, if the partner_id were different but the partner_invoice_id were identical, the make invoice grouped by partner created two different invoices
bzr revid: dle@openerp.com-20140325103226-vusygdpd74yha91m
2014-03-25 11:32:26 +01:00
a8d14c47df
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140325072122-d9jgtji9dmmytg8d
2014-03-25 07:21:22 +00:00
04f632820b
[FIX] sale: trigger signal manual invoice for make invoices wizard (not advance)
...
bzr revid: dle@openerp.com-20140324103427-yckncrnynvs5si8i
2014-03-24 11:34:27 +01:00
245e83d43b
[FIX] last version of wkhtmltopdf expects all file to have a doctype, inject one if not present
...
bzr revid: sle@openerp.com-20140324101731-eqzqins3s8uak1yd
2014-03-24 11:17:31 +01:00
6472e4155a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140322070453-bbx8zxmppthwar0s
bzr revid: launchpad_translations_on_behalf_of_openerp-20140323064412-l97e4rap18b68ab0
2014-03-23 06:44:12 +00:00
0871d10503
[FIX] survey: avoid duplicate partners on new users creation
...
bzr revid: dle@openerp.com-20140321135705-lrnxu3gsnkt4r5cd
2014-03-21 14:57:05 +01:00
2fa6706037
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4
2014-03-21 06:51:50 +00:00
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
be81326ee3
[FIX] survey: report not stored on filesystem
...
bzr revid: dle@openerp.com-20140320174835-kdha7ivs64vsvizt
2014-03-20 18:48:35 +01:00
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
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
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
42518c339a
[FIX] subscription: missing required dependency on `base`
...
bzr revid: odo@openerp.com-20140320091349-74zykqzf2ols3ja1
2014-03-20 10:13:49 +01:00
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
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
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
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
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
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
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
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
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
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
596cc96b7e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062135-gqvoka8hm41pe762
2014-03-18 06:21:35 +00:00
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
112fe22347
[FIX] point_of_sale: prevent duplicated order posting
...
bzr revid: dle@openerp.com-20140317164131-eewyqmzz5niebz2a
2014-03-17 17:41:31 +01:00
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
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
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
b8071f8bc7
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140317142550-53fky76kjdc04s4h
2014-03-17 15:25:50 +01:00
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
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
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
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
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
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
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
19aacaaea8
[FIX] website: readability block with container css
...
bzr revid: chm@openerp.com-20140317114956-j5sqt6flie5fla31
2014-03-17 12:49:56 +01:00
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
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
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
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
Simon Lejeune
Launchpad Translations on behalf of openerp
Christophe Simonis
Denis Ledoux
Martin Trigaux
Olivier Dony
Kersten Jeremy
Xavier Morel
Fabien Meghazi