diff --git a/issue33209.diff b/issue33209.diff deleted file mode 100644 index 02986e1..0000000 --- a/issue33209.diff +++ /dev/null @@ -1,41 +0,0 @@ -diff -r 096004a93da6 trytond/trytond/modules/account_invoice/invoice.py ---- a/trytond/trytond/modules/account_invoice/invoice.py Thu Jan 18 13:57:46 2018 +0100 -+++ b/trytond/trytond/modules/account_invoice/invoice.py Thu Jan 18 14:43:12 2018 +0100 -@@ -2665,11 +2665,11 @@ - refund = self.start.with_refund - invoices = Invoice.browse(Transaction().context['active_ids']) - -- if refund: -- for invoice in invoices: -- if invoice.state != 'posted': -- self.raise_user_error('refund_non_posted', -- (invoice.rec_name,)) -+ for invoice in invoices: -+ if invoice.state != 'posted': -+ self.raise_user_error('invoice_non_posted', -+ (invoice.rec_name,)) -+ if refund: - if invoice.payment_lines: - self.raise_user_error('refund_with_payement', - (invoice.rec_name,)) -diff -r 096004a93da6 trytond/trytond/modules/account_invoice/tests/scenario_invoice.rst ---- a/trytond/trytond/modules/account_invoice/tests/scenario_invoice.rst Thu Jan 18 13:57:46 2018 +0100 -+++ b/trytond/trytond/modules/account_invoice/tests/scenario_invoice.rst Thu Jan 18 14:43:12 2018 +0100 -@@ -139,6 +139,17 @@ - Decimal('240.00') - >>> invoice.save() - -+Try to credit the invoice:: -+ -+ >>> invoice.state -+ u'draft' -+ >>> credit = Wizard('account.invoice.credit', [invoice]) -+ >>> credit.form.with_refund = True -+ >>> credit.execute('credit') #doctest: +IGNORE_EXCEPTION_DETAIL -+ Traceback (most recent call last): -+ ... -+ UserError: ('UserError', (u'You can not credit with refund invoice "1 Party" because it is not posted.', '')) -+ - Test change tax:: - - >>> tax_line, = invoice.taxes diff --git a/series b/series index d05cc9e..695a379 100644 --- a/series +++ b/series @@ -70,5 +70,4 @@ issue6896.diff # [sale_credit_limit] - Use quantity sold and invoiced to compute issue6845-issue5613.diff # [commission] Missing agent type domain on sale and invoice + Remove old usage of out_credit_note issue7012.diff # [stock_consignment] Allow to create internal order points to provision supplier consignment locations -issue33209.diff # [account_invoice] Forbid to create credit notes from nonposted invoices issue7129.diff # [account_payment] Slow to list Lines to Pay