[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property invoice_detail.php,1.3,1.4 invoice_deta
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property invoice_detail.php,1.3,1.4 invoice_detail_paid.php,1.3,1.4 invoice_paid.php,1.3,1.4 list_invoice.php,1.3,1.4 add_admin.php,1.2,1.3 list_workorder.php,1.2,1.3 add_invoice.php,1.1.1.1,1.2 |
|
Date: |
Mon, 02 Sep 2002 11:22:26 -0400 |
Update of /cvsroot/phpgroupware/property
In directory subversions:/tmp/cvs-serv7219
Modified Files:
invoice_detail.php invoice_detail_paid.php invoice_paid.php
list_invoice.php add_admin.php list_workorder.php
add_invoice.php
Log Message:
no message
Index: invoice_detail.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_detail.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** invoice_detail.php 1 Sep 2002 19:43:49 -0000 1.3
--- invoice_detail.php 2 Sep 2002 15:22:23 -0000 1.4
***************
*** 244,248 ****
}
! $GLOBALS['phpgw']->db->query(" SELECT * from fm_invoice_role where
account_id = $user_id");
$GLOBALS['phpgw']->db->next_record();
$is_janitor = $GLOBALS['phpgw']->db->f('janitor');
--- 244,248 ----
}
! $GLOBALS['phpgw']->db->query(" SELECT * from fm_admin where account_id
= $user_id");
$GLOBALS['phpgw']->db->next_record();
$is_janitor = $GLOBALS['phpgw']->db->f('janitor');
Index: invoice_detail_paid.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_detail_paid.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** invoice_detail_paid.php 1 Sep 2002 19:43:49 -0000 1.3
--- invoice_detail_paid.php 2 Sep 2002 15:22:23 -0000 1.4
***************
*** 156,160 ****
}
! $GLOBALS['phpgw']->db->query(" SELECT * from fm_invoice_role where
account_id = $user_id");
$GLOBALS['phpgw']->db->next_record();
$is_janitor = $GLOBALS['phpgw']->db->f('janitor');
--- 156,160 ----
}
! $GLOBALS['phpgw']->db->query(" SELECT * from fm_admin where account_id
= $user_id");
$GLOBALS['phpgw']->db->next_record();
$is_janitor = $GLOBALS['phpgw']->db->f('janitor');
Index: invoice_paid.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_paid.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** invoice_paid.php 1 Sep 2002 19:43:49 -0000 1.3
--- invoice_paid.php 2 Sep 2002 15:22:23 -0000 1.4
***************
*** 21,28 ****
$GLOBALS['phpgw']->session->appsession('sub','property','p_invoice');
- // $c = CreateObject('phpgwapi.categories');
- // $c->app_name = 'property';
- //
$t->set_var('category_list',$GLOBALS['phpgw']->categories->formated_list('select','all',$cat_id,'True'));
-
if
(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['currency']))
{
--- 21,24 ----
***************
*** 61,65 ****
*/
$t->set_var('check','check.gif');
!
$t->set_var('coordinator_list',select_coordinator_list($coordinator_lid));
$t->set_var('lang_action',lang('Paid'));
$t->set_var('coordinator_url',$GLOBALS['phpgw']->link('/property/invoice_paid.php',"sort=$sort&order=$order&filter=$filter&start=$start&ab_id=$ab_id&cat_id=$cat_id"));
--- 57,61 ----
*/
$t->set_var('check','check.gif');
!
$t->set_var('coordinator_list',select_coordinator_list('',$coordinator_lid,
invoice));
$t->set_var('lang_action',lang('Paid'));
$t->set_var('coordinator_url',$GLOBALS['phpgw']->link('/property/invoice_paid.php',"sort=$sort&order=$order&filter=$filter&start=$start&ab_id=$ab_id&cat_id=$cat_id"));
***************
*** 84,88 ****
$t->set_var('lang_from_date',lang('From'));
$t->set_var('lang_to_date',lang('To'));
! $t->set_var('lang_invoice',lang('property'));
$t->set_var('query',$query);
--- 80,84 ----
$t->set_var('lang_from_date',lang('From'));
$t->set_var('lang_to_date',lang('To'));
! $t->set_var('lang_invoice',lang('Invoice'));
$t->set_var('query',$query);
***************
*** 262,301 ****
if ($coordinator_lid || $ab_id || $objekt_id)
{
! /* $sql = "SELECT DATEDIFF(day, fakturadato, utbetalingsigndato)
AS no_of_days,
bilagsnr,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
! .
"utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
! .
"forfallsdato,periode,artid,kidnr,godkjentbelop,belop,underbilag "
! . " FROM v_ecohovedbilagoverf LEFT OUTER JOIN
phpgw_addressbook ON dbo.phpgw_addressbook.id =
dbo.v_ecohovedbilagoverf.spvend_code $querymethod $coordinator $filtermethod"
! . " AND (utbetalingsigndato >'$sdate') AND (utbetalingsigndato
< '$edate')";
! */
! $sql = "SELECT DISTINCT org_name,bilagsnr, spvend_code, oppsynsmannid,
saksbehandlerid, budsjettansvarligid, utbetalingid, "
! . " (SELECT MIN(oppsynsigndato) "
! . " FROM t_ecobilagoverf underbilag "
! . " WHERE underbilag.bilagsnr = hovedbilag.bilagsnr) AS
oppsynsigndato, "
! . " (SELECT MIN(saksigndato) "
! . " FROM t_ecobilagoverf underbilag "
! . " WHERE underbilag.bilagsnr = hovedbilag.bilagsnr) AS
saksigndato, "
! . " (SELECT MIN(budsjettsigndato) "
! . " FROM t_ecobilagoverf underbilag "
! . " WHERE underbilag.bilagsnr = hovedbilag.bilagsnr) AS
budsjettsigndato, "
! . " (SELECT MIN(overftid) "
! . " FROM t_ecobilagoverf underbilag "
! . " WHERE underbilag.bilagsnr = hovedbilag.bilagsnr) AS
utbetalingsigndato, fakturadato, forfallsdato,"
! . " DATEDIFF(day, fakturadato, utbetalingsigndato) AS no_of_days, "
! . " RIGHT(CONVERT(varchar(4),DATEPART(year, fakturadato)), 2) +
RIGHT(CONVERT(varchar(3), 100 + periode), 2) AS periode,"
! . " artid, kidnr, "
! . " (SELECT MAX(splitt) "
! . " FROM t_ecobilagoverf underbilag "
! . " WHERE underbilag.bilagsnr = hovedbilag.bilagsnr) AS splitt, "
! . " (SELECT SUM(godkjentbelop) "
! . " FROM t_ecobilagoverf underbilag "
! . " WHERE underbilag.bilagsnr = hovedbilag.bilagsnr) AS
godkjentbelop, "
! . " (SELECT SUM(belop) "
! . " FROM t_ecobilagoverf underbilag "
! . " WHERE underbilag.bilagsnr = hovedbilag.bilagsnr) AS belop, "
! . " (SELECT COUNT(*) "
! . " FROM t_ecobilagoverf underbilag "
! . " WHERE underbilag.bilagsnr = hovedbilag.bilagsnr) AS
underbilag, typeid "
! . " FROM t_ecobilagoverf hovedbilag $join phpgw_addressbook ON
phpgw_addressbook.id = hovedbilag.spvend_code $querymethod $coordinator
$filtermethod"
! . " AND (overftid >'$sdate') AND (overftid < '$edate')";
}
else
--- 258,279 ----
if ($coordinator_lid || $ab_id || $objekt_id)
{
!
! $groupmethod=" group by bilagsnr";
!
! $sql = "SELECT DISTINCT bilagsnr, count(bilagsnr) as underbilag,
sum(belop) as belop,sum(godkjentbelop) as godkjentbelop FROM t_ecobilagoverf
$querymethod $coordinator $filtermethod $groupmethod $ordermethod";
! $GLOBALS['phpgw']->db->limit_query($sql ,$start,__LINE__,__FILE__);
! while ($GLOBALS['phpgw']->db->next_record())
! {
! $bilag[] = array('bilagsnr' =>
$GLOBALS['phpgw']->db->f('bilagsnr'),
! 'underbilag' => $GLOBALS['phpgw']->db->f('underbilag'),
! 'godkjentbelop' => $GLOBALS['phpgw']->db->f('godkjentbelop'),
! 'belop' => $GLOBALS['phpgw']->db->f('belop'),);
! }
!
! // print_r($bilag);
!
! $db2->query($sql,__LINE__,__FILE__);
! $total_records = $db2->num_rows();
!
}
else
***************
*** 303,308 ****
$sql ="SELECT * from t_ecobilag where spvend_code='none'";
}
- $db2->query($sql,__LINE__,__FILE__);
- $total_records = $db2->num_rows();
--- 281,284 ----
***************
*** 328,355 ****
}
- /*
- if ($ab_id)
- {
- if ($total_records == 1)
- {
- $t->set_var('lang_showing',lang('Your search has
returned 1 match'));
- }
- else
- {
- $t->set_var('lang_showing',lang('Your search returned x
matchs',$total_records));
- }
- }
- else
- {
- if ($total_records > $limit)
- {
- $t->set_var('lang_showing',lang('showing x - x of
x',($start + 1),($start + $limit),$total_records));
- }
- else
- {
- $t->set_var('lang_showing',lang('showing
x',$total_records));
- }
- }
- */
if ($total_records >
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'])
--- 304,307 ----
***************
*** 364,369 ****
// ---------------- nextmatch variable template-declarations
------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('/property/invoice_paid.php',$start,$total_records,"&cat_id=$cat_id&location_code=$location_code&coordinator_lid=$coordinator_lid&start_date=$start_date&end_date=$end_date&abid=$abid");
! $right =
$GLOBALS['phpgw']->nextmatchs->right('/property/invoice_paid.php',$start,$total_records,"&cat_id=$cat_id&location_code=$location_code&coordinator_lid=$coordinator_lid&start_date=$start_date&end_date=$end_date&abid=$abid");
$t->set_var('left',$left);
$t->set_var('right',$right);
--- 316,321 ----
// ---------------- nextmatch variable template-declarations
------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('/property/invoice_paid.php',$start,$total_records,"&cat_id=$cat_id&location_code=$location_code&coordinator_lid=$coordinator_lid&start_date=$start_date&end_date=$end_date&abid=$abid&objekt_id=$objekt_id");
! $right =
$GLOBALS['phpgw']->nextmatchs->right('/property/invoice_paid.php',$start,$total_records,"&cat_id=$cat_id&location_code=$location_code&coordinator_lid=$coordinator_lid&start_date=$start_date&end_date=$end_date&abid=$abid&objekt_id=$objekt_id");
$t->set_var('left',$left);
$t->set_var('right',$right);
***************
*** 375,386 ****
$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$t->set_var('sort_voucher',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'bilagsnr',$order,'/property/invoice_paid.php',lang('Voucher')));
!
$t->set_var('sort_invoice_date',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'fakturadato',$order,'/property/invoice_paid.php',lang('invoice
date')));
!
$t->set_var('sort_amount',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'belop',$order,'/property/invoice_paid.php',lang('Amount')));
!
$t->set_var('sort_vendor_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'spvend_code',$order,'/property/invoice_paid.php',lang('Vendor
ID')));
!
!
! $t->set_var('lang_invoice',lang('property'));
$t->set_var('lang_gab_entry',lang('g'));
-
$t->set_var('lang_view_entry',lang('view'));
$t->set_var('lang_apartment_entry',lang('Apartment'));
--- 327,334 ----
$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$t->set_var('sort_voucher',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'bilagsnr',$order,'/property/invoice_paid.php',lang('Voucher')));
! $t->set_var('lang_invoice_date',lang('invoice date'));
! $t->set_var('lang_amount',lang('Amount'));
! $t->set_var('lang_vendor_id',lang('Vendor ID'));
$t->set_var('lang_gab_entry',lang('g'));
$t->set_var('lang_view_entry',lang('view'));
$t->set_var('lang_apartment_entry',lang('Apartment'));
***************
*** 403,419 ****
$t->set_var('lang_select',lang('Select'));
$t->set_var('cats_action',$GLOBALS['phpgw']->link('/property/invoice_paid.php',"sort=$sort&order=$order&filter=$filter&start=$start&ab_id=$ab_id&cat_id=$cat_id"));
- //
$t->set_var('cats_list',$c->formated_list('select','all',$cat_id,'True'));
// ------------------------- end header declaration
--------------------------------
! $GLOBALS['phpgw']->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
! $j=0;
! while ($GLOBALS['phpgw']->db->next_record())
{
$tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
$select= '<input type="hidden" name="select[' . $j . ']"
value="'.$j.'" checked>';
-
$oppsynsigndato =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('oppsynsigndato'));
$saksigndato =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('saksigndato'));
--- 351,381 ----
$t->set_var('lang_select',lang('Select'));
$t->set_var('cats_action',$GLOBALS['phpgw']->link('/property/invoice_paid.php',"sort=$sort&order=$order&filter=$filter&start=$start&ab_id=$ab_id&cat_id=$cat_id"));
// ------------------------- end header declaration
--------------------------------
! if ($bilag)
{
+ $j=0;
+ $i = 0;
+ while(each($bilag))
+ {
+ $bilag_nr=$bilag[$i]['bilagsnr'];
+ // echo 'bilag_nr: '.$bilag_nr .'<BR>';
+ $GLOBALS['phpgw']->db->query("SELECT
spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
+ . "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
+ . " forfallsdato,periode,artid,kidnr, "
+ . " DATEDIFF(day, fakturadato, utbetalingsigndato) AS
no_of_days "
+ . " from t_ecobilagoverf $join phpgw_addressbook ON
phpgw_addressbook.id = t_ecobilagoverf.spvend_code WHERE bilagsnr = '$bilag_nr'
"
+ . " group by
spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
+ . "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
+ . " forfallsdato,periode,artid,kidnr
",__LINE__,__FILE__);
+
+ $GLOBALS['phpgw']->db->next_record();
+
+
$tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
$select= '<input type="hidden" name="select[' . $j . ']"
value="'.$j.'" checked>';
$oppsynsigndato =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('oppsynsigndato'));
$saksigndato =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('saksigndato'));
***************
*** 494,498 ****
else
{
! $sign_janitor= '<input type="radio"
name="sign[' . $j . ']" value="sign_janitor"' . $checked_janitor . '>';
}
if (!$checked_janitor)
--- 456,460 ----
else
{
! $sign_janitor= '';
}
if (!$checked_janitor)
***************
*** 525,529 ****
else
{
! $sign_janitor= '<input type="radio"
name="sign[' . $j . ']" value="sign_janitor"' . $checked_janitor . '>';
if ($checked_janitor)
{
--- 487,491 ----
else
{
! $sign_janitor= '';
if ($checked_janitor)
{
***************
*** 537,541 ****
else
{
! $sign_supervisor= '<input type="radio"
name="sign[' . $j . ']" value="sign_supervisor"' . $checked_super .'>';
if ($checked_super)
{
--- 499,503 ----
else
{
! $sign_supervisor= '';
if ($checked_super)
{
***************
*** 561,565 ****
else
{
! $sign_janitor= '<input type="radio"
name="sign[' . $j . ']" value="sign_janitor"' . $checked_janitor . '>';
if ($checked_janitor)
{
--- 523,527 ----
else
{
! $sign_janitor= '';
if ($checked_janitor)
{
***************
*** 573,577 ****
else
{
! $sign_budget_responsible= '<input
type="radio" name="sign[' . $j . ']" value="sign_budget_responsible"' .
$checked_budget .'>';
if ($checked_budget)
{
--- 535,539 ----
else
{
! $sign_budget_responsible= '';
if ($checked_budget)
{
***************
*** 597,601 ****
else
{
! $sign_janitor= '<input type="radio"
name="sign[' . $j . ']" value="sign_janitor"' . $checked_janitor . '>';
if ($checked_janitor)
{
--- 559,563 ----
else
{
! $sign_janitor= '';
if ($checked_janitor)
{
***************
*** 609,613 ****
else
{
! $sign_supervisor= '<input type="radio"
name="sign[' . $j . ']" value="sign_supervisor"' . $checked_super .'>';
if ($checked_super)
{
--- 571,575 ----
else
{
! $sign_supervisor= '';
if ($checked_super)
{
***************
*** 621,625 ****
else
{
! $sign_budget_responsible= '<input
type="radio" name="sign[' . $j . ']" value="sign_budget_responsible"' .
$checked_budget .'>';
if ($checked_budget)
{
--- 583,587 ----
else
{
! $sign_budget_responsible= '';
if ($checked_budget)
{
***************
*** 641,645 ****
else
{
! $sign_supervisor= '<input type="radio"
name="sign[' . $j . ']" value="sign_supervisor"' . $checked_super .'>';
if ($checked_super)
{
--- 603,607 ----
else
{
! $sign_supervisor= '';
if ($checked_super)
{
***************
*** 669,673 ****
else
{
! $sign_supervisor= '<input type="radio"
name="sign[' . $j . ']" value="sign_supervisor"' . $checked_super .'>';
if ($checked_super)
{
--- 631,635 ----
else
{
! $sign_supervisor= '';
if ($checked_super)
{
***************
*** 681,685 ****
else
{
! $sign_budget_responsible= '<input type="radio"
name="sign[' . $j . ']" value="sign_budget_responsible"' . $checked_budget .'>';
if ($checked_budget)
{
--- 643,647 ----
else
{
! $sign_budget_responsible= '';
if ($checked_budget)
{
***************
*** 705,709 ****
else
{
! $sign_budget_responsible= '<input type="radio"
name="sign[' . $j . ']" value="sign_budget_responsible"' . $checked_budget .'>';
if ($checked_budget)
{
--- 667,671 ----
else
{
! $sign_budget_responsible= '';
if ($checked_budget)
{
***************
*** 726,755 ****
! $sign_none= '<input type="radio" name="sign[' . $j . ']"
value="sign_none"' . $checked_none . '>';
$sign_orig_h ='<input type="hidden" name="sign_orig_h[' . $j .
']" value="'. $sign_orig . '">';
!
! if ($is_transfer)
! {
! // $transfer = '<input type="checkbox" name="transfer[' .
$j . ']" value="'. $j . '"' .$checked_transfer .'>';
! $transfer = '<input type="checkbox" name="transfer[' .
$j . ']"' .$checked_transfer .'>';
! }
! else
! {
! if ($checked_transfer)
! {
! $transfer='<b> x </b>';
! }
! else
! {
! $transfer='';
! }
! }
!
!
! $bilagsnr =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bilagsnr'));
!
! $bilagsnr_h ='<input type="hidden" name="bilagsnr[' . $j . ']"
value="'. $bilagsnr . '">';
$user_lid_h ='<input type="hidden" name="user_lid_h[' . $j .
']" value="'. $user_lid . '">';
--- 688,696 ----
! $sign_none= '';
$sign_orig_h ='<input type="hidden" name="sign_orig_h[' . $j .
']" value="'. $sign_orig . '">';
! $bilagsnr_h ='<input type="hidden" name="bilagsnr[' . $j . ']"
value="'. $bilag_nr . '">';
$user_lid_h ='<input type="hidden" name="user_lid_h[' . $j .
']" value="'. $user_lid . '">';
***************
*** 776,789 ****
$no_of_days = $GLOBALS['phpgw']->db->f('no_of_days');
if (! $no_of_days) $no_of_days = ' ';
! $period =
substr($GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('periode')),2,2);
if (! $periode) $periode = ' ';
! $belop =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('belop'));
if (! $belop) $belop = ' ';
! $godkjentbelop =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('godkjentbelop'));
if (! $godkjentbelop) $godkjentbelop = ' ';
! $underbilag =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('underbilag'));
if (! $underbilag) $underbilag = ' ';
$underbilag_h ='<input type="hidden" name="underbilag_h[' . $j
. ']" value="'. $underbilag . '">';
--- 717,730 ----
$no_of_days = $GLOBALS['phpgw']->db->f('no_of_days');
if (! $no_of_days) $no_of_days = ' ';
! $period = $GLOBALS['phpgw']->db->f('periode');
if (! $periode) $periode = ' ';
! $belop=$bilag[$i]['belop'];
if (! $belop) $belop = ' ';
! $godkjentbelop=$bilag[$i]['godkjentbelop'];
if (! $godkjentbelop) $godkjentbelop = ' ';
! $underbilag=$bilag[$i]['underbilag'];
if (! $underbilag) $underbilag = ' ';
$underbilag_h ='<input type="hidden" name="underbilag_h[' . $j
. ']" value="'. $underbilag . '">';
***************
*** 791,797 ****
$t->set_var('tr_color',$tr_color);
$j++;
// ------------------- template declaration for list records
-------------------------
! $t->set_var(array('bilagsnr' => $bilagsnr,
'bilagsnr_h' => $bilagsnr_h,
'select' => $select,
--- 732,739 ----
$t->set_var('tr_color',$tr_color);
+ $i++;
$j++;
// ------------------- template declaration for list records
-------------------------
! $t->set_var(array('bilagsnr' => $bilag_nr,
'bilagsnr_h' => $bilagsnr_h,
'select' => $select,
***************
*** 820,836 ****
'underbilag_h' =>
$underbilag_h));
-
$t->set_var('gab',$GLOBALS['phpgw']->link('/property/list_gabnr.php','objekt_id='
. $objekt_id ));
- //
$t->set_var('event',$GLOBALS['phpgw']->link('/invoice_paid.php','menuaction=calendar.uicalendar.search&from=calendar.uicalendar.search&keywords='
. $objekt_id ));
-
-
$t->set_var('link_bilagsnr',$GLOBALS['phpgw']->link('/property/invoice_detail_paid.php','bilagsnr='
. $bilagsnr . '&coordinator_lid=' . $coordinator_lid. '&ab_id=' . $ab_id));
-
$t->set_var('link_no_of_days',$GLOBALS['phpgw']->link('/property/invoice_days.php','bilagsnr='
. $bilagsnr . '&no_of_days=' . $no_of_days));
!
!
$t->set_var('view',$GLOBALS['phpgw']->link('/property/view_workorder.php','id='
. $objekt_id . '&sort=' . $sort . '&order=' . $order . '&ab_id=' . $ab_id
!
. '&start=' . $start . '&filter=' . $filter . '&cat_id=' . $cat_id));
!
! $t->set_var('objekt_id',$objekt_id);
! $t->set_var('bydel_id',$bydel_id);
! $t->set_var('invoice_name',$invoice_name);
$t->parse('list','invoice_list',true);
--- 762,767 ----
'underbilag_h' =>
$underbilag_h));
!
$t->set_var('link_bilagsnr',$GLOBALS['phpgw']->link('/property/invoice_detail_paid.php','bilagsnr='
. $bilag_nr . '&coordinator_lid=' . $coordinator_lid. '&ab_id=' . $ab_id));
$t->parse('list','invoice_list',true);
***************
*** 839,842 ****
--- 770,774 ----
// ------------------------------- end record declaration
--------------------------------
}
+ }
$hidden_vars = '<input type="hidden" name="sort" value="' . $sort .
'">' . "\n"
. '<input type="hidden" name="order" value="' .
$order . '">' . "\n"
***************
*** 847,853 ****
. '<input type="hidden" name="cat_id" value="'
. $cat_id . '">' . "\n"
. '<input type="hidden" name="sdate" value="' .
$sdate . '">' . "\n"
! . '<input type="hidden" name="edate" value="' .
$edate . '">' . "\n"
! . '<input type="hidden" name="filter" value="'
. $filter . '">' . "\n";
! $t->set_var('hidden_vars',$hidden_vars);
// ------------------------- template declaration for Add Form
---------------------------
--- 779,785 ----
. '<input type="hidden" name="cat_id" value="'
. $cat_id . '">' . "\n"
. '<input type="hidden" name="sdate" value="' .
$sdate . '">' . "\n"
! . '<input type="hidden" name="edate" value="' .
$edate . '">' . "\n";
! // . '<input type="hidden" name="filter" value="'
. $filter . '">' . "\n";
! //$t->set_var('hidden_vars',$hidden_vars);
// ------------------------- template declaration for Add Form
---------------------------
Index: list_invoice.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_invoice.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** list_invoice.php 1 Sep 2002 19:43:49 -0000 1.3
--- list_invoice.php 2 Sep 2002 15:22:23 -0000 1.4
***************
*** 51,55 ****
*/
$t->set_var('check','check.gif');
!
$t->set_var('coordinator_list',select_coordinator_list($coordinator_lid));
$t->set_var('lang_action',lang('invoice list'));
$t->set_var('coordinator_url',$GLOBALS['phpgw']->link('/property/list_invoice.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
--- 51,55 ----
*/
$t->set_var('check','check.gif');
!
$t->set_var('coordinator_list',select_coordinator_list('',$coordinator_lid,
invoice));
$t->set_var('lang_action',lang('invoice list'));
[...1059 lines suppressed...]
!
$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));
!
$t->set_var('equipment',$GLOBALS['phpgw']->link('/property/list_equipment.php','location_code='
. $location_code));
!
$t->set_var('attribute',$GLOBALS['phpgw']->link('/property/add_invoice_attribute.php','invoice_type_id='
. $invoice_type_id . "&location_code=" . $location_code . "&invoice_table=" .
$invoice_table .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));
! $t->set_var('objekt_id',$objekt_id);
! $t->set_var('bydel_id',$bydel_id);
! $t->set_var('invoice_name',$invoice_name);
! $t->parse('list','invoice_list',true);
! // ------------------------------- end record declaration
--------------------------------
! }
}
+
$hidden_vars = '<input type="hidden" name="sort" value="' . $sort .
'">' . "\n"
Index: add_admin.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** add_admin.php 1 Sep 2002 19:43:49 -0000 1.2
--- add_admin.php 2 Sep 2002 15:22:23 -0000 1.3
***************
*** 174,178 ****
}
! $allusers = $GLOBALS['phpgw']->accounts->get_list('accounts', $start,
$sort, $order, $query);
while (list($null,$ad_account) = each($allusers))
{
--- 174,180 ----
}
! $order='account_lastname';
!
! $allusers = $GLOBALS['phpgw']->accounts->get_list('accounts', $start,
ASC, $order, $query);
while (list($null,$ad_account) = each($allusers))
{
Index: list_workorder.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_workorder.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** list_workorder.php 1 Sep 2002 19:43:49 -0000 1.2
--- list_workorder.php 2 Sep 2002 15:22:23 -0000 1.3
***************
*** 14,18 ****
include('../header.inc.php');
- // ob_start();
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
$t->set_file(array('wrkorders_list' => 'list_workorder.tpl',
--- 14,17 ----
***************
*** 33,37 ****
$t->set_var('category_list',$c->formated_list('select','all',$cat_id,'True'));
!
$t->set_var('coordinator_list',$fm_wrkorder->select_coordinator_list($coordinator_id));
$t->set_var('lang_all',lang('All'));
$t->set_var('lang_none',lang('None'));
--- 32,37 ----
$t->set_var('category_list',$c->formated_list('select','all',$cat_id,'True'));
!
!
$t->set_var('coordinator_list',select_coordinator_list($coordinator_id,'',workorder));
$t->set_var('lang_all',lang('All'));
$t->set_var('lang_none',lang('None'));
Index: add_invoice.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_invoice.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** add_invoice.php 28 Aug 2002 16:43:05 -0000 1.1.1.1
--- add_invoice.php 2 Sep 2002 15:22:23 -0000 1.2
***************
*** 331,335 ****
$user_id=$GLOBALS['phpgw_info']['user']['account_id'];
! $GLOBALS['phpgw']->db->query(" SELECT * from fm_invoice_role where
account_id = $user_id");
$GLOBALS['phpgw']->db->next_record();
$is_janitor = $GLOBALS['phpgw']->db->f('janitor');
--- 331,335 ----
$user_id=$GLOBALS['phpgw_info']['user']['account_id'];
! $GLOBALS['phpgw']->db->query(" SELECT * from fm_admin where account_id
= $user_id");
$GLOBALS['phpgw']->db->next_record();
$is_janitor = $GLOBALS['phpgw']->db->f('janitor');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property invoice_detail.php,1.3,1.4 invoice_detail_paid.php,1.3,1.4 invoice_paid.php,1.3,1.4 list_invoice.php,1.3,1.4 add_admin.php,1.2,1.3 list_workorder.php,1.2,1.3 add_invoice.php,1.1.1.1,1.2,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default invoice_paid.tpl,1.2,1.3 list_invoice.tpl,1.1.1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: etemplate/inc class.boetemplate.inc.php,1.12,1.13 class.editor.inc.php,1.7,1.8
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default invoice_paid.tpl,1.2,1.3 list_invoice.tpl,1.1.1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: etemplate/inc class.boetemplate.inc.php,1.12,1.13 class.editor.inc.php,1.7,1.8
- Index(es):