[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9417] property: fixes
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9417] property: fixes |
|
Date: |
Mon, 21 May 2012 18:05:07 +0000 |
Revision: 9417
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9417
Author: sigurdne
Date: 2012-05-21 18:05:05 +0000 (Mon, 21 May 2012)
Log Message:
-----------
property: fixes
Modified Paths:
--------------
trunk/property/inc/class.boinvoice.inc.php
trunk/property/inc/class.soinvoice.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uiworkorder.inc.php
trunk/property/js/yahoo/project.edit.js
trunk/property/js/yahoo/workorder.edit.js
Modified: trunk/property/inc/class.boinvoice.inc.php
===================================================================
--- trunk/property/inc/class.boinvoice.inc.php 2012-05-21 05:45:12 UTC (rev
9416)
+++ trunk/property/inc/class.boinvoice.inc.php 2012-05-21 18:05:05 UTC (rev
9417)
@@ -415,11 +415,15 @@
$values['godkjentbelop'] = $values['amount'];
$_dateformat = $this->bocommon->dateformat;
-
- $values['fakturadato'] =
date($_dateformat,phpgwapi_datetime::date_to_timestamp($values['invoice_date']));
- $values['forfallsdato'] =
date($_dateformat,phpgwapi_datetime::date_to_timestamp($values['payment_date']));
- $values['periode'] =
date('Ym',phpgwapi_datetime::date_to_timestamp($values['paid_date']));
+ $invoice_date = $values['invoice_date'] ?
phpgwapi_datetime::date_to_timestamp($values['invoice_date']) : time();
+ $payment_date = $values['payment_date'] ?
phpgwapi_datetime::date_to_timestamp($values['payment_date']) : time();
+ $paid_date = $values['paid_date'] ?
phpgwapi_datetime::date_to_timestamp($values['paid_date']) : time();
+
+ $values['fakturadato'] = date($_dateformat,
$invoice_date);
+ $values['forfallsdato'] = date($_dateformat,
$payment_date);
+ $values['periode'] = date('Ym',
$paid_date);
+
$values['kildeid'] = 1;
$values['pmwrkord_code'] = $values['order_id'];
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2012-05-21 05:45:12 UTC (rev
9416)
+++ trunk/property/inc/class.soinvoice.inc.php 2012-05-21 18:05:05 UTC (rev
9417)
@@ -557,6 +557,7 @@
$sql = "SELECT DISTINCT
pmwrkord_code,bilagsnr,bilagsnr_ut,fakturanr,sum(belop) as belop,
sum(godkjentbelop) as godkjentbelop,"
. " currency,budsjettansvarligid,org_name"
. " FROM $table"
+ . " {$this->join} fm_ecoart ON fm_ecoart.id =
$table.artid"
. " {$this->join} fm_workorder ON
fm_workorder.id = $table.pmwrkord_code"
. " {$this->join} fm_project ON
fm_workorder.project_id = fm_project.id"
. " {$this->join} fm_vendor ON
{$table}.spvend_code = fm_vendor.id {$filtermethod} {$groupmethod}";
@@ -583,11 +584,15 @@
foreach ($values as &$entry)
{
- $sql = "SELECT budsjettsigndato{$overftid} FROM
$table WHERE pmwrkord_code = '{$entry['workorder_id']}' AND bilagsnr =
'{$entry['voucher_id']}' AND fakturanr = '{$entry['invoice_id']}'";
+ $sql = "SELECT
budsjettsigndato{$overftid},fm_ecoart.descr as type"
+ . " FROM {$table} {$this->join} fm_ecoart ON
fm_ecoart.id = $table.artid"
+ . " WHERE pmwrkord_code =
'{$entry['workorder_id']}' AND bilagsnr = '{$entry['voucher_id']}' AND
fakturanr = '{$entry['invoice_id']}'";
+
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$entry['budsjettsigndato'] =
$this->db->f('budsjettsigndato');
$entry['transfer_time'] =
$this->db->f('overftid');
+ $entry['type'] =
$this->db->f('type');
}
return $values;
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2012-05-21 05:45:12 UTC (rev
9416)
+++ trunk/property/inc/class.uiproject.inc.php 2012-05-21 18:05:05 UTC (rev
9417)
@@ -1746,6 +1746,7 @@
'dima'
=> $entry['dima'],
'dimb'
=> $entry['dimb'],
'dimd'
=> $entry['dimd'],
+ 'type'
=> $entry['type'],
'amount'
=> $entry['amount'],
'approved_amount' =>
$entry['approved_amount'],
'vendor'
=> $entry['vendor'],
@@ -1781,6 +1782,7 @@
array('key' =>
'amount','label'=>lang('amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'approved_amount','label'=>lang('approved
amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'currency','label'=>lang('currency'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'type','label'=>lang('type'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budget_responsible','label'=>lang('budget
responsible'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budsjettsigndato','label'=>lang('budsjettsigndato'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'transfer_time','label'=>lang('transfer
time'),'sortable'=>false,'resizeable'=>true),
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2012-05-21 05:45:12 UTC
(rev 9416)
+++ trunk/property/inc/class.uiworkorder.inc.php 2012-05-21 18:05:05 UTC
(rev 9417)
@@ -1650,6 +1650,7 @@
'dima'
=> $entry['dima'],
'dimb'
=> $entry['dimb'],
'dimd'
=> $entry['dimd'],
+ 'type'
=> $entry['type'],
'amount'
=> $entry['amount'],
'approved_amount' =>
$entry['approved_amount'],
'vendor'
=> $entry['vendor'],
@@ -1690,6 +1691,7 @@
array('key' =>
'amount','label'=>lang('amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'approved_amount','label'=>lang('approved
amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'currency','label'=>lang('currency'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'type','label'=>lang('type'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budget_responsible','label'=>lang('budget
responsible'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budsjettsigndato','label'=>lang('budsjettsigndato'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'transfer_time','label'=>lang('transfer
time'),'sortable'=>false,'resizeable'=>true),
Modified: trunk/property/js/yahoo/project.edit.js
===================================================================
--- trunk/property/js/yahoo/project.edit.js 2012-05-21 05:45:12 UTC (rev
9416)
+++ trunk/property/js/yahoo/project.edit.js 2012-05-21 18:05:05 UTC (rev
9417)
@@ -180,7 +180,7 @@
td_empty(4);
td_sum(tmp_sum1);
td_sum(tmp_sum2);
- td_empty(4);
+ td_empty(5);
myfoot = tableYUI2.createTFoot();
myfoot.setAttribute("id","myfoot");
Modified: trunk/property/js/yahoo/workorder.edit.js
===================================================================
--- trunk/property/js/yahoo/workorder.edit.js 2012-05-21 05:45:12 UTC (rev
9416)
+++ trunk/property/js/yahoo/workorder.edit.js 2012-05-21 18:05:05 UTC (rev
9417)
@@ -115,7 +115,7 @@
td_empty(3);
td_sum(tmp_sum1);
td_sum(tmp_sum2);
- td_empty(4);
+ td_empty(5);
myfoot = tableYUI.createTFoot();
myfoot.setAttribute("id","myfoot");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9417] property: fixes,
Sigurd Nes <=