[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.boinvestment.inc.php,1.4,1.5
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.boinvestment.inc.php,1.4,1.5 class.boinvoice.inc.php,1.8,1.9 class.soinvoice.inc.php,1.9,1.10 class.uiadmin.inc.php,1.1,1.2 class.uibuilding.inc.php,1.1,1.2 class.uiinvestment.inc.php,1.4,1.5 class.uiinvoice.inc.php,1.9,1.10 class.uilookup.inc.php,1.4,1.5 class.uiproperty.inc.php,1.2,1.3 class.uistandard_2.inc.php,1.1,1.2class.uistandard_3.inc.php,1.1,1.2 class.uistandard_entity.inc.php,1.3,1.4 |
|
Date: |
Mon, 27 Jan 2003 05:40:41 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv28044/inc
Modified Files:
class.boinvestment.inc.php class.boinvoice.inc.php
class.soinvoice.inc.php class.uiadmin.inc.php
class.uibuilding.inc.php class.uiinvestment.inc.php
class.uiinvoice.inc.php class.uilookup.inc.php
class.uiproperty.inc.php class.uistandard_2.inc.php
class.uistandard_3.inc.php class.uistandard_entity.inc.php
Log Message:
no message
Index: class.boinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvestment.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.boinvestment.inc.php 26 Jan 2003 12:27:49 -0000 1.4
--- class.boinvestment.inc.php 27 Jan 2003 10:40:30 -0000 1.5
***************
*** 52,63 ****
$this->socommon =
CreateObject($this->currentapp.'.socommon');
! $start = get_var('start',array('POST','GET'));
! $query = get_var('query',array('POST','GET'));
! $sort = get_var('sort',array('POST','GET'));
! $order = get_var('order',array('POST','GET'));
! $filter = get_var('filter',array('POST','GET'));
! $cat_id = get_var('cat_id',array('POST','GET'));
$part_of_town_id =
get_var('part_of_town_id',array('POST','GET'));
! $allrows =
get_var('allrows',array('POST','GET'));
if ($start)
--- 52,63 ----
$this->socommon =
CreateObject($this->currentapp.'.socommon');
! $start =
get_var('start',array('POST','GET'));
! $query =
get_var('query',array('POST','GET'));
! $sort =
get_var('sort',array('POST','GET'));
! $order =
get_var('order',array('POST','GET'));
! $filter =
get_var('filter',array('POST','GET'));
! $cat_id =
get_var('cat_id',array('POST','GET'));
$part_of_town_id =
get_var('part_of_town_id',array('POST','GET'));
! $allrows =
get_var('allrows',array('POST','GET'));
if ($start)
Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.boinvoice.inc.php 20 Jan 2003 10:35:28 -0000 1.8
--- class.boinvoice.inc.php 27 Jan 2003 10:40:30 -0000 1.9
***************
*** 49,52 ****
--- 49,53 ----
$user_lid =
get_var('user_lid',array('POST','GET'));
$sub =
get_var('sub',array('POST','GET'));
+ $allrows =
get_var('allrows',array('POST','GET'));
if ($start)
***************
*** 87,90 ****
--- 88,95 ----
$this->sub = $sub;
}
+ if(isset($allrows))
+ {
+ $this->allrows = $allrows;
+ }
***************
*** 113,117 ****
'user_lid' => $this->user_lid,'cat_id' => $this->cat_id, 'paid' =>
$paid,
'start_date'=>$start_date,'end_date'=>$end_date,'vendor_id'=>$vendor_id,
!
'property_id'=>$property_id,'workorder_id'=>$workorder_id));
$this->total_records = $this->so->total_records;
--- 118,122 ----
'user_lid' => $this->user_lid,'cat_id' => $this->cat_id, 'paid' =>
$paid,
'start_date'=>$start_date,'end_date'=>$end_date,'vendor_id'=>$vendor_id,
!
'property_id'=>$property_id,'workorder_id'=>$workorder_id,'allrows'=>$this->allrows));
$this->total_records = $this->so->total_records;
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.soinvoice.inc.php 21 Jan 2003 17:53:01 -0000 1.9
--- class.soinvoice.inc.php 27 Jan 2003 10:40:31 -0000 1.10
***************
*** 64,67 ****
--- 64,68 ----
$property_id =
(isset($data['property_id'])?$data['property_id']:'');
$workorder_id =
(isset($data['workorder_id'])?$data['workorder_id']:'');
+ $allrows =
(isset($data['allrows'])?$data['allrows']:'');
}
***************
*** 166,170 ****
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
! $this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
while ($this->db->next_record())
--- 167,182 ----
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
!
! if(!$allrows)
! {
! $this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
! }
! else
! {
! $this->db->query($sql .
$ordermethod,__LINE__,__FILE__);
! }
!
!
! // $this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
while ($this->db->next_record())
***************
*** 338,342 ****
}
! $sql = "SELECT
$table.*,fm_wo_wrkorders.status,fm_wo_wrkorders.charge_tenant FROM $table
$this->join fm_wo_wrkorders on fm_wo_wrkorders.id = $table.pmwrkord_code
$filtermethod ";
$this->db2->query($sql,__LINE__,__FILE__);
--- 350,356 ----
}
! $sql = "SELECT
$table.*,fm_wo_wrkorders.status,fm_wo_wrkorders.charge_tenant ,org_name FROM
$table $this->join "
! . "fm_wo_wrkorders on fm_wo_wrkorders.id =
$table.pmwrkord_code $this->join "
! . "phpgw_addressbook on $table.spvend_code =
phpgw_addressbook.id $filtermethod ";
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 369,372 ****
--- 383,387 ----
$invoice[$i]['amount']
= $this->db->f('belop');
$invoice[$i]['charge_tenant']
= $this->db->f('charge_tenant');
+ $invoice[$i]['vendor']
= $this->db->f('org_name');
$i++;
Index: class.uiadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uiadmin.inc.php 11 Dec 2002 19:31:22 -0000 1.1
--- class.uiadmin.inc.php 27 Jan 2003 10:40:31 -0000 1.2
***************
*** 220,224 ****
'hidden_vars'
=> $hidden_vars,
'links'
=> $links,
! 'allow_all_rows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 220,224 ----
'hidden_vars'
=> $hidden_vars,
'links'
=> $links,
! 'allow_allrows' =>
false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
Index: class.uibuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uibuilding.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uibuilding.inc.php 11 Dec 2002 19:31:22 -0000 1.1
--- class.uibuilding.inc.php 27 Jan 2003 10:40:31 -0000 1.2
***************
*** 126,130 ****
(
'links'
=> $links,
! 'allow_all_rows'
=> True,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 126,130 ----
(
'links'
=> $links,
! 'allow_allrows' =>
false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
Index: class.uiinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uiinvestment.inc.php 26 Jan 2003 12:27:49 -0000 1.4
--- class.uiinvestment.inc.php 27 Jan 2003 10:40:31 -0000 1.5
***************
*** 206,210 ****
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
! 'allow_all_rows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 206,210 ----
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
! 'allow_allrows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
***************
*** 409,413 ****
'links'
=> $links,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'allow_all_rows'
=> true,
'allrows'
=> $this->allrows,
'start_record'
=> $this->start,
--- 409,413 ----
'links'
=> $links,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'allow_allrows'
=> true,
'allrows'
=> $this->allrows,
'start_record'
=> $this->start,
***************
*** 415,419 ****
'num_records'
=> count($investment_list),
'all_records'
=> $this->bo->total_records,
! 'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.history&entity_id='
. $entity_id.'&investment_id=' . $investment_id),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'appname'
=> lang($this->currentapp),
--- 415,419 ----
'num_records'
=> count($investment_list),
'all_records'
=> $this->bo->total_records,
! 'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.history&entity_id='
. $entity_id.'&investment_id=' . $investment_id . '&entity_type=' .
$entity_type),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'appname'
=> lang($this->currentapp),
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uiinvoice.inc.php 21 Jan 2003 17:53:01 -0000 1.9
--- class.uiinvoice.inc.php 27 Jan 2003 10:40:31 -0000 1.10
***************
*** 50,53 ****
--- 50,54 ----
$this->sub =
$this->bo->sub;
$this->user_lid =
$this->bo->user_lid;
+ $this->allrows =
$this->bo->allrows;
}
***************
*** 198,207 ****
);
$data['sum']
= number_format($sum, 2, ',', ' ');
$data['overlib_source']
= './'.$this->currentapp.'/inc/overlib.js';
$data['links']
= $links;
! $data['allow_all_rows']
= false;
$data['start_record']
= $this->start;
! $data['record_limit']
= $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
$data['num_records']
= count($content);
$data['all_records']
= $this->bo->total_records;
--- 199,220 ----
);
+
+ if(!$this->allrows)
+ {
+ $record_limit =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ }
+ else
+ {
+ $record_limit = $this->bo->total_records;
+ }
+
+
$data['sum']
= number_format($sum, 2, ',', ' ');
$data['overlib_source']
= './'.$this->currentapp.'/inc/overlib.js';
$data['links']
= $links;
! $data['allow_allrows']
= true;
! $data['allrows']
= $this->allrows;
$data['start_record']
= $this->start;
! $data['record_limit']
= $record_limit;
$data['num_records']
= count($content);
$data['all_records']
= $this->bo->total_records;
***************
*** 228,231 ****
--- 241,245 ----
{
+ $data['allow_allrows']
= false;
$data['user_list']
= $this->bo->get_invoice_user_list('select',$this->user_lid);
$data['cat_list']
= $this->bo->select_category('select',$this->cat_id);
***************
*** 444,448 ****
'lang_save_statustext' =>
lang('Save the voucher'),
'links'
=> $links,
! 'allow_all_rows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=>
count($content),//$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 458,462 ----
'lang_save_statustext' =>
lang('Save the voucher'),
'links'
=> $links,
! 'allow_allrows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=>
count($content),//$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
***************
*** 454,460 ****
'function_msg'
=> $function_msg,
'lang_submit'
=> lang('submit'),
! 'table_header_list_invoice_sub' =>
$table_header,
! 'values_list_invoice_sub'
=> $content,
'paid'
=> $paid,
'table_done'
=> $table_done
);
--- 468,478 ----
'function_msg'
=> $function_msg,
'lang_submit'
=> lang('submit'),
! 'table_header_list_invoice_sub' =>
$table_header,
! 'values_list_invoice_sub' =>
$content,
'paid'
=> $paid,
+ 'vendor'
=> $content[0]['vendor'],
+ 'lang_vendor'
=> lang('Vendor'),
+ 'voucher_id'
=> $voucher_id,
+ 'lang_voucher_id'
=> lang('Voucher Id'),
'table_done'
=> $table_done
);
***************
*** 605,609 ****
$data['overlib_source']
= './'.$this->currentapp.'/inc/overlib.js';
$data['links']
= $links;
! $data['allow_all_rows']
= false;
$data['start_record']
= $this->start;
$data['record_limit']
= $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
--- 623,627 ----
$data['overlib_source']
= './'.$this->currentapp.'/inc/overlib.js';
$data['links']
= $links;
! $data['allow_allrows']
= false;
$data['start_record']
= $this->start;
$data['record_limit']
= $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uilookup.inc.php 15 Jan 2003 20:55:46 -0000 1.4
--- class.uilookup.inc.php 27 Jan 2003 10:40:31 -0000 1.5
***************
*** 149,153 ****
$data = array
(
! 'allow_all_rows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 149,153 ----
$data = array
(
! 'allow_allrows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
***************
*** 268,272 ****
$data = array
(
! 'allow_all_rows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 268,272 ----
$data = array
(
! 'allow_allrows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
***************
*** 393,397 ****
$data = array
(
! 'allow_all_rows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 393,397 ----
$data = array
(
! 'allow_allrows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uiproperty.inc.php 28 Dec 2002 17:25:45 -0000 1.2
--- class.uiproperty.inc.php 27 Jan 2003 10:40:31 -0000 1.3
***************
*** 143,147 ****
(
'links'
=> $links,
! 'allow_all_rows'
=> False,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 143,147 ----
(
'links'
=> $links,
! 'allow_allrows'
=> False,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
Index: class.uistandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_2.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uistandard_2.inc.php 12 Dec 2002 18:15:33 -0000 1.1
--- class.uistandard_2.inc.php 27 Jan 2003 10:40:31 -0000 1.2
***************
*** 117,121 ****
$data = array
(
! 'allow_all_rows'
=> False,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 117,121 ----
$data = array
(
! 'allow_allrows'
=> False,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
Index: class.uistandard_3.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_3.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uistandard_3.inc.php 12 Dec 2002 18:15:33 -0000 1.1
--- class.uistandard_3.inc.php 27 Jan 2003 10:40:31 -0000 1.2
***************
*** 127,131 ****
$data = array
(
! 'allow_all_rows'
=> False,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 127,131 ----
$data = array
(
! 'allow_allrows'
=> False,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
Index: class.uistandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_entity.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uistandard_entity.inc.php 14 Dec 2002 19:02:18 -0000 1.3
--- class.uistandard_entity.inc.php 27 Jan 2003 10:40:31 -0000 1.4
***************
*** 134,138 ****
$data = array
(
! 'allow_all_rows'
=> False,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 134,138 ----
$data = array
(
! 'allow_allrows'
=> False,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
***************
*** 356,360 ****
$data = array
(
! 'allow_all_rows'
=> False,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 356,360 ----
$data = array
(
! 'allow_allrows'
=> False,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.boinvestment.inc.php,1.4,1.5 class.boinvoice.inc.php,1.8,1.9 class.soinvoice.inc.php,1.9,1.10 class.uiadmin.inc.php,1.1,1.2 class.uibuilding.inc.php,1.1,1.2 class.uiinvestment.inc.php,1.4,1.5 class.uiinvoice.inc.php,1.9,1.10 class.uilookup.inc.php,1.4,1.5 class.uiproperty.inc.php,1.2,1.3 class.uistandard_2.inc.php,1.1,1.2class.uistandard_3.inc.php,1.1,1.2 class.uistandard_entity.inc.php,1.3,1.4,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc class.bobuilding.inc.php,1.1,1.2 class.bocommon.inc.php,1.6,1.7 class.boinvestment.inc.php,1.3,1.4 class.socommon.inc.php,1.3,1.4 class.soinvestment.inc.php,1.3,1.4 class.uiinvestment.inc.php,1.3,1.4
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default invoice.xsl,1.14,1.15 lookup.xsl,1.5,1.6 nextmatchs.xsl,1.2,1.3
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc class.bobuilding.inc.php,1.1,1.2 class.bocommon.inc.php,1.6,1.7 class.boinvestment.inc.php,1.3,1.4 class.socommon.inc.php,1.3,1.4 class.soinvestment.inc.php,1.3,1.4 class.uiinvestment.inc.php,1.3,1.4
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default invoice.xsl,1.14,1.15 lookup.xsl,1.5,1.6 nextmatchs.xsl,1.2,1.3
- Index(es):