[Fmsystem-commits] [11543] property:update invoice handling

[Sigurd Nes]

Revision: 11543
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11543
Author:   sigurdne
Date:     2013-12-18 13:13:03 +0000 (Wed, 18 Dec 2013)
Log Message:
-----------
property:update invoice handling

Modified Paths:
--------------
    trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling
    trunk/property/inc/import/default/Import_fra_Service
    trunk/property/js/portico/ajax_invoice.js

Modified: trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling
===================================================================
--- trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling      
2013-12-17 15:17:58 UTC (rev 11542)
+++ trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling      
2013-12-18 13:13:03 UTC (rev 11543)
@@ -884,7 +884,7 @@
                                        }
 
                                        $Konto          = 
sprintf("%08s",$invoice_line['spbudact_code']);// verdi: Art, type: c8, plass: 
21 - 28
-                                       $Dim_1          = 
sprintf("%08s",$invoice_line['dimb']);// verdi: Ansvarssted, type: c8, plass: 
29 - 36
+                                       $Dim_1          = 
sprintf("%08s",$invoice_line['dimb']);// 64040 verdi: Ansvarssted, type: c8, 
plass: 29 - 36
                                        $Dim_2          = 
sprintf("%-8s",$invoice_line['kostra_id']);// verdi: Tjeneste, type: c8, plass: 
37 - 44
 
                                        if($pre_transfer)

Modified: trunk/property/inc/import/default/Import_fra_Service
===================================================================
--- trunk/property/inc/import/default/Import_fra_Service        2013-12-17 
15:17:58 UTC (rev 11542)
+++ trunk/property/inc/import/default/Import_fra_Service        2013-12-18 
13:13:03 UTC (rev 11543)
@@ -167,7 +167,9 @@
                                        }
                                        else
                                        {
-                                               
$buffer[$this->id]['project_id'] = $this->soXport->get_project(intval($value)); 
+                                               $workorder = 
execMethod('property.soworkorder.read_single', (int)$value);
+                                               
$buffer[$this->id]['project_id'] = $workorder['project_id'];
+                                               $buffer[$this->id]['dime']      
= $workorder['cat_id'];
                                        }
                                }
                                if($name=='spbudact_code')

Modified: trunk/property/js/portico/ajax_invoice.js
===================================================================
--- trunk/property/js/portico/ajax_invoice.js   2013-12-17 15:17:58 UTC (rev 
11542)
+++ trunk/property/js/portico/ajax_invoice.js   2013-12-18 13:13:03 UTC (rev 
11543)
@@ -86,7 +86,26 @@
                update_form_values(line_id, voucher_id_orig);
     });
 
+       $("#dim_e").change(function(){
+               var oArgs = {menuaction:'property.boworkorder.get_category', 
cat_id:$(this).val()};
+               var requestUrl = phpGWLink('index.php', oArgs, true);
 
+               $.ajax({
+                       type: 'POST',
+                       dataType: 'json',
+                       url: requestUrl,
+                       success: function(data) {
+                               if( data != null)
+                               {
+                                       if(data.active !=1)
+                                       {
+                                               alert('Denne kan ikke velges');
+                                       }
+                               }
+                       }
+               });
+       });
+
        $("#voucher_form").live("submit", function(e){
                e.preventDefault();
                var line_id = $("#line_id").val();
@@ -97,12 +116,36 @@
                        return;
                }
 
-               if($("#periodization").val() && ! 
$("#periodization_start").val())
+               var periodization = 
document.getElementById("periodization").value;
+               var periodization_start = 
document.getElementById("periodization_start").value;
+               var dim_e = document.getElementById("dim_e").value;
+               var dim_b = document.getElementById("dim_b").value;
+               var dim_a = document.getElementById("dim_a").value;
+
+               if(periodization && ! periodization_start)
                {
                        alert('Du må velge startperiode');
                        return;
                }
 
+               if(!dim_e)
+               {
+                       alert('Du må velge Kategori');
+                       return;
+               }
+
+               if(!dim_b)
+               {
+                       alert('Du må velge Ansvarssted');
+                       return;
+               }
+
+               if(!dim_a)
+               {
+                       alert('Du må angi Dim A');
+                       return;
+               }
+
                var thisForm = $(this);
                var submitBnt = $(thisForm).find("input[type='submit']");
                var requestUrl = $(thisForm).attr("action");