mirror of
https://github.com/NaN-tic/trytond-patches.git
synced 2023-12-14 06:03:03 +01:00
parent
404bacfe1c
commit
54af94e9b7
|
@ -1,6 +1,6 @@
|
|||
--- a/tryton/trytond/trytond/worker.py
|
||||
+++ b/tryton/trytond/trytond/worker.py
|
||||
@@ -73,7 +73,10 @@
|
||||
@@ -73,7 +73,10 @@ def work(options):
|
||||
while len(tasks.filter()) >= processes:
|
||||
time.sleep(0.1)
|
||||
for queue in queues:
|
||||
|
@ -9,7 +9,7 @@
|
|||
+ task_id, next_ = queue.pull(options.name)
|
||||
+ except backend.DatabaseOperationalError:
|
||||
+ break
|
||||
timeout = min(
|
||||
next_ or options.timeout, timeout, options.timeout)
|
||||
if next_ is not None:
|
||||
timeout = min(next_, timeout)
|
||||
if task_id:
|
||||
|
||||
|
|
17
issue11989.diff
Normal file
17
issue11989.diff
Normal file
|
@ -0,0 +1,17 @@
|
|||
diff --git a/tryton/modules/purchase_request/purchase.py b/tryton/modules/purchase_request/purchase.py
|
||||
index 63425351b4..a63b557763 100644
|
||||
--- a/tryton/modules/purchase_request/purchase.py
|
||||
+++ b/tryton/modules/purchase_request/purchase.py
|
||||
@@ -26,6 +26,12 @@ def process_request(func):
|
||||
class Purchase(metaclass=PoolMeta):
|
||||
__name__ = 'purchase.purchase'
|
||||
|
||||
+ @classmethod
|
||||
+ def copy(cls, lines, default=None):
|
||||
+ default = default.copy() if default is not None else {}
|
||||
+ default.setdefault('requests')
|
||||
+ return super().copy(lines, default=default)
|
||||
+
|
||||
@classmethod
|
||||
def delete(cls, purchases):
|
||||
cls.check_delete_purchase_request(purchases)
|
2
series
2
series
|
@ -36,3 +36,5 @@ issue11931.diff # [stock_lot] Allow to deactivate lot
|
|||
issue11868.diff # [account] Add on delete CASCADE to lines and keywords of move template
|
||||
|
||||
issue11582.diff # [trytond] Add authentication services
|
||||
|
||||
issue11989.diff # [purchase_request] Clear requests when copying purchase lines
|
||||
|
|
Loading…
Reference in a new issue