Remove issue12567.diff issue12590.diff issue12626.diff issue12653.diff

This commit is contained in:
Albert Cervera i Areny 2023-11-02 23:09:22 +01:00
parent 9e7fec7798
commit 14a3d8cbef
5 changed files with 0 additions and 67 deletions

View File

@ -1,17 +0,0 @@
diff --git a/tryton/modules/account_invoice_defer/account.py b/tryton/modules/account_invoice_defer/account.py
index 22e28da6c9..be4d4d06f5 100644
--- a/tryton/modules/account_invoice_defer/account.py
+++ b/tryton/modules/account_invoice_defer/account.py
@@ -460,9 +460,11 @@ class Invoice(metaclass=PoolMeta):
def _post(cls, invoices):
pool = Pool()
InvoiceDeferred = pool.get('account.invoice.deferred')
+ # defer invoices only the first time post is called
+ invoices_to_defer = [i for i in invoices if not i.move]
super()._post(invoices)
deferrals = []
- for invoice in invoices:
+ for invoice in invoices_to_defer:
for line in invoice.lines:
print(invoice, line, line.defer_from)
if line.deferrable and line.defer_from and line.defer_to:

View File

@ -1,16 +0,0 @@
diff --git a/tryton/modules/account_payment/account.py b/tryton/modules/account_payment/account.py
index 112c8e1f2c..3a5b860aec 100644
--- a/tryton/modules/account_payment/account.py
+++ b/tryton/modules/account_payment/account.py
@@ -699,9 +699,9 @@ class Dunning(metaclass=PoolMeta):
@classmethod
def search_active(cls, name, clause):
- if tuple(clause[1:]) in {('=', True), ('!=', False)}:
+ if tuple(clause[1:]) in [('=', True), ('!=', False)]:
domain = ('line.payment_amount', '>', 0)
- elif tuple(clause[1:]) in {('=', False), ('!=', True)}:
+ elif tuple(clause[1:]) in [('=', False), ('!=', True)]:
domain = ('line.payment_amount', '<=', 0)
else:
domain = []

View File

@ -1,13 +0,0 @@
diff --git a/tryton/modules/account/move.py b/tryton/modules/account/move.py
index 35be14cf1f..123755b2e9 100644
--- a/tryton/modules/account/move.py
+++ b/tryton/modules/account/move.py
@@ -1368,6 +1368,8 @@ class Line(MoveLineMixin, ModelSQL, ModelView):
reconciliations = []
for lines in lines_list:
+ if not lines:
+ continue
for line in lines:
if line.reconciliation:
raise AccessError(

View File

@ -1,13 +0,0 @@
diff --git a/tryton/modules/purchase/product.py b/tryton/modules/purchase/product.py
index ebf14df442..2d20903a8e 100644
--- a/tryton/modules/purchase/product.py
+++ b/tryton/modules/purchase/product.py
@@ -483,7 +483,7 @@ class ProductSupplierPrice(
def default_quantity():
return 0.0
- @fields.depends('product_supplier', '_parent_product_supplier.product')
+ @fields.depends('product_supplier', '_parent_product_supplier.uom')
def on_change_with_uom(self, name=None):
if self.product_supplier and self.product_supplier.uom:
return self.product_supplier.uom.id

8
series
View File

@ -54,14 +54,6 @@ issue12576.diff # [account_stock_eu] Could not find the intrastat countries for
issue7672.diff # [stock] Always fill product and template of cost price revision
issue12590.diff # [account_payment] Do not test active clause of dunning being in a set
issue12567.diff # [account_invoice_defer] Defer invoice line only once
issue12626.diff # [account] Do not fail when reconciling an empty list
issue12653.diff # [purchase] Depend on product supplier unit to compute unit on price
issue12678.diff # [account_statement] Not delete statement lines when statament is not draft state
account_statement_second_currency.diff # [account_statement] Support second currency on statement line