[Fmsystem-commits] [12091] property: refine actual cost at tickets

[Sigurd Nes]

Revision: 12091
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12091
Author:   sigurdne
Date:     2014-09-14 12:09:11 +0000 (Sun, 14 Sep 2014)
Log Message:
-----------
property: refine actual cost at tickets

Modified Paths:
--------------
    trunk/property/inc/class.uitts.inc.php
    
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
    trunk/property/js/yahoo/tts.view.js
    trunk/property/setup/phpgw_no.lang

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2014-09-13 20:31:04 UTC (rev 
12090)
+++ trunk/property/inc/class.uitts.inc.php      2014-09-14 12:09:11 UTC (rev 
12091)
@@ -3222,7 +3222,8 @@
                                (
                                        'name'          => "4",
                                        'values'        =>      
json_encode(array(      array('key' => 
'period','label'=>lang('period'),'sortable'=>true,'resizeable'=>true),
-                                                                               
                                array('key' => 
'amount','label'=>lang('amount'),'sortable'=>true,'resizeable'=>true, 
'formatter'=> 'FormatterAmount2')))
+                                                                               
                                array('key' => 
'amount','label'=>lang('amount'),'sortable'=>true,'resizeable'=>true, 
'formatter'=> 'FormatterAmount2'),
+                                                                               
                                array('key' => 
'remark','label'=>lang('remark'),'sortable'=>false,'resizeable'=>true)))
                                );
 
                        $payments = $this->bo->get_payments($id);

Modified: 
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
===================================================================
--- 
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
        2014-09-13 20:31:04 UTC (rev 12090)
+++ 
trunk/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
        2014-09-14 12:09:11 UTC (rev 12091)
@@ -286,6 +286,7 @@
                                'ticket_id'     => $id,
                                'amount'        => $diff_actual_cost,
                                'period'        => date('Ym'),
+                               'remark'        => 'Oppdatert fra Agresso',
                                'created_on'=> time(),
                                'created_by'=> -1
                        );

Modified: trunk/property/js/yahoo/tts.view.js
===================================================================
--- trunk/property/js/yahoo/tts.view.js 2014-09-13 20:31:04 UTC (rev 12090)
+++ trunk/property/js/yahoo/tts.view.js 2014-09-14 12:09:11 UTC (rev 12091)
@@ -33,6 +33,7 @@
 
        td_sum('Sum');
        td_sum(tmp_sum1);
+       td_empty(1);
 
        myfoot = tableYUI.createTFoot();
        myfoot.setAttribute("id","myfoot");

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2014-09-13 20:31:04 UTC (rev 12090)
+++ trunk/property/setup/phpgw_no.lang  2014-09-14 12:09:11 UTC (rev 12091)
@@ -1223,6 +1223,7 @@
 park invoice   property        no      Parker faktura
 part of town   property        no      Bydel
 part of town id        property        no      Bydel
+payment        property        no      Betaling
 payment date   property        no      Forfallsdato
 pdf    property        no      PDF
 per agreement  property        no      pr avtale