[Fmsystem-commits] [8175] voucher handling

[Sigurd Nes]

Revision: 8175
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8175
Author:   sigurdne
Date:     2011-11-23 13:18:29 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
voucher handling

Modified Paths:
--------------
    trunk/property/inc/class.soinvoice.inc.php
    trunk/property/setup/phpgw_no.lang

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2011-11-23 13:03:38 UTC (rev 
8174)
+++ trunk/property/inc/class.soinvoice.inc.php  2011-11-23 13:18:29 UTC (rev 
8175)
@@ -412,6 +412,7 @@
                                                'remark'                        
        => !!$this->db->f('merknad'),
                                                'tax_code'                      
        => $this->db->f('mvakode'),
                                                'amount'                        
        => $this->db->f('belop'),
+                                               'approved_amount'               
=> $this->db->f('godkjentbelop'),
                                                'charge_tenant'                 
=> $this->db->f('charge_tenant'),
                                                'vendor'                        
        => $this->db->f('org_name'),
                                                'paid_percent'                  
=> $this->db->f('paid_percent'),

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2011-11-23 13:03:38 UTC (rev 8174)
+++ trunk/property/setup/phpgw_no.lang  2011-11-23 13:18:29 UTC (rev 8175)
@@ -175,6 +175,7 @@
 approval from is updated       property        no      Godkjenning fra er 
oppdatert
 approve        property        no      Godkjenn
 approved       property        no      Godkjent
+approved amount        property        no      Godkjent beløp
 archive        property        no      Arkiv
 art    property        no      Art
 ask for approval       property        no      Be om godkjenning