NaNtic
/
trytond-patches
mirror of https://github.com/NaN-tic/trytond-patches.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade issue15211002 and search_sales_from_shipments patches from last upgrade 4.0 in sale module

This commit is contained in:
Raimon Esteve 2017-11-10 13:34:33 +01:00
parent 53c1bb4600
commit 43642bbab6
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
issue15211002-sale-confirmed-to-done.diff
View File

@ -1,9 +1,9 @@
diff -r 758b49de71a9 trytond/trytond/modules/sale/sale.py
--- a/trytond/trytond/modules/sale/sale.py Wed May 11 11:54:40 2016 +0200
+++ b/trytond/trytond/modules/sale/sale.py Mon May 30 15:22:18 2016 +0200
@@ -919,7 +919,7 @@
if sale.is_done():
if sale.state != 'done':
diff -r 02a162618a67 trytond/trytond/modules/sale/sale.py
--- a/trytond/trytond/modules/sale/sale.py Wed Oct 25 18:48:58 2017 +0200
+++ b/trytond/trytond/modules/sale/sale.py Fri Nov 10 13:28:49 2017 +0100
@@ -928,7 +928,7 @@
if sale.state == 'confirmed':
process.append(sale)
done.append(sale)
- elif sale.state != 'processing':
+ if sale.state != 'processing':

15
search_sales_from_shipments.diff
View File

@ -1,7 +1,7 @@
diff -r d1160d8084c5 sale.py
--- a/trytond/trytond/modules/sale/sale.py Wed Sep 27 18:37:32 2017 +0200
+++ b/trytond/trytond/modules/sale/sale.py Tue Nov 07 06:59:18 2017 +0100
@@ -580,12 +580,12 @@
diff -r fb270fa63414 trytond/trytond/modules/sale/sale.py
--- a/trytond/trytond/modules/sale/sale.py Fri Nov 10 13:30:35 2017 +0100
+++ b/trytond/trytond/modules/sale/sale.py Fri Nov 10 13:31:38 2017 +0100
@@ -580,17 +580,12 @@
Search on shipments or returns
'''
def method(self, name, clause):
@ -12,7 +12,12 @@ diff -r d1160d8084c5 sale.py
+ if isinstance(clause[2], basestring):
+ target = 'rec_name'
else:
- return [('lines.moves.shipment',) + tuple(clause[1:3])]
- if isinstance(clause[2], basestring):
- target = 'rec_name'
- else:
- target = 'id'
- return [('lines.moves.shipment.' + target,)
- + tuple(clause[1:3]) + (model_name,)]
+ target = 'id'
+ return [('lines.moves.shipment.' + target,) + tuple(clause[1:])
+ + (model_name,)]