DataObjects/Core_watch.php

[Pman.Core] / DataObjects / Companies.php

diff --git a/DataObjects/Companies.php b/DataObjects/Companies.php
index f63a499..4c2b443 100644 (file)
--- a/DataObjects/Companies.php
+++ b/DataObjects/Companies.php
@@ -41,7 +41,7 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
     function applyFilters($q, $au)
     {
        
-        $this->selectAdd("i18n_translate('c' ,  country, 'en') as country_display_name ");
+        $this->selectAdd("i18n_translate('c' , Companies.country, 'en') as country_display_name ");
       
         $tn = $this->tableName();
         //DB_DataObject::debugLevel(1);
@@ -248,7 +248,7 @@ class Pman_Core_DataObjects_Companies extends DB_DataObject
     function beforeUpdate($old, $q,$roo)
     {
         if(!empty($this->is_system) && 
-            ($old->code != $this->code || $old->name != $this->name)
+            ($old->code != $this->code  ) // used to be not allowed to change name..
         ){
             $roo->jerr('This company is not allow to editing Ref. or Company Name...');
         }