[Phpgroupware-cvs] property/inc class.soinvoice.inc.php,1.15

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.soinvoice.inc.php lines: +11 -11

Log Message:
no message

====================================================
Index: property/inc/class.soinvoice.inc.php
diff -u property/inc/class.soinvoice.inc.php:1.14 
property/inc/class.soinvoice.inc.php:1.15
--- property/inc/class.soinvoice.inc.php:1.14   Thu May 12 21:26:28 2005
+++ property/inc/class.soinvoice.inc.php        Thu May 26 11:51:01 2005
@@ -653,7 +653,7 @@
                                                
$update_status[$workorder_id]='R';
                                        }

-                                       $GLOBALS['phpgw']->db->query("update 
fm_ecobilag set $dima_field ,$kostra_field,$dimd_field, mvakode = 
'$tax_code',spbudact_code = '$budget_account' where id='$id'");
+                                       $GLOBALS['phpgw']->db->query("UPDATE 
fm_ecobilag set $dima_field ,$kostra_field,$dimd_field, mvakode = 
'$tax_code',spbudact_code = '$budget_account' where id='$id'");

                                        $receipt['message'][] = 
array('msg'=>lang('Voucher is updated '));
                                }
@@ -669,7 +669,7 @@
                                while (list($id,$entry) = each($update_status))
                                {
                                        
$historylog_workorder->add($entry,$id,$status_code[$entry]);
-                                       $GLOBALS['phpgw']->db->query("update 
fm_workorder set status=" . "'$status_code[$entry]'" . "where id=$id");
+                                       $GLOBALS['phpgw']->db->query("UPDATE 
fm_workorder set status=" . "'$status_code[$entry]'" . "where id=$id");
                                        $receipt['message'][] = 
array('msg'=>lang('Workorder %1 is %2',$id, $status_code[$entry]));
                                }
                        }
@@ -733,7 +733,7 @@
                {
                        $this->db->transaction_begin();

-                       $this->db->query("update fm_ecobilag set 
periode='$period' where bilagsnr='$voucher_id'");
+                       $this->db->query("UPDATE fm_ecobilag set 
periode='$period' where bilagsnr='$voucher_id'");

                        $this->db->transaction_commit();

@@ -745,7 +745,7 @@
                function increment_bilagsnr()
                {

-                       $this->db->query("update fm_idgenerator set value = 
value + 1 where name = 'Bilagsnummer'");
+                       $this->db->query("UPDATE fm_idgenerator set value = 
value + 1 where name = 'Bilagsnummer'");
                        $this->db->query("select value from fm_idgenerator 
where name = 'Bilagsnummer'");
                        $this->db->next_record();
                        $bilagsnr = $this->db->f('value');
@@ -1062,7 +1062,7 @@
                                                if 
(!($values['num_days_orig'][$n]==$values['num_days'][$n]))
                                                {
                                                        $payment_date = 
date($this->bocommon->dateformat,$values['timestamp_voucher_date'][$n]+(24*3600*$values['num_days'][$n]));
-                                                       
$GLOBALS['phpgw']->db->query("update fm_ecobilag set forfallsdato= 
'$payment_date' where bilagsnr='$voucher_id'");
+                                                       
$GLOBALS['phpgw']->db->query("UPDATE fm_ecobilag set forfallsdato= 
'$payment_date' where bilagsnr='$voucher_id'");
                                                }

                                                $transfer_id="Null".",";
@@ -1095,13 +1095,9 @@

                                                if (! $local_error)
                                                {
-                                                       $sql= "update 
fm_ecobilag set $blank_date $kommma_blank $sign_field $sign_id $kommma 
$sign_date_field $sign_date $kommma $transfer_sign_field $transfer_id 
$transfer_date_field $transfer_date ,kreditnota=$wait_for_kreditnota  where 
bilagsnr='$voucher_id'";
-                                                       $sql2= "update 
fm_ecobilag set utbetalingid = NULL, utbetalingsigndato = NULL WHERE 
budsjettsigndato IS NULL";
-                                                       $sql3= "update 
fm_ecobilag set utbetalingid = NULL, utbetalingsigndato = NULL WHERE 
oppsynsigndato IS NULL AND saksigndato IS NULL";
+                                                       $sql= "UPDATE 
fm_ecobilag set $blank_date $kommma_blank $sign_field $sign_id $kommma 
$sign_date_field $sign_date $kommma $transfer_sign_field $transfer_id 
$transfer_date_field $transfer_date ,kreditnota=$wait_for_kreditnota  where 
bilagsnr='$voucher_id'";
                                                        
$GLOBALS['phpgw']->db->transaction_begin();
                                                        
$GLOBALS['phpgw']->db->query($sql);
-                                                       
$GLOBALS['phpgw']->db->query($sql2);
-                                                       
$GLOBALS['phpgw']->db->query($sql3);
                                                        
$GLOBALS['phpgw']->db->transaction_commit();

                                                        $receipt['message'][] = 
array('msg'=> lang('voucher is updated: ') . $voucher_id);
@@ -1109,6 +1105,10 @@
                                        }
                                }
                        }
+
+                       $GLOBALS['phpgw']->db->query("UPDATE fm_ecobilag set 
utbetalingid = NULL, utbetalingsigndato = NULL WHERE budsjettsigndato IS NULL");
+                       $GLOBALS['phpgw']->db->query("UPDATE fm_ecobilag set 
utbetalingid = NULL, utbetalingsigndato = NULL WHERE oppsynsigndato IS NULL AND 
saksigndato IS NULL");
+
                        return $receipt;
                }