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

[Sigurd Nes]

Revision: 8771
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8771
Author:   sigurdne
Date:     2012-02-02 14:52:41 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
property: invoice handling

Modified Paths:
--------------
    trunk/property/inc/class.uiinvoice.inc.php
    trunk/property/templates/base/invoice.xsl

Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php  2012-02-02 14:38:33 UTC (rev 
8770)
+++ trunk/property/inc/class.uiinvoice.inc.php  2012-02-02 14:52:41 UTC (rev 
8771)
@@ -2190,9 +2190,12 @@
 //                                     
$receipt['error'][]=array('msg'=>lang('Missing log message'));
                                }
 
-                               if( isset($values['order_id']) && 
$values['order_id'] && 
!execMethod('property.soXport.check_order',$values['order_id']) )
+                               if($line['approved_amount'])
                                {
-                                       
$receipt['error'][]=array('msg'=>lang('no such order: 
%1',$values['order_id']));                                
+                                       if( isset($values['order_id']) && 
$values['order_id'] && 
!execMethod('property.soXport.check_order',$values['order_id']) )
+                                       {
+                                               
$receipt['error'][]=array('msg'=>lang('no such order: 
%1',$values['order_id']));                                
+                                       }
                                }
 
                                if(isset($values['split_line']) && 
isset($values['split_amount']) && $values['split_amount'])
@@ -2309,6 +2312,7 @@
                                        'project_group_data'    => 
$project_group_data,
                                        'order_id'                              
=> $line['order_id'],
                                        'value_amount'                  => 
$line['amount'],
+                                       'value_approved_amount' => 
$line['approved_amount'],
                                        'value_currency'                => 
$line['currency'],
                                        'value_process_log'             =>  
isset($values['process_log']) && $values['process_log'] ? 
$values['process_log'] : $line['process_log']
                        );

Modified: trunk/property/templates/base/invoice.xsl
===================================================================
--- trunk/property/templates/base/invoice.xsl   2012-02-02 14:38:33 UTC (rev 
8770)
+++ trunk/property/templates/base/invoice.xsl   2012-02-02 14:52:41 UTC (rev 
8771)
@@ -1456,8 +1456,27 @@
                                                </textarea>
                                        </td>
                                </tr>
+
+
                                <tr>
                                        <td class="th_text" align="left" 
valign="top" style="white-space: nowrap;">
+                                               <xsl:value-of 
select="php:function('lang', 'approved amount')"/>
+                                       </td>
+                                       <td align="left" class="th_text" 
valign="top">
+                                               <input type="text" 
name="values[approved_amount]" value="{value_approved_amount}">
+                                                       <xsl:attribute 
name="size">
+                                                               
<xsl:text>20</xsl:text>
+                                                       </xsl:attribute>
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="php:function('lang', 'approved amount')"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+
+
+                               <tr>
+                                       <td class="th_text" align="left" 
valign="top" style="white-space: nowrap;">
                                                <xsl:value-of 
select="php:function('lang', 'split line')"/>
                                        </td>
                                        <td align="left" valign="top">