Remove issue11006.diff as it's already been applied in core.
This commit is contained in:
parent
2b08fd8b3f
commit
2622530b10
|
@ -1,22 +0,0 @@
|
|||
diff --git a/trytond/trytond/modules/account_invoice_defer/account.py b/trytond/trytond/modules/account_invoice_defer/account.py
|
||||
index 09929e7..cd9a40f 100644
|
||||
--- a/trytond/trytond/modules/account_invoice_defer/account.py
|
||||
+++ b/trytond/trytond/modules/account_invoice_defer/account.py
|
||||
@@ -164,7 +164,7 @@ class InvoiceDeferred(Workflow, ModelSQL, ModelView):
|
||||
if journals:
|
||||
self.journal, = journals
|
||||
|
||||
- @fields.depends('invoice_line', 'start_date')
|
||||
+ @fields.depends('invoice_line', 'start_date', 'company')
|
||||
def on_change_invoice_line(self):
|
||||
pool = Pool()
|
||||
Currency = pool.get('currency.currency')
|
||||
@@ -172,7 +172,7 @@ class InvoiceDeferred(Workflow, ModelSQL, ModelView):
|
||||
if not self.start_date:
|
||||
self.start_date = self.invoice_line.invoice.invoice_date
|
||||
invoice = self.invoice_line.invoice
|
||||
- if invoice.currency != self.company.currency:
|
||||
+ if self.company and invoice.currency != self.company.currency:
|
||||
with Transaction().set_context(date=invoice.currency_date):
|
||||
self.amount = Currency.compute(
|
||||
invoice.currency, self.invoice_line.amount,
|
1
series
1
series
|
@ -50,5 +50,4 @@ issue8952.diff # [country] Use Tryton's CDN to download postal codes Remove on 6
|
|||
issue11181.diff # [stock] Require unit price also for view location like for storage (only 6.0)
|
||||
|
||||
issue11051.diff # [account_invoice_defer] Add default company to invoice deferred (only 6.0)
|
||||
issue11006.diff # [account_invoice_defer] Add company to on_change_invoice_line depends (only 6.0)
|
||||
issue11049.diff # [account_invoice_defer] Raise user error message for account not configured (only 6.0)
|
||||
|
|
Loading…
Reference in New Issue