[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.boinvoice.inc.php, 1.21, 1.22
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.boinvoice.inc.php, 1.21, 1.22 class.bolocation.inc.php, 1.21, 1.22 class.bowo_hour.inc.php, 1.9, 1.10 class.soinvoice.inc.php, 1.31, 1.32 class.uiinvoice.inc.php, 1.28, 1.29 class.uiwo_hour.inc.php, 1.30, 1.31 |
|
Date: |
Mon, 14 Jul 2003 06:36:46 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv27556/inc
Modified Files:
class.boinvoice.inc.php class.bolocation.inc.php
class.bowo_hour.inc.php class.soinvoice.inc.php
class.uiinvoice.inc.php class.uiwo_hour.inc.php
Log Message:
no message
Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.boinvoice.inc.php 2 Jul 2003 22:26:28 -0000 1.21
--- class.boinvoice.inc.php 14 Jul 2003 10:36:42 -0000 1.22
***************
*** 152,168 ****
{
! while($entry=each($values['counter']))
{
$local_error='';
- $n=$entry[0];
-
-
-
- //_debug_array($entry);
-
if($values['voucher_id'][$n])
{
-
$voucher_id=$values['voucher_id'][$n];
--- 152,161 ----
{
! foreach($values['counter'] as $n)
{
$local_error='';
if($values['voucher_id'][$n])
{
$voucher_id=$values['voucher_id'][$n];
Index: class.bolocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.bolocation.inc.php 1 Jul 2003 11:19:24 -0000 1.21
--- class.bolocation.inc.php 14 Jul 2003 10:36:43 -0000 1.22
***************
*** 164,168 ****
}
! for ($i=0;$i<count($owner_list);$i++)
{
if ($owner_list[$i]['selected'] != 'selected')
--- 164,169 ----
}
! $owner_count=count($owner_list);
! for ($i=0;$i<$owner_count;$i++)
{
if ($owner_list[$i]['selected'] != 'selected')
***************
*** 206,210 ****
}
! for ($i=0;$i<count($owner_list);$i++)
{
if ($owner_list[$i]['selected'] != 'selected')
--- 207,213 ----
}
! $owner_count=count($owner_list);
!
! for ($i=0;$i<$owner_count;$i++)
{
if ($owner_list[$i]['selected'] != 'selected')
***************
*** 298,302 ****
//_debug_array($data);
! for ($j=0;$j<count($fm_location_cols);$j++)
{
if(($fm_location_cols[$j]['location_type'] <=
$data['type_id']) && $fm_location_cols[$j]['lookup_form'])
--- 301,306 ----
//_debug_array($data);
! $location_cols_count =count($fm_location_cols);
! for ($j=0;$j<$location_cols_count;$j++)
{
if(($fm_location_cols[$j]['location_type'] <=
$data['type_id']) && $fm_location_cols[$j]['lookup_form'])
***************
*** 317,321 ****
}
! for ($j=0;$j<count($config);$j++)
{
if($config[$j]['location_type'] <=
$data['type_id'] && $config[$j]['lookup_form'] )
--- 321,327 ----
}
!
! $config_count =count($config);
! for ($j=0;$j<$config_count;$j++)
{
if($config[$j]['location_type'] <=
$data['type_id'] && $config[$j]['lookup_form'] )
***************
*** 497,501 ****
}
! for ($i=0;$i<count($category_list);$i++)
{
if ($category_list[$i]['selected'] !=
'selected')
--- 503,508 ----
}
! $category_count=count($category_list);
! for ($i=0;$i<$category_count;$i++)
{
if ($category_list[$i]['selected'] !=
'selected')
Index: class.bowo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bowo_hour.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.bowo_hour.inc.php 9 Jul 2003 11:12:16 -0000 1.9
--- class.bowo_hour.inc.php 14 Jul 2003 10:36:43 -0000 1.10
***************
*** 268,275 ****
//_debug_array($values);
! while($entry=each($values['select']))
{
- $n=$entry[0];
-
$cost=($values['total_cost'][$n]*$values['quantity'][$n]);
--- 268,273 ----
//_debug_array($values);
! foreach($values['select'] as $n)
{
$cost=($values['total_cost'][$n]*$values['quantity'][$n]);
***************
*** 308,315 ****
//_debug_array($values);
! while($entry=each($values['select']))
{
- $n=$entry[0];
-
if(!$values['quantity'][$n])
{
--- 306,311 ----
//_debug_array($values);
! foreach($values['select'] as $n)
{
if(!$values['quantity'][$n])
{
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** class.soinvoice.inc.php 9 Jul 2003 11:12:16 -0000 1.31
--- class.soinvoice.inc.php 14 Jul 2003 10:36:43 -0000 1.32
***************
*** 175,179 ****
while ($this->db->next_record())
{
! $invoice_temp[] = array
(
'voucher_id' =>
$this->db->f('bilagsnr'),
--- 175,179 ----
while ($this->db->next_record())
{
! $temp[] = array
(
'voucher_id' =>
$this->db->f('bilagsnr'),
***************
*** 183,195 ****
}
! if ($invoice_temp)
{
$i = 0;
! while(each($invoice_temp))
{
$role= $this->check_role();
!
$voucher_id=$invoice_temp[$i]['voucher_id'];
$sql = "SELECT
spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
--- 183,195 ----
}
! if ($temp)
{
$i = 0;
! foreach($temp as $invoice_temp)
{
$role= $this->check_role();
! $voucher_id=$invoice_temp['voucher_id'];
$sql = "SELECT
spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
***************
*** 251,255 ****
$invoice[$i]['current_user']
= strtoupper($GLOBALS['phpgw_info']['user']['account_lid']);
$invoice[$i]['voucher_id']
= $voucher_id;
! $invoice[$i]['invoice_count']
= $invoice_temp[$i]['invoice_count'];
$invoice[$i]['vendor_id']
= $this->db->f('spvend_code');
$invoice[$i]['vendor']
= $this->db->f('org_name');
--- 251,255 ----
$invoice[$i]['current_user']
= strtoupper($GLOBALS['phpgw_info']['user']['account_lid']);
$invoice[$i]['voucher_id']
= $voucher_id;
! $invoice[$i]['invoice_count']
= $invoice_temp['invoice_count'];
$invoice[$i]['vendor_id']
= $this->db->f('spvend_code');
$invoice[$i]['vendor']
= $this->db->f('org_name');
***************
*** 269,273 ****
$invoice[$i]['kidnr']
= $this->db->f('kidnr');
$invoice[$i]['kreditnota']
= $this->db->f('kreditnota');
! $invoice[$i]['amount']
= $invoice_temp[$i]['amount'];
$invoice[$i]['num_days']
=
intval(($timestamp_payment_date-$timestamp_voucher_date)/(24*3600));
$invoice[$i]['timestamp_voucher_date']
= $timestamp_voucher_date;
--- 269,273 ----
$invoice[$i]['kidnr']
= $this->db->f('kidnr');
$invoice[$i]['kreditnota']
= $this->db->f('kreditnota');
! $invoice[$i]['amount']
= $invoice_temp['amount'];
$invoice[$i]['num_days']
=
intval(($timestamp_payment_date-$timestamp_voucher_date)/(24*3600));
$invoice[$i]['timestamp_voucher_date']
= $timestamp_voucher_date;
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** class.uiinvoice.inc.php 2 Jul 2003 11:32:57 -0000 1.28
--- class.uiinvoice.inc.php 14 Jul 2003 10:36:43 -0000 1.29
***************
*** 125,133 ****
if(is_array($content))
{
! while(each($content))
{
! $sum
= $sum + $content[$i]['amount'];
! $content[$i]['amount']
= number_format($content[$i]['amount'], 2, ',', ' ');
$content[$i]['lang_payment_date']
= lang('Payment Date');
$content[$i]['link_sub']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.list_sub&sub='.$sub);
--- 125,133 ----
if(is_array($content))
{
! foreach($content as $extra)
{
! $sum
= $sum + $extra['amount'];
! $content[$i]['amount']
= number_format($extra['amount'], 2, ',', ' ');
$content[$i]['lang_payment_date']
= lang('Payment Date');
$content[$i]['link_sub']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.list_sub&sub='.$sub);
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** class.uiwo_hour.inc.php 26 Jun 2003 09:02:06 -0000 1.30
--- class.uiwo_hour.inc.php 14 Jul 2003 10:36:43 -0000 1.31
***************
*** 94,151 ****
$hour_list = $this->bo->read($workorder_id);
- //_debug_array($workorder);
-
$grouping_descr_old='';
! while (is_array($hour_list) && list(,$hour) =
each($hour_list))
{
! $sum_hour = $sum_hour + $hour['cost'];
!
! if($hour['grouping_descr']!=$grouping_descr_old)
{
! $new_grouping = true;
! }
! else
! {
! $new_grouping = false;
! }
! $grouping_descr_old =
$hour['grouping_descr'];
! if($hour['activity_num'])
! {
! $code = $hour['activity_num'];
! }
! else
! {
! $code =
str_replace("-",$hour['tolerance'],$hour['ns3420_id']);
}
-
- $content[] = array
- (
-
- 'post'
=> sprintf("%02s",$workorder['chapter_id']) . '.' .
sprintf("%02s",$hour['building_part']) . '.' .
sprintf("%02s",$hour['grouping_id']) . '.' . sprintf("%03s",$hour['record']),
- 'hour_id'
=> $hour['hour_id'],
- 'activity_num'
=> $hour['activity_num'],
- 'hours_descr'
=> $hour['hours_descr'],
- 'activity_descr'
=> $hour['activity_descr'],
- 'new_grouping'
=> $new_grouping,
- 'grouping_id'
=> $hour['grouping_id'],
- 'grouping_descr'
=> $hour['grouping_descr'],
- 'ns3420_id'
=> $hour['ns3420_id'],
- 'code'
=> $code,
- 'remark'
=> $hour['remark'],
- 'building_part'
=> $hour['building_part'],
- 'quantity'
=> $hour['quantity'],
- 'cost'
=> $hour['cost'],
- 'unit'
=> $hour['unit'],
- 'billperae'
=> $hour['billperae'],
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.edit&workorder_id='
. $workorder_id . '&hour_id=' . $hour['hour_id']),
- 'lang_edit_statustext' =>
lang('edit/customise this hour'),
- 'lang_delete_statustext' =>
lang('delete this hour'),
- 'text_edit'
=> lang('edit'),
- 'text_delete'
=> lang('delete')
- );
}
--- 94,151 ----
$hour_list = $this->bo->read($workorder_id);
$grouping_descr_old='';
! if (isSet($hour_list) AND is_array($hour_list))
{
! foreach($hour_list as $hour)
{
! $sum_hour = $sum_hour +
$hour['cost'];
!
if($hour['grouping_descr']!=$grouping_descr_old)
! {
! $new_grouping = true;
! }
! else
! {
! $new_grouping = false;
! }
!
! $grouping_descr_old =
$hour['grouping_descr'];
!
! if($hour['activity_num'])
! {
! $code = $hour['activity_num'];
! }
! else
! {
! $code =
str_replace("-",$hour['tolerance'],$hour['ns3420_id']);
! }
+ $content[] = array
+ (
! 'post'
=> sprintf("%02s",$workorder['chapter_id']) . '.' .
sprintf("%02s",$hour['building_part']) . '.' .
sprintf("%02s",$hour['grouping_id']) . '.' . sprintf("%03s",$hour['record']),
! 'hour_id'
=> $hour['hour_id'],
! 'activity_num'
=> $hour['activity_num'],
! 'hours_descr'
=> $hour['hours_descr'],
! 'activity_descr'
=> $hour['activity_descr'],
! 'new_grouping'
=> $new_grouping,
! 'grouping_id'
=> $hour['grouping_id'],
! 'grouping_descr'
=> $hour['grouping_descr'],
! 'ns3420_id'
=> $hour['ns3420_id'],
! 'code'
=> $code,
! 'remark'
=> $hour['remark'],
! 'building_part'
=> $hour['building_part'],
! 'quantity'
=> $hour['quantity'],
! 'cost'
=> $hour['cost'],
! 'unit'
=> $hour['unit'],
! 'billperae'
=> $hour['billperae'],
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.edit&workorder_id='
. $workorder_id . '&hour_id=' . $hour['hour_id']),
! 'lang_edit_statustext'
=> lang('edit/customise this hour'),
! 'lang_delete_statustext'
=> lang('delete this hour'),
! 'text_edit'
=> lang('edit'),
! 'text_delete'
=> lang('delete')
! );
}
}
***************
*** 623,667 ****
$grouping_descr_old = '';
- while (is_array($values_hour) && list(,$hour) =
each($values_hour))
- {
- $descr= $hour['hours_descr'];
! if($hour['remark'])
{
! $descr .= "\n" . $hour['remark'];
! }
! if(!$show_cost)
! {
! unset($hour['billperae']);
! unset($hour['cost']);
! }
- if($hour['grouping_descr']!=$grouping_descr_old)
- {
$content[] = array
(
! lang('post')
=> $hour['grouping_descr'],
! lang('code')
=> '',
! lang('descr')
=> '',
! lang('unit')
=> '',
! lang('quantity')
=> '',
! lang('bill per unit')
=> '',
! lang('cost')
=> ''
);
}
-
- $grouping_descr_old =
$hour['grouping_descr'];
-
- $content[] = array
- (
- lang('post')
=> $hour['post'],
- lang('code')
=> $hour['code'],
- lang('descr')
=> $descr,
- lang('unit')
=> $hour['unit'],
- lang('quantity')
=> $hour['quantity'],
- lang('bill per unit') =>
$hour['billperae'],
- lang('cost')
=> $hour['cost']
- );
}
--- 623,671 ----
$grouping_descr_old = '';
! if (isSet($values_hour) AND is_array($values_hour))
! {
! foreach($values_hour as $hour)
{
! $descr= $hour['hours_descr'];
! if($hour['remark'])
! {
! $descr .= "\n" .
$hour['remark'];
! }
!
! if(!$show_cost)
! {
! unset($hour['billperae']);
! unset($hour['cost']);
! }
!
!
if($hour['grouping_descr']!=$grouping_descr_old)
! {
! $content[] = array
! (
! lang('post')
=> $hour['grouping_descr'],
! lang('code')
=> '',
! lang('descr')
=> '',
! lang('unit')
=> '',
! lang('quantity')
=> '',
! lang('bill per unit')
=> '',
! lang('cost')
=> ''
! );
! }
!
! $grouping_descr_old =
$hour['grouping_descr'];
$content[] = array
(
! lang('post')
=> $hour['post'],
! lang('code')
=> $hour['code'],
! lang('descr')
=> $descr,
! lang('unit')
=> $hour['unit'],
! lang('quantity')
=> $hour['quantity'],
! lang('bill per unit')
=> $hour['billperae'],
! lang('cost')
=> $hour['cost']
);
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.boinvoice.inc.php, 1.21, 1.22 class.bolocation.inc.php, 1.21, 1.22 class.bowo_hour.inc.php, 1.9, 1.10 class.soinvoice.inc.php, 1.31, 1.32 class.uiinvoice.inc.php, 1.28, 1.29 class.uiwo_hour.inc.php, 1.30, 1.31,
Sigurd Nes <address@hidden> <=