[Fmsystem-commits] [11682] property: invoice handling

[Sigurd Nes]

Revision: 11682
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11682
Author:   sigurdne
Date:     2014-02-13 12:13:58 +0000 (Thu, 13 Feb 2014)
Log Message:
-----------
property: invoice handling

Modified Paths:
--------------
    trunk/property/inc/class.soinvoice.inc.php
    trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling
    trunk/property/inc/import/default/Import_fra_Service_EBF

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2014-02-13 12:10:56 UTC (rev 
11681)
+++ trunk/property/inc/class.soinvoice.inc.php  2014-02-13 12:13:58 UTC (rev 
11682)
@@ -818,7 +818,7 @@
 
                        while($entry=each($values['counter']))
                        {
-                               $local_error='';
+                               $local_error = false;
 
                                $n=$entry[0];
 
@@ -853,13 +853,15 @@
                                if(!$values['dimd'][$n])
                                {
                                        $dimd_field="dimd=NULL";
+                                       $local_error= true;
+                                       $receipt['error'][] = 
array('msg'=>lang('Dim D is mandatory'));
                                }
                                else
                                {
                                        $dimd=$values['dimd'][$n];
                                        $GLOBALS['phpgw']->db->query("select 
count(*) as cnt from fm_ecodimd where id ='$dimd'");
                                        $GLOBALS['phpgw']->db->next_record();
-                                       if ($GLOBALS['phpgw']->db->f('cnt') == 
0)
+                                       if ($GLOBALS['phpgw']->db->f('cnt') == 
0 )
                                        {
                                                $receipt['error'][] = 
array('msg'=>lang('This Dim D is not valid:'). " ".$dimd);
                                                $local_error= true;
@@ -919,7 +921,16 @@
                                                
$update_paid_percent[$workorder_id] = $values['paid_percent'][$n];
                                        }
 */
-                                       $GLOBALS['phpgw']->db->query("UPDATE 
fm_ecobilag SET $dima_field ,$kostra_field,{$dimd_field}, mvakode = 
{$tax_code},spbudact_code = '{$budget_account}',dimb = $dimb,godkjentbelop = 
$approved_amount WHERE id='$id'");
+                                       if($values['workorder_id'][$n])
+                                       {
+                                               
$GLOBALS['phpgw']->db->query("SELECT id FROM fm_workorder WHERE id = 
'{$values['workorder_id'][$n]}'",__LINE__,__FILE__);
+                                               if($this->db->next_record())
+                                               {
+                                                       
$GLOBALS['phpgw']->db->query("UPDATE fm_workorder SET category = 
'{$values['dimd'][$n]}' WHERE 
id='{$values['workorder_id'][$n]}'",__LINE__,__FILE__);
+                                               }
+                                       }
+                                       
+                                       $GLOBALS['phpgw']->db->query("UPDATE 
fm_ecobilag SET $dima_field ,$kostra_field,{$dimd_field}, mvakode = 
{$tax_code},spbudact_code = '{$budget_account}',dimb = $dimb,godkjentbelop = 
$approved_amount WHERE id='{$id}'",__LINE__,__FILE__);
 
                                        $receipt['message'][] = 
array('msg'=>lang('Voucher is updated '));
                                }
@@ -951,9 +962,13 @@
                                        switch ( $this->db->f('type') )
                                        {
                                                case 'workorder':
-                                                       
$historylog_workorder->add($entry,$id,$status_code[$entry]);
-                                                       
$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]));
+                                                       
$GLOBALS['phpgw']->db->query("SELECT id FROM fm_workorder WHERE 
status='{$status_code[$entry]}' AND id = {$id}");
+                                                       
if(!$this->db->next_record())
+                                                       {
+                                                               
$historylog_workorder->add($entry,$id,$status_code[$entry]);
+                                                               
$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]));
+                                                       }
                                                        break;
                                        }
                                }

Modified: trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling
===================================================================
--- trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling      
2014-02-13 12:10:56 UTC (rev 11681)
+++ trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling      
2014-02-13 12:13:58 UTC (rev 11682)
@@ -256,7 +256,7 @@
                                $BilagOverf['splitt'],
                                $BilagOverf['kildeid'],
                                $BilagOverf['kidnr'],
-                               $BilagOverf[typeid],
+                               $BilagOverf['typeid'],
                                $BilagOverf['fakturadato'],
                                $BilagOverf['forfallsdato'],
                                $BilagOverf['regtid'],
@@ -301,7 +301,7 @@
 
 //                     $download = 'on';
 //                     $download = False;
-                       $pre_transfer=True;
+                       $pre_transfer=false;
 //                     $this->debug=True;
 
                        //Generer batch ID

Modified: trunk/property/inc/import/default/Import_fra_Service_EBF
===================================================================
--- trunk/property/inc/import/default/Import_fra_Service_EBF    2014-02-13 
12:10:56 UTC (rev 11681)
+++ trunk/property/inc/import/default/Import_fra_Service_EBF    2014-02-13 
12:13:58 UTC (rev 11682)
@@ -257,7 +257,7 @@
                                }
                                else
                                {
-                                       $buffer[$this->id]['dime'] = 
$workorder['cat_id']; // Dim 6
+                                       $buffer[$this->id]['dime'] = 
strlen($workorder['cat_id']) == 4 ? $workorder['cat_id'] : ''; // Dim 6
                                        $buffer[$this->id]['spbudact_code'] = 
$workorder['b_account_id'];
                                }
                        }