projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #8131 - chinese translations
[Pman.Core]
/
DataObjects
/
Core_company.php
diff --git
a/DataObjects/Core_company.php
b/DataObjects/Core_company.php
index
c9b31ee
..
4ae8fb3
100644
(file)
--- a/
DataObjects/Core_company.php
+++ b/
DataObjects/Core_company.php
@@
-35,6
+35,13
@@
class Pman_Core_DataObjects_Core_Company extends DB_DataObject
public $country; // string(4) not_null
public $is_system; // int(2)
public $country; // string(4) not_null
public $is_system; // int(2)
+
+ public $comptype_id;
+ public $address1;
+ public $address2;
+ public $address3;
+
+
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
@@
-79,7
+86,7
@@
class Pman_Core_DataObjects_Core_Company extends DB_DataObject
}
if (!empty($q['query']['comptype'])) {
}
if (!empty($q['query']['comptype'])) {
- $this->whereAddIn(
'
comptype', explode(',', $q['query']['comptype']), 'string');
+ $this->whereAddIn(
$tn.'.
comptype', explode(',', $q['query']['comptype']), 'string');
}
}
@@
-280,7
+287,7
@@
class Pman_Core_DataObjects_Core_Company extends DB_DataObject
$roo->jok('OK');
}
$roo->jok('OK');
}
- $roo->jerr
(
'EXIST');
+ $roo->jerr
or('NOTICE-EXIST-CHECK',
'EXIST');
}
}
}
}
@@
-320,7
+327,7
@@
class Pman_Core_DataObjects_Core_Company extends DB_DataObject
$roo->jok('OK');
}
$roo->jok('OK');
}
- $roo->jerr
(
'EXIST');
+ $roo->jerr
or('NOTICE-EXIST-CHECK',
'EXIST');
}
if(!empty($q['_merge_id'])){
}
if(!empty($q['_merge_id'])){