projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
81b82c1
)
sync
author
Edward
<edward@roojs.com>
Fri, 1 Mar 2019 06:49:33 +0000
(14:49 +0800)
committer
Edward
<edward@roojs.com>
Fri, 1 Mar 2019 06:49:33 +0000
(14:49 +0800)
DataObjects/Core_company.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_company.php
b/DataObjects/Core_company.php
index
cb0af57
..
aca5be8
100644
(file)
--- a/
DataObjects/Core_company.php
+++ b/
DataObjects/Core_company.php
@@
-255,6
+255,18
@@
class Pman_Core_DataObjects_Core_Company extends DB_DataObject
{
// we still use comptype in some old systems...
{
// we still use comptype in some old systems...
+ if(!empty($q['comptype']) && empty($q['comptype_id'])) {
+ $en = DB_DataObject::Factory('core_enum');
+ $en->setFrom(array(
+ 'etype' => 'COMPTYPE',
+ 'name' => $q['comptype'],
+ 'active' => 1
+ ));
+ if($en->find(true)) {
+ $this->comptype_id = $en->id;
+ }
+ }
+
if (!empty($q['comptype_id'])) {
$en = DB_DataObject::Factory('core_enum');
$en->get($q['comptype_id']);
if (!empty($q['comptype_id'])) {
$en = DB_DataObject::Factory('core_enum');
$en->get($q['comptype_id']);
@@
-274,13
+286,24
@@
class Pman_Core_DataObjects_Core_Company extends DB_DataObject
{
// we still use comptype in some old systems...
{
// we still use comptype in some old systems...
+ if(!empty($q['comptype']) && empty($q['comptype_id'])) {
+ $en = DB_DataObject::Factory('core_enum');
+ $en->setFrom(array(
+ 'etype' => 'COMPTYPE',
+ 'name' => $q['comptype'],
+ 'active' => 1
+ ));
+ if($en->find(true)) {
+ $this->comptype_id = $en->id;
+ }
+ }
+
if (!empty($q['comptype_id'])) {
$en = DB_DataObject::Factory('core_enum');
$en->get($q['comptype_id']);
$this->comptype = $en->name;
}
if (!empty($q['comptype_id'])) {
$en = DB_DataObject::Factory('core_enum');
$en->get($q['comptype_id']);
$this->comptype = $en->name;
}
-
if(!empty($q['_flag_delete'])){
$this->deleted_dt = $this->sqlValue("NOW()");
$this->deleted_by = $roo->getAuthUser()->id;
if(!empty($q['_flag_delete'])){
$this->deleted_dt = $this->sqlValue("NOW()");
$this->deleted_by = $roo->getAuthUser()->id;