X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ftypes.inc;h=959c1cd1360a94c58c361d5b46999babe37f42fe;hb=268a54dcfd08aff7113bc3afe8b784f36db2d0d4;hp=cd4e3dc3d18fd055c040c9177c033dbf2634c244;hpb=fa43a9c974d05b77517a0d8e3e510ef4a088632e;p=fa-stable.git

diff --git a/includes/types.inc b/includes/types.inc
index cd4e3dc3..959c1cd1 100644
--- a/includes/types.inc
+++ b/includes/types.inc
@@ -36,6 +36,11 @@ define('ST_WORKORDER', 26);
 define('ST_MANUISSUE', 28);
 define('ST_MANURECEIVE', 29);
 
+//
+//	Depreciation period types
+//
+define('FA_MONTHLY', 0);
+define('FA_YEARLY', 1);
 
 define('ST_SALESORDER', 30);
 define('ST_SALESQUOTE', 32);
@@ -125,91 +130,16 @@ function payment_person_name($type, $person_id, $full=true) {
 			return ($full ? $payment_person_types[$type] . " ":"") . $qe["description"];
 		case PT_WORKORDER :
 			global $wo_cost_types;
-			return $wo_cost_types[$person_id];
+			return get_trans_view_str(ST_WORKORDER, $person_id, _('Work Order').' '.$person_id);
 		case PT_CUSTOMER :
-			return ($full ?$payment_person_types[$type] . " ":"") . get_customer_name($person_id);
+			return ($full ?$payment_person_types[$type] . " ":"") . sprintf("[%05s] %s", $person_id, get_customer_name($person_id));
 		case PT_SUPPLIER :
-			return ($full ? $payment_person_types[$type] . " ":"") . get_supplier_name($person_id);
+			return ($full ? $payment_person_types[$type] . " ":"") . sprintf("[%05s] %s", $person_id, get_supplier_name($person_id));
 		default :
-			//DisplayDBerror("Invalid type sent to person_name");
-			//return;
 			return '';
 	}
 }
 
-//
-//	Returns counterparty (supplier/customer) name for selected transaction.
-//
-function get_counterparty_name($trans_type, $trans_no, $full=true)
-{
-	switch($trans_type)
-	{
-		case ST_SALESORDER:
-		case ST_SALESQUOTE:
-			$sql = "SELECT order.customer_id as person_id, debtor.name as name
-			FROM ".TB_PREF."sales_orders order, ".TB_PREF."debtors_master debtor
-			WHERE order_no=".db_escape($trans_no)." AND trans_type=".db_escape($trans_type)
-			." AND order.debtor_no=debtor.debtor_no";
-			break;
-		case ST_SALESINVOICE :
-		case ST_CUSTCREDIT :
-		case ST_CUSTPAYMENT :
-		case ST_CUSTDELIVERY :
-			$sql = "SELECT trans.debtor_no as person_id, debtor.name as name
-			FROM ".TB_PREF."debtor_trans trans, ".TB_PREF."debtors_master debtor
-			WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type)
-			." AND trans.debtor_no=debtor.debtor_no";
-			break;
-
-		case ST_PURCHORDER :
-			$sql = "SELECT order.supplier_id as person_id, supp.supp_name as name
-			FROM ".TB_PREF."purch_orders order, ".TB_PREF."suppliers supp
-			WHERE order_no=".db_escape($trans_no)
-			." AND order.supplier_id=supp.supplier_id";
-			break;
-
-		case ST_SUPPINVOICE :
-		case ST_SUPPCREDIT :
-		case ST_SUPPAYMENT :
-			$sql = "SELECT trans.supplier_id as person_id, supp.supp_name as name
-			FROM ".TB_PREF."supp_trans trans, ".TB_PREF."suppliers supp
-			WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type)
-			." AND trans.supplier_id=supp.supplier_id";
-			break;
-
-		case ST_SUPPRECEIVE :
-			$sql = "SELECT trans.supplier_id as person_id, supp.supp_name as name
-			FROM ".TB_PREF."grn_batch trans, ".TB_PREF."suppliers supp
-			WHERE id=".db_escape($trans_no)
-			." AND trans.supplier_id=supp.supplier_id";
-			break;
-
-		case ST_JOURNAL:	// FIXME - this one can have multiply counterparties of various types depending on person_type_id
-
-		default: 
-		/*	// internal operations
-		case ST_WORKORDER :
-		case ST_INVADJUST : // GRN/DN returns ?
-		case ST_BANKTRANSFER :
-		case ST_LOCTRANSFER :
-		case ST_MANUISSUE :
-		case ST_MANURECEIVE :
-		case ST_COSTUPDATE :
-		case ST_BANKPAYMENT :	// generic bank transactions
-		case ST_BANKDEPOSIT :*/
-			return null;
-	}
-
-	$result = db_query($sql, 'cannot retrieve counterparty name');
-	if (db_num_rows($result))
-	{
-		$row = db_fetch($result);
-		return sprintf("[%05s] %s", $row['person_id'], $row['name']);
-	}
-
-	return '';
-}
-
 function payment_person_has_items($type) {
 	switch ($type)
 	{
@@ -259,8 +189,9 @@ define('CL_EXPENSE', 6);
 
 function get_class_type_convert($ctype)
 {
-	global $use_oldstyle_convert;
-	if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+	global $SysPrefs;
+
+	if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
 		return (($ctype >= CL_INCOME || $ctype == CL_NONE) ? -1 : 1);
 	else	
 		return ((($ctype >= CL_LIABILITIES && $ctype <= CL_INCOME) || $ctype == CL_NONE) ? -1 : 1);
@@ -315,6 +246,9 @@ define('BO_SUPPLIER', 3);
 
 include_once($path_to_root . '/includes/sysnames.inc');
 
+// tax register type
+define('TR_OUTPUT', 0); // sales
+define('TR_INPUT', 1);	// purchase
 //---------------------------------------------------------------------------------
 // Constants optionally redefined locally
 //
@@ -338,5 +272,5 @@ defined('ICON_VIEW') || define('ICON_VIEW', 'view.gif');
 defined('ICON_SUBMIT') || define('ICON_SUBMIT', 'ok.gif');
 defined('ICON_ESCAPE') || define('ICON_ESCAPE', 'escape.png');
 defined('ICON_ALLOC') || define('ICON_ALLOC', 'alloc.png');
+defined('ICON_CLOSED') || define('ICON_CLOSED', 'closed.png');
 
-?>
\ No newline at end of file