Fix patches that can't be applied because the original code changes.
This commit is contained in:
parent
2cb6c1bfd0
commit
94b859a8ea
|
@ -1,15 +1,16 @@
|
||||||
diff -r cb4549f91f7b trytond/trytond/modules/sale_supply_drop_shipment/stock.py
|
Index: imi/trytond/trytond/modules/sale_supply_drop_shipment/stock.py
|
||||||
--- a/trytond/trytond/modules/sale_supply_drop_shipment/stock.py Mon May 21 20:17:02 2018 +0200
|
===================================================================
|
||||||
+++ b/trytond/trytond/modules/sale_supply_drop_shipment/stock.py Fri Jan 25 09:28:50 2019 +0100
|
--- imi.orig/trytond/trytond/modules/sale_supply_drop_shipment/stock.py
|
||||||
@@ -557,7 +557,10 @@
|
+++ imi/trytond/trytond/modules/sale_supply_drop_shipment/stock.py
|
||||||
|
@@ -522,7 +522,10 @@ class ShipmentDrop(Workflow, ModelSQL, M
|
||||||
for move in shipment.supplier_moves:
|
for move in shipment.supplier_moves:
|
||||||
if not move.origin:
|
if not move.origin:
|
||||||
continue
|
continue
|
||||||
- sale_line = request2sline[pline2request[move.origin]]
|
- sale_line = request2sline.get(pline2request.get(move.origin))
|
||||||
+ purchase_request = pline2request.get(move.origin)
|
+ purchase_request = pline2request.get(move.origin)
|
||||||
+ if not purchase_request:
|
+ if not purchase_request:
|
||||||
+ continue
|
+ continue
|
||||||
+ sale_line = request2sline[purchase_request]
|
+ sale_line = request2sline[purchase_request]
|
||||||
|
if not sale_line:
|
||||||
|
continue
|
||||||
for move in sale_line.moves:
|
for move in sale_line.moves:
|
||||||
if (move.state not in ('cancel', 'done')
|
|
||||||
and not move.shipment
|
|
||||||
|
|
|
@ -1,19 +1,21 @@
|
||||||
diff -r 12404f4be997 trytond/trytond/modules/stock_supply_production/production.py
|
Index: imi/trytond/trytond/modules/stock_supply_production/production.py
|
||||||
--- a/trytond/trytond/modules/stock_supply_production/production.py Sat Jan 26 01:12:51 2019 +0100
|
===================================================================
|
||||||
+++ b/trytond/trytond/modules/stock_supply_production/production.py Thu Jan 31 12:36:30 2019 +0100
|
--- imi.orig/trytond/trytond/modules/stock_supply_production/production.py
|
||||||
|
+++ imi/trytond/trytond/modules/stock_supply_production/production.py
|
||||||
@@ -1,6 +1,7 @@
|
@@ -1,6 +1,7 @@
|
||||||
# This file is part of Tryton. The COPYRIGHT file at the top level of
|
# This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||||
# this repository contains the full copyright notices and license terms.
|
# this repository contains the full copyright notices and license terms.
|
||||||
import datetime
|
import datetime
|
||||||
+from decimal import Decimal
|
+from decimal import Decimal
|
||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
|
|
||||||
from trytond.model import ModelSQL, ValueMixin, fields
|
from trytond.model import ModelSQL, ValueMixin, fields
|
||||||
@@ -143,7 +144,7 @@
|
@@ -143,7 +144,7 @@ class Production(metaclass=PoolMeta):
|
||||||
product=product,
|
product=product,
|
||||||
bom=product.boms[0].bom if product.boms else None,
|
bom=product.boms[0].bom if product.boms else None,
|
||||||
uom=product.default_uom,
|
uom=uom,
|
||||||
- quantity=quantity,
|
- quantity=quantity,
|
||||||
+ quantity=float(Decimal(quantity).quantize(Decimal(str(10 ** -product.default_uom.digits)))),
|
+ quantity=float(Decimal(quantity).quantize(Decimal(str(10 ** -product.default_uom.digits)))),
|
||||||
state='request',
|
state='request',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
diff -r a4d9a0d5ca24 purchase_request.py
|
Index: imi/trytond/trytond/modules/purchase_request/purchase_request.py
|
||||||
--- a/trytond/trytond/modules/purchase_request/purchase_request.py Mon May 21 20:13:25 2018 +0200
|
===================================================================
|
||||||
+++ b/trytond/trytond/modules/purchase_request/purchase_request.py Tue Jul 24 15:56:01 2018 +0200
|
--- imi.orig/trytond/trytond/modules/purchase_request/purchase_request.py
|
||||||
@@ -276,6 +276,8 @@
|
+++ imi/trytond/trytond/modules/purchase_request/purchase_request.py
|
||||||
|
@@ -276,6 +276,8 @@ class PurchaseRequest(ModelSQL, ModelVie
|
||||||
supplier = None
|
pool = Pool()
|
||||||
|
Date = pool.get('ir.date')
|
||||||
today = Date.today()
|
today = Date.today()
|
||||||
+ if not date:
|
+ if not date:
|
||||||
+ date = today
|
+ date = today
|
||||||
for product_supplier in product.product_suppliers:
|
for product_supplier in product.product_suppliers_used(**pattern):
|
||||||
supply_date = product_supplier.compute_supply_date(date=today)
|
supply_date = product_supplier.compute_supply_date(date=today)
|
||||||
timedelta = date - supply_date
|
timedelta = date - supply_date
|
||||||
|
|
1
series
1
series
|
@ -17,7 +17,6 @@ issue10467.diff # stock_lot: add lot to grouping if lot it's required on product
|
||||||
|
|
||||||
# issue53451002_1_10001.diff # [stock] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages
|
# issue53451002_1_10001.diff # [stock] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages
|
||||||
# sale_number_of_packages.diff # [sale_number_of_packages] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages
|
# sale_number_of_packages.diff # [sale_number_of_packages] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages
|
||||||
stock_external_party.diff # [stock_external_party] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages
|
|
||||||
# stock_lot_deactivatable.diff # [stock_lot_deactivatable] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages
|
# stock_lot_deactivatable.diff # [stock_lot_deactivatable] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages
|
||||||
stock_lot_sled.diff # [stock_lot_sled] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages
|
stock_lot_sled.diff # [stock_lot_sled] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue