projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://git.code.sf.net/p/frontaccounting/git
[fa-stable.git]
/
purchasing
/
includes
/
po_class.inc
diff --git
a/purchasing/includes/po_class.inc
b/purchasing/includes/po_class.inc
index c9ec00df2f32362d5ca993b480c1e699026266f4..b197cb0369b1d27d3c31e81f79ead7dfa743c957 100644
(file)
--- a/
purchasing/includes/po_class.inc
+++ b/
purchasing/includes/po_class.inc
@@
-32,12
+32,21
@@
class purch_order
var $tax_group_id;
var $tax_group_array = null; // saves db queries
var $tax_included; // type of prices
var $tax_group_id;
var $tax_group_array = null; // saves db queries
var $tax_included; // type of prices
- var $tax_algorithm;
- var $stored_algorithm; // copy to find the change after invoice in processed
var $terms;
var $terms;
-
+ var $ex_rate;
+ var $cash_account;
+ var $dimension,
+ $dimension2;
+
var $reference;
var $reference;
+ var $tax_overrides = array(); // array of taxes manually inserted during sales invoice entry (direct invoice)
+ var $prep_amount = 0; // prepayment required
+ var $alloc; // sum of payments allocated
+ var $prepayments = array();
+
+ var $fixed_asset = false;
+
function purch_order()
{
/*Constructor function initialises a new purchase order object */
function purch_order()
{
/*Constructor function initialises a new purchase order object */
@@
-45,20
+54,19
@@
class purch_order
$this->lines_on_order = $this->order_no = $this->supplier_id = 0;
}
$this->lines_on_order = $this->order_no = $this->supplier_id = 0;
}
- function set_supplier($supplier_id, $supplier_name, $curr_code, $tax_group_id, $tax_included
, $tax_algorithm
)
+ function set_supplier($supplier_id, $supplier_name, $curr_code, $tax_group_id, $tax_included)
{
$this->supplier_id = $supplier_id;
$this->supplier_name = $supplier_name;
$this->curr_code = $curr_code;
$this->tax_group_id = $tax_group_id;
$this->tax_included = $tax_included;
{
$this->supplier_id = $supplier_id;
$this->supplier_name = $supplier_name;
$this->curr_code = $curr_code;
$this->tax_group_id = $tax_group_id;
$this->tax_included = $tax_included;
- $this->stored_algorithm = $this->tax_algorithm = $tax_algorithm;
$this->tax_group_array = get_tax_group_items_as_array($tax_group_id);
}
function add_to_order($line_no, $stock_id, $qty, $item_descr, $price, $uom, $req_del_date, $qty_inv, $qty_recd)
{
$this->tax_group_array = get_tax_group_items_as_array($tax_group_id);
}
function add_to_order($line_no, $stock_id, $qty, $item_descr, $price, $uom, $req_del_date, $qty_inv, $qty_recd)
{
- if (
$qty != 0 && isset($qty)
)
+ if (
isset($qty) && $qty != 0
)
{
$this->line_items[$line_no] = new po_line_details($line_no, $stock_id, $item_descr, $qty, $price, $uom,
$req_del_date, $qty_inv, $qty_recd);
{
$this->line_items[$line_no] = new po_line_details($line_no, $stock_id, $item_descr, $qty, $price, $uom,
$req_del_date, $qty_inv, $qty_recd);
@@
-144,13
+152,18
@@
class purch_order
$prices[] = round($ln_itm->price * ($receival ? $ln_itm->receive_qty : $ln_itm->quantity), user_price_dec());
}
$taxes = get_tax_for_items($items, $prices, $shipping_cost,
$prices[] = round($ln_itm->price * ($receival ? $ln_itm->receive_qty : $ln_itm->quantity), user_price_dec());
}
$taxes = get_tax_for_items($items, $prices, $shipping_cost,
- $this->tax_group_id, $this->tax_included, $this->tax_group_array
, $this->tax_algorithm
);
+ $this->tax_group_id, $this->tax_included, $this->tax_group_array);
// Adjustment for swiss franken, we always have 5 rappen = 1/20 franken
if ($this->curr_code == 'CHF') {
$val = $taxes['1']['Value'];
// Adjustment for swiss franken, we always have 5 rappen = 1/20 franken
if ($this->curr_code == 'CHF') {
$val = $taxes['1']['Value'];
- $taxes['1']['Value'] = (floatval((intval(round(($val*20),0)))/20));
- }
+ $val1 = (floatval((intval(round(($val*20),0)))/20));
+ $taxes['1']['Value'] = $val1;
+ }
+ foreach($this->tax_overrides as $id => $value) // add values entered manually
+ {
+ $taxes[$id]['Override'] = $value;
+ }
return $taxes;
}
return $taxes;
}
@@
-171,7
+184,7
@@
class purch_order
if (!$this->tax_included ) {
$taxes = get_tax_for_items($items, $prices, 0, $this->tax_group_id,
if (!$this->tax_included ) {
$taxes = get_tax_for_items($items, $prices, 0, $this->tax_group_id,
- $this->tax_included, $this->tax_group_array
, $this->tax_algorithm
);
+ $this->tax_included, $this->tax_group_array);
foreach($taxes as $tax)
$total += round($tax['Value'], $dec);
foreach($taxes as $tax)
$total += round($tax['Value'], $dec);
@@
-233,11
+246,20
@@
class po_line_details
$this->grn_item_id = $grn_item_id;
}
$this->grn_item_id = $grn_item_id;
}
- function taxfree_charge_price($po)
+ // Deprecated, use with care. If you need line value as it is calculated in invoice, use taxfree_charge_value below.
+ function taxfree_charge_price($po)
{
return get_tax_free_price_for_item($this->stock_id, $this->price,
$po->tax_group_id, $po->tax_included, $po->tax_group_array);
}
{
return get_tax_free_price_for_item($this->stock_id, $this->price,
$po->tax_group_id, $po->tax_included, $po->tax_group_array);
}
+
+ //
+ // GRN line tax free value.
+ //
+ function taxfree_charge_value($po)
+ {
+ return get_tax_free_price_for_item($this->stock_id, $this->receive_qty*$this->price,
+ $po->tax_group_id, $po->tax_included, $po->tax_group_array);
+ }
}
}
-?>