Author: nathangray
New Revision: 55489
URL: http://svn.stylite.de/viewvc/egroupware?rev=55489&view=rev
Log:
Allow status cancelled to be 100% completed
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 Tue Mar 22 15:23:12 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,55058,55098,55464
+/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,55098,55464,55476
— branches/14.2/infolog/inc/class.infolog_bo.inc.php (original)
+++ branches/14.2/infolog/inc/class.infolog_bo.inc.php Tue Mar 22 15:23:12 2016
@@ -816,7 +816,7 @@
$values[‘info_percent’] = 0;
}
else if (
-
($values['info_status'] != 'archive' && $values['info_status'] != 'cancelled' && 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
Propchange: branches/14.2/infolog/inc/class.infolog_bo.inc.php
— svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 22 15:23:12 2016
@@ -1,1 +1,1 @@
-/trunk/infolog/inc/class.infolog_bo.inc.php:52480,52506,52536,52809,53500,54304,54409,55058
+/trunk/infolog/inc/class.infolog_bo.inc.php:52480,52506,52536,52809,53500,54304,54409,55058,55476
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
