Fixes in sales credit note voiding procedures (invalid changes in delivery notes).

diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc
index 896649090fedf2658b5dd85ac8b4b4d1a4d4d289..7260f0e10ed0702b19ab0c4e0dd8648cd8eb9693 100644 (file)
--- a/sales/includes/db/custalloc_db.inc
+++ b/sales/includes/db/custalloc_db.inc
@@ -286,7 +286,7 @@ function credit_sales_invoice_allocate($invoice_no, $credit_no, $amount, $date)
                        $free += $unalloc;
                }
        }
-       if ($free < $amount) {
+       if (floatcmp($free, $amount)<0) {
                // this should never happen unless sparse credit notices were allocated to 
                // the invoice, or summarized freight costs on credit notes is more than those on invoice.
                display_error(_("Unsuspected overallocation happened due to sparse credit notes exists for this invoice.

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index d710e4ec0fa428408281eeac31c63cfbded97b68..a1f6dd5cc62697364448f6b99d288d95d627a4d4 100644 (file)
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -196,19 +196,18 @@ function void_sales_invoice($type, $type_no)
 
        // reverse all the changes in parent document(s)
 
-       $deliveries = get_sales_parent_numbers($type, $type_no);
+       $parents = get_sales_parent_numbers($type, $type_no);
 
-       if ($deliveries !== 0) {
-               if (count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto")
+       if ($parents !== 0) {
+               if ($type == ST_SALESINVOICE && count($parents) == 1 && get_reference(ST_CUSTDELIVERY, $parents[0]) == "auto")
                {
-                       void_sales_delivery(ST_CUSTDELIVERY, $deliveries[0], false);
+                       void_sales_delivery(ST_CUSTDELIVERY, $parents[0], false);
                        $date_ = Today();
-                       add_audit_trail(ST_CUSTDELIVERY, $deliveries[0], $date_, _("Voided."));
-                       add_voided_entry(ST_CUSTDELIVERY, $deliveries[0], $date_, "");
+                       add_audit_trail(ST_CUSTDELIVERY, $parents[0], $date_, _("Voided."));
+                       add_voided_entry(ST_CUSTDELIVERY, $parents[0], $date_, "");
                }
                else
                {
-                       
                        $srcdetails = get_sales_parent_lines($type, $type_no);
                        while ($row = db_fetch($srcdetails)) {
                                update_parent_line($type, $row['id'], -$row['quantity']);
@@ -218,6 +217,8 @@ function void_sales_invoice($type, $type_no)
        // clear details after they've been reversed in the sales order
        void_customer_trans_details($type, $type_no);
 
+       void_stock_move($type, $type_no); // in case of credit note with return
+
        void_trans_tax_details($type, $type_no);
 
        void_cust_allocations($type, $type_no);