[Fmsystem-commits] [8683] property: periodization

[Sigurd Nes]

Revision: 8683
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8683
Author:   sigurdne
Date:     2012-01-25 09:59:42 +0000 (Wed, 25 Jan 2012)
Log Message:
-----------
property: periodization

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

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2012-01-25 09:50:44 UTC (rev 
8682)
+++ trunk/property/inc/class.soinvoice.inc.php  2012-01-25 09:59:42 UTC (rev 
8683)
@@ -915,8 +915,17 @@
                {
                        $receipt = array();
                        $this->db->transaction_begin();
+                       
+                       if($periodization)
+                       {
+                               $value = "'{$periodization}'";
+                       }
+                       else
+                       {
+                               $value = 'NULL';
+                       }
 
-                       $this->db->query("UPDATE fm_ecobilag set 
periodization='$periodization' where bilagsnr='$voucher_id'");
+                       $this->db->query("UPDATE fm_ecobilag SET 
periodization={$value} where bilagsnr='{$voucher_id}'");
 
                        $this->db->transaction_commit();
 

Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php  2012-01-25 09:50:44 UTC (rev 
8682)
+++ trunk/property/inc/class.uiinvoice.inc.php  2012-01-25 09:59:42 UTC (rev 
8683)
@@ -668,6 +668,10 @@
                                );
 
                        $periodization_list = 
execMethod('property.bogeneric.get_list', array('type'=>'periodization'));
+                       if($periodization_list)
+                       {
+                               array_unshift ($periodization_list,array('id' 
=> '0', 'name' => lang('none')));
+                       }
 
                        $jscode = <<<JS
                            var myPeriodizationDropDown = function(elCell, 
oRecord, oColumn, oData)