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

[Sigurd Nes]

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

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

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2012-02-02 14:52:41 UTC (rev 
8771)
+++ trunk/property/inc/class.soinvoice.inc.php  2012-02-02 17:45:16 UTC (rev 
8772)
@@ -893,16 +893,23 @@
 
                        $value_set = array
                        (
+                               'godkjentbelop' => $values['approved_amount'],
                                'project_id'    => $values['project_group'] ? 
$values['project_group'] : '',
                                'pmwrkord_code' => $values['order_id'],
                                'process_log'   => 
$this->db->db_addslashes($values['process_log']),
                                'process_code'  => $values['process_code'],
                        );
+                       
 
                        $value_set      = 
$this->db->validate_update($value_set);
 
                        $this->db->query("UPDATE {$table} SET $value_set WHERE 
id= {$id}" ,__LINE__,__FILE__);
 
+                       if(!$values['approved_amount'])
+                       {
+                               $this->db->query("UPDATE {$table} SET 
godkjentbelop = 0 WHERE id= {$id}" ,__LINE__,__FILE__);
+                       }
+
                        if(isset($values['split_line']) && 
$values['split_amount'] && isset($values['split_amount']) && 
$values['split_amount'])
                        {
                                $metadata = $this->db->metadata($table);

Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php  2012-02-02 14:52:41 UTC (rev 
8771)
+++ trunk/property/inc/class.uiinvoice.inc.php  2012-02-02 17:45:16 UTC (rev 
8772)
@@ -2190,13 +2190,20 @@
 //                                     
$receipt['error'][]=array('msg'=>lang('Missing log message'));
                                }
 
-                               if($line['approved_amount'])
+                               if($values['approved_amount'])
                                {
+                                       $values['approved_amount']              
= str_replace(' ','',$values['approved_amount']);
+                                       $values['approved_amount']              
= str_replace(',','.',$values['approved_amount']);
                                        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']));                                
                                        }
                                }
+                               else
+                               {
+                                       unset($values['split_amount']);
+                                       unset($values['split_line']);
+                               }
 
                                if(isset($values['split_line']) && 
isset($values['split_amount']) && $values['split_amount'])
                                {
@@ -3659,6 +3666,11 @@
                                case 's_agreement':
                                        
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=> 
'property.uis_agreement.view', 'id'=> $order_id));
                                        break;
+                               default:
+                                       
$GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
+                                       
$GLOBALS['phpgw']->common->phpgw_header(true);
+                                       echo 'No such order';
+                                       $GLOBALS['phpgw']->common->phpgw_exit();
                        }
                }
 

Modified: trunk/property/js/yahoo/invoice.list_sub.js
===================================================================
--- trunk/property/js/yahoo/invoice.list_sub.js 2012-02-02 14:52:41 UTC (rev 
8771)
+++ trunk/property/js/yahoo/invoice.list_sub.js 2012-02-02 17:45:16 UTC (rev 
8772)
@@ -40,7 +40,7 @@
                        var frame = document.createElement('iframe');
                        frame.src = sUrl;
                        frame.width = "100%";
-                       frame.height = "460";
+                       frame.height = "500";
                        o.setBody(frame);
                };
                lightbox.showEvent.subscribe(onDialogShow, lightbox);

Modified: trunk/property/templates/base/invoice.xsl
===================================================================
--- trunk/property/templates/base/invoice.xsl   2012-02-02 14:52:41 UTC (rev 
8771)
+++ trunk/property/templates/base/invoice.xsl   2012-02-02 17:45:16 UTC (rev 
8772)
@@ -1391,8 +1391,21 @@
                                                </tr>
                                        </xsl:when>
                                </xsl:choose>
-                               <!--<xsl:variable 
name="lang_process_code"><xsl:value-of select="php:function('lang', 'voucher 
process code')" /></xsl:variable>-->
-                               <xsl:apply-templates select="approved_list"/>
+
+                               <xsl:for-each select="approved_list">
+                                       <tr>
+                                               <td align="left" 
style="white-space: nowrap;">
+                                                       <xsl:value-of 
select="role"/>
+                                               </td>
+                                               <td align="left" 
style="white-space: nowrap;">
+                                                       <xsl:if test="initials 
!= ''">
+                                                               <xsl:value-of 
select="initials"/>
+                                                               <xsl:text>: 
</xsl:text>
+                                                               <xsl:value-of 
select="date"/>
+                                                       </xsl:if>               
+                                               </td>
+                                       </tr>
+                               </xsl:for-each>                         
                                <tr>
                                        <input type="hidden" 
name="values[sign_orig]" value="{sign_orig}"/>
                                        <input type="hidden" 
name="values[my_initials]" value="{my_initials}"/>
@@ -1411,6 +1424,7 @@
                                                </select>
                                        </td>
                                </tr>
+
                                <tr>
                                        <td class="th_text" align="left" 
valign="top" style="white-space: nowrap;">
                                                <xsl:value-of 
select="php:function('lang', 'voucher process code')"/>