From 3da9b00ca6e94932900b3464a1212bb8effcb2cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?= Date: Wed, 20 Jul 2016 16:34:09 -0400 Subject: [PATCH] Solving conflicts with branch 3.1-CONTENT --- workflow/engine/classes/model/om/BaseProcess.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/workflow/engine/classes/model/om/BaseProcess.php b/workflow/engine/classes/model/om/BaseProcess.php index 037a19b3a..deb9c6556 100755 --- a/workflow/engine/classes/model/om/BaseProcess.php +++ b/workflow/engine/classes/model/om/BaseProcess.php @@ -1658,7 +1658,7 @@ abstract class BaseProcess extends BaseObject implements Persistent $this->pro_unit_cost = $rs->getString($startcol + 36); - $this->pro_itee = $rs->getString($startcol + 35); + $this->pro_itee = $rs->getString($startcol + 37); $this->resetModified(); @@ -1980,7 +1980,7 @@ abstract class BaseProcess extends BaseObject implements Persistent case 36: return $this->getProUnitCost(); break; - case 35: + case 37: return $this->getProItee(); break; default: @@ -2183,7 +2183,7 @@ abstract class BaseProcess extends BaseObject implements Persistent case 36: $this->setProUnitCost($value); break; - case 35: + case 37: $this->setProItee($value); break; } // switch() @@ -2357,8 +2357,8 @@ abstract class BaseProcess extends BaseObject implements Persistent $this->setProUnitCost($arr[$keys[36]]); } - if (array_key_exists($keys[35], $arr)) { - $this->setProItee($arr[$keys[35]]); + if (array_key_exists($keys[37], $arr)) { + $this->setProItee($arr[$keys[37]]); } }