[Fmsystem-commits] [12047] property: mandatory process log for invoice approval

[Sigurd Nes]

Revision: 12047
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12047
Author:   sigurdne
Date:     2014-07-31 11:21:12 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
property: mandatory process log for invoice approval

Modified Paths:
--------------
    trunk/property/inc/class.uiinvoice2.inc.php
    trunk/property/js/portico/ajax_invoice.js

Modified: trunk/property/inc/class.uiinvoice2.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice2.inc.php 2014-07-31 08:25:39 UTC (rev 
12046)
+++ trunk/property/inc/class.uiinvoice2.inc.php 2014-07-31 11:21:12 UTC (rev 
12047)
@@ -703,7 +703,7 @@
                                $entry['approve_line'] = "<input 
id=\"approve_line\" type =\"radio\" {$_checked} name=\"values[approve_line]\" 
value=\"{$entry['id']}\">";
                                $entry['split'] = "<input type =\"text\" 
name=\"values[split_amount][{$entry['id']}]\" value=\"\" size=\"8\">";
                                $entry['approved_amount_hidden'] = 
$entry['approved_amount'];
-                               $entry['approved_amount'] = "<input type 
=\"text\" name=\"values[approved_amount][{$entry['id']}]\" 
value=\"{$entry['approved_amount']}\" size=\"8\">";
+                               $entry['approved_amount'] = "<input 
id=\"approved_amount_{$entry['id']}\" type =\"text\" 
name=\"values[approved_amount][{$entry['id']}]\" 
value=\"{$entry['approved_amount']}\" size=\"8\">";
                                if($entry['dime'])
                                {
                                        $catetory = 
execMethod('phpgwapi.categories.return_single',$entry['dime']);

Modified: trunk/property/js/portico/ajax_invoice.js
===================================================================
--- trunk/property/js/portico/ajax_invoice.js   2014-07-31 08:25:39 UTC (rev 
12046)
+++ trunk/property/js/portico/ajax_invoice.js   2014-07-31 11:21:12 UTC (rev 
12047)
@@ -124,6 +124,14 @@
                        return;
                }
 
+               var approved_amount = $("#approved_amount_" +line_id).val();
+               var process_log = $("#process_log").val();
+               if(approved_amount == 0 && !process_log)
+               {
+                       alert('Du må begrunne i fakturaloggen hvorfor godkjent 
beløp = 0 ');
+                       return;
+               }
+
                var periodization = 
document.getElementById("periodization").value;
                var periodization_start = 
document.getElementById("periodization_start").value;
                var dim_e = document.getElementById("dim_e").value;