From 9be2c0c7056dc3669ecd9eaf9bbf103768c4f5a4 Mon Sep 17 00:00:00 2001 From: dSevere Date: Wed, 9 Nov 2011 18:02:26 +0000 Subject: [PATCH] // stock : bug fix on supplier orders states change git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10019 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/stock/SupplierOrderState.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/stock/SupplierOrderState.php b/classes/stock/SupplierOrderState.php index bf9233f4c..571347add 100755 --- a/classes/stock/SupplierOrderState.php +++ b/classes/stock/SupplierOrderState.php @@ -151,10 +151,10 @@ class SupplierOrderStateCore extends ObjectModel //check first if the order is editable if ($is_editable) - $query->where('s.editable = 1 OR s.delivery_note = 1'); + $query->where('s.editable = 1 OR s.delivery_note = 1 OR s.enclosed = 1'); //check if the delivery note is available or if the state correspond to a pending receipt state else if ($is_delivery_note || $is_pending_receipt) - $query->where('s.delivery_note = 0 AND s.editable = 0'); + $query->where('(s.delivery_note = 0 AND s.editable = 0) OR s.enclosed = 1'); //check if the state correspond to a receipt state else if ($is_receipt_state) $query->where('s.receipt_state = 1 OR s.enclosed = 1');