[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property activity_vendor_prizing.php,1.1.1.1,1.2
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property activity_vendor_prizing.php,1.1.1.1,1.2 add_agreement.php,1.1.1.1,1.2 add_equipment.php,1.1.1.1,1.2 addactivity.php,1.1.1.1,1.2 add_power_meter.php,1.1.1.1,1.2 deleteactivity_prize_index.php,1.1.1.1,1.2 edit_agreement.php,1.1.1.1,1.2 edit_equipment.php,1.1.1.1,1.2 invoice_detail.php,1.1.1.1,1.2 invoice_detail_paid.php,1.1.1.1,1.2 invoice_paid.php,1.1.1.1,1.2 list_activity_vendor.php,1.1.1.1,1.2 list_attribute_type.php,1.1.1.1,1.2 list_invoice.php,1.1.1.1,1.2 list_property.php,1.1.1.1,1.2 |
|
Date: |
Thu, 29 Aug 2002 16:28:08 -0400 |
Update of /cvsroot/phpgroupware/property
In directory subversions:/tmp/cvs-serv14969
Modified Files:
activity_vendor_prizing.php add_agreement.php
add_equipment.php addactivity.php add_power_meter.php
deleteactivity_prize_index.php edit_agreement.php
edit_equipment.php invoice_detail.php invoice_detail_paid.php
invoice_paid.php list_activity_vendor.php
list_attribute_type.php list_invoice.php list_property.php
Log Message:
Navigation
Index: activity_vendor_prizing.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/activity_vendor_prizing.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** activity_vendor_prizing.php 28 Aug 2002 16:43:04 -0000 1.1.1.1
--- activity_vendor_prizing.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 24,28 ****
{
$join = " LEFT JOIN ";
! }
--- 24,28 ----
{
$join = " LEFT JOIN ";
! }
Index: add_agreement.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_agreement.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** add_agreement.php 28 Aug 2002 16:43:04 -0000 1.1.1.1
--- add_agreement.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 16,20 ****
$t->set_block('agreement_add','edit','edithandle');
!
$t->set_var('search_ns3420_link',$GLOBALS['phpgw']->link('/fm_wrkorder/search_ns3420.php','query='));
$t->set_var('ns3420_id',$ns3420_id);
--- 16,20 ----
$t->set_block('agreement_add','edit','edithandle');
!
$t->set_var('search_ns3420_link',$GLOBALS['phpgw']->link('/property/search_ns3420.php','query='));
$t->set_var('ns3420_id',$ns3420_id);
Index: add_equipment.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_equipment.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** add_equipment.php 28 Aug 2002 16:43:04 -0000 1.1.1.1
--- add_equipment.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 168,176 ****
$t->set_var('lang_action',lang('Add FM Ticket'));
!
$t->set_var('addressbook_link',$GLOBALS['phpgw']->link('/fm_wrkorder/addressbook.php','query='));
!
$t->set_var('property_link',$GLOBALS['phpgw']->link('/fm_wrkorder/property.php','query='));
!
$t->set_var('building_link',$GLOBALS['phpgw']->link('/fm_wrkorder/building.php','query='));
!
$t->set_var('entrance_link',$GLOBALS['phpgw']->link('/fm_wrkorder/entrance.php','query='));
!
$t->set_var('apartment_link',$GLOBALS['phpgw']->link('/fm_wrkorder/apartment.php','query='));
// --------------- end lokalisering-------------------
--- 168,176 ----
$t->set_var('lang_action',lang('Add FM Ticket'));
!
$t->set_var('addressbook_link',$GLOBALS['phpgw']->link('/property/addressbook.php','query='));
!
$t->set_var('property_link',$GLOBALS['phpgw']->link('/property/property.php','query='));
!
$t->set_var('building_link',$GLOBALS['phpgw']->link('/property/building.php','query='));
!
$t->set_var('entrance_link',$GLOBALS['phpgw']->link('/property/entrance.php','query='));
!
$t->set_var('apartment_link',$GLOBALS['phpgw']->link('/property/apartment.php','query='));
// --------------- end lokalisering-------------------
Index: addactivity.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/addactivity.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** addactivity.php 28 Aug 2002 16:43:04 -0000 1.1.1.1
--- addactivity.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 16,20 ****
$t->set_block('activity_add','edit','edithandle');
!
$t->set_var('search_ns3420_link',$GLOBALS['phpgw']->link('/fm_wrkorder/search_ns3420.php','query='));
$t->set_var('ns3420_id',$ns3420_id);
--- 16,20 ----
$t->set_block('activity_add','edit','edithandle');
!
$t->set_var('search_ns3420_link',$GLOBALS['phpgw']->link('/property/search_ns3420.php','query='));
$t->set_var('ns3420_id',$ns3420_id);
Index: add_power_meter.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_power_meter.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** add_power_meter.php 28 Aug 2002 16:43:05 -0000 1.1.1.1
--- add_power_meter.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 18,22 ****
$t->set_var('lang_power_meter',lang('Power meter'));
!
$t->set_var('entrance_link',$GLOBALS['phpgw']->link('/fm_wrkorder/entrance.php','query='));
if ($submit)
--- 18,22 ----
$t->set_var('lang_power_meter',lang('Power meter'));
!
$t->set_var('entrance_link',$GLOBALS['phpgw']->link('/property/search_entrance.php','query='));
if ($submit)
Index: deleteactivity_prize_index.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/deleteactivity_prize_index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** deleteactivity_prize_index.php 28 Aug 2002 16:43:07 -0000 1.1.1.1
--- deleteactivity_prize_index.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 39,43 ****
}
Header('Location: ' .
$GLOBALS['phpgw']->link('/property/activity_vendor_prizing.php','id=' . $id .
'&vendor_id=' . $vendor_id . '&index_count=' . $index_count . '&sort=' . $sort
. '&order=' . $order . '&query=' . $query
!
. '&start=' . $start . '&filter=' . $filter));
}
else
--- 39,43 ----
}
Header('Location: ' .
$GLOBALS['phpgw']->link('/property/activity_vendor_prizing.php','id=' . $id .
'&vendor_id=' . $vendor_id . '&index_count=' . $index_count . '&sort=' . $sort
. '&order=' . $order . '&query=' . $query
!
. '&start=' . $start . '&filter=' . $filter . '&referer=' . $referer));
}
else
Index: edit_agreement.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/edit_agreement.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** edit_agreement.php 28 Aug 2002 16:43:08 -0000 1.1.1.1
--- edit_agreement.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 16,20 ****
$t->set_block('agreement_edit','edit','edithandle');
!
$t->set_var('search_ns3420_link',$GLOBALS['phpgw']->link('/fm_wrkorder/search_ns3420.php','query='));
$t->set_var('ns3420_id',$ns3420_id);
--- 16,20 ----
$t->set_block('agreement_edit','edit','edithandle');
!
$t->set_var('search_ns3420_link',$GLOBALS['phpgw']->link('/property/search_ns3420.php','query='));
$t->set_var('ns3420_id',$ns3420_id);
Index: edit_equipment.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/edit_equipment.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** edit_equipment.php 28 Aug 2002 16:43:08 -0000 1.1.1.1
--- edit_equipment.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 181,189 ****
$t->set_var('lang_action',lang('Edit Equipment'));
!
$t->set_var('addressbook_link',$GLOBALS['phpgw']->link('/fm_wrkorder/addressbook.php','query='));
!
$t->set_var('property_link',$GLOBALS['phpgw']->link('/fm_wrkorder/property.php','query='));
!
$t->set_var('building_link',$GLOBALS['phpgw']->link('/fm_wrkorder/building.php','query='));
!
$t->set_var('entrance_link',$GLOBALS['phpgw']->link('/fm_wrkorder/entrance.php','query='));
!
$t->set_var('apartment_link',$GLOBALS['phpgw']->link('/fm_wrkorder/apartment.php','query='));
// --------------- end lokalisering-------------------
--- 181,189 ----
$t->set_var('lang_action',lang('Edit Equipment'));
!
$t->set_var('addressbook_link',$GLOBALS['phpgw']->link('/property/addressbook.php','query='));
!
$t->set_var('property_link',$GLOBALS['phpgw']->link('/property/property.php','query='));
!
$t->set_var('building_link',$GLOBALS['phpgw']->link('/property/building.php','query='));
!
$t->set_var('entrance_link',$GLOBALS['phpgw']->link('/property/entrance.php','query='));
!
$t->set_var('apartment_link',$GLOBALS['phpgw']->link('/property/apartment.php','query='));
// --------------- end lokalisering-------------------
Index: invoice_detail.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_detail.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** invoice_detail.php 28 Aug 2002 16:43:10 -0000 1.1.1.1
--- invoice_detail.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 583,587 ****
$t->set_var('link_remark',$GLOBALS['phpgw']->link('/property/invoice_remark.php','invoice_id='
. $invoice_id.'&remark_table='.$remark_table ));
!
$t->set_var('link_workorder',$GLOBALS['phpgw']->link('/fm_wrkorder/view.php','id='
. $wrkorder_id.'&view_one_page=1'));
--- 583,587 ----
$t->set_var('link_remark',$GLOBALS['phpgw']->link('/property/invoice_remark.php','invoice_id='
. $invoice_id.'&remark_table='.$remark_table ));
!
$t->set_var('link_workorder',$GLOBALS['phpgw']->link('/property/view_workorder.php','id='
. $wrkorder_id.'&view_one_page=1'));
Index: invoice_detail_paid.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_detail_paid.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** invoice_detail_paid.php 28 Aug 2002 16:43:10 -0000 1.1.1.1
--- invoice_detail_paid.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 443,447 ****
$t->set_var('link_remark',$GLOBALS['phpgw']->link('/property/invoice_remark.php','invoice_id='
. $invoice_id.'&remark_table='.$remark_table ));
!
$t->set_var('link_workorder',$GLOBALS['phpgw']->link('/fm_wrkorder/view.php','id='
. $wrkorder_id.'&view_one_page=1'));
--- 443,447 ----
$t->set_var('link_remark',$GLOBALS['phpgw']->link('/property/invoice_remark.php','invoice_id='
. $invoice_id.'&remark_table='.$remark_table ));
!
$t->set_var('link_workorder',$GLOBALS['phpgw']->link('/property/view_workorder.php','id='
. $wrkorder_id.'&view_one_page=1'));
Index: invoice_paid.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_paid.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** invoice_paid.php 28 Aug 2002 16:43:11 -0000 1.1.1.1
--- invoice_paid.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 800,804 ****
!
$t->set_var('view',$GLOBALS['phpgw']->link('/property/view.php','id=' .
$objekt_id . '&sort=' . $sort . '&order=' . $order . '&query=' . $query
. '&start=' . $start . '&filter=' . $filter . '&cat_id=' . $cat_id));
--- 800,804 ----
!
$t->set_var('view',$GLOBALS['phpgw']->link('/property/view_workorder.php','id='
. $objekt_id . '&sort=' . $sort . '&order=' . $order . '&query=' . $query
. '&start=' . $start . '&filter=' . $filter . '&cat_id=' . $cat_id));
Index: list_activity_vendor.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_activity_vendor.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** list_activity_vendor.php 28 Aug 2002 16:43:11 -0000 1.1.1.1
--- list_activity_vendor.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 44,48 ****
. '<input type="hidden" name="filter" value="'
. $filter . '">' . "\n";
!
$t->set_var('addressbook_link',$GLOBALS['phpgw']->link('/fm_wrkorder/addressbook.php','query='));
$t->set_var('lang_action',lang('Vendor list'));
$t->set_var('actionurl',$GLOBALS['phpgw']->link('/property/list_activity_vendor.php'));
--- 44,48 ----
. '<input type="hidden" name="filter" value="'
. $filter . '">' . "\n";
!
$t->set_var('addressbook_link',$GLOBALS['phpgw']->link('/property/addressbook.php','query='));
$t->set_var('lang_action',lang('Vendor list'));
$t->set_var('actionurl',$GLOBALS['phpgw']->link('/property/list_activity_vendor.php'));
Index: list_attribute_type.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_attribute_type.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** list_attribute_type.php 28 Aug 2002 16:43:11 -0000 1.1.1.1
--- list_attribute_type.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 69,74 ****
//--------------------------------- nextmatch
--------------------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('/fm_wrkorder/building.php',$start,$d->total_records,"&order=$order&filter=$filter&sort=$sort&query=$query&objekt_id=$objekt_id");
! $right =
$GLOBALS['phpgw']->nextmatchs->right('/fm_wrkorder/building.php',$start,$d->total_records,"&order=$order&filter=$filter&sort=$sort&query=$query&objekt_id=$objekt_id");
$t->set_var('left',$left);
$t->set_var('right',$right);
--- 69,74 ----
//--------------------------------- nextmatch
--------------------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('/property/building.php',$start,$d->total_records,"&order=$order&filter=$filter&sort=$sort&query=$query&objekt_id=$objekt_id");
! $right =
$GLOBALS['phpgw']->nextmatchs->right('/property/building.php',$start,$d->total_records,"&order=$order&filter=$filter&sort=$sort&query=$query&objekt_id=$objekt_id");
$t->set_var('left',$left);
$t->set_var('right',$right);
Index: list_invoice.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_invoice.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** list_invoice.php 28 Aug 2002 16:43:12 -0000 1.1.1.1
--- list_invoice.php 29 Aug 2002 20:28:05 -0000 1.2
***************
*** 920,924 ****
$t->set_var('apartment',$GLOBALS['phpgw']->link('/property/list_apartment.php','location_code='
. $objekt_id));
!
$t->set_var('view',$GLOBALS['phpgw']->link('/property/view.php','id=' .
$objekt_id . '&sort=' . $sort . '&order=' . $order . '&query=' . $query
. '&start=' . $start . '&filter=' . $filter . '&cat_id=' . $cat_id));
--- 920,924 ----
$t->set_var('apartment',$GLOBALS['phpgw']->link('/property/list_apartment.php','location_code='
. $objekt_id));
!
$t->set_var('view',$GLOBALS['phpgw']->link('/property/view_workorder.php','id='
. $objekt_id . '&sort=' . $sort . '&order=' . $order . '&query=' . $query
. '&start=' . $start . '&filter=' . $filter . '&cat_id=' . $cat_id));
Index: list_property.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_property.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** list_property.php 28 Aug 2002 16:43:12 -0000 1.1.1.1
--- list_property.php 29 Aug 2002 20:28:06 -0000 1.2
***************
*** 245,249 ****
$t->set_var('apartment',$GLOBALS['phpgw']->link('/property/list_apartment.php','location_code='
. $objekt_id));
!
$t->set_var('view',$GLOBALS['phpgw']->link('/property/view.php','id=' .
$objekt_id . '&sort=' . $sort . '&order=' . $order . '&query=' . $query
. '&start=' . $start . '&filter=' . $filter . '&cat_id=' . $cat_id));
--- 245,249 ----
$t->set_var('apartment',$GLOBALS['phpgw']->link('/property/list_apartment.php','location_code='
. $objekt_id));
!
$t->set_var('view',$GLOBALS['phpgw']->link('/property/view_workorder.php','id='
. $objekt_id . '&sort=' . $sort . '&order=' . $order . '&query=' . $query
. '&start=' . $start . '&filter=' . $filter . '&cat_id=' . $cat_id));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property activity_vendor_prizing.php,1.1.1.1,1.2 add_agreement.php,1.1.1.1,1.2 add_equipment.php,1.1.1.1,1.2 addactivity.php,1.1.1.1,1.2 add_power_meter.php,1.1.1.1,1.2 deleteactivity_prize_index.php,1.1.1.1,1.2 edit_agreement.php,1.1.1.1,1.2 edit_equipment.php,1.1.1.1,1.2 invoice_detail.php,1.1.1.1,1.2 invoice_detail_paid.php,1.1.1.1,1.2 invoice_paid.php,1.1.1.1,1.2 list_activity_vendor.php,1.1.1.1,1.2 list_attribute_type.php,1.1.1.1,1.2 list_invoice.php,1.1.1.1,1.2 list_property.php,1.1.1.1,1.2,
Sigurd Nes <address@hidden> <=