Next fixes to db_pager usage/behaviour.

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

diff --git a/includes/types.inc b/includes/types.inc
index c8c5f90482dec7bffa1b6c8fe05691f1f958270f..9003ecebbdaf0e49fa008ee6cf0ff1588a52cc12 100644 (file)
--- a/includes/types.inc
+++ b/includes/types.inc
@@ -110,11 +110,11 @@ class systypes
 //----------------------------------------------------------------------------------
 
 $bank_account_types_array = array (
-                                               0=> array ('id' => 0, 'name' => _("Savings Account")),
-                                               1=> array ('id' => 1, 'name' => _("Chequing Account")),
-                                               2=> array ('id' => 2, 'name' => _("Credit Account")),
-                                               3=> array ('id' => 3, 'name' => _("Cash Account"))
-                                               );
+       0=> array ('id' => 0, 'name' => _("Savings Account"), 'ptype' => _("Transfer")),
+       1=> array ('id' => 1, 'name' => _("Chequing Account"),'ptype' => _("Cheque")),
+       2=> array ('id' => 2, 'name' => _("Credit Account"), 'ptype' => _("Credit")),
+       3=> array ('id' => 3, 'name' => _("Cash Account"), 'ptype' => _("Cash"))
+       );
 
 class bank_account_types 
 {
@@ -130,8 +130,13 @@ class bank_account_types
                global $bank_account_types_array;
                return $bank_account_types_array[$index]['name'];
        }
+       
+       function transfer_type($index) 
+       {
+               global $bank_account_types_array;
+               return $bank_account_types_array[$index]['ptype'];
+       }
 }
-
 //----------------------------------------------------------------------------------
 
 include_once($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
@@ -144,6 +149,7 @@ $payment_person_types_array = array (
                                                        1=> array ('id' => 1, 'name' => _("Work Order")),
                                                        2=> array ('id' => 2, 'name' => _("Customer")),
                                                        3=> array ('id' => 3, 'name' => _("Supplier")),
+                                                       4=> array ('id' => 4, 'name' => _("Quick Entry"))
                                                        );
 
 class payment_person_types 
@@ -175,12 +181,15 @@ class payment_person_types
        return 3; 
     }
 
-    function dimension()  
+    function QuickEntry()  
     { 
        return 4; 
     }
 
-    //function Project()  { return 4; }
+    function dimension()  
+    { 
+       return 5; 
+    }
 
     function type_name($type)
     {
@@ -194,6 +203,9 @@ class payment_person_types
        {
                case payment_person_types::misc() :
                        return $person_id;
+               case payment_person_types::QuickEntry() :
+                       $qe = get_quick_entry($person_id);
+                       return ($full?payment_person_types::type_name($type) . " ":"") . $qe["description"];
                case payment_person_types::WorkOrder() :
                        $wo = get_work_order($person_id);
                        return ($full?payment_person_types::type_name($type) . " ":"") . $wo["wo_ref"];
@@ -201,8 +213,6 @@ class payment_person_types
                        return ($full?payment_person_types::type_name($type) . " ":"") . get_customer_name($person_id);
                case payment_person_types::supplier() :
                        return ($full?payment_person_types::type_name($type) . " ":"") . get_supplier_name($person_id);
-               //case payment_person_types::Project() :
-               //      return ($full?payment_person_types::type_name($type) . " ":"") . get_dimension_string($person_id);
                default :
                        //DisplayDBerror("Invalid type sent to person_name");
                        //return;
@@ -215,8 +225,8 @@ class payment_person_types
        switch ($type)
        {
                case payment_person_types::misc() :
+               case payment_person_types::QuickEntry() :
                case payment_person_types::WorkOrder() :
-               //case payment_person_types::Project() :
                        return get_company_currency();
 
                case payment_person_types::customer() :
@@ -236,17 +246,17 @@ class payment_person_types
        {
                case payment_person_types::misc() :
                        return true;
-               case payment_person_types::WorkOrder() : // 070305 changed to open workorders ES
+               case payment_person_types::QuickEntry() :
+                       return db_has_quick_entries();
+               case payment_person_types::WorkOrder() : // 070305 changed to open workorders JH
                        return db_has_open_workorders();
                case payment_person_types::customer() :
                        return db_has_customers();
                case payment_person_types::supplier() :
                        return db_has_suppliers();
-               //case payment_person_types::Project() :
-               //      return db_has_dimensions();
                default :
                        display_db_error("Invalid type sent to has_items", "");
-                       return;
+                       return false;
        }
     }
 }