User branch_ref as pick location and delete topick table properly.

diff --git a/includes/picking.inc b/includes/picking.inc
index 61283a2e284a3fd3c5124136becbbb8c61538ae9..a45dd6ee81e0aeb7632edc3a049b36d81c8c6583 100644 (file)
--- a/includes/picking.inc
+++ b/includes/picking.inc
@@ -1,5 +1,6 @@
 <?php
 
+require_once($path_to_root.'/'.'sales/includes/sales_db.inc');
 function process_picking_flag() {
        $id = find_submit('_chgpck', false);
        if ($id != -1 && isset($_POST['pick'])) {
@@ -43,7 +44,8 @@ class Picker {
        }
        function insertAllForBranch($debtor_no, $branch_code) {
                $this->deleteAllForBranch($debtor_no, $branch_code);
-               $location = OrderXtraConfig::$default_location;
+               $branch = get_cust_branch($debtor_no, $branch_code);
+               $location = $branch['branch_ref'];
                $sql = "SELECT  d.stock_id
                                                                                , d.quantity AS quantity
                                                                                ,IF(".OrderXtraConfig::sql_held_condition().", d.quantity, 0) held
@@ -57,9 +59,11 @@ class Picker {
                                                WHERE debtor_no = $debtor_no AND branch_code = $branch_code
                                                ";
                $result = db_query($sql, $sql);
-                       display_warning("R");
+                       display_warning("B");
                while($row=db_fetch($result)) {
+                       display_warning("R");
                        foreach($row as $key => $value) { $$key = $value; }
+                       foreach($row as $key => $value) { display_warning("$key => $value"); }
                        $available = min($quantity, max($qoh-$quantity_before-$held,0 ));
                        $booked = $quantity - $available;
 
@@ -100,12 +104,13 @@ class Picker {
 
        function deleteAllForBranch($debtor_no, $branch_code) {
                display_warning("deleting for $debtor_no $branch_code");
-               $sql = "DELETE *
-                                               FROM ".TB_PREF."topick so
-                                               JOIN ".TB_PREF."sales_order_detals p on (sod.id = p.detail_id)
-                                               NATURAL JOIN ".TB_PREF."sales_order_details sod
+               $sql = "DELETE ".TB_PREF."topick p
+                                               FROM ".TB_PREF."topick p
+                                               JOIN ".TB_PREF."sales_order_details sod on (sod.id = p.detail_id)
+                                               NATURAL JOIN ".TB_PREF."sales_orders so
                                                WHERE debtor_no = $debtor_no AND branch_code = $branch_code
                                                ";
+               db_query($sql);
        }
 
 }