Added quick entries in supplier invoice/credit note as well. Based on bank payments

[fa-stable.git] / includes / errors.inc

diff --git a/includes/errors.inc b/includes/errors.inc
index 04874a392538a6145ba61e7ea151b5ed43deccea..ae34c9d9933bc65c71ed829b7b2091d8a8dce4eb 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -5,21 +5,20 @@ $before_box = ''; // temporary container for output html data before error box
 
 $msg_colors = array( 
        E_USER_ERROR => array('bg'=>'#ffcccc', 'txt'=>'#dd2200', 'bd'=>'#cc3300'),
-    E_USER_WARNING => array('bg'=>'#ffcccc', 'txt'=>'#dd2200', 'bd'=>'#cc3300'),
+    E_USER_WARNING => array('bg'=>'#ffdd33', 'txt'=>'#ff5500', 'bd'=>'#ff9900'),
     E_USER_NOTICE => array('bg'=>'#ccffcc', 'txt'=>'#007700', 'bd'=>'#33cc00'));
 
 //-----------------------------------------------------------------------------
 //    Error handler - collects all php/user messages for
 //    display in message box.
-// FIX: fatal errors ?
 
 function error_handler($errno, $errstr, $file, $line) {
     global $messages;
 
        // error_reporting==0 when messages are set off with @ 
-       if ($errno & error_reporting())
+       if ($errno & error_reporting()) {
                $messages[] = array($errno, $errstr, $file, $line);
-
+       }
     return true;
 }
 //------------------------------------------------------------------------------
@@ -34,14 +33,22 @@ function fmt_errors($center=true) {
        $content = '';
        foreach($messages as $msg) {
                if ($msg[0]>$type) continue;
-               if ($msg[0]<$type && $type>E_USER_ERROR) {
-                       $content = ''; // clean notices when we have errors
-                       $type = E_USER_ERROR; // php or user errors 
+
+               if ($msg[0]<$type) { 
+                       if ($msg[0] == E_USER_WARNING) {
+                               $type = E_USER_WARNING; // user warnings 
+                               $content = '';                  // clean notices when we have errors
+                       } else  {
+                               $type = E_USER_ERROR;   // php or user errors 
+                               if($type == E_USER_WARNING)
+                                       $content = '';                  // clean other messages
+                       }
                }
            $str = $msg[1];
                $c = $msg_colors[$type];
-               if ($msg[0]<E_USER_ERROR && $msg[2]!=null)
+               if ($msg[0] < E_USER_ERROR && $msg[2] != null)
                  $str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
+
                $content .= "<tr><td  " . ($center?"align='center' ":"").
                  " width='100%' bgcolor='{$c['bg']}'><font color='{$c['txt']}'>"
                  .$str."</font></td></tr>";
@@ -65,6 +72,7 @@ function error_box() {
     echo "<div id='msgbox'>";
     $before_box = ob_get_clean(); // save html content before error box 
 // Necessary restart instead of get_contents/clean calls due to a bug in php 4.3.2
+       register_shutdown_function('ob_end_flush');
     ob_start('output_html');
     echo "</div>";
 }