projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed get_post() support for numeric fields.
[fa-stable.git]
/
purchasing
/
includes
/
po_class.inc
diff --git
a/purchasing/includes/po_class.inc
b/purchasing/includes/po_class.inc
index 142dd55dd16e363d9d774bf759a5008fcd9cf6fc..c24119d2b9d26bd226e7c149a83a468cfbfb4db5 100644
(file)
--- a/
purchasing/includes/po_class.inc
+++ b/
purchasing/includes/po_class.inc
@@
-33,11
+33,21
@@
class purch_order
var $tax_group_array = null; // saves db queries
var $tax_included; // type of prices
var $terms;
var $tax_group_array = null; // saves db queries
var $tax_included; // type of prices
var $terms;
-
+ var $ex_rate;
+ var $cash_account;
+ var $dimension,
+ $dimension2;
+
var $reference;
var $tax_overrides = array(); // array of taxes manually inserted during sales invoice entry (direct invoice)
var $reference;
var $tax_overrides = array(); // array of taxes manually inserted during sales invoice entry (direct invoice)
- function purch_order()
+ var $prep_amount = 0; // prepayment required
+ var $alloc; // sum of payments allocated
+ var $prepayments = array();
+
+ var $fixed_asset = false;
+
+ function __construct()
{
/*Constructor function initialises a new purchase order object */
$this->line_items = array();
{
/*Constructor function initialises a new purchase order object */
$this->line_items = array();
@@
-206,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)
{
@@
-236,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);
+ }
}
}
-?>