[MERGE] Forward-port saas-11 up to 6490e652c3742e2752e4ee9f20af78f7e3fcbdbe

7 files changed, 9 insertions, 22 deletions

diff --git a/addons/l10n_cn/__manifest__.py b/addons/l10n_cn/__manifest__.py
index 02b2fcb1551..80c479ba517 100644
--- a/addons/l10n_cn/__manifest__.py
+++ b/addons/l10n_cn/__manifest__.py
@@ -27,5 +27,4 @@
         'data/res_country_state_data.xml',
         'data/account_account_type_data.xml',
     ],
-    'license': 'GPL-3',
 }
diff --git a/addons/l10n_cn_small_business/__manifest__.py b/addons/l10n_cn_small_business/__manifest__.py
index 1e45d2de892..c5e504f2da7 100644
--- a/addons/l10n_cn_small_business/__manifest__.py
+++ b/addons/l10n_cn_small_business/__manifest__.py
@@ -27,5 +27,4 @@
         'data/l10n_cn_small_business_chart_data.xml',
         'data/account_chart_template_data.yml',
     ],
-    'license': 'GPL-3',
 }
diff --git a/addons/l10n_cn_standard/__manifest__.py b/addons/l10n_cn_standard/__manifest__.py
index e29a1a4ecc1..d770d4eaa0f 100644
--- a/addons/l10n_cn_standard/__manifest__.py
+++ b/addons/l10n_cn_standard/__manifest__.py
@@ -36,5 +36,4 @@ Including the following data in the Accounting Standards for Business Enterprise
         'data/account_chart_template_data.xml',
         'data/account_chart_template_data.yml',
     ],
-    'license': 'GPL-3',
 }
diff --git a/addons/payment_sips/__manifest__.py b/addons/payment_sips/__manifest__.py
index a8c608d8774..6039f962009 100644
--- a/addons/payment_sips/__manifest__.py
+++ b/addons/payment_sips/__manifest__.py
@@ -1,22 +1,8 @@
 # -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Copyright Eezee-It
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+# Copyright 2015 Eezee-It
+
 {
     'name': 'Worldline SIPS',
     'version': '1.0',
diff --git a/addons/payment_sips/controllers/main.py b/addons/payment_sips/controllers/main.py
index c5b21fbf517..3af8e2c7b3e 100644
--- a/addons/payment_sips/controllers/main.py
+++ b/addons/payment_sips/controllers/main.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+# Copyright 2015 Eezee-It
+
 import json
 import logging
 import werkzeug
diff --git a/addons/payment_sips/models/payment.py b/addons/payment_sips/models/payment.py
index e9cd4d40e6b..f7024d3b025 100644
--- a/addons/payment_sips/models/payment.py
+++ b/addons/payment_sips/models/payment.py
@@ -1,5 +1,7 @@
 # coding: utf-8
 
+# Copyright 2015 Eezee-It
+
 import json
 import logging
 from hashlib import sha256
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index 53ee89c5c98..50a0d7f1154 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -59,7 +59,7 @@ class SaleOrder(models.Model):
             # Search for invoices which have been 'cancelled' (filter_refund = 'modify' in
             # 'account.invoice.refund')
             # use like as origin may contains multiple references (e.g. 'SO01, SO02')
-            refunds = invoice_ids.search([('origin', 'like', order.name)])
+            refunds = invoice_ids.search([('origin', 'like', order.name)]).filtered(lambda r: r.type in ['out_invoice', 'out_refund'])
             invoice_ids |= refunds.filtered(lambda r: order.name in [origin.strip() for origin in r.origin.split(',')])
             # Search for refunds as well
             refund_ids = self.env['account.invoice'].browse()