Recurrent Invoices: fixed buggy call to non existing function and payment terms type...

[fa-stable.git] / includes / types.inc

diff --git a/includes/types.inc b/includes/types.inc
index 37ec321cf4d2352aeed1938e8f6072da4b657665..003bd7246fd0a3bb4f7bb92475245e4c8d4543f8 100644 (file)
--- a/includes/types.inc
+++ b/includes/types.inc
@@ -36,14 +36,13 @@ define('ST_WORKORDER', 26);
 define('ST_MANUISSUE', 28);
 define('ST_MANURECEIVE', 29);
 
-
 define('ST_SALESORDER', 30);
 define('ST_SALESQUOTE', 32);
 define('ST_COSTUPDATE', 35);
 define('ST_DIMENSION', 40);
 
 // Don't include these defines in the $systypes_array.
-// They are used for documents only.
+// They are used as report subtypes only.
 define ('ST_STATEMENT', 91);
 define ('ST_CHEQUE', 92);
 
@@ -125,14 +124,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 '';
        }
 }
@@ -171,6 +168,7 @@ define('WO_ADVANCED', 2);
 
 define('WO_LABOUR', 0);
 define('WO_OVERHEAD', 1);
+define('WO_MATERIALS', 2);
 
 //----------------------------------------------------------------------------------
 //     GL account classes
@@ -185,8 +183,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);
@@ -221,13 +220,69 @@ define('TAG_DIMENSION', 2);
 //----------------------------------------------------------------------------------
 // Payment term types
 
-define('PTT_PRE', 1);
+define('PTT_PREPAY', 1);
 define('PTT_CASH', 2);
 define('PTT_DAYS', 3);
 define('PTT_FOLLOWING', 4);
 
+//----------------------------------------------------------------------------------
+// Tax calculation algorithms used in als and purchase (depends on supplier's invoicing software)
+
+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');
 
+define('VC_NONE', -1); // for tax adjustemnts
+define('VC_OTHER', 0);
+define('VC_MEDIA', 1);
+define('VC_ASSETS', 2);
+define('VC_NONDEDUCT', 3);
+define('VC_SERVICES', 4);
+define('VC_REVERSE', 5);
+define('VC_PARTIAL', 6);
+
+$vat_categories = array(
+       VC_OTHER => _('Other goods'),
+       VC_MEDIA => _('Continous services'),
+       VC_ASSETS => _('Fixed assets'),
+       VC_NONDEDUCT => _('No VAT deductible'),
+       VC_SERVICES => _('Other services'),
+       VC_PARTIAL => _('VAT partially deductible'),
+       VC_REVERSE => _('Reverse charge'),
+);
+
+//
+// Tax area categories
+//
+define('TA_DOMESTIC', 0);
+define('TA_EXPORT', 1);
+define('TA_EU', 2);
+
+$tax_area_types = array(
+       TA_DOMESTIC => _('Domestic'),
+       TA_EXPORT => _('Abroad'),
+       TA_EU => _('European Union'),
+);
+
+
+// tax register type
+define('TR_OUTPUT', 0); // sales
+define('TR_INPUT', 1); // purchase
+
+//
+//     Depreciation period types
+//
+define('FA_MONTHLY', 0);
+define('FA_YEARLY', 1);
+
 //---------------------------------------------------------------------------------
 // Constants optionally redefined locally
 //
@@ -251,5 +306,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