[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9480] property: invoice
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [9480] property: invoice |
Date: |
Thu, 31 May 2012 20:39:01 +0000 |
Revision: 9480
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9480
Author: sigurdne
Date: 2012-05-31 20:39:00 +0000 (Thu, 31 May 2012)
Log Message:
-----------
property: invoice
Modified Paths:
--------------
trunk/property/inc/class.soinvoice.inc.php
trunk/property/inc/class.uiinvoice.inc.php
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2012-05-31 13:39:22 UTC (rev
9479)
+++ trunk/property/inc/class.soinvoice.inc.php 2012-05-31 20:39:00 UTC (rev
9480)
@@ -72,7 +72,7 @@
$cat_id = isset($data['cat_id']) &&
$data['cat_id'] ? $data['cat_id']:0;
$user_lid = isset($data['user_lid']) &&
$data['user_lid']?$data['user_lid']:'none';
$paid =
isset($data['paid'])?$data['paid']:'';
- $start_date = isset($data['start_date']) &&
$data['start_date'] ? $data['start_date'] : 0;
+ $start_date = isset($data['start_date']) &&
$data['start_date'] ? $data['start_date'] : mktime(0,0,0,'01','01',date('Y'));
$end_date = isset($data['end_date']) &&
$data['end_date'] ? $data['end_date'] : time();
$vendor_id =
isset($data['vendor_id'])?$data['vendor_id']:'';
$loc1 =
isset($data['loc1'])?$data['loc1']:'';
Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php 2012-05-31 13:39:22 UTC (rev
9479)
+++ trunk/property/inc/class.uiinvoice.inc.php 2012-05-31 20:39:00 UTC (rev
9480)
@@ -227,8 +227,8 @@
if(!$end_date)
{
//-- fecha actual
+ $start_date =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,'01','01',date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$end_date =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
- $start_date = $end_date;
}
//-- edicion de registro
$values = phpgw::get_var('values');
@@ -550,15 +550,6 @@
$field_invoice = array
(
array
- ( // imag calendar1
- 'type' => 'img',
- 'id' =>
'start_date-trigger',
- 'src' =>
$GLOBALS['phpgw']->common->image('phpgwapi','cal'),
- 'alt' =>
lang('Select date'),
- 'tab_index' =>
1,
- 'style' =>
'filter'
- ),
- array
( // calendar1
start_date
'type' =>
'text',
'name' =>
'start_date',
@@ -570,15 +561,6 @@
'style' =>
'filter'
),
array
- ( // imag calendar1
- 'type' => 'img',
- 'id' =>
'end_date-trigger',
- 'src' =>
$GLOBALS['phpgw']->common->image('phpgwapi','cal'),
- 'alt' =>
lang('Select date'),
- 'tab_index' =>
3,
- 'style' =>
'filter'
- ),
- array
( // calendar1
start_date
'type' =>
'text',
'name' =>
'end_date',
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9480] property: invoice,
Sigurd Nes <=