projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Code cleanup in supplier_invoice.php and supplier_credit.php
[fa-stable.git]
/
purchasing
/
includes
/
po_class.inc
diff --git
a/purchasing/includes/po_class.inc
b/purchasing/includes/po_class.inc
index 47129816ac1b7501303319d38426d5b708d76b6b..c24119d2b9d26bd226e7c149a83a468cfbfb4db5 100644
(file)
--- a/
purchasing/includes/po_class.inc
+++ b/
purchasing/includes/po_class.inc
@@
-32,8
+32,6
@@
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 $ex_rate;
var $cash_account;
var $terms;
var $ex_rate;
var $cash_account;
@@
-47,21
+45,22
@@
class purch_order
var $alloc; // sum of payments allocated
var $prepayments = array();
var $alloc; // sum of payments allocated
var $prepayments = array();
- function purch_order()
+ var $fixed_asset = false;
+
+ function __construct()
{
/*Constructor function initialises a new purchase order object */
$this->line_items = array();
$this->lines_on_order = $this->order_no = $this->supplier_id = 0;
}
{
/*Constructor function initialises a new purchase order object */
$this->line_items = array();
$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);
}
$this->tax_group_array = get_tax_group_items_as_array($tax_group_id);
}
@@
-153,7
+152,7
@@
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') {
// Adjustment for swiss franken, we always have 5 rappen = 1/20 franken
if ($this->curr_code == 'CHF') {
@@
-185,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);
@@
-217,7
+216,7
@@
class po_line_details
var $standard_cost;
var $descr_editable;
var $standard_cost;
var $descr_editable;
- function
po_line_details
($line_no, $stock_item, $item_descr, $qty, $prc, $uom, $req_del_date,
+ function
__construct
($line_no, $stock_item, $item_descr, $qty, $prc, $uom, $req_del_date,
$qty_inv, $qty_recd, $grn_item_id=0)
{
$qty_inv, $qty_recd, $grn_item_id=0)
{
@@
-247,10
+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);
+ }
}
}