pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port of branch saas-6 up to 081f21e

Browse Source
This commit is contained in:
Christophe Simonis
2015-08-06 17:44:09 +02:00
parent 95ac2cfd10 081f21eeec
commit 47f6b1bb32
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/stock.py
+1
View File
@@ -1431,6 +1431,7 @@ class stock_picking(models.Model):
'name': _('Extra Move: ') + name,
'state': 'draft',
'restrict_partner_id': op.owner_id,
'group_id': picking.group_id.id,
}
return res
addons/web_editor/static/src/js/rte.summernote.js
+3 -3
View File
@@ -192,6 +192,8 @@ eventHandler.popover.button.update = function ($container, oStyle) {
fn_boutton_update.call(this, $container, oStyle);
$container.find('.note-color').removeClass("hidden");
if (oStyle.image) {
$container.find('[data-event]').parent().removeClass("active");
@@ -212,8 +214,6 @@ eventHandler.popover.button.update = function ($container, oStyle) {
$container.find('button[data-event="resizefa"][data-value="1"]').toggleClass("active", !$container.find('.active[data-event="resizefa"]').length);
$container.find('button[data-event="imageShape"][data-value="fa-spin"]').toggleClass("active", $(oStyle.image).hasClass("fa-spin"));
$container.find('.note-color').removeClass("hidden");
} else {
@@ -228,7 +228,7 @@ eventHandler.popover.button.update = function ($container, oStyle) {
$container.find('button[data-event="resize"][data-value="0.25"]').toggleClass("active", width === "25%");
$container.find('button[data-event="imageShape"][data-value="shadow"]').toggleClass("active", $(oStyle.image).hasClass("shadow"));
if (!$(oStyle.image).is("img")) {
$container.find('.btn-group:has(button[data-event="imageShape"])').addClass("hidden");
}
openerp/tests/phantomtest.js
+1 -1
View File
@@ -93,8 +93,8 @@ function PhantomTest() {
"\nreferrer: " + document.referrer +
"\n\n" + (document.body && document.body.innerHTML)).replace(/[^a-z0-9\s~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "*");
console.log('<phantomLog>error ' + message + '</phantomLog>');
phantom.exit(1);
});
phantom.exit(1);
}, self.timeout);
// ----------------------------------------------------