Rewritten sales shipping cost taxation, improved shipping cost handling in sales...

[fa-stable.git] / inventory / includes / db / items_db.inc

diff --git a/inventory/includes/db/items_db.inc b/inventory/includes/db/items_db.inc
index cfbbbdbe579bd0f68097906ecead76ce54957c08..57ddf3162d33b562d558318e12e023fb79bd9a4b 100644 (file)
--- a/inventory/includes/db/items_db.inc
+++ b/inventory/includes/db/items_db.inc
@@ -14,7 +14,7 @@ function update_item($stock_id, $description, $long_description, $category_id,
        $cogs_account,  $adjustment_account, $wip_account, $dimension_id, 
        $dimension2_id, $no_sale, $editable, $no_purchase,
        $depreciation_method = 'D', $depreciation_rate=100, $depreciation_factor=1,
-       $depreciation_start=null, $fa_class_id=null, $vat_category='')
+       $depreciation_start=null, $fa_class_id=null, $vat_category='', $shipper_id=0)
 {
        $sql = "UPDATE ".TB_PREF."stock_master SET long_description=".db_escape($long_description).",
                description=".db_escape($description).",
@@ -33,7 +33,8 @@ function update_item($stock_id, $description, $long_description, $category_id,
                depreciation_method=".db_escape($depreciation_method).",
                depreciation_rate=".db_escape($depreciation_rate).",
                depreciation_factor=".db_escape($depreciation_factor).",
-               fa_class_id=".db_escape($fa_class_id);
+               fa_class_id=".db_escape($fa_class_id).",
+               shipper_id=".db_escape($shipper_id);
 
        if ($units != '')
                $sql .= ", units=".db_escape($units);
@@ -61,14 +62,14 @@ function add_item($stock_id, $description, $long_description, $category_id,
        $cogs_account, $adjustment_account,     $wip_account, $dimension_id, 
        $dimension2_id, $no_sale, $editable, $no_purchase,
        $depreciation_method='D', $depreciation_rate=100,  $depreciation_factor=1, $depreciation_start=null,
-       $fa_class_id=null, $vat_category=0)
+       $fa_class_id=null, $vat_category=0, $shipper_id=0)
 {
        $sql = "INSERT INTO ".TB_PREF."stock_master (stock_id, description, long_description, category_id,
                tax_type_id, units, mb_flag, sales_account, inventory_account, cogs_account,
                adjustment_account, wip_account, dimension_id, dimension2_id, no_sale, no_purchase, editable, vat_category,
                depreciation_method, depreciation_rate, depreciation_factor"
                .(isset($depreciation_start) ? ", depreciation_start, depreciation_date, fa_class_id" : "")
-               .") VALUES (".db_escape($stock_id).", ".db_escape($description).", ".db_escape($long_description).",
+               .",shipper_id) VALUES (".db_escape($stock_id).", ".db_escape($description).", ".db_escape($long_description).",
                ".db_escape($category_id).", ".db_escape($tax_type_id).", "
                .db_escape($units).", ".db_escape($mb_flag).",
                ".db_escape($sales_account).", ".db_escape($inventory_account)
@@ -80,7 +81,7 @@ function add_item($stock_id, $description, $long_description, $category_id,
                .db_escape($editable).",".db_escape($vat_category).","
                .db_escape($depreciation_method).",".db_escape($depreciation_rate).",".db_escape($depreciation_factor)
                .(isset($depreciation_start) ? ",'".date2sql($depreciation_start)."','".date2sql($depreciation_start)."',".db_escape($fa_class_id) : "")
-               .")";
+               .",".db_escape($shipper_id).")";
 
        db_query($sql, "The item could not be added");
 
@@ -149,7 +150,10 @@ function item_in_foreign_codes($stock_id)
         _('Cannot delete this item because there are existing sales order items for it.'),
        "SELECT COUNT(*) FROM "
                .TB_PREF."purch_order_details WHERE item_code=".db_escape($stock_id)=>
-        _('Cannot delete this item because there are existing purchase order items for it.')
+        _('Cannot delete this item because there are existing purchase order items for it.'),
+       "SELECT COUNT(*) FROM "
+               .TB_PREF."sales_orders WHERE ship_via=".db_escape($stock_id)=>
+        _('Cannot delete this item because there are existing sales transactions for it.'),
        );
 
        $msg = '';
@@ -230,4 +234,3 @@ function get_items_search($description, $type)
 
        return db_query($sql, "Failed in retreiving item list.");
 }
-