R55074 - in /branches/14.2/infolog: ./ inc/class.infolog_bo.inc.php

[nathangray]

Author: nathangray
New Revision: 55074

URL: http://svn.stylite.de/viewvc/egroupware?rev=55074&view=rev
Log:
Fix changing status to archived changes completion

Modified:
branches/14.2/infolog/ (props changed)
branches/14.2/infolog/inc/class.infolog_bo.inc.php (contents, props changed)

Propchange: branches/14.2/infolog/

— svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 18 22:33:30 2016
@@ -1,1 +1,1 @@
-/trunk/infolog:51376,51564,51630,51633,51645-51646,51648,51651,51658,51692,51760,51812,51817,51828,51935,51945-51946,51953,52021,52065,52075,52078,52111,52151,52238,52245,52265,52362,52381,52437,52467,52480,52506,52509,52536,52732,52735,52774,52782,52806,52809,52971-52973,52983-52988,53087,53116,53146-53147,53180,53194,53214,53449,53453,53500,53546,53562,53623,54165,54304,54332,54387,54391,54409,54443,54481,54557,54629,54668,55037-55038
+/trunk/infolog:51376,51564,51630,51633,51645-51646,51648,51651,51658,51692,51760,51812,51817,51828,51935,51945-51946,51953,52021,52065,52075,52078,52111,52151,52238,52245,52265,52362,52381,52437,52467,52480,52506,52509,52536,52732,52735,52774,52782,52806,52809,52971-52973,52983-52988,53087,53116,53146-53147,53180,53194,53214,53449,53453,53500,53546,53562,53623,54165,54304,54332,54387,54391,54409,54443,54481,54557,54629,54668,55037-55038,55058

Modified: branches/14.2/infolog/inc/class.infolog_bo.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/infolog/inc/class.infolog_bo.inc.php?rev=55074&r1=55073&r2=55074&view=diff

— branches/14.2/infolog/inc/class.infolog_bo.inc.php (original)
+++ branches/14.2/infolog/inc/class.infolog_bo.inc.php Thu Feb 18 22:33:30 2016
@@ -766,7 +766,7 @@
if ($status_only && !$undelete) // make sure only status gets writen
{
$set_completed = !$values[‘info_datecompleted’] && // set date completed of finished job, only if its not already set

•   		(in_array($values['info_status'],array('done','billed','cancelled')) || (int)$values['info_percent'] == 100);
  

•   		in_array($values['info_status'],array('done','billed','cancelled'));
  
    	$values = $old;
    	// only overwrite explicitly allowed fields
  

@@ -802,7 +802,7 @@
if ($check_defaults)
{
if (!$values[‘info_datecompleted’] &&

•   		(in_array($values['info_status'],array('done','billed')) || (int)$values['info_percent'] == 100))
  

•   		(in_array($values['info_status'],array('done','billed'))))
    	{
    		$values['info_datecompleted'] = $user2server ? $this->user_time_now : $this->now;	// set date completed to today if status == done
    	}
  

@@ -815,7 +815,9 @@
{
$values[‘info_percent’] = 0;
}

•   	else if ((int)$values['info_percent'] == 100 || $values['info_percent'] == 0)
  

•   	else if (
  

•   		($values['info_status'] != 'archive' && in_array($values['info_status'], $this->stock_status[$values['info_type']])) &&
  

•   		((int)$values['info_percent'] == 100 || $values['info_percent'] == 0))
    	{
    		// We change percent to match status, not status to match percent
    		$values['info_percent'] = 10;
  

Propchange: branches/14.2/infolog/inc/class.infolog_bo.inc.php

— svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 18 22:33:30 2016
@@ -1,1 +1,1 @@
-/trunk/infolog/inc/class.infolog_bo.inc.php:52480,52506,52536,52809,53500,54304,54409
+/trunk/infolog/inc/class.infolog_bo.inc.php:52480,52506,52536,52809,53500,54304,54409,55058

---

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs