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' into unstable
[fa-stable.git]
/
includes
/
ui
/
items_cart.inc
diff --git
a/includes/ui/items_cart.inc
b/includes/ui/items_cart.inc
index 7a19d23508e508c4d4e857b9d948461312848ab9..0e32165b0be23c17dda2b8fc05fcd11cbd26330d 100644
(file)
--- a/
includes/ui/items_cart.inc
+++ b/
includes/ui/items_cart.inc
@@
-40,7
+40,7
@@
class items_cart
var $fixed_asset;
var $fixed_asset;
- function
items_car
t($type, $trans_no=0)
+ function
__construc
t($type, $trans_no=0)
{
$this->trans_type = $type;
$this->order_id = $trans_no;
{
$this->trans_type = $type;
$this->order_id = $trans_no;
@@
-101,7
+101,7
@@
class items_cart
$low_stock = array();
$low_stock = array();
- if (!$SysPrefs->allow_negative_stock()
|| is_fixed_asset($line_item->mb_flag)
)
+ if (!$SysPrefs->allow_negative_stock())
{
foreach ($this->line_items as $line_no => $line_item)
if (has_stock_holding($line_item->mb_flag) || is_fixed_asset($line_item->mb_flag))
{
foreach ($this->line_items as $line_no => $line_item)
if (has_stock_holding($line_item->mb_flag) || is_fixed_asset($line_item->mb_flag))
@@
-224,7
+224,7
@@
class items_cart
{
foreach ($this->gl_items as $gl_item)
{
{
foreach ($this->gl_items as $gl_item)
{
- if (
$gl_item->person_id
)
+ if (
is_subledger_account($gl_item->code_id)
)
return true;
}
return false;
return true;
}
return false;
@@
-309,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 (!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)
{
$ex_net = abs($net_sum) - @array_sum($tax_info['net_amount']);
if ($ex_net != 0)
@@
-465,7
+465,7
@@
class line_item
var $price;
var $standard_cost;
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);
{
$item_row = get_item($stock_id);
@@
-509,7
+509,7
@@
class gl_item
var $branch_id;
var $date;
var $branch_id;
var $date;
- function
gl_item
($code_id=null, $dimension_id=0, $dimension2_id=0, $amount=0, $memo='',
+ 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>";
$act_descr=null, $person_id=null, $date=null)
{
//echo "adding $index, $code_id, $dimension_id, $amount, $reference<br>";