From 9e53f04332800b570531b69592a2491b7ae26b0f Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 23 Sep 2015 10:46:51 +0200 Subject: [PATCH 1/6] [FIX] l10n_hu: missing flag --- addons/l10n_hu/static/description/icon.png | Bin 0 -> 322 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/addons/l10n_hu/static/description/icon.png b/addons/l10n_hu/static/description/icon.png index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4f9bf7a810236f3cec3b3ceca1c7edd2cca4082a 100644 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p<)L71^VC4M4MP^!c=q9iy!t)x7$D3u`~F*C13&(AePq0Cs% zRL{`R{j-xfP}N3H7srr_xVP62axxnVusF89V-Rh>JmG!Myt$5VofKa@|Fh+s<(8gF z*x=Xu3}(zBQ_e7msv0}Ep5zG#G=g$pzo|_*&-3jp!}rvDwjKJ_#s_L|&Srdf`W{a~ z{I|4*zjxiYU3>mh=#-Hcc6d*Iq0V9zEb#Ff`Nih{%abcx8-R{y@O1TaS?83{1OPt& BbIJe! literal 0 HcmV?d00001 From bdcae86d67c05273f404594c9b38f22b31c8abec Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Tue, 22 Sep 2015 17:19:19 +0200 Subject: [PATCH 2/6] [FIX] purchase: invoiced purchase order line When invoice_method == 'picking', a po line is invoiced if all the lines linked to the po line are in invoices with state not in ['draft', 'cancel']. To keep the same logic than before commit 9b1ab76. opw:649746 --- addons/purchase/purchase.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index c0c3e2845ba..45d63b15efe 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -1014,7 +1014,8 @@ class purchase_order(osv.osv): if (po_line.move_ids and all(move.state in ('done', 'cancel') for move in po_line.move_ids) and not all(move.state == 'cancel' for move in po_line.move_ids) and - all(move.invoice_state == 'invoiced' for move in po_line.move_ids if move.state == 'done')): + all(move.invoice_state == 'invoiced' for move in po_line.move_ids if move.state == 'done') + and po_line.invoice_lines and all(line.invoice_id.state not in ['draft', 'cancel'] for line in po_line.invoice_lines)): is_invoiced.append(po_line.id) else: for po_line in po.order_line: From 19f9328d0b21b546c724e12efc4ddb3b9fdcb4ed Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 23 Sep 2015 14:45:49 +0200 Subject: [PATCH 3/6] [IMP] l10n_cr: outdated URL Costa Rica localisation team has moved to GitHub cf #8651 --- addons/l10n_cr/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py index eeea209006f..4819b87d3ed 100644 --- a/addons/l10n_cr/__openerp__.py +++ b/addons/l10n_cr/__openerp__.py @@ -35,7 +35,7 @@ { 'name': 'Costa Rica - Accounting', 'version': '0.1', - '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', From 6dd50719523a0128c36371249140c81644b55ab4 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 23 Sep 2015 15:28:12 +0200 Subject: [PATCH 4/6] [FIX] fields: in binary fields, pass `strip_style` parameter between APIs --- openerp/osv/fields.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index e836bf370d9..fd417d2b7b7 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -374,6 +374,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__ From b1bd0c6cfaa1b8393d592b5e6518bfe7a5cc64be Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 23 Sep 2015 15:33:55 +0200 Subject: [PATCH 5/6] [FIX] account_cancel: allow cancel of whole bank statement This revision is related to 6f355623f0632527aae55d02d24a5a06976441c2. The above revision had as goal to not allow the partial cancellation (line per line) of a confirmed bank statement, as it would prevent the ability to reconcile the statement, as reconcilling a confirmed statement it not possible. Nevertheless, cancelling the whole bank statement should be allowed (using the `Cancel Statement` button), as this cancel all lines and re-set the statement in draft. opw-649864 fixes #8568 --- .../account_cancel/models/account_bank_statement.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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() From 0cddf87a77f3c7b4216d9badbe700d8306342241 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 23 Sep 2015 17:15:01 +0200 Subject: [PATCH 6/6] [FIX] {website_,}membership: membership should start the same day of the invoice --- addons/membership/membership.py | 2 +- addons/website_membership/controllers/main.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/membership/membership.py b/addons/membership/membership.py index 33a8cf59bc1..0a4dd491847 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -231,7 +231,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 c9001445030..b94f57b41a4 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: