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

6 files changed, 13 insertions, 6 deletions

diff --git a/addons/account_cancel/models/account_bank_statement.py b/addons/account_cancel/models/account_bank_statement.py
index 821014abf37..3e8fb178f2e 100644
--- a/addons/account_cancel/models/account_bank_statement.py
+++ b/addons/account_cancel/models/account_bank_statement.py
@@ -12,12 +12,18 @@ class BankStatement(models.Model):
     def button_draft(self):
         self.state = 'draft'
 
+    @api.multi
+    def button_cancel(self):
+        return super(BankStatement, self.with_context(bank_statement_cancel=True)).button_cancel()
+
+
 class BankStatementLine(models.Model):
     _inherit = 'account.bank.statement.line'
 
     @api.multi
     def cancel(self):
-        for line in self:
-            if line.statement_id.state == 'confirm':
-                raise Warning(_("Please set the bank statement to New before canceling."))
+        if not self.env.context.get('bank_statement_cancel'):
+            for line in self:
+                if line.statement_id.state == 'confirm':
+                    raise Warning(_("Please set the bank statement to New before canceling."))
         return super(BankStatementLine, self).cancel()
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index 90628e2d1e7..eaec9682bde 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -35,7 +35,7 @@
 {
     'name': 'Costa Rica - Accounting',
     'version': '1.0',
-    'url': 'http://launchpad.net/openerp-costa-rica',
+    'url': 'https://github.com/CLEARCORP/odoo-costa-rica',
     'author': 'ClearCorp S.A.',
     'website': 'http://clearcorp.co.cr',
     'category': 'Localization/Account Charts',
diff --git a/addons/l10n_hu/static/description/icon.png b/addons/l10n_hu/static/description/icon.png
index e69de29bb2d..4f9bf7a8102 100644
--- a/addons/l10n_hu/static/description/icon.png
+++ b/addons/l10n_hu/static/description/icon.png
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index d374598d517..c1460008ccd 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -181,7 +181,7 @@ class Partner(osv.osv):
             s = 4
             if partner_data.member_lines:
                 for mline in partner_data.member_lines:
-                    if mline.date_to >= today and mline.date_from < today:
+                    if mline.date_to >= today and mline.date_from <= today:
                         if mline.account_invoice_line and mline.account_invoice_line.invoice_id:
                             mstate = mline.account_invoice_line.invoice_id.state
                             if mstate == 'paid':
diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py
index 4ce62903d98..ebd38f94139 100644
--- a/addons/website_membership/controllers/main.py
+++ b/addons/website_membership/controllers/main.py
@@ -45,7 +45,7 @@ class WebsiteMembership(http.Controller):
             today = time.strftime(DEFAULT_SERVER_DATE_FORMAT)
             base_line_domain += [
                     ('membership_id', '=', membership_id), ('date_to', '>=', today),
-                    ('date_from', '<', today), ('state', '=', 'paid')
+                    ('date_from', '<=', today), ('state', '=', 'paid')
             ]
             membership = product_obj.browse(cr, uid, membership_id, context=context)
         else:
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index ad7a4185cb3..a59708af082 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -356,6 +356,7 @@ class html(text):
     def to_field_args(self):
         args = super(html, self).to_field_args()
         args['sanitize'] = self._sanitize
+        args['strip_style'] = self._strip_style
         return args
 
 import __builtin__