class.infolog_bo.inc.php

nathangray 2016-02-18 00:30:25 UTC #1

Author: nathangray
New Revision: 55058

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

Modified:
trunk/infolog/inc/class.infolog_bo.inc.php

Modified: trunk/infolog/inc/class.infolog_bo.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/infolog/inc/class.infolog_bo.inc.php?rev=55058&r1=55057&r2=55058&view=diff

— trunk/infolog/inc/class.infolog_bo.inc.php (original)
+++ trunk/infolog/inc/class.infolog_bo.inc.php Thu Feb 18 01:30:21 2016
@@ -764,7 +764,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

@@ -800,7 +800,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
  	}

@@ -813,7 +813,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;

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