[Frontaccounting-cvs_updates] frontaccount/reporting rep303.php, 1.10, 1.11

[FrontAccounting <fro...@us...>]

Update of /cvsroot/frontaccounting/frontaccount/reporting
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10133/reporting

Modified Files:
	rep303.php 
Log Message:
Extra column in Stock Check Sheet, On Order

Index: rep303.php
===================================================================
RCS file: /cvsroot/frontaccounting/frontaccount/reporting/rep303.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rep303.php	19 May 2009 23:23:45 -0000	1.10
--- rep303.php	25 May 2009 13:33:22 -0000	1.11
***************
*** 15,19 ****
  // Creator:	Joe Hunt
  // date_:	2005-05-19
! // Title:	Stock Check
  // ----------------------------------------------------------------
  $path_to_root="..";
--- 15,19 ----
  // Creator:	Joe Hunt
  // date_:	2005-05-19
! // Title:	Stock Check Sheet
  // ----------------------------------------------------------------
  $path_to_root="..";
***************
*** 91,103 ****
  	if ($check)
  	{
! 		$cols = array(0, 100, 250, 305, 375, 445,	515);
! 		$headers = array(_('Category'), _('Description'), _('Quantity'), _('Check'), _('Demand'), _('Difference'));
! 		$aligns = array('left',	'left',	'right', 'right', 'right', 'right');
  	}
  	else
  	{
! 		$cols = array(0, 100, 305, 375, 445,	515);
! 		$headers = array(_('Category'), _('Description'), _('Quantity'), _('Demand'), _('Difference'));
! 		$aligns = array('left',	'left',	'right', 'right', 'right');
  	}
  
--- 91,103 ----
  	if ($check)
  	{
! 		$cols = array(0, 100, 250, 295, 345, 390, 445,	515);
! 		$headers = array(_('Category'), _('Description'), _('Quantity'), _('Check'), _('Demand'), _('Shortage'), _('On Order'));
! 		$aligns = array('left',	'left',	'right', 'right', 'right', 'right', 'right');
  	}
  	else
  	{
! 		$cols = array(0, 100, 250, 315, 380, 445,	515);
! 		$headers = array(_('Category'), _('Description'), _('Quantity'), _('Demand'), _('Shortage'), _('On Order'));
! 		$aligns = array('left',	'left',	'right', 'right', 'right', 'right');
  	}
  
***************
*** 140,143 ****
--- 140,145 ----
  		$demandqty = get_demand_qty($trans['stock_id'], $loc_code);
  		$demandqty += get_demand_asm_qty($trans['stock_id'], $loc_code);
+ 		$onorder = get_on_porder_qty($trans['stock_id'], $loc_code);
+ 		$onorder += get_on_worder_qty($trans['stock_id'], $loc_code);
  		$rep->NewLine();
  		$dec = get_qty_dec($trans['stock_id']);
***************
*** 150,153 ****
--- 152,156 ----
  			$rep->AmountCol(4, 5, $demandqty, $dec);
  			$rep->AmountCol(5, 6, $trans['QtyOnHand'] - $demandqty, $dec);
+ 			$rep->AmountCol(6, 7, $onorder, $dec);
  		}
  		else
***************
*** 155,158 ****
--- 158,162 ----
  			$rep->AmountCol(3, 4, $demandqty, $dec);
  			$rep->AmountCol(4, 5, $trans['QtyOnHand'] - $demandqty, $dec);
+ 			$rep->AmountCol(5, 6, $onorder, $dec);
  		}
  		if ($pictures)