[Fmsystem-commits] [9264] property: invoice

[Sigurd Nes]

Revision: 9264
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9264
Author:   sigurdne
Date:     2012-05-02 10:40:21 +0000 (Wed, 02 May 2012)
Log Message:
-----------
property: invoice

Modified Paths:
--------------
    trunk/property/inc/class.soinvoice.inc.php

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2012-05-02 09:40:41 UTC (rev 
9263)
+++ trunk/property/inc/class.soinvoice.inc.php  2012-05-02 10:40:21 UTC (rev 
9264)
@@ -2019,11 +2019,22 @@
                                        $this->db->next_record();
                                        $amount = $this->db->f('belop');
                                        
-                                       if(($amount - $split_amount) < 0)
+                                       if($amount > 0)
                                        {
-                                               
phpgwapi_cache::message_set(lang('negative sum'), 'error');
-                                               continue;
+                                               if(($amount - $split_amount) <= 
0)
+                                               {
+                                                       
phpgwapi_cache::message_set(lang('negative sum'), 'error');
+                                                       continue;
+                                               }
                                        }
+                                       else
+                                       {
+                                               if(($amount - $split_amount) >= 
0)
+                                               {
+                                                       
phpgwapi_cache::message_set(lang('positive sum'), 'error');
+                                                       continue;
+                                               }
+                                       }
 
                                        $metadata = $this->db->metadata($table);
                                        $sql ="SELECT * FROM {$table} WHERE id= 
{$id}";
@@ -2032,7 +2043,8 @@
 
                                        $value_set = array();
 
-                                       $skip_values = 
array('id','pmwrkord_code', 'spbudact_code', 'dima', 'dimb', 'dime', 'loc1', 
'mvakode', 'dimd', 'merknad', 
'line_text','oppsynsmannid','saksbehandlerid','oppsynsigndato','saksigndato','budsjettsigndato');
+                                       $skip_values = array('id','project_id', 
'pmwrkord_code', 'spbudact_code', 'dima', 'dimb', 'dime', 'loc1', 'mvakode', 
'dimd', 'merknad', 
'line_text','oppsynsmannid','saksbehandlerid','oppsynsigndato','saksigndato','budsjettsigndato');
+
                                        foreach($metadata as $_field)
                                        {
                                                if(!in_array($_field->name, 
$skip_values))