[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/class.soinvoice.php, 1.1.1.9
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] property/class.soinvoice.php, 1.1.1.9 |
|
Date: |
Sun, 23 May 2004 05:34:51 -0000 |
Update of /property
Modified Files:
Branch:
class.soinvoice.php
date: 2004/05/02 12:47:35; author: sigurdne; state: Exp; lines: +13 -13
Log Message:
no message
=====================================================================
Index: property/class.soinvoice.php
diff -u property/class.soinvoice.php:1.1.1.8
property/class.soinvoice.php:1.1.1.9
--- property/class.soinvoice.php:1.1.1.8 Fri Apr 30 17:35:56 2004
+++ property/class.soinvoice.php Sun May 2 12:47:35 2004
@@ -117,7 +117,7 @@
if ($paid)
{
$table = 'fm_ecobilagoverf';
- $dateformat =
strtolower($GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
+ $dateformat =
strtolower($GLOBALS['phpgw_data']['prefs'][$this->currentapp . '.dateformat']);
$dateformat = str_replace(".","",$dateformat);
$dateformat = str_replace("-","",$dateformat);
$dateformat = str_replace("/","",$dateformat);
@@ -214,8 +214,8 @@
if($dbresult->fields['oppsynsmannid']
&& $dbresult->fields['oppsynsigndato'])
{
// $timestamp_jan_date
=
mktime(0,0,0,date(m,strtotime($dbresult->fields['oppsynsigndato'])),date(d,strtotime($dbresult->fields['oppsynsigndato'])),date(y,strtotime($dbresult->fields['oppsynsigndato'])));
-// $invoice[$i]['jan_date']
=
$this->bocommon->show_date($timestamp_jan_date,$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
-
$invoice[$i]['jan_date']=date($GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'],strtotime($dbresult->fields['oppsynsigndato']));
+// $invoice[$i]['jan_date']
=
$this->bocommon->show_date($timestamp_jan_date,$GLOBALS['phpgw_data']['prefs'][$this->currentapp
. '.dateformat']);
+
$invoice[$i]['jan_date']=date($GLOBALS['phpgw_data']['prefs'][$this->currentapp
. '.dateformat'],strtotime($dbresult->fields['oppsynsigndato']));
}
else
{
@@ -224,8 +224,8 @@
if($dbresult->fields['saksbehandlerid']
&& $dbresult->fields['saksigndato'])
{
// $timestamp_super_date
=
mktime(0,0,0,date(m,strtotime($dbresult->fields['saksigndato'])),date(d,strtotime($dbresult->fields['saksigndato'])),date(y,strtotime($dbresult->fields['saksigndato'])));
-// $invoice[$i]['super_date']
=
$this->bocommon->show_date($timestamp_super_date,$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
-
$invoice[$i]['super_date']=date($GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'],strtotime($dbresult->fields['saksigndato']));
+// $invoice[$i]['super_date']
=
$this->bocommon->show_date($timestamp_super_date,$GLOBALS['phpgw_data']['prefs'][$this->currentapp
. '.dateformat']);
+
$invoice[$i]['super_date']=date($GLOBALS['phpgw_data']['prefs'][$this->currentapp
. '.dateformat'],strtotime($dbresult->fields['saksigndato']));
}
else
{
@@ -235,8 +235,8 @@
if($dbresult->fields['budsjettansvarligid'] &&
$dbresult->fields['budsjettsigndato'])
{
// $timestamp_budget_date
=
mktime(0,0,0,date(m,strtotime($dbresult->fields['budsjettsigndato'])),date(d,strtotime($dbresult->fields['budsjettsigndato'])),date(y,strtotime($dbresult->fields['budsjettsigndato'])));
-//
$invoice[$i]['budget_date'] =
$this->bocommon->show_date($timestamp_budget_date,$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
-
$invoice[$i]['budget_date']=date($GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'],strtotime($dbresult->fields['budsjettsigndato']));
+//
$invoice[$i]['budget_date'] =
$this->bocommon->show_date($timestamp_budget_date,$GLOBALS['phpgw_data']['prefs'][$this->currentapp
. '.dateformat']);
+
$invoice[$i]['budget_date']=date($GLOBALS['phpgw_data']['prefs'][$this->currentapp
. '.dateformat'],strtotime($dbresult->fields['budsjettsigndato']));
}
else
{
@@ -246,8 +246,8 @@
if($dbresult->fields['utbetalingid'] &&
$dbresult->fields['utbetalingsigndato'])
{
// $timestamp_transfer_date=
mktime(0,0,0,date(m,strtotime($dbresult->fields['utbetalingsigndato'])),date(d,strtotime($dbresult->fields['utbetalingsigndato'])),date(y,strtotime($dbresult->fields['utbetalingsigndato'])));
-// $invoice[$i]['transfer_date']
=
$this->bocommon->show_date($timestamp_transfer_date,$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
-
$invoice[$i]['transfer_date']=date($GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'],strtotime($dbresult->fields['utbetalingsigndato']));
+// $invoice[$i]['transfer_date']
=
$this->bocommon->show_date($timestamp_transfer_date,$GLOBALS['phpgw_data']['prefs'][$this->currentapp
. '.dateformat']);
+
$invoice[$i]['transfer_date']=date($GLOBALS['phpgw_data']['prefs'][$this->currentapp
. '.dateformat'],strtotime($dbresult->fields['utbetalingsigndato']));
}
else
{
@@ -269,8 +269,8 @@
$invoice[$i]['supervisor']
= $dbresult->fields['saksbehandlerid'];
$invoice[$i]['budget_responsible']
= $dbresult->fields['budsjettansvarligid'];
$invoice[$i]['transfer_id']
= $dbresult->fields['utbetalingid'];
- $invoice[$i]['voucher_date']
=
$this->bocommon->show_date($timestamp_voucher_date,$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
- $invoice[$i]['payment_date']
=
$this->bocommon->show_date($timestamp_payment_date,$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
+ $invoice[$i]['voucher_date']
=
$this->bocommon->show_date($timestamp_voucher_date,$GLOBALS['phpgw_data']['prefs'][$this->currentapp
. '.dateformat']);
+ $invoice[$i]['payment_date']
=
$this->bocommon->show_date($timestamp_payment_date,$GLOBALS['phpgw_data']['prefs'][$this->currentapp
. '.dateformat']);
$invoice[$i]['period']
= $dbresult->fields['periode'];
$invoice[$i]['type']
= $dbresult->fields['artid'];
$invoice[$i]['kidnr']
= $dbresult->fields['kidnr'];
@@ -422,7 +422,7 @@
}
//html_print_r($data);
- $dateformat =
strtolower($GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
+ $dateformat =
strtolower($GLOBALS['phpgw_data']['prefs'][$this->currentapp . '.dateformat']);
$dateformat = str_replace(".","",$dateformat);
$dateformat = str_replace("-","",$dateformat);
$dateformat = str_replace("/","",$dateformat);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/class.soinvoice.php, 1.1.1.9,
nomail <=