Merged latest changes from stable branch.

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

diff --git a/includes/sysnames.inc b/includes/sysnames.inc
index 440ff528bda86b88d0ba9de6724cb6e2c4f4230e..52f96c64b95a288a23498259281bbd4ebff44a56 100644 (file)
--- a/includes/sysnames.inc
+++ b/includes/sysnames.inc
@@ -16,7 +16,7 @@
 //
 global $systypes_array, $bank_account_types, $bank_transfer_types, 
        $payment_person_types, $wo_types_array, $wo_cost_types, $class_types,
-       $quick_actions, $quick_entry_types, $stock_types, $tag_types;
+       $quick_actions, $quick_entry_types, $stock_types, $tag_types, $bank_owner;
 
 $systypes_array = array (
        ST_JOURNAL => _("Journal Entry"),
@@ -110,6 +110,7 @@ $wo_types_array = array (
 $wo_cost_types = array(
        WO_LABOUR => _("Labour Cost"),
        WO_OVERHEAD => _("Overhead Cost"),
+       WO_MATERIALS => _("Materials")
 );
 
 //----------------------------------------------------------------------------------
@@ -182,7 +183,19 @@ $pterm_types = array(
        PTT_FOLLOWING => _("Day In Following Month")
 );
 
+$tax_algorithms = array( 
+       TCA_LINES => _("Sum per line taxes"), 
+       TCA_TOTALS => _("Taxes from totals")
+);
 //----------------------------------------------------------------------------------
+
+$bank_owner_types = array(
+       BO_UNKNOWN => _("Unknown"),
+       BO_COMPANY => _("Company"),
+       BO_CUSTBRANCH => _("Customer"),
+       BO_SUPPLIER => _("Supplier")
+);
+
 // This month array is for use with the last 3 dateformats. 
 $tmonths = array("", _("Jan"),_("Feb"),_("Mar"),_("Apr"),_("May"),_("Jun"),_("Jul"),_("Aug"),_("Sep"),_("Oct"),_("Nov"),_("Dec"));