projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5232: A disposed fixed asset still appears in the fixed assets valuation report with...
[fa-stable.git]
/
includes
/
types.inc
diff --git
a/includes/types.inc
b/includes/types.inc
index 2c233be66f927b14074059665f7ca64c6388c09f..a47e265fc5884d272e3c96b22d2bc22af76f4e61 100644
(file)
--- a/
includes/types.inc
+++ b/
includes/types.inc
@@
-36,11
+36,18
@@
define('ST_WORKORDER', 26);
define('ST_MANUISSUE', 28);
define('ST_MANURECEIVE', 29);
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_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.
// 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 ($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 :
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 :
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 :
default :
- //DisplayDBerror("Invalid type sent to person_name");
- //return;
return '';
}
}
return '';
}
}
@@
-243,6
+248,9
@@
define('BO_SUPPLIER', 3);
include_once($path_to_root . '/includes/sysnames.inc');
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
//
//---------------------------------------------------------------------------------
// Constants optionally redefined locally
//
@@
-266,4
+274,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_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');