X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fsupp_trans_class.inc;h=96959ecd282e93382d1e3f30c8e004521094e46b;hb=6ca1979dd3d94414a18958346bcb39b984f7a544;hp=60e5b7edadb00c95c402d96594d0c82f2e1af7fc;hpb=e735f0a06f8a43ed4885ff51a5c0b4332c130b40;p=fa-stable.git diff --git a/purchasing/includes/supp_trans_class.inc b/purchasing/includes/supp_trans_class.inc index 60e5b7ed..96959ecd 100644 --- a/purchasing/includes/supp_trans_class.inc +++ b/purchasing/includes/supp_trans_class.inc @@ -22,6 +22,7 @@ class supp_trans var $supplier_id; var $supplier_name; var $terms; + var $ex_rate; var $tax_description; var $tax_group_id; @@ -42,12 +43,15 @@ class supp_trans var $ov_gst; var $gl_codes_counter=0; var $credit = 0; - var $tax_algorithm; - var $stored_algorithm; var $currency; + var $tax_overrides = array(); // array of taxes manually inserted during sales invoice entry - function supp_trans($trans_type, $trans_no=0) + var $dimension, + $dimension2; + + function __construct($trans_type, $trans_no=0) { + $this->trans_type = $trans_type; /*Constructor function initialises a new Supplier Transaction object */ $this->read($trans_type, $trans_no); } @@ -62,7 +66,7 @@ class supp_trans read_supp_invoice($trans_no, $trans_type, $this); if ($trans_type == ST_SUPPCREDIT) { - $this->src_docs = find_src_invoices($trans_no); + $this->src_docs = find_src_invoices($this); } read_supplier_details_to_trans($this, $this->supplier_id); } @@ -70,12 +74,15 @@ class supp_trans function add_grn_to_trans($grn_item_id, $po_detail_item, $item_code, $item_description, $qty_recd, $prev_quantity_inv, $this_quantity_inv, $order_price, $chg_price, - $std_cost_unit, $gl_code) + $std_cost_unit=null, $gl_code='') { $this->grn_items[$grn_item_id] = new grn_item($grn_item_id, $po_detail_item, $item_code, $item_description, $qty_recd, $prev_quantity_inv, $this_quantity_inv, $order_price, $chg_price, $std_cost_unit, $gl_code, $this->tax_included); + $this->src_docs = find_src_invoices($this); + + unset($this->tax_overrides); // cancel tax overrides after cart change return 1; } @@ -84,96 +91,105 @@ class supp_trans $this->gl_codes[$this->gl_codes_counter] = new gl_codes($this->gl_codes_counter, $gl_code, $gl_act_name, $gl_dim, $gl_dim2, $amount, $memo_); $this->gl_codes_counter++; + unset($this->tax_overrides); // cancel tax overrides after cart change return 1; } function remove_grn_from_trans($grn_item_id) { + unset($this->tax_overrides); // cancel tax overrides after cart change unset($this->grn_items[$grn_item_id]); } function remove_gl_codes_from_trans($gl_code_counter) { - unset($this->gl_codes[$gl_code_counter]); + unset($this->tax_overrides); // cancel tax overrides after cart change + unset($this->gl_codes[$gl_code_counter]); } - + function is_valid_trans_to_post() { return (count($this->grn_items) > 0 || count($this->gl_codes) > 0 || ($this->ov_amount != 0) || ($this->ov_discount > 0)); } - + function clear_items() { unset($this->grn_items); unset($this->gl_codes); $this->ov_amount = $this->ov_discount = $this->supplier_id = 0; - + $this->grn_items = array(); $this->gl_codes = array(); } - + function get_taxes($tax_group_id=null, $shipping_cost=0, $gl_codes=true) { $items = array(); $prices = array(); - + if ($tax_group_id == null) $tax_group_id = $this->tax_group_id; - - // preload the taxgroup ! - $tax_group = get_tax_group_items_as_array($tax_group_id); - + + // preload the taxgroup + $tax_group = get_tax_group_items_as_array($tax_group_id); + foreach ($this->grn_items as $ln_itm) { $items[] = $ln_itm->item_code; -// $prices[] =round( ($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group)), $prices[] =round( ($ln_itm->this_quantity_inv * $ln_itm->chg_price), - user_price_dec()); + user_price_dec()); } if ($tax_group_id == null) $tax_group_id = $this->tax_group_id; $taxes = get_tax_for_items($items, $prices, $shipping_cost, $tax_group_id, - $this->tax_included, null, $this->tax_algorithm); + $this->tax_included); -///////////////// Joe Hunt 2009.08.18 + if (isset($this->tax_overrides)) + foreach($this->tax_overrides as $id => $value) // add values entered manually + { + $taxes[$id]['Override'] = $value; + } - if ($gl_codes) + // Taxes included in gl_codes table have exact value, but count to overrides as well. + // Therefore when we want to now taxes only for items (gl_codes==false), + // we have to subtract gl_taxes from override values. + foreach ($this->gl_codes as $gl_code) { - foreach ($this->gl_codes as $gl_code) + $index = is_tax_account($gl_code->gl_code); + if ($index !== false) { - $index = is_tax_account($gl_code->gl_code); - if ($index !== false) - { + if ($gl_codes) $taxes[$index]['Value'] += $gl_code->amount; - } + elseif (isset($this->tax_overrides)) + $taxes[$index]['Override'] -= $gl_code->amount; } - } -//////////////// + } + return $taxes; - } + } // // Returns total invoice amount without taxes. // function get_total_taxfree($tax_group_id=null) { $total = 0; - + // preload the taxgroup ! if ($tax_group_id != null) $tax_group = get_tax_group_items_as_array($tax_group_id); - else - $tax_group = null; - + else + $tax_group = null; + foreach ($this->grn_items as $ln_itm) $total += round(($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group)), user_price_dec()); foreach ($this->gl_codes as $gl_line) - { //////// 2009-08-18 Joe Hunt + { if (!is_tax_account($gl_line->gl_code)) $total += $gl_line->amount; - } + } return $total; } // @@ -187,7 +203,7 @@ class supp_trans $total += round($ln_itm->this_quantity_inv * $ln_itm->chg_price, user_price_dec()); foreach ($this->gl_codes as $gl_line) - { //////// 2010-10-10 Joe Hunt + { if (!is_tax_account($gl_line->gl_code) || $this->tax_included) $total += $gl_line->amount; } @@ -214,7 +230,7 @@ all the info to do the necessary entries without looking up ie additional querie var $gl_code; var $tax_included; - function grn_item ($id, $po_detail_item, $item_code, $item_description, $qty_recd, + function __construct($id, $po_detail_item, $item_code, $item_description, $qty_recd, $prev_quantity_inv, $this_quantity_inv, $order_price, $chg_price, $std_cost_unit, $gl_code, $tax_included) { @@ -232,17 +248,15 @@ all the info to do the necessary entries without looking up ie additional querie $this->gl_code = $gl_code; $this->tax_included = $tax_included; } - + function full_charge_price($tax_group_id, $tax_group=null) { return get_full_price_for_item($this->item_code, $this->chg_price, $tax_group_id, $this->tax_included, $tax_group); } - + function taxfree_charge_price($tax_group_id, $tax_group=null) { -// if ($tax_group_id==null) -// return $this->chg_price; return get_tax_free_price_for_item($this->item_code, $this->chg_price, $tax_group_id, $this->tax_included, $tax_group); } @@ -260,7 +274,7 @@ class gl_codes var $amount; var $memo_; - function gl_codes ($Counter, $gl_code, $gl_act_name, $gl_dim, $gl_dim2, $amount, $memo_) + function __construct($Counter, $gl_code, $gl_act_name, $gl_dim, $gl_dim2, $amount, $memo_) { /* Constructor function to add a new gl_codes object with passed params */ @@ -274,4 +288,3 @@ class gl_codes } } -?>