X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ftypes.inc;h=a47e265fc5884d272e3c96b22d2bc22af76f4e61;hb=630e99edecc3eabe708a9e7bda94eaa60bf16db7;hp=70fb7f0cc08e285cd4b9782c37c4f472243f0045;hpb=76ca9fef9bb510236a6a7740fa0f60eb7db384c9;p=fa-stable.git

diff --git a/includes/types.inc b/includes/types.inc
index 70fb7f0c..a47e265f 100644
--- a/includes/types.inc
+++ b/includes/types.inc
@@ -36,11 +36,18 @@ 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);
 define('ST_COSTUPDATE', 35);
 define('ST_DIMENSION', 40);
+define('ST_CUSTOMER', 41);
+define('ST_SUPPLIER', 42);
 
 // Don't include these defines in the $systypes_array.
 // They are used for documents only.
@@ -125,14 +132,12 @@ 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 '';
 	}
 }
@@ -186,8 +191,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);
@@ -232,7 +238,41 @@ define('PTT_FOLLOWING', 4);
 
 define('TCA_TOTALS', 1); // taxes are calculated from respective net totals for all lines
 define('TCA_LINES', 2); // taxes calculated for every line, then summed
+//
+//	Bank account owner types
+//
+define('BO_UNKNOWN', 0);
+define('BO_COMPANY', 1);
+define('BO_CUSTBRANCH', 2);
+define('BO_SUPPLIER', 3);
 
 include_once($path_to_root . '/includes/sysnames.inc');
 
-?>
\ No newline at end of file
+// tax register type
+define('TR_OUTPUT', 0); // sales
+define('TR_INPUT', 1);	// purchase
+//---------------------------------------------------------------------------------
+// Constants optionally redefined locally
+//
+defined('ICON_EDIT') || define('ICON_EDIT', 'edit.gif');
+defined('ICON_DELETE') || define('ICON_DELETE', 'delete.gif');
+defined('ICON_ADD')	|| define('ICON_ADD', 'ok.gif');
+defined('ICON_UPDATE') || define('ICON_UPDATE', 'ok.gif');
+defined('ICON_OK') || define('ICON_OK', 'ok.gif');
+defined('ICON_CANCEL') || define('ICON_CANCEL', 'cancel.png');
+defined('ICON_GL') || define('ICON_GL', 'gl.png');
+defined('ICON_PRINT') || define('ICON_PRINT', 'print.png');
+defined('ICON_PDF') || define('ICON_PDF', 'pdf.gif');
+defined('ICON_DOC') || define('ICON_DOC', 'invoice.gif');
+defined('ICON_CREDIT') || define('ICON_CREDIT', 'credit.gif');
+defined('ICON_RECEIVE') || define('ICON_RECEIVE', 'receive.gif');
+defined('ICON_DOWN') || define('ICON_DOWN', 'download.gif');
+defined('ICON_MONEY') || define('ICON_MONEY', 'money.png');
+defined('ICON_REMOVE') || define('ICON_REMOVE', 'remove.png');
+defined('ICON_REPORT') || define('ICON_REPORT', 'report.png');
+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');
+