mirror of
https://github.com/NaN-tic/trytond-patches.git
synced 2023-12-14 06:03:03 +01:00
Remove already applied patches
This commit is contained in:
parent
a87ee4db5b
commit
0a350f0871
|
@ -1,15 +0,0 @@
|
|||
Index: invoice.py
|
||||
===================================================================
|
||||
|
||||
--- ./modules/account_invoice/invoice.py
|
||||
+++ ./modules/account_invoice/invoice.py
|
||||
@@ -391,6 +391,8 @@
|
||||
|
||||
if self.party:
|
||||
invoice_address = self.party.address_get(type='invoice')
|
||||
+ if not invoice_address:
|
||||
+ return res
|
||||
res['invoice_address'] = invoice_address.id
|
||||
res['invoice_address.rec_name'] = invoice_address.rec_name
|
||||
return res
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
Index: trytond/model/modelview.py
|
||||
===================================================================
|
||||
|
||||
--- a/trytond/trytond/model/modelview.py
|
||||
+++ b/trytond/trytond/model/modelview.py
|
||||
@@ -426,7 +426,9 @@
|
||||
# convert attributes into pyson
|
||||
encoder = PYSONEncoder()
|
||||
for attr in ('states', 'domain', 'spell', 'colors'):
|
||||
- if element.get(attr):
|
||||
+ if (element.get(attr)
|
||||
+ # Avoid double evaluation from inherit with different model
|
||||
+ and '__' not in element.get(attr)):
|
||||
element.set(attr, encoder.encode(safe_eval(element.get(attr),
|
||||
CONTEXT)))
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
Index: trytond/trytond/modules/sale/sale.py
|
||||
===================================================================
|
||||
|
||||
--- a/trytond/trytond/modules/sale/sale.py
|
||||
+++ b/trytond/trytond/modules/sale/sale.py
|
||||
@@ -1347,7 +1347,8 @@
|
||||
old_invoice_line.quantity, self.unit)
|
||||
invoice_line.quantity = quantity
|
||||
|
||||
- if invoice_line.quantity <= 0.0:
|
||||
+ rounding = self.unit.rounding if self.unit else 0
|
||||
+ if invoice_line.quantity < rounding:
|
||||
return []
|
||||
invoice_line.unit = self.unit
|
||||
invoice_line.product = self.product
|
||||
@@ -1418,7 +1419,7 @@
|
||||
if move.id not in skip_ids:
|
||||
quantity -= Uom.compute_qty(move.uom, move.quantity,
|
||||
self.unit)
|
||||
- if quantity <= 0.0:
|
||||
+ if quantity < self.unit.rounding:
|
||||
return
|
||||
if not self.sale.party.customer_location:
|
||||
self.raise_user_error('customer_location_required', {
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
Index: trytond/trytond/modules/purchase/purchase.py
|
||||
===================================================================
|
||||
|
||||
--- a/trytond/trytond/modules/purchase/purchase.py
|
||||
+++ b/trytond/trytond/modules/purchase/purchase.py
|
||||
@@ -1220,7 +1220,8 @@
|
||||
old_invoice_line.quantity, self.unit)
|
||||
invoice_line.quantity = quantity
|
||||
|
||||
- if invoice_line.quantity <= 0.0:
|
||||
+ rounding = self.unit.rounding if self.unit else 0
|
||||
+ if invoice_line.quantity < rounding:
|
||||
return []
|
||||
invoice_line.unit = self.unit
|
||||
invoice_line.product = self.product
|
||||
@@ -1275,7 +1276,7 @@
|
||||
if move not in skip:
|
||||
quantity -= Uom.compute_qty(move.uom, move.quantity,
|
||||
self.unit)
|
||||
- if quantity <= 0.0:
|
||||
+ if quantity < self.unit.rounding:
|
||||
return
|
||||
if not self.purchase.party.supplier_location:
|
||||
self.raise_user_error('supplier_location_required', {
|
||||
|
4
series
4
series
|
@ -1,7 +1,6 @@
|
|||
issue154_316.diff
|
||||
issue14321002_40001.diff
|
||||
issue136_416.diff
|
||||
issue10739.diff
|
||||
issue10467.diff
|
||||
issue130_392_10919.diff
|
||||
issue239_630.diff
|
||||
|
@ -29,9 +28,6 @@ issue8481003_1.diff
|
|||
issue7461002_1.diff
|
||||
issue6441002_20001.diff
|
||||
issue6451002_60001.diff
|
||||
issue8391002_40001.diff
|
||||
issue8381002_20002.diff
|
||||
issue3991003_40001.diff
|
||||
issue4011003_200001.diff
|
||||
nan_tic_sao.diff
|
||||
issue5681002_1_10001.diff
|
||||
|
|
Loading…
Reference in a new issue