Payments & Deposits(Rounding Problem). Fixed.

[fa-stable.git] / includes / ui / items_cart.inc

diff --git a/includes/ui/items_cart.inc b/includes/ui/items_cart.inc
index f517edd973ce3241dd10107d1c66442f770d9047..7de50277ff2d9fcc40104c0d0365064c8451f800 100644 (file)
--- a/includes/ui/items_cart.inc
+++ b/includes/ui/items_cart.inc
@@ -38,7 +38,9 @@ class items_cart
 
        var $tax_info;  // tax info for the GL transaction
 
-       function items_cart($type, $trans_no=0)
+       var $fixed_asset;
+
+       function __construct($type, $trans_no=0)
        {
                $this->trans_type = $type;
                $this->order_id = $trans_no;
@@ -102,7 +104,7 @@ class items_cart
        if (!$SysPrefs->allow_negative_stock())
        {
                        foreach ($this->line_items as $line_no => $line_item)
-                               if (has_stock_holding($line_item->mb_flag))
+                               if (has_stock_holding($line_item->mb_flag) || is_fixed_asset($line_item->mb_flag))
                                {
                                        $quantity = $line_item->quantity;
                                        if ($reverse)
@@ -120,12 +122,12 @@ class items_cart
 
        // ----------- GL item functions
 
-       function add_gl_item($code_id, $dimension_id, $dimension2_id, $amount, $memo='', $act_descr=null, $person_id=null)
+       function add_gl_item($code_id, $dimension_id, $dimension2_id, $amount, $memo='', $act_descr=null, $person_id=null, $date=null)
        {
                if (isset($code_id) && $code_id != "" && isset($amount) && isset($dimension_id)  &&
                        isset($dimension2_id))
                {
-                       $this->gl_items[] = new gl_item($code_id, $dimension_id, $dimension2_id, $amount, $memo, $act_descr, $person_id);
+                       $this->gl_items[] = new gl_item($code_id, $dimension_id, $dimension2_id, $amount, $memo, $act_descr, $person_id, $date);
                        return true;
                }
                else
@@ -142,8 +144,8 @@ class items_cart
            $this->gl_items[$index]->code_id = $code_id;
            $this->gl_items[$index]->person_id = $person_id;
 
-               $gl_type = is_subledger_account($code_id, $person_id);
-               if ($gl_type)
+        $gl_type = is_subledger_account($code_id);
+        if ($person_id != null && $gl_type)
                {
                        $this->gl_items[$index]->person_type_id = $gl_type > 0 ? PT_CUSTOMER : PT_SUPPLIER;
                        $data = get_subaccount_data($code_id, $person_id);
@@ -222,7 +224,7 @@ class items_cart
        {
                foreach ($this->gl_items as $gl_item)
                {
-                       if ($gl_item->person_id)
+                       if (is_subledger_account($gl_item->code_id))
                                return true;
                }
                return false;
@@ -261,7 +263,7 @@ class items_cart
 
                foreach($this->gl_items as $gl)
                {
-                       if ($person_type = is_subledger_account($gl->code_id, $gl->person_id))
+            if ($person_type = is_subledger_account($gl->code_id))
                        {
                                $tax_info['person_type'] = $person_type < 0 ? PT_SUPPLIER : PT_CUSTOMER;
                                $tax_info['person_id'] = $gl->person_id;
@@ -297,7 +299,7 @@ class items_cart
                                        // we can have both input and output tax postings in some cases like intra-EU trade.
                                        // so just calculate net_amount from the higher in/out tax
                                        $tax_info['net_amount'][$tax_id]
-                                               = $sign*round2(max(abs(@$tax_info['tax_in'][$tax_id]), abs(@$tax_info['tax_out'][$tax_id]))/$tax_type['rate']*100, 2)/$factor;
+                                               = $sign*round2(max(abs(@$tax_info['tax_in'][$tax_id]), abs(@$tax_info['tax_out'][$tax_id]))/$tax_type['rate']*100, user_price_dec())/$factor;
 
                                }
                        } else
@@ -307,7 +309,7 @@ class items_cart
                if (!isset($tax_info['tax_reg']) && isset($tax_info['person_type']))
                        $tax_info['tax_reg'] = $tax_info['person_type']==PT_CUSTOMER ? TR_OUTPUT : TR_INPUT;
 
-               if (count(@$tax_info['net_amount']))    // guess exempt sales/purchase if any tax has been found
+               if (count_array(@$tax_info['net_amount']))      // guess exempt sales/purchase if any tax has been found
                {
                        $ex_net = abs($net_sum) - @array_sum($tax_info['net_amount']);
                        if ($ex_net != 0)
@@ -361,7 +363,10 @@ class items_cart
                $total_gl = 0;
                foreach($this->gl_items as $gl)
                {
-                       $total_gl += add_gl_trans($this->trans_type, $this->order_id, $this->tran_date, $gl->code_id, $gl->dimension_id, $gl->dimension2_id, 
+                       if (!isset($gl->date))
+                               $gl->date = $this->tran_date;
+
+                       $total_gl += add_gl_trans($this->trans_type, $this->order_id, $gl->date, $gl->code_id, $gl->dimension_id, $gl->dimension2_id, 
                                $gl->reference, $gl->amount, $this->currency, $gl->person_type_id, $gl->person_id, "", $this->rate);
 
                        // post to first found bank account using given gl acount code.
@@ -379,8 +384,7 @@ class items_cart
                                // do not post exchange variations to AR/AP (journal in not customer/supplier currency)
                        if ($gl->person_type_id==PT_SUPPLIER && (get_supplier_currency($gl->person_id) == $this->currency || $this->currency != $home_currency))
                                        $supp_trans[$gl->person_id] = @$supp_trans[$gl->person_id] + $gl->amount;
-                       else
-                       if ($gl->person_type_id==PT_CUSTOMER && (get_customer_currency(null, $gl->branch_id) == $this->currency || $this->currency != $home_currency))
+                       elseif ($gl->person_type_id==PT_CUSTOMER && (get_customer_currency(null, $gl->branch_id) == $this->currency || $this->currency != $home_currency))
                                        $cust_trans[$gl->branch_id] = @$cust_trans[$gl->branch_id] + $gl->amount;
                }
 
@@ -403,7 +407,7 @@ class items_cart
                        foreach($cust_trans as $branch_id => $amount)
                                if (floatcmp($amount, 0))
                                        write_cust_journal($this->trans_type, $this->order_id, $branch_id, $this->tran_date,
-                                               $this->reference, -$amount, $this->rate);
+                                               $this->reference, $amount, $this->rate);
                        // update AP
                        foreach($supp_trans as $supp_id => $amount)
                                if (floatcmp($amount, 0))
@@ -461,7 +465,7 @@ class line_item
        var $price;
        var $standard_cost;
 
-       function line_item ($stock_id, $qty, $standard_cost=null, $description=null)
+       function __construct($stock_id, $qty, $standard_cost=null, $description=null)
        {
                $item_row = get_item($stock_id);
 
@@ -477,7 +481,7 @@ class line_item
                        $this->item_description = $description;
 
                if ($standard_cost == null)
-                       $this->standard_cost = $item_row["actual_cost"];
+                       $this->standard_cost = $item_row["purchase_cost"];
                else
                        $this->standard_cost = $standard_cost;
 
@@ -503,9 +507,10 @@ class gl_item
        var $person_type_id;
        var $person_name;
        var $branch_id;
+       var $date;
 
-       function gl_item($code_id=null, $dimension_id=0, $dimension2_id=0, $amount=0, $memo='',
-               $act_descr=null, $person_id=null)
+       function __construct($code_id=null, $dimension_id=0, $dimension2_id=0, $amount=0, $memo='',
+               $act_descr=null, $person_id=null, $date=null)
        {
                //echo "adding $index, $code_id, $dimension_id, $amount, $reference<br>";
 
@@ -516,8 +521,8 @@ class gl_item
 
                $this->code_id = $code_id;
                $this->person_id = $person_id;
-               $gl_type = is_subledger_account($code_id, $person_id);
-               if ($gl_type)
+        $gl_type = is_subledger_account($code_id);
+        if ($person_id != null  && $gl_type)
                {
                        $this->person_type_id = $gl_type > 0 ? PT_CUSTOMER : PT_SUPPLIER;
                        $data = get_subaccount_data($code_id, $person_id);
@@ -526,7 +531,8 @@ class gl_item
                }
                $this->dimension_id = $dimension_id;
                $this->dimension2_id = $dimension2_id;
-               $this->amount = round($amount, 2);
+               $this->amount = round2($amount, user_price_dec());
                $this->reference = $memo;
+               $this->date = $date;
        }
 }