Menu
▾
▴
deleted-70949-cvs
|
From: <tim...@us...> - 2009-11-22 17:41:31
|
Revision: 3078
http://web-erp.svn.sourceforge.net/web-erp/?rev=3078&view=rev
Author: tim_schofield
Date: 2009-11-22 17:41:16 +0000 (Sun, 22 Nov 2009)
Log Message:
-----------
Improve the working of adding and editing purchasing data
Modified Paths:
--------------
trunk/PurchData.php
trunk/doc/Change.log.html
trunk/index.php
Modified: trunk/PurchData.php
===================================================================
--- trunk/PurchData.php 2009-11-22 11:30:25 UTC (rev 3077)
+++ trunk/PurchData.php 2009-11-22 17:41:16 UTC (rev 3078)
@@ -4,80 +4,69 @@
$PageSecurity = 4;
-include('includes/session.inc');
+include ('includes/session.inc');
$title = _('Supplier Purchasing Data');
-include('includes/header.inc');
+include ('includes/header.inc');
-if (isset($_GET['SupplierID'])){
- $SupplierID = trim(strtoupper($_GET['SupplierID']));
-} elseif (isset($_POST['SupplierID'])){
- $SupplierID = trim(strtoupper($_POST['SupplierID']));
+if (isset($_GET['SupplierID'])) {
+ $SupplierID = trim(strtoupper($_GET['SupplierID']));
+} elseif (isset($_POST['SupplierID'])) {
+ $SupplierID = trim(strtoupper($_POST['SupplierID']));
}
-if (isset($_GET['StockID'])){
- $StockID = trim(strtoupper($_GET['StockID']));
-} elseif (isset($_POST['StockID'])){
- $StockID = trim(strtoupper($_POST['StockID']));
+if (isset($_GET['StockID'])) {
+ $StockID = trim(strtoupper($_GET['StockID']));
+} elseif (isset($_POST['StockID'])) {
+ $StockID = trim(strtoupper($_POST['StockID']));
}
-echo "<a href='" . $rootpath . '/SelectProduct.php?' . SID . "'>" . _('Back to Items') . '</a><br>';
-
-if( isset($_POST['SupplierDescription']) ) {
- $_POST['SupplierDescription'] = trim($_POST['SupplierDescription']);
+if (isset($_POST['stockuom'])) {
+ $stockuom=$_POST['stockuom'];
}
+$NoPurchasingData=0;
-if (isset($SupplierID) AND $SupplierID!=''){ /*NOT EDITING AN EXISTING BUT SUPPLIER selected OR ENTERED*/
- $sql = "SELECT suppliers.suppname, suppliers.currcode FROM suppliers WHERE supplierid='$SupplierID'";
+echo "<a href='" . $rootpath . '/SelectProduct.php?' . SID . "'>" . _('Back to Items') . '</a><br>';
- $ErrMsg = _('The supplier details for the selected supplier could not be retrieved because');
- $DbgMsg = _('The SQL that failed was');
- $SuppSelResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
-
- if (DB_num_rows($SuppSelResult) ==1){
- $myrow = DB_fetch_array($SuppSelResult);
- $SuppName = $myrow['suppname'];
- $CurrCode = $myrow['currcode'];
- } else {
- prnMsg( _('The supplier code') . ' ' . $SupplierID . ' ' . _('is not an existing supplier in the database') . '. ' . _('You must enter an alternative supplier code or select a supplier using the search facility below'),'error');
- unset($SupplierID);
- }
+if (isset($_POST['SupplierDescription'])) {
+ $_POST['SupplierDescription'] = trim($_POST['SupplierDescription']);
}
-if ((isset($_POST['AddRecord']) OR isset($_POST['UpdateRecord'])) AND isset($SupplierID)){ /*Validate Inputs */
- $InputError = 0; /*Start assuming the best */
- if ($StockID=='' OR !isset($StockID)){
- $InputError=1;
- prnMsg( _('There is no stock item set up enter the stock code or select a stock item using the search page'),'error');
- }
- if (! is_numeric($_POST['Price']) OR $_POST['Price']==0){
- $InputError =1;
- unset($_POST['Price']);
- prnMsg( _('The price entered was not numeric') . ' (' . _('a number is expected') . ') - ' . _('no changes have been made to the database'),'error');
- }
- if (! is_numeric($_POST['LeadTime'])){
- $InputError =1;
- unset($_POST['LeadTime']);
- prnMsg( _('The lead time entered was not numeric') . ' (' . _('a number is expected') . ') - ' . _('no changes have been made to the database'),'error');
- }
- if (!is_numeric($_POST['ConversionFactor'])){
- $InputError =1;
- unset($_POST['ConversionFactor']);
- prnMsg( _('The conversion factor entered was not numeric') . ' (' . _('a number is expected') . '). ' . _('The conversion factor is the number which the price must be divided by to get the unit price in our unit of measure') . '. <br>' . _('E.g.') . ' ' . _('The supplier sells an item by the tonne and we hold stock by the kg') . '. ' . _('The suppliers price must be divided by 1000 to get to our cost per kg') . '. ' . _('The conversion factor to enter is 1000') . '. <br><br>' . _('No changes will be made to the database'),'error');
- }
-
-
- if ($InputError==0 AND isset($_POST['AddRecord'])){
-
- $sql = "INSERT INTO purchdata (supplierno,
+if ((isset($_POST['AddRecord']) OR isset($_POST['UpdateRecord'])) AND isset($SupplierID)) { /*Validate Inputs */
+ $InputError = 0; /*Start assuming the best */
+ if ($StockID == '' OR !isset($StockID)) {
+ $InputError = 1;
+ prnMsg(_('There is no stock item set up enter the stock code or select a stock item using the search page'), 'error');
+ }
+ if (!is_numeric($_POST['Price'])) {
+ $InputError = 1;
+ unset($_POST['Price']);
+ prnMsg(_('The price entered was not numeric') . ' (' . _('a number is expected') . ') - ' . _('no changes have been made to the database'), 'error');
+ }
+ if ($_POST['Price'] == 0) {
+ prnMsg(_('The price entered is zero') . ' ' . _('Is this intentional?'), 'warn');
+ }
+ if (!is_numeric($_POST['LeadTime'])) {
+ $InputError = 1;
+ unset($_POST['LeadTime']);
+ prnMsg(_('The lead time entered was not numeric') . ' (' . _('a number is expected') . ') - ' . _('no changes have been made to the database'), 'error');
+ }
+ if (!is_numeric($_POST['ConversionFactor'])) {
+ $InputError = 1;
+ unset($_POST['ConversionFactor']);
+ prnMsg(_('The conversion factor entered was not numeric') . ' (' . _('a number is expected') . '). ' . _('The conversion factor is the number which the price must be divided by to get the unit price in our unit of measure') . '. <br>' . _('E.g.') . ' ' . _('The supplier sells an item by the tonne and we hold stock by the kg') . '. ' . _('The suppliers price must be divided by 1000 to get to our cost per kg') . '. ' . _('The conversion factor to enter is 1000') . '. <br><br>' . _('No changes will be made to the database'), 'error');
+ }
+ if ($InputError == 0 AND isset($_POST['AddRecord'])) {
+ $sql = "INSERT INTO purchdata (supplierno,
stockid,
price,
effectivefrom,
suppliersuom,
conversionfactor,
supplierdescription,
+ suppliers_partno,
leadtime,
preferred)
VALUES ('" . $SupplierID . "',
@@ -87,101 +76,62 @@
'" . $_POST['SuppliersUOM'] . "',
" . $_POST['ConversionFactor'] . ",
'" . $_POST['SupplierDescription'] . "',
+ '" . $_POST['SupplierCode'] . "',
" . $_POST['LeadTime'] . ",
" . $_POST['Preferred'] . ')';
-
- $ErrMsg = _('The supplier purchasing details could not be added to the database because');
- $DbgMsg = _('The SQL that failed was');
- $AddResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
-
- prnMsg( _('This supplier purchasing data has been added to the database'),'success');
-
- }
- if ($InputError==0 AND isset($_POST['UpdateRecord'])){
-
- $sql = "UPDATE purchdata SET
+ $ErrMsg = _('The supplier purchasing details could not be added to the database because');
+ $DbgMsg = _('The SQL that failed was');
+ $AddResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ prnMsg(_('This supplier purchasing data has been added to the database'), 'success');
+ }
+ if ($InputError == 0 AND isset($_POST['UpdateRecord'])) {
+ $sql = "UPDATE purchdata SET
price=" . $_POST['Price'] . ",
effectivefrom='" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
suppliersuom='" . $_POST['SuppliersUOM'] . "',
conversionfactor=" . $_POST['ConversionFactor'] . ",
supplierdescription='" . $_POST['SupplierDescription'] . "',
+ suppliers_partno='" . $_POST['SupplierCode'] . "',
leadtime=" . $_POST['LeadTime'] . ",
preferred=" . $_POST['Preferred'] . "
WHERE purchdata.stockid='$StockID'
AND purchdata.supplierno='$SupplierID'
AND purchdata.effectivefrom='" . $_POST['WasEffectiveFrom'] . "'";
-
-
- $ErrMsg = _('The supplier purchasing details could not be update because');
- $DbgMsg = _('The SQL that failed was');
-
- $UpdResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
-
- prnMsg (_('Supplier purchasing data has been updated'),'success');
-
- }
-
- if ($InputError==0 AND (isset($_POST['UpdateRecord']) OR isset($_POST['AddRecord']))){
- /*update or insert took place and need to clear the form */
- unset($SupplierID);
- unset($_POST['Price']);
- unset($CurrCode);
- unset($_POST['SuppliersUOM']);
- unset($_POST['EffectiveFrom']);
- unset($_POST['ConversionFactor']);
- unset($_POST['SupplierDescription']);
- unset($_POST['LeadTime']);
- unset($_POST['Preferred']);
- }
+ $ErrMsg = _('The supplier purchasing details could not be update because');
+ $DbgMsg = _('The SQL that failed was');
+ $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ prnMsg(_('Supplier purchasing data has been updated'), 'success');
+ }
+ if ($InputError == 0 AND (isset($_POST['UpdateRecord']) OR isset($_POST['AddRecord']))) {
+ /*update or insert took place and need to clear the form */
+ unset($SupplierID);
+ unset($_POST['Price']);
+ unset($CurrCode);
+ unset($_POST['SuppliersUOM']);
+ unset($_POST['EffectiveFrom']);
+ unset($_POST['ConversionFactor']);
+ unset($_POST['SupplierDescription']);
+ unset($_POST['LeadTime']);
+ unset($_POST['Preferred']);
+ unset($_POST['SupplierCode']);
+ unset($SuppName);
+ }
}
-
-if (isset($_GET['Delete'])){
-
- $sql = "DELETE FROM purchdata
+if (isset($_GET['Delete'])) {
+ $sql = "DELETE FROM purchdata
WHERE purchdata.supplierno='$SupplierID'
AND purchdata.stockid='$StockID'
AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
- $ErrMsg = _('The supplier purchasing details could not be deleted because');
- $DelResult=DB_query($sql,$db,$ErrMsg);
-
- prnMsg( _('This purchasing data record has been successfully deleted'),'success');
- unset ($SupplierID);
+ $ErrMsg = _('The supplier purchasing details could not be deleted because');
+ $DelResult = DB_query($sql, $db, $ErrMsg);
+ prnMsg(_('This purchasing data record has been successfully deleted'), 'success');
+ unset($SupplierID);
}
-if (isset($StockID)){
- $result = DB_query("SELECT stockmaster.description,
- stockmaster.units,
- stockmaster.mbflag
- FROM stockmaster
- WHERE stockmaster.stockid='$StockID'",$db);
- $myrow = DB_fetch_row($result);
- $stockuom=$myrow[1];
- if (DB_num_rows($result)==1){
- if ($myrow[2]=='D' OR $myrow[2]=='A' OR $myrow[2]=='K'){
- prnMsg( $StockID . ' - ' . $myrow[0] . '<p> ' . _('The item selected is a dummy part or an assembly or kit set part') . ' - ' . _('it is not purchased') . '. ' . _('Entry of purchasing information is therefore inappropriate'),'warn');
- include('includes/footer.inc');
- exit;
- } else {
- echo '<br><font color=BLUE size=3><b>' . $StockID . ' - ' . $myrow[0] . ' </b> (' . _('In Units of') . ' ' . $myrow[1] . ' )</font>';
- }
- } else {
- prnMsg( _('Stock Item') . ' - ' . $StockID . ' ' . _('is not defined in the database'), 'warn');
- }
-}
-
-if (!isset($StockID)) {
- $StockID='';
-}
-
-echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method=post>';
-echo _('Stock Code') . ':<input type=text name="StockID" value="' . $StockID . '" size=21 maxlength=20>';
-echo ' <input type=submit name="ShowSupplierDetails" VALUE="' . _('Show Suppliers') . '">';
-echo ' <a href="' . $rootpath . '/SelectProduct.php?' . SID . '">' . _('Select Product') . '</a>';
-echo '<hr>';
-
-if (!isset($_GET['Edit'])){
- $sql = "SELECT purchdata.supplierno,
+if (!isset($_GET['Edit'])) {
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/maintenance.png" title="' . _('Search') . '" alt="">' . ' ' . $title . ' ' . _('For Stock Code') . ' - ' . $StockID . '<br>';
+ $sql = "SELECT purchdata.supplierno,
suppliers.suppname,
purchdata.price,
suppliers.currcode,
@@ -189,21 +139,20 @@
purchdata.suppliersuom,
purchdata.supplierdescription,
purchdata.leadtime,
+ purchdata.suppliers_partno,
purchdata.preferred
FROM purchdata INNER JOIN suppliers
ON purchdata.supplierno=suppliers.supplierid
WHERE purchdata.stockid = '" . $StockID . "'
ORDER BY purchdata.effectivefrom DESC";
-
- $ErrMsg = _('The supplier purchasing details for the selected part could not be retrieved because');
- $PurchDataResult = DB_query($sql, $db,$ErrMsg);
-
- if (DB_num_rows($PurchDataResult)==0 and $StockID!=''){
- prnMsg( _('There is no purchasing data set up for the part selected'),'info');
- } else if ($StockID!='') {
-
- echo '<table cellpadding=2 BORDER=2>';
- $TableHeader = '<tr><th>' . _('Supplier') . '</th>
+ $ErrMsg = _('The supplier purchasing details for the selected part could not be retrieved because');
+ $PurchDataResult = DB_query($sql, $db, $ErrMsg);
+ if (DB_num_rows($PurchDataResult) == 0 and $StockID != '') {
+// prnMsg(_('There is no purchasing data set up for the part selected'), 'info');
+ $NoPurchasingData=1;
+ } else if ($StockID != '') {
+ echo '<table cellpadding=2 BORDER=2>';
+ $TableHeader = '<tr><th>' . _('Supplier') . '</th>
<th>' . _('Price') . '</th>
<th>' . _('Currency') . '</th>
<th>' . _('Effective From') . '</th>
@@ -211,30 +160,26 @@
<th>' . _('Lead Time') . '</th>
<th>' . _('Preferred') . '</th>
</tr>';
-
- echo $TableHeader;
-
- $CountPreferreds =0;
- $k=0; //row colour counter
-
- while ($myrow=DB_fetch_array($PurchDataResult)) {
- if ($myrow['preferred']==1){
- echo '<tr class="EvenTableRows">';
- } elseif ($k==1){
- echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
- echo '<tr class="OddTableRows">';
- $k++;
- }
- if ($myrow['preferred']==1){
- $DisplayPreferred= _('Yes');
- $CountPreferreds++;
- } else {
- $DisplayPreferred=_('No');
- }
-
- printf("<td>%s</td>
+ echo $TableHeader;
+ $CountPreferreds = 0;
+ $k = 0; //row colour counter
+ while ($myrow = DB_fetch_array($PurchDataResult)) {
+ if ($myrow['preferred'] == 1) {
+ echo '<tr class="EvenTableRows">';
+ } elseif ($k == 1) {
+ echo '<tr class="EvenTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+ if ($myrow['preferred'] == 1) {
+ $DisplayPreferred = _('Yes');
+ $CountPreferreds++;
+ } else {
+ $DisplayPreferred = _('No');
+ }
+ printf("<td>%s</td>
<td align=right>%s</td>
<td>%s</td>
<td>%s</td>
@@ -243,290 +188,283 @@
<td>%s</td>
<td><a href='%s?%s&StockID=%s&SupplierID=%s&Edit=1&EffectiveFrom=%s'>" . _('Edit') . "</a></td>
<td><a href='%s?%s&StockID=%s&SupplierID=%s&Delete=1&EffectiveFrom=%s' onclick=\"return confirm('" . _('Are you sure you wish to delete this suppliers price?') . "');\">" . _('Delete') . "</a></td>
- </tr>",
- $myrow['suppname'],
- number_format($myrow['price'],3),
- $myrow['currcode'],
- ConvertSQLDate($myrow['effectivefrom']),
- $myrow['suppliersuom'],
- $myrow['leadtime'],
- $DisplayPreferred,
- $_SERVER['PHP_SELF'],
- SID,
- $StockID,
- $myrow['supplierno'],
- $myrow['effectivefrom'],
- $_SERVER['PHP_SELF'],
- SID,
- $StockID,
- $myrow['supplierno'],
- $myrow['effectivefrom']
- );
-
- } //end of while loop
- echo '</table>';
- if ($CountPreferreds>1){
- prnMsg( _('There are now') . ' ' . $CountPreferreds . ' ' . _('preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should edit the supplier purchasing data to make only one supplier the preferred supplier'),'warn');
- } elseif($CountPreferreds==0){
- prnMsg( _('There are NO preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should make one supplier only the preferred supplier'),'warn');
- }
- } // end of there are purchsing data rows to show
- echo '<hr>';
+ </tr>", $myrow['suppname'], number_format($myrow['price'], 3), $myrow['currcode'], ConvertSQLDate($myrow['effectivefrom']), $myrow['suppliersuom'], $myrow['leadtime'], $DisplayPreferred, $_SERVER['PHP_SELF'], SID, $StockID, $myrow['supplierno'], $myrow['effectivefrom'], $_SERVER['PHP_SELF'], SID, $StockID, $myrow['supplierno'], $myrow['effectivefrom']);
+ } //end of while loop
+ echo '</table><br/>';
+ if ($CountPreferreds > 1) {
+ prnMsg(_('There are now') . ' ' . $CountPreferreds . ' ' . _('preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should edit the supplier purchasing data to make only one supplier the preferred supplier'), 'warn');
+ } elseif ($CountPreferreds == 0) {
+ prnMsg(_('There are NO preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should make one supplier only the preferred supplier'), 'warn');
+ }
+ } // end of there are purchsing data rows to show
+ echo '<br/>';
} /* Only show the existing purchasing data records if one is not being edited */
-
-/*Show the input form for new supplier purchasing details */
-
-if (isset($_GET['Edit'])){
-
- $sql = "SELECT purchdata.supplierno,
- suppliers.suppname,
- purchdata.price,
- purchdata.effectivefrom,
- suppliers.currcode,
- purchdata.suppliersuom,
- purchdata.supplierdescription,
- purchdata.leadtime,
- purchdata.conversionfactor,
- purchdata.preferred
- FROM purchdata INNER JOIN suppliers
- ON purchdata.supplierno=suppliers.supplierid
- WHERE purchdata.supplierno='$SupplierID'
- AND purchdata.stockid='$StockID'
- AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
-
- $ErrMsg = _('The supplier purchasing details for the selected supplier and item could not be retrieved because');
- $EditResult = DB_query($sql, $db, $ErrMsg);
-
- $myrow = DB_fetch_array($EditResult);
-
- $SuppName = $myrow['suppname'];
- $_POST['Price'] = $myrow['price'];
- $_POST['EffectiveFrom']=ConvertSQLDate($myrow['effectivefrom']);
- $CurrCode = $myrow['currcode'];
- $_POST['SuppliersUOM'] = $myrow['suppliersuom'];
- $_POST['SupplierDescription'] = $myrow['supplierdescription'];
- $_POST['LeadTime'] = $myrow['leadtime'];
- $_POST['ConversionFactor'] = $myrow['conversionfactor'];
- $_POST['Preferred'] = $myrow['preferred'];
-
-}
-
-echo '<table>';
-
-if (!isset($SupplierID)) {
- $SupplierID = '';
-}
-
-if (isset($_GET['Edit'])){
- echo '<tr><td>' . _('Supplier Code') . ':</td>
- <td><input type=hidden name="SupplierID" VALUE="' . $SupplierID . '">' . $SupplierID . ' - ' . $SuppName . '<input type=hidden name="WasEffectiveFrom" VALUE="' . $myrow['effectivefrom'] . '"></td></tr>';
-} else {
- echo '<tr><td>' . _('Supplier Code') . ':</td>
- <td><input type=TEXT name="SupplierID" maxlength=10 size=11 VALUE="' . $SupplierID . '">';
- if (!isset($SuppName) OR $SuppName=""){
- echo '<font size=1>' . '(' . _('A search facility is available below if necessary') . ')';
+if (isset($SupplierID) AND $SupplierID != '' AND !isset($_POST['SearchSupplier'])) { /*NOT EDITING AN EXISTING BUT SUPPLIER selected OR ENTERED*/
+ $sql = "SELECT suppliers.suppname, suppliers.currcode FROM suppliers WHERE supplierid='$SupplierID'";
+ $ErrMsg = _('The supplier details for the selected supplier could not be retrieved because');
+ $DbgMsg = _('The SQL that failed was');
+ $SuppSelResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ if (DB_num_rows($SuppSelResult) == 1) {
+ $myrow = DB_fetch_array($SuppSelResult);
+ $SuppName = $myrow['suppname'];
+ $CurrCode = $myrow['currcode'];
} else {
- echo $SuppName;
+ prnMsg(_('The supplier code') . ' ' . $SupplierID . ' ' . _('is not an existing supplier in the database') . '. ' . _('You must enter an alternative supplier code or select a supplier using the search facility below'), 'error');
+ unset($SupplierID);
}
- echo '</td></tr>';
-}
-
-if (!isset($CurrCode)) {
- $CurrCode = '';
-}
-
-if (!isset($_POST['Price'])) {
- $_POST['Price'] = 0;
-}
-if (!isset($_POST['EffectiveFrom'])) {
- $_POST['EffectiveFrom'] = Date($_SESSION['DefaultDateFormat']);
-}
-if (!isset($_POST['SuppliersUOM'])) {
- $_POST['SuppliersUOM'] = '';
-}
-
-if (!isset($_POST['SupplierDescription'])) {
- $_POST['SupplierDescription'] = '';
-}
-
-echo '<tr><td>' . _('Currency') . ':</td>
- <td><input type=hidden name="CurrCode" . VALUE="' . $CurrCode . '">' . $CurrCode . '</td></tr>';
-echo '<tr><td>' . _('Price') . ' (' . _('in Supplier Currency') . '):</td>
- <td><input type=text class=number name="Price" maxlength=12 size=12 VALUE=' .
- number_format($_POST['Price'],DecimalPlaces($CurrCode, $db)) . '></td></tr>';
-echo '<tr><td>' . _('Date Updated') . ':</td>
- <td><input type=text class=date alt="'.$_SESSION['DefaultDateFormat'].'" name="EffectiveFrom" maxlength=10 size=11 VALUE="' . $_POST['EffectiveFrom'] . '"></td></tr>';
-echo '<tr><td>' . _('Our Unit of Measure') . ':</td>
- <td>'.$stockuom.'</td></tr>';
-echo '<tr><td>' . _('Suppliers Unit of Measure') . ':</td>';
-
-echo '<td><select name="SuppliersUOM">';
-$sql='SELECT * FROM unitsofmeasure';
-$result=DB_query($sql, $db);
-while ($myrow=DB_fetch_array($result)) {
- if ($_POST['SuppliersUOM']==$myrow['unitid']) {
- echo '<option selected value="'.$myrow['unitid'].'">'.$myrow['unitname'].'</option>';
- } else {
- echo '<option value="'.$myrow['unitid'].'">'.$myrow['unitname'].'</option>';
+} else {
+ if ($NoPurchasingData=0) {
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/maintenance.png" title="' . _('Search') . '" alt="">' . ' ' . $title . ' ' . _('For Stock Code') . ' - ' . $StockID . '<br>';
}
+ if (!isset($_POST['SearchSupplier'])) {
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method=post><table cellpadding=3 colspan=4><tr>';
+ echo '<input type="hidden" name="StockID" value="' . $StockID . '">';
+ echo '<td>' . _('Text in the Supplier') . ' <b>' . _('NAME') . '</b>:</font></td>';
+ echo '<td><input type="Text" name="Keywords" size=20 maxlength=25></td>';
+ echo '<td><font size=3><b>' . _('OR') . '</b></font></td>';
+ echo '<td>' . _('Text in Supplier') . ' <b>' . _('CODE') . '</b>:</font></td>';
+ echo '<td><input type="Text" name="SupplierCode" size=15 maxlength=18></td>';
+ echo '</tr></table><br />';
+ echo '<div class="centre"><input type=submit name="SearchSupplier" VALUE="' . _('Find Suppliers Now') . '"></div></form>';
+ include ('includes/footer.inc');
+ exit;
+ };
}
-echo '</td></tr>';
-if (!isset($_POST['ConversionFactor']) OR $_POST['ConversionFactor']==""){
- $_POST['ConversionFactor']=1;
-}
-echo '<tr><td>' . _('Conversion Factor (to our UOM)') . ':</td>
- <td><input type=text class=number name="ConversionFactor" maxlength=12 size=12 VALUE=' . $_POST['ConversionFactor'] . '></td></tr>';
-echo '<tr><td>' . _('Supplier Code or Description') . ':</td>
- <td><input type=text name="SupplierDescription" maxlength=50 size=51 VALUE="' . $_POST['SupplierDescription'] . '"></td></tr>';
-if (!isset($_POST['LeadTime']) OR $_POST['LeadTime']==""){
- $_POST['LeadTime']=1;
-}
-echo '<tr><td>' . _('Lead Time') . ' (' . _('in days from date of order') . '):</td>
- <td><input type=text class=number name="LeadTime" maxlength=4 size=5 VALUE=' . $_POST['LeadTime'] . '></td></tr>';
-echo '<tr><td>' . _('Preferred Supplier') . ':</td>
- <td><select name="Preferred">';
-
-if ($_POST['Preferred']==1){
- echo '<option selected VALUE=1>' . _('Yes');
- echo '<option VALUE=0>' . _('No');
-} else {
- echo '<option VALUE=1>' . _('Yes');
- echo '<option selected VALUE=0>' . _('No');
-}
-echo '</select></td></tr></table><div class="centre">';
-
-if (isset($_GET['Edit'])){
- echo '<input type=submit name="UpdateRecord" VALUE="' . _('Update') . '">';
-} else {
- echo '<input type=submit name="AddRecord" VALUE="' . _('Add') . '">';
-}
-
-echo '</div><hr>';
-
-if (isset($_POST['SearchSupplier'])){
-
- if (isset($_POST['Keywords']) AND isset($_POST['SupplierCode'])) {
- $msg=_('Supplier Name keywords have been used in preference to the Supplier Code extract entered') . '.';
- }
- if ($_POST['Keywords']=="" AND $_POST['SupplierCode']=="") {
- $msg=_('At least one Supplier Name keyword OR an extract of a Supplier Code must be entered for the search');
- } else {
- if (strlen($_POST['Keywords'])>0) {
- //insert wildcard characters in spaces
-
- $i=0;
- $SearchString = '%';
- while (strpos($_POST['Keywords'], ' ', $i)) {
- $wrdlen=strpos($_POST['Keywords'],' ',$i) - $i;
- $SearchString=$SearchString . substr($_POST['Keywords'],$i,$wrdlen) . '%';
- $i=strpos($_POST['Keywords'],' ',$i) +1;
- }
- $SearchString = $SearchString. substr($_POST['Keywords'],$i).'%';
-
- $SQL = "SELECT suppliers.supplierid,
+if (isset($_POST['SearchSupplier'])) {
+ if (isset($_POST['Keywords']) AND isset($_POST['SupplierCode'])) {
+ $msg = _('Supplier Name keywords have been used in preference to the Supplier Code extract entered') . '.';
+ }
+ if ($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') {
+ $_POST['Keywords'] = ' ';
+ }
+ if (strlen($_POST['Keywords']) > 0) {
+ //insert wildcard characters in spaces
+ $i = 0;
+ $SearchString = '%';
+ while (strpos($_POST['Keywords'], ' ', $i)) {
+ $wrdlen = strpos($_POST['Keywords'], ' ', $i) -$i;
+ $SearchString = $SearchString . substr($_POST['Keywords'], $i, $wrdlen) . '%';
+ $i = strpos($_POST['Keywords'], ' ', $i) +1;
+ }
+ $SearchString = $SearchString . substr($_POST['Keywords'], $i) . '%';
+ $SQL = "SELECT suppliers.supplierid,
suppliers.suppname,
suppliers.currcode,
suppliers.address1,
suppliers.address2,
suppliers.address3
FROM suppliers WHERE suppliers.suppname " . LIKE . " '$SearchString'";
-
- } elseif (strlen($_POST['SupplierCode'])>0){
- $SQL = "SELECT suppliers.supplierid,
- suppliers.suppname,
- suppliers.currcode,
- suppliers.address1,
- suppliers.address2,
- suppliers.address3
- FROM suppliers
- WHERE suppliers.supplierid " . LIKE . " '%" . $_POST['SupplierCode'] . "%'";
- }
-
- $ErrMsg = _('The suppliers matching the criteria entered could not be retrieved because');
- $DbgMsg = _('The SQL to retrieve supplier details that failed was');
- $SuppliersResult = DB_query($SQL,$db,$ErrMsg,$DbgMsg);
-
- } //one of keywords or SupplierCode was more than a zero length string
+ } elseif (strlen($_POST['SupplierCode']) > 0) {
+ $SQL = "SELECT suppliers.supplierid,
+ suppliers.suppname,
+ suppliers.currcode,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3
+ FROM suppliers
+ WHERE suppliers.supplierid " . LIKE . " '%" . $_POST['SupplierCode'] . "%'";
+ } //one of keywords or SupplierCode was more than a zero length string
+ $ErrMsg = _('The suppliers matching the criteria entered could not be retrieved because');
+ $DbgMsg = _('The SQL to retrieve supplier details that failed was');
+ $SuppliersResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
} //end of if search
-$msg = '';
-
-if (strlen($msg)>1){
- prnMsg($msg,'warn');
-}
-
-?>
-
-<table cellpadding=3 colspan=4>
-<tr>
-<td><?php echo _('Text in the Supplier'); ?> <b><?php echo _('NAME'); ?></b>:</font></td>
-<td><input type="Text" name="Keywords" size=20 maxlength=25></td>
-<td><font size=3><b><?php echo _('OR'); ?></b></font></td>
-<td><?php echo _('Text in Supplier'); ?> <b><?php echo _('CODE'); ?></b>:</font></td>
-<td><input type="Text" name="SupplierCode" size=15 maxlength=18></td>
-</tr>
-</table>
-<div class='centre'><input type=submit name="SearchSupplier" VALUE="<?php echo _('Find Suppliers Now'); ?>">
-<input type=submit action=RESET VALUE="<?php echo _('Reset'); ?>"></div>
-<hr>
-
-<?php
-
if (isset($SuppliersResult)) {
-
- echo '<table cellpadding=2 colspan=7 BORDER=2>';
- $TableHeader = '<tr><th>' . _('Code') . '</th>
+ if (isset($StockID)) {
+ $result = DB_query("SELECT stockmaster.description,
+ stockmaster.units,
+ stockmaster.mbflag
+ FROM stockmaster
+ WHERE stockmaster.stockid='$StockID'", $db);
+ $myrow = DB_fetch_row($result);
+ $stockuom = $myrow[1];
+ if (DB_num_rows($result) == 1) {
+ if ($myrow[2] == 'D' OR $myrow[2] == 'A' OR $myrow[2] == 'K') {
+ prnMsg($StockID . ' - ' . $myrow[0] . '<p> ' . _('The item selected is a dummy part or an assembly or kit set part') . ' - ' . _('it is not purchased') . '. ' . _('Entry of purchasing information is therefore inappropriate'), 'warn');
+ include ('includes/footer.inc');
+ exit;
+ } else {
+ // echo '<br><font color=BLUE size=3><b>' . $StockID . ' - ' . $myrow[0] . ' </b> (' . _('In Units of') . ' ' . $myrow[1] . ' )</font>';
+ }
+ } else {
+ prnMsg(_('Stock Item') . ' - ' . $StockID . ' ' . _('is not defined in the database'), 'warn');
+ }
+ } else {
+ $StockID = '';
+ $stockuom = 'each';
+ }
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method=post><table cellpadding=2 colspan=7 BORDER=2>';
+ $TableHeader = '<tr><th>' . _('Code') . '</th>
<th>' . _('Supplier Name') . '</th>
<th>' . _('Currency') . '</th>
<th>' . _('Address 1') . '</th>
<th>' . _('Address 2') . '</th>
<th>' . _('Address 3') . '</th>
</tr>';
- echo $TableHeader;
-
- $j = 1;
-
- while ($myrow=DB_fetch_array($SuppliersResult)) {
-
- printf("<tr><td><font size=1><input type=submit name='SupplierID' VALUE='%s'</font></td>
+ echo $TableHeader;
+ $j = 1;
+ while ($myrow = DB_fetch_array($SuppliersResult)) {
+ printf("<tr><td><font size=1><input type=submit name='SupplierID' VALUE='%s'</font></td>
<td><font size=1>%s</font></td>
<td><font size=1>%s</font></td>
<td><font size=1>%s</font></td>
<td><font size=1>%s</font></td>
<td><font size=1>%s</font></td>
- </tr>",
- $myrow['supplierid'],
- $myrow['suppname'],
- $myrow['currcode'],
- $myrow['address1'],
- $myrow['address2'],
- $myrow['address3']
- );
+ </tr>", $myrow['supplierid'], $myrow['suppname'], $myrow['currcode'], $myrow['address1'], $myrow['address2'], $myrow['address3']);
+ echo '<input type=hidden name=StockID value="' . $StockID . '">';
+ echo '<input type=hidden name=stockuom value="' . $stockuom . '">';
+ $j++;
+ if ($j == 11) {
+ $j = 1;
+ echo $TableHeader;
+ }
+ //end of page full new headings if
+
+ }
+ //end of while loop
+ echo '</table><br/></form>';
+}
+//end if results to show
- $j++;
- if ($j == 11){
- $j=1;
- echo $TableHeader;
+/*Show the input form for new supplier purchasing details */
+if (!isset($SuppliersResult)) {
+ if (isset($_GET['Edit'])) {
+ $sql = "SELECT purchdata.supplierno,
+ suppliers.suppname,
+ purchdata.price,
+ purchdata.effectivefrom,
+ suppliers.currcode,
+ purchdata.suppliersuom,
+ purchdata.supplierdescription,
+ purchdata.leadtime,
+ purchdata.conversionfactor,
+ purchdata.suppliers_partno,
+ purchdata.preferred,
+ stockmaster.units
+ FROM purchdata INNER JOIN suppliers
+ ON purchdata.supplierno=suppliers.supplierid
+ INNER JOIN stockmaster
+ ON purchdata.stockid=stockmaster.stockid
+ WHERE purchdata.supplierno='$SupplierID'
+ AND purchdata.stockid='$StockID'
+ AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
+ $ErrMsg = _('The supplier purchasing details for the selected supplier and item could not be retrieved because');
+ $EditResult = DB_query($sql, $db, $ErrMsg);
+ $myrow = DB_fetch_array($EditResult);
+ $SuppName = $myrow['suppname'];
+ $_POST['Price'] = $myrow['price'];
+ $_POST['EffectiveFrom'] = ConvertSQLDate($myrow['effectivefrom']);
+ $CurrCode = $myrow['currcode'];
+ $_POST['SuppliersUOM'] = $myrow['suppliersuom'];
+ $_POST['SupplierDescription'] = $myrow['supplierdescription'];
+ $_POST['LeadTime'] = $myrow['leadtime'];
+ $_POST['ConversionFactor'] = $myrow['conversionfactor'];
+ $_POST['Preferred'] = $myrow['preferred'];
+ $_POST['SupplierCode'] = $myrow['suppliers_partno'];
+ $stockuom=$myrow['units'];
+ }
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method=post><table>';
+ if (!isset($SupplierID)) {
+ $SupplierID = '';
+ }
+ if (isset($_GET['Edit'])) {
+ echo '<tr><td>' . _('Supplier Name') . ':</td>
+ <td><input type=hidden name="SupplierID" VALUE="' . $SupplierID . '">' . $SupplierID . ' - ' . $SuppName . '<input type=hidden name="WasEffectiveFrom" VALUE="' . $myrow['effectivefrom'] . '"></td></tr>';
+ } else {
+ echo '<tr><td>' . _('Supplier Name') . ':</td>
+ <input type=hidden name="SupplierID" maxlength=10 size=11 VALUE="' . $SupplierID . '">';
+ if ($SupplierID!='') {
+ echo '<td>'.$SuppName;
}
-//end of page full new headings if
+ if (!isset($SuppName) OR $SuppName = "") {
+ echo '<font size=1>' . '(' . _('A search facility is available below if necessary') . ')';
+ } else {
+ echo '<td>'.$SuppName;
+ }
+ echo '</td></tr>';
+ }
+ echo '<td><input type=hidden name="StockID" maxlength=10 size=11 VALUE="' . $StockID . '">';
+ if (!isset($CurrCode)) {
+ $CurrCode = '';
+ }
+ if (!isset($_POST['Price'])) {
+ $_POST['Price'] = 0;
+ }
+ if (!isset($_POST['EffectiveFrom'])) {
+ $_POST['EffectiveFrom'] = Date($_SESSION['DefaultDateFormat']);
+ }
+ if (!isset($_POST['SuppliersUOM'])) {
+ $_POST['SuppliersUOM'] = '';
+ }
+ if (!isset($_POST['SupplierDescription'])) {
+ $_POST['SupplierDescription'] = '';
+ }
+ if (!isset($_POST['SupplierCode'])) {
+ $_POST['SupplierCode'] = '';
+ }
+ echo '<tr><td>' . _('Currency') . ':</td>
+ <td><input type=hidden name="CurrCode" . VALUE="' . $CurrCode . '">' . $CurrCode . '</td></tr>';
+ echo '<tr><td>' . _('Price') . ' (' . _('in Supplier Currency') . '):</td>
+ <td><input type=text class=number name="Price" maxlength=12 size=12 VALUE=' . number_format($_POST['Price'], DecimalPlaces($CurrCode, $db)) . '></td></tr>';
+ echo '<tr><td>' . _('Date Updated') . ':</td>
+ <td><input type=text class=date alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom" maxlength=10 size=11 VALUE="' . $_POST['EffectiveFrom'] . '"></td></tr>';
+ echo '<tr><td>' . _('Our Unit of Measure') . ':</td>';
+ if (isset($SupplierID)) {
+ echo '<td>' . $stockuom . '</td></tr>';
}
-//end of while loop
-
- echo '</table>';
-
+ echo '<tr><td>' . _('Suppliers Unit of Measure') . ':</td>';
+ echo '<td><select name="SuppliersUOM">';
+ $sql = 'SELECT * FROM unitsofmeasure';
+ $result = DB_query($sql, $db);
+ while ($myrow = DB_fetch_array($result)) {
+ if ($_POST['SuppliersUOM'] == $myrow['unitid']) {
+ echo '<option selected value="' . $myrow['unitid'] . '">' . $myrow['unitname'] . '</option>';
+ } else {
+ echo '<option value="' . $myrow['unitid'] . '">' . $myrow['unitname'] . '</option>';
+ }
+ }
+ echo '</td></tr>';
+ if (!isset($_POST['ConversionFactor']) OR $_POST['ConversionFactor'] == "") {
+ $_POST['ConversionFactor'] = 1;
+ }
+ echo '<tr><td>' . _('Conversion Factor (to our UOM)') . ':</td>
+ <td><input type=text class=number name="ConversionFactor" maxlength=12 size=12 VALUE=' . $_POST['ConversionFactor'] . '></td></tr>';
+ echo '<tr><td>' . _('Supplier Stock Code') . ':</td>
+ <td><input type=text name="SupplierCode" maxlength=15 size=15 VALUE="' . $_POST['SupplierCode'] . '"></td></tr>';
+ echo '<tr><td>' . _('Supplier Stock Description') . ':</td>
+ <td><input type=text name="SupplierDescription" maxlength=50 size=51 VALUE="' . $_POST['SupplierDescription'] . '"></td></tr>';
+ if (!isset($_POST['LeadTime']) OR $_POST['LeadTime'] == "") {
+ $_POST['LeadTime'] = 1;
+ }
+ echo '<tr><td>' . _('Lead Time') . ' (' . _('in days from date of order') . '):</td>
+ <td><input type=text class=number name="LeadTime" maxlength=4 size=5 VALUE=' . $_POST['LeadTime'] . '></td></tr>';
+ echo '<tr><td>' . _('Preferred Supplier') . ':</td>
+ <td><select name="Preferred">';
+ if ($_POST['Preferred'] == 1) {
+ echo '<option selected VALUE=1>' . _('Yes');
+ echo '<option VALUE=0>' . _('No');
+ } else {
+ echo '<option VALUE=1>' . _('Yes');
+ echo '<option selected VALUE=0>' . _('No');
+ }
+ echo '</select></td></tr></table><div class="centre">';
+ if (isset($_GET['Edit'])) {
+ echo '<input type=submit name="UpdateRecord" VALUE="' . _('Update') . '">';
+ } else {
+ echo '<input type=submit name="AddRecord" VALUE="' . _('Add') . '">';
+ }
+ echo '</div>';
+ echo '<div class="centre">';
+ if (isset($StockLocation) and isset($StockID) AND strlen($StockID) != 0) {
+ echo '<br><a href="' . $rootpath . '/StockStatus.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
+ echo '<br><a href="' . $rootpath . '/StockMovements.php?' . SID . '&StockID=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Show Stock Movements') . '</a>';
+ echo '<br><a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Search Outstanding Sales Orders') . '</a>';
+ echo '<br><a href="' . $rootpath . '/SelectCompletedOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
+ }
+ echo '</form></div>';
}
-//end if results to show
-echo '<div class="centre">';
-if (isset($StockLocation) and isset($StockID) AND strlen($StockID)!=0){
- echo '<br><a href="' . $rootpath . '/StockStatus.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
- echo '<br><a href="' . $rootpath . '/StockMovements.php?' . SID . '&StockID=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Show Stock Movements') . '</a>';
- echo '<br><a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Search Outstanding Sales Orders') . '</a>';
- echo '<br><a href="' . $rootpath . '/SelectCompletedOrder.php?' .SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
-}
-
-echo '</form></div>';
-include('includes/footer.inc');
-?>
+include ('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-11-22 11:30:25 UTC (rev 3077)
+++ trunk/doc/Change.log.html 2009-11-22 17:41:16 UTC (rev 3078)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>22/11/09 Tim: PurchData.php - Improve the working of adding and editing purchasing data
<p>22/11/09 Tim: PO_PDFOrderPageHeader.php - Correct variable name to show order lines correctly
<p>21/11/09 Tim: PO_AuthorisationLevels.php - Correct edit functionality - Fixes Ticket #15
<p>21/11/09 Tim: Logout.php - Take out reference to $demo_text and the incorrect call to session_start().
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2009-11-22 11:30:25 UTC (rev 3077)
+++ trunk/index.php 2009-11-22 17:41:16 UTC (rev 3078)
@@ -481,11 +481,6 @@
</td>
<td class="menu_group_items"> <!-- PO Maintenance -->
<table width="100%" class="table_index">
- <tr>
- <td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PurchData.php?' . SID . '">' . _('Maintain Purchasing Data') . '</a></p>'; ?>
- </td>
- </tr>
</table>
</td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-11-22 17:42:56
|
Revision: 3079
http://web-erp.svn.sourceforge.net/web-erp/?rev=3079&view=rev
Author: tim_schofield
Date: 2009-11-22 17:42:42 +0000 (Sun, 22 Nov 2009)
Log Message:
-----------
Correction for case of LogPath not being set
Modified Paths:
--------------
trunk/doc/Change.log.html
trunk/includes/MiscFunctions.php
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-11-22 17:41:16 UTC (rev 3078)
+++ trunk/doc/Change.log.html 2009-11-22 17:42:42 UTC (rev 3079)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>22/11/09 Tim: MiscFunctions.php - Correction for case of LogPath not being set
<p>22/11/09 Tim: PurchData.php - Improve the working of adding and editing purchasing data
<p>22/11/09 Tim: PO_PDFOrderPageHeader.php - Correct variable name to show order lines correctly
<p>21/11/09 Tim: PO_AuthorisationLevels.php - Correct edit functionality - Fixes Ticket #15
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2009-11-22 17:41:16 UTC (rev 3078)
+++ trunk/includes/MiscFunctions.php 2009-11-22 17:42:42 UTC (rev 3079)
@@ -13,7 +13,9 @@
function getMsg($Msg,$Type='info',$Prefix=''){
$Colour='';
- $LogFile=fopen($_SESSION['LogPath'].'/webERP-test.log', 'a');
+ if ($_SESSION['LogSeverity']>0) {
+ $LogFile=fopen($_SESSION['LogPath'].'/webERP-test.log', 'a');
+ }
switch($Type){
case 'error':
$Class = 'error';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-11-23 10:20:37
|
Revision: 3084
http://web-erp.svn.sourceforge.net/web-erp/?rev=3084&view=rev
Author: tim_schofield
Date: 2009-11-23 10:20:29 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
Correctly print the invoice lines, and add the invoice number to the file name
Modified Paths:
--------------
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/doc/Change.log.html
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2009-11-23 08:55:13 UTC (rev 3083)
+++ trunk/PrintCustTrans.php 2009-11-23 10:20:29 UTC (rev 3084)
@@ -293,11 +293,15 @@
if ($myrow2['discountpercent']==0){
$DisplayDiscount ='';
- $DisplayNet=number_format(($myrow3['unitprice'] * $myrow2['Quantity']),2);
+ $DisplayNet=number_format(($myrow3['unitprice'] * $myrow2['quantity']),2);
+ $DisplayPrice=$myrow3['unitprice'];
+ $DisplayQty=$myrow2['quantity'];
} else {
$DisplayDiscount = number_format($myrow2['discountpercent']*100,2) . '%';
$DiscountPrice=$myrow2['discountpercent'] * $myrow3['unitprice'];
- $DisplayNet=number_format((($myrow3['unitprice'] - $DiscountPrice) * $myrow2['Quantity']),2);
+ $DisplayPrice=$myrow3['unitprice'];
+ $DisplayQty=$myrow2['quantity'];
+ $DisplayNet=number_format((($myrow3['unitprice'] - $DiscountPrice) * $myrow2['quantity']),2);
}
$LeftOvers = $pdf->addTextWrap($Left_Margin+3,$YPos,95,$FontSize,$myrow2['stockid']);
@@ -311,7 +315,7 @@
$YPos -= ($line_height);
- $lines=explode('\r\n',$Narrative);
+ $lines=explode('\r\n',$myrow2['narrative']);
for ($i=0;$i<sizeOf($lines);$i++) {
while (strlen($lines[$i])>1){
if ($YPos-$line_height <= $Bottom_Margin){
@@ -445,7 +449,7 @@
$FromTransNo++;
} /* end loop to print invoices */
- $pdfcode = $pdf->output($_SESSION['reports_dir'] . '/Invoice.pdf', "F");
+ $pdfcode = $pdf->Output('SalesInvoice'.($FromTransNo-1).'.pdf', "I");
$len = strlen($pdfcode);
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2009-11-23 08:55:13 UTC (rev 3083)
+++ trunk/PrintCustTransPortrait.php 2009-11-23 10:20:29 UTC (rev 3084)
@@ -84,6 +84,9 @@
$myrow = DB_fetch_array($result);
$DefaultBankAccountNumber = _('Account:') .' ' .$myrow['bankaccountnumber'];
$DefaultBankAccountCode = _('Bank Code:') .' ' .$myrow['bankaccountcode'];
+ } else {
+ $DefaultBankAccountNumber = '';
+ $DefaultBankAccountCode = '';
}
}
// gather the invoice data
@@ -496,7 +499,7 @@
} /* end loop to print invoices */
// $pdfcode = $pdf->stream();
- $pdfcode = $pdf->Output('Invoice.pdf', "I");
+ $pdfcode = $pdf->Output('SalesInvoice'.($FromTransNo-1).'.pdf', "I");
$len = strlen($pdfcode);
// Start FPDI concatination to append PDF files conditionally to the invoice
// This part taken from FPDI example page
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-11-23 08:55:13 UTC (rev 3083)
+++ trunk/doc/Change.log.html 2009-11-23 10:20:29 UTC (rev 3084)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>23/11/09 Tim: PrintCustTrans.php and PrintCustTransPortrait.php - Correctly print the invoice lines, and add the invoice number to the file name
<p>22/11/09 Tim: MiscFunctions.php - Correction for case of LogPath not being set
<p>22/11/09 Tim: PurchData.php - Improve the working of adding and editing purchasing data
<p>22/11/09 Tim: PO_PDFOrderPageHeader.php - Correct variable name to show order lines correctly
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-11-24 16:05:59
|
Revision: 3101
http://web-erp.svn.sourceforge.net/web-erp/?rev=3101&view=rev
Author: tim_schofield
Date: 2009-11-24 16:05:52 +0000 (Tue, 24 Nov 2009)
Log Message:
-----------
Remove .svn from the theme list, and minor layout changes for currencies where large numbers are common.
Modified Paths:
--------------
trunk/SystemParameters.php
trunk/doc/Change.log.html
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2009-11-24 14:47:56 UTC (rev 3100)
+++ trunk/SystemParameters.php 2009-11-24 16:05:52 UTC (rev 3101)
@@ -318,7 +318,7 @@
<td><select Name="X_DefaultTheme">';
$ThemeDirectory = dir('css/');
while (false != ($ThemeName = $ThemeDirectory->read())){
- if (is_dir("css/$ThemeName") AND $ThemeName != '.' AND $ThemeName != '..' AND $ThemeName != 'CVS'){
+ if (is_dir("css/$ThemeName") AND $ThemeName != '.' AND $ThemeName != '..' AND $ThemeName != '.svn'){
if ($_SESSION['DefaultTheme'] == $ThemeName)
echo "<option selected value='$ThemeName'>$ThemeName";
else
@@ -343,7 +343,7 @@
// DefaultCreditLimit
echo '<tr><td>' . _('Default Credit Limit') . ':</td>
- <td><input type="Text" class="number" Name="X_DefaultCreditLimit" value="' . $_SESSION['DefaultCreditLimit'] . '" size=6 maxlength=12></td>
+ <td><input type="Text" class="number" Name="X_DefaultCreditLimit" value="' . $_SESSION['DefaultCreditLimit'] . '" size=12 maxlength=12></td>
<td>' . _('The default used in new customer set up') . '</td></tr>';
// Check Credit Limits
@@ -489,7 +489,7 @@
//FreightChargeAppliesIfLessThan
echo '<tr><td>' . _('Apply freight charges if an order is less than') . ':</td>
- <td><input type="Text" class="number" Name="X_FreightChargeAppliesIfLessThan" size=6 maxlength=12 value="' . $_SESSION['FreightChargeAppliesIfLessThan'] . '"></td>
+ <td><input type="Text" class="number" Name="X_FreightChargeAppliesIfLessThan" size=12 maxlength=12 value="' . $_SESSION['FreightChargeAppliesIfLessThan'] . '"></td>
<td>' . _('This parameter is only effective if Do Freight Calculation is set to Yes. If it is set to 0 then freight is always charged. The total order value is compared to this value in deciding whether or not to charge freight') .'</td></tr>';
@@ -762,7 +762,7 @@
<td><input type="text" name="X_WikiPath" size=40 maxlength=40 value="' . $_SESSION['WikiPath'] . '"></td>
<td>' . _('The path to the wiki installation to form the basis of wiki URLs - this should be the directory on the web-server where the wiki is installed. The wiki must be installed on the same web-server as webERP') .'</td></tr>';
-echo '<tr><td>' . _('Geocode Customers and Suppliers:') . ':</td>
+echo '<tr><td>' . _('Geocode Customers and Suppliers') . ':</td>
<td><select name="X_geocode_integration">';
if ($_SESSION['geocode_integration']==1){
echo '<option selected value="1">' . _('Geocode Integration Enabled') . '</option>';
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-11-24 14:47:56 UTC (rev 3100)
+++ trunk/doc/Change.log.html 2009-11-24 16:05:52 UTC (rev 3101)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>24/11/09 Tim: SystemParameters.php - Remove .svn from the theme list, and minor layout changes for currencies where large numbers are common.
<p>23/11/09 Tim: PrintCustTrans.php and PrintCustTransPortrait.php - Correctly print the invoice lines, and add the invoice number to the file name
<p>22/11/09 Tim: MiscFunctions.php - Correction for case of LogPath not being set
<p>22/11/09 Tim: PurchData.php - Improve the working of adding and editing purchasing data
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-11-24 16:52:50
|
Revision: 3102
http://web-erp.svn.sourceforge.net/web-erp/?rev=3102&view=rev
Author: tim_schofield
Date: 2009-11-24 16:52:44 +0000 (Tue, 24 Nov 2009)
Log Message:
-----------
Allow for case where Last visited date isn'nt set, and set it.
Modified Paths:
--------------
trunk/WWW_Users.php
trunk/doc/Change.log.html
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2009-11-24 16:05:52 UTC (rev 3101)
+++ trunk/WWW_Users.php 2009-11-24 16:52:44 UTC (rev 3102)
@@ -267,8 +267,12 @@
echo '<tr class="OddTableRows">';
$k=1;
}
-
+
+ if ($myrow[6]=='') {
+ $LastVisitDate = Date('Y-m-d');
+ } else {
$LastVisitDate = ConvertSQLDate($myrow[6]);
+ }
/*The SecurityHeadings array is defined in config.php */
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-11-24 16:05:52 UTC (rev 3101)
+++ trunk/doc/Change.log.html 2009-11-24 16:52:44 UTC (rev 3102)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>24/11/09 Tim: WWW_Users.php - Allow for case where Last visited date isn'nt set, and set it.
<p>24/11/09 Tim: SystemParameters.php - Remove .svn from the theme list, and minor layout changes for currencies where large numbers are common.
<p>23/11/09 Tim: PrintCustTrans.php and PrintCustTransPortrait.php - Correctly print the invoice lines, and add the invoice number to the file name
<p>22/11/09 Tim: MiscFunctions.php - Correction for case of LogPath not being set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2009-11-29 06:52:55
|
Revision: 3134
http://web-erp.svn.sourceforge.net/web-erp/?rev=3134&view=rev
Author: daintree
Date: 2009-11-29 06:52:46 +0000 (Sun, 29 Nov 2009)
Log Message:
-----------
New remittance advice script
Modified Paths:
--------------
branches/utf-8/includes/header.inc
trunk/doc/Change.log.html
trunk/includes/PDFPaymentRunPageHeader.inc
trunk/includes/PDFStarter.php
trunk/index.php
Added Paths:
-----------
trunk/PDFRemittanceAdvice.php
Modified: branches/utf-8/includes/header.inc
===================================================================
--- branches/utf-8/includes/header.inc 2009-11-29 06:08:47 UTC (rev 3133)
+++ branches/utf-8/includes/header.inc 2009-11-29 06:52:46 UTC (rev 3134)
@@ -8,7 +8,7 @@
// $title - should be defined in the page this file is included with
if (!headers_sent()){
- header('Content-type: text/html; charset=' . _('ISO-8859-1'));
+ header('Content-type: text/html; charset=' . _('UTF-8'));
}
echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
@@ -17,7 +17,7 @@
echo '<html xmlns="http://www.w3.org/1999/xhtml"><head><title>' . $title . '</title>';
echo '<link rel="shortcut icon" href="'. $rootpath.'/favicon.ico" />';
echo '<link rel="icon" href="' . $rootpath.'/favicon.ico" />';
- echo '<meta http-equiv="Content-Type" content="text/html; charset=' . _('ISO-8859-1') . '" />';
+ echo '<meta http-equiv="Content-Type" content="text/html; charset=' . _('UTF-8') . '" />';
echo '<link href="'.$rootpath. '/css/'. $_SESSION['Theme'] .'/default.css" rel="stylesheet" type="text/css" />';
echo '<script type="text/javascript" src = "'.$rootpath.'/javascripts/MiscFunctions.js"></script>';
echo '</head>';
Added: trunk/PDFRemittanceAdvice.php
===================================================================
--- trunk/PDFRemittanceAdvice.php (rev 0)
+++ trunk/PDFRemittanceAdvice.php 2009-11-29 06:52:46 UTC (rev 3134)
@@ -0,0 +1,322 @@
+<?php
+/* $Id $ */
+
+$PageSecurity = 2;
+
+include('includes/session.inc');
+
+If ((isset($_POST['PrintPDF']))
+ AND isset($_POST['FromCriteria'])
+ AND strlen($_POST['FromCriteria'])>=1
+ AND isset($_POST['ToCriteria'])
+ AND strlen($_POST['ToCriteria'])>=1) {
+
+/*then print the report */
+
+ include('includes/PDFStarter.php');
+ $pdf->addInfo('Title',_('Remmitance Advice'));
+ $pdf->addInfo('Subject',_('Remittance Advice') . ' - ' . _('suppliers from') . ' ' . $_POST['FromCriteria'] . ' to ' . $_POST['ToCriteria'] . ' ' . _('and Paid On') . ' ' . $_POST['PaymentDate']);
+
+ $line_height=12;
+
+ /*Now figure out the invoice less credits due for the Supplier range under review */
+
+ $sql = "SELECT suppliers.supplierid,
+ suppliers.suppname,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3,
+ suppliers.address4,
+ suppliers.address5,
+ suppliers.address6,
+ suppliers.currcode,
+ supptrans.id
+ FROM supptrans INNER JOIN suppliers ON supptrans.supplierno = suppliers.supplierid
+ INNER JOIN paymentterms ON suppliers.paymentterms = paymentterms.termsindicator
+ WHERE supptrans.type=22
+ AND trandate ='" . FormatDateForSQL($_POST['PaymentDate']) . "'
+ AND supplierno >= '" . $_POST['FromCriteria'] . "'
+ AND supplierno <= '" . $_POST['ToCriteria'] . "'
+ AND suppliers.remittance=1
+ ORDER BY supplierno";
+
+ $SuppliersResult = DB_query($sql,$db);
+
+ $SupplierID ='';
+ $RemittanceAdviceCounter =0;
+ while ($SuppliersPaid = DB_fetch_array($SuppliersResult)){
+
+ $PageNumber=1;
+ PageHeader();
+ $RemittanceAdviceCounter++;
+ $SupplierID = $SuppliersPaid['supplierid'];
+ $SupplierName = $SuppliersPaid['suppname'];
+ $AccumBalance = 0;
+
+ /* Now get the transactions and amounts that the payment was allocated to */
+ $sql = "SELECT systypes.typename,
+ supptrans.suppreference,
+ supptrans.trandate,
+ supptrans.transno,
+ suppallocs.amt,
+ (supptrans.ovamount + supptrans.ovgst ) AS trantotal
+ FROM supptrans
+ INNER JOIN systypes ON systypes.typeid = supptrans.type
+ INNER JOIN suppallocs ON suppallocs.transid_allocto=supptrans.id
+ WHERE suppallocs.transid_allocfrom=" . $SuppliersPaid['id'] . "
+ ORDER BY supptrans.type,
+ supptrans.transno";
+
+
+ $TransResult = DB_query($sql,$db,'','',false,false);
+ if (DB_error_no($db) !=0) {
+ $title = _('Remittance Advice Problem Report');
+ include('includes/header.inc');
+ prnMsg(_('The details of the payment to the supplier could not be retrieved because') . ' - ' . DB_error_msg($db),'error');
+ echo '<br><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
+ if ($debug==1){
+ echo '<br>' . _('The SQL that failed was') . ' ' . $sql;
+ }
+ include('includes/footer.inc');
+ exit;
+ }
+
+
+ while ($DetailTrans = DB_fetch_array($TransResult)){
+
+ $DisplayTranDate = ConvertSQLDate($DetailTrans['trandate']);
+
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+5, $YPos, 80,$FontSize,$DetailTrans['typename'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+95, $YPos, 80,$FontSize,$DisplayTranDate, 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+175, $YPos, 80,$FontSize,$DetailTrans['suppreference'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+255, $YPos, 80,$FontSize,number_format($DetailTrans['trantotal'],2), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+355, $YPos,80,$FontSize,number_format($DetailTrans['amt'],2), 'right');
+ $AccumBalance += $DetailTrans['amt'];
+
+ $YPos -=$line_height;
+ if ($YPos < $Bottom_Margin + $line_height){
+ $PageNumber++;
+ PageHeader();
+ }
+ } /*end while there are detail transactions to show */
+ PaymentFooter();
+ } /* end while there are supplier payments to retrieve allocations for */
+
+ $pdfcode = $pdf->output();
+ $len = strlen($pdfcode);
+ header('Content-type: application/pdf');
+ header('Content-Length: ' . $len);
+ header('Content-Disposition: inline; filename=RemittanceAdvice.pdf');
+ header('Expires: 0');
+ header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+ header('Pragma: public');
+
+ $pdf->stream();
+
+ header('Expires: 0');
+ header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+ header('Pragma: public');
+
+} else { /*The option to print PDF was not hit */
+
+ $title=_('Remittance Advices');
+ include('includes/header.inc');
+
+ /* show form to allow input */
+
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method="POST"><table>';
+
+ if (!isset($_POST['FromCriteria']) or strlen($_POST['FromCriteria'])<1){
+ $DefaultFromCriteria = '1';
+ } else {
+ $DefaultFromCriteria = $_POST['FromCriteria'];
+ }
+ if (!isset($_POST['ToCriteria']) or strlen($_POST['ToCriteria'])<1){
+ $DefaultToCriteria = 'zzzzzzz';
+ } else {
+ $DefaultToCriteria = $_POST['ToCriteria'];
+ }
+ echo '<tr><td>' . _('From Supplier Code') . ':</font></td>
+ <td><input Type=text maxlength=6 size=7 name=FromCriteria value="' . $DefaultFromCriteria . '"></td></tr>';
+ echo '<tr><td>' . _('To Supplier Code') . ':</td>
+ <td><input Type=text maxlength=6 size=7 name=ToCriteria value="' . $DefaultToCriteria . '"></td></tr>';
+
+ if (!isset($_POST['PaymentDate'])){
+ $DefaultDate = Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date('m')+1,0 ,Date('y')));
+ } else {
+ $DefaultDate = $_POST['PaymentDate'];
+ }
+
+ echo '<tr><td>' . _('Date Of Payment') . ':</td>
+ <td><input type=text class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="PaymentDate" maxlength=11 size=12 VALUE=' . $DefaultDate . '></td></tr>';
+
+ echo '</table><div class="centre"><input type=Submit Name="PrintPDF" Value="' . _('Print PDF') . '"></div>';
+
+ include ('includes/footer.inc');
+} /*end of else not PrintPDF */
+
+
+function PaymentFooter (){
+ global $pdf;
+ global $YPos;
+ global $line_height;
+ global $Page_Width;
+ global $Right_Margin;
+ global $Left_Margin;
+ global $Bottom_Margin;
+ global $FontSize;
+ global $SupplierName;
+ global $AccumBalance;
+ global $TotalPayments;
+
+ $YPos -= (0.5*$line_height);
+ $pdf->line($Left_Margin, $YPos+$line_height,$Page_Width-$Right_Margin, $YPos+$line_height);
+
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+280,$YPos,75,$FontSize,_('Total Payment:'), 'right');
+
+ $TotalPayments += $AccumBalance;
+
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+355,$YPos,80,$FontSize,number_format($AccumBalance,2), 'right');
+
+ $YPos -= (1.5*$line_height);
+ $pdf->line($Left_Margin, $YPos+$line_height,$Page_Width-$Right_Margin, $YPos+$line_height);
+}
+
+function PageHeader(){
+ global $pdf;
+ global $PageNumber;
+ global $YPos;
+ global $Xpos;
+ global $line_height;
+ global $Page_Height;
+ global $Top_Margin;
+ global $Page_Width;
+ global $Right_Margin;
+ global $Left_Margin;
+ global $Bottom_Margin;
+ global $FontSize;
+ global $SupplierName;
+ global $AccumBalance;
+ global $RemittanceAdviceCounter;
+ global $SuppliersPaid;
+
+ if ($RemittanceAdviceCounter>0){
+ $pdf->newPage();
+ }
+
+ $YPos = $Page_Height - $Top_Margin;
+
+ $pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -50,$YPos-50,0,30);
+
+ // Title
+ $FontSize =15;
+ $XPos = $Page_Width/2 - 110;
+ $pdf->addText($XPos, $YPos,$FontSize, _('Remittance Advice') );
+
+ $FontSize = 10;
+ $pdf->addText($XPos + 150, $YPos,$FontSize, ' '. _('printed:').' ' . Date($_SESSION['DefaultDateFormat']));
+
+ $pdf->addText($XPos + 280, $YPos,$FontSize, _('Page').': ' . $PageNumber);
+
+ /*Now print out company info at the top left */
+
+ $XPos = $Left_Margin;
+ $YPos = $Page_Height - $Top_Margin - 20;
+
+ $FontSize = 10;
+ $LineHeight = 13;
+ $LineCount = 0;
+
+ $pdf->addText($XPos, $YPos-$LineCount*$LineHeight, $FontSize, $_SESSION['CompanyRecord']['coyname']);
+
+ $FontSize = 8;
+ $LineHeight = 10;
+
+ if ($_SESSION['CompanyRecord']['regoffice1'] <> '') {
+ $LineCount += 1;
+ $pdf->addText($XPos, $YPos-$LineCount*$LineHeight,$FontSize, $_SESSION['CompanyRecord']['regoffice1']);
+ }
+ if ($_SESSION['CompanyRecord']['regoffice2'] <> '') {
+ $LineCount += 1;
+ $pdf->addText($XPos, $YPos-$LineCount*$LineHeight,$FontSize, $_SESSION['CompanyRecord']['regoffice2']);
+ }
+ if (($_SESSION['CompanyRecord']['regoffice3'] <> '') OR ($_SESSION['CompanyRecord']['regoffice4'] <> '') OR ($_SESSION['CompanyRecord']['regoffice5'] <> '')) {
+ $LineCount += 1;
+ $pdf->addText($XPos, $YPos-$LineCount*$LineHeight,$FontSize, $_SESSION['CompanyRecord']['regoffice3'] . ' ' . $_SESSION['CompanyRecord']['regoffice4'] . ' ' . $_SESSION['CompanyRecord']['regoffice5']); // country in 6 not printed
+ }
+ $LineCount += 1;
+ $pdf->addText($XPos, $YPos-$LineCount*$LineHeight, $FontSize, _('Phone') . ':' . $_SESSION['CompanyRecord']['telephone']);
+ $LineCount += 1;
+ $pdf->addText($XPos, $YPos-$LineCount*$LineHeight,$FontSize, _('Fax') . ': ' . $_SESSION['CompanyRecord']['fax']);
+ $LineCount += 1;
+ $pdf->addText($XPos, $YPos-$LineCount*$LineHeight, $FontSize, _('Email') . ': ' . $_SESSION['CompanyRecord']['email']);
+
+
+ /*Now the supplier details and remittance advice address */
+
+ $XPos = $Left_Margin+20;
+ $YPos = $Page_Height - $Top_Margin - 120;
+
+ $LineCount = 0;
+ $FontSize = 10;
+ $pdf->addText($XPos, $YPos-$LineCount*$LineHeight, $FontSize, $SuppliersPaid['suppname']);
+ $LineCount ++;
+ $pdf->addText($XPos, $YPos-$LineCount*$LineHeight, $FontSize, $SuppliersPaid['address1']);
+ $LineCount ++;
+ $pdf->addText($XPos, $YPos-$LineCount*$LineHeight, $FontSize, $SuppliersPaid['address2']);
+ $LineCount ++;
+ $pdf->addText($XPos, $YPos-$LineCount*$LineHeight, $FontSize, $SuppliersPaid['address3'] . ' ' . $SuppliersPaid['address4'] . ' ' . $SuppliersPaid['address5'] . ' ' . $SuppliersPaid['address6']);
+ $LineCount += 2;
+ $pdf->addText($XPos, $YPos-$LineCount*$LineHeight, $FontSize, _('Our Code:') . ' ' .$SuppliersPaid['supplierid']);
+
+ $YPos = $Page_Height - $Top_Margin - 120;
+
+ $FontSize=8;
+ $XPos = $Page_Width/2 - 60;
+ $pdf->addText($XPos, $YPos,$FontSize, _('All amounts stated in') . ' - ' . $SuppliersPaid['currcode']);
+ $YPos -= $line_height;
+ $pdf->addText($XPos, $YPos,$FontSize, $SuppliersPaid['terms']);
+
+ $YPos = $Page_Height - $Top_Margin - 180;
+ //$YPos -= $line_height;
+ $XPos = $Left_Margin;
+
+ /*draw a nice curved corner box around the statement details */
+ /*from the top right */
+ $pdf->partEllipse($Page_Width-$Right_Margin-10,$YPos-10,0,90,10,10);
+ /*line to the top left */
+ $pdf->line($Page_Width-$Right_Margin-10, $YPos,$Left_Margin+10, $YPos);
+ /*Do top left corner */
+ $pdf->partEllipse($Left_Margin+10, $YPos-10,90,180,10,10);
+ /*Do a line to the bottom left corner */
+ $pdf->line($Left_Margin, $YPos-10,$Left_Margin, $Bottom_Margin+10);
+ /*Now do the bottom left corner 180 - 270 coming back west*/
+ $pdf->partEllipse($Left_Margin+10, $Bottom_Margin+10,180,270,10,10);
+ /*Now a line to the bottom right */
+ $pdf->line($Left_Margin+10, $Bottom_Margin,$Page_Width-$Right_Margin-10, $Bottom_Margin);
+ /*Now do the bottom right corner */
+ $pdf->partEllipse($Page_Width-$Right_Margin-10, $Bottom_Margin+10,270,360,10,10);
+ /*Finally join up to the top right corner where started */
+ $pdf->line($Page_Width-$Right_Margin, $Bottom_Margin+10,$Page_Width-$Right_Margin, $YPos-10);
+
+ /*Finally join up to the top right corner where started */
+ $pdf->line($Page_Width-$Right_Margin, $Bottom_Margin+10,$Page_Width-$Right_Margin, $YPos-10);
+
+ $YPos -= $line_height;
+ $FontSize =10;
+ /*Set up headings */
+ $pdf->addText($Left_Margin+10, $YPos,$FontSize, _('Trans Type') );
+ $pdf->addText($Left_Margin+100, $YPos,$FontSize, _('Date') );
+ $pdf->addText($Left_Margin+180, $YPos,$FontSize, _('Reference') );
+ $pdf->addText($Left_Margin+310, $YPos,$FontSize, _('Total') );
+ $pdf->addText($Left_Margin+390, $YPos,$FontSize, _('This Payment') );
+
+ $YPos -= $line_height;
+ /*draw a line */
+ $pdf->line($Page_Width-$Right_Margin, $YPos,$XPos, $YPos);
+
+ $YPos -= $line_height;
+ $XPos = $Left_Margin;
+
+}
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-11-29 06:08:47 UTC (rev 3133)
+++ trunk/doc/Change.log.html 2009-11-29 06:52:46 UTC (rev 3134)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>29/11/09 Phil: New Remittance Advice script
<p>24/11/09 Tim: WWW_Users.php - Allow for case where Last visited date isn'nt set, and set it.
<p>24/11/09 Tim: SystemParameters.php - Remove .svn from the theme list, and minor layout changes for currencies where large numbers are common.
<p>23/11/09 Tim: PrintCustTrans.php and PrintCustTransPortrait.php - Correctly print the invoice lines, and add the invoice number to the file name
Modified: trunk/includes/PDFPaymentRunPageHeader.inc
===================================================================
--- trunk/includes/PDFPaymentRunPageHeader.inc 2009-11-29 06:08:47 UTC (rev 3133)
+++ trunk/includes/PDFPaymentRunPageHeader.inc 2009-11-29 06:52:46 UTC (rev 3134)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.5 $ */
+/* $Id $ */
/*PDF page header for aged analysis reports */
if ($PageNumber >1){
$pdf->newPage();
Modified: trunk/includes/PDFStarter.php
===================================================================
--- trunk/includes/PDFStarter.php 2009-11-29 06:08:47 UTC (rev 3133)
+++ trunk/includes/PDFStarter.php 2009-11-29 06:52:46 UTC (rev 3134)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.5 $ */
+/* $Id $ */
/*this class is an extension to the fpdf class using a syntax that the original reports were written in
(the R &OS pdf.php class) - due to limitation of this class for foreign character support this wrapper class
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2009-11-29 06:08:47 UTC (rev 3133)
+++ trunk/index.php 2009-11-29 06:52:46 UTC (rev 3134)
@@ -383,6 +383,11 @@
</tr>
<tr>
<td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFRemittanceAdvice.php?' . SID . '">' . _('Remittance Advices') . '</a></p>'; ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="menu_group_item">
<?php echo '<p>• <a href="' . $rootpath . '/OutstandingGRNs.php?' . SID . '">' . _('Outstanding GRNs Report') . '</a></p>'; ?>
</td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-04 08:24:05
|
Revision: 3139
http://web-erp.svn.sourceforge.net/web-erp/?rev=3139&view=rev
Author: tim_schofield
Date: 2009-12-04 08:23:57 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
Show the suppliers uom correctly, and have button correctly shown on screen.
Modified Paths:
--------------
trunk/PO_Items.php
trunk/doc/Change.log.html
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2009-12-01 10:14:05 UTC (rev 3138)
+++ trunk/PO_Items.php 2009-12-04 08:23:57 UTC (rev 3139)
@@ -927,8 +927,13 @@
echo '<tr class="OddTableRows">';
$k=1;
}
- $uomsql='SELECT conversionfactor, suppliersuom
+ $uomsql='SELECT conversionfactor,
+ suppliersuom,
+ unitsofmeasure.
+ unitname
FROM purchdata
+ LEFT JOIN unitsofmeasure
+ ON purchdata.suppliersuom=unitsofmeasure.unitid
WHERE supplierno="'.$_SESSION['PO'.$identifier]->SupplierID.'"
AND stockid="'.$POLine->StockID.'"';
@@ -936,7 +941,7 @@
if (DB_num_rows($uomresult)>0) {
$uomrow=DB_fetch_array($uomresult);
if (strlen($uomrow['suppliersuom'])>0) {
- $uom=$uomrow['suppliersuom'];
+ $uom=$uomrow['unitname'];
} else {
$uom=$POLine->Units;
}
@@ -992,7 +997,7 @@
echo '<td><input type=text class=date alt="'.$_SESSION['DefaultDateFormat'].'" name=ReqDelDate size=11
value="'.$_SESSION['PO'.$identifier]->deliverydate .'"></td></tr>';
echo '</table>';
- echo '<input type=submit name="EnterLine" value="Enter Item">';
+ echo '<div class=centre><input type=submit name="EnterLine" value="Enter Item"></div>';
}
echo '<hr>';
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-12-01 10:14:05 UTC (rev 3138)
+++ trunk/doc/Change.log.html 2009-12-04 08:23:57 UTC (rev 3139)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>04/12/09 Tim: PO_Items.php - Show the suppliers uom correctly, and have button correctly shown on screen.
<p>01/12/09 Tim: StockTransferontrolled.php - Correct for batch controlled Items.
<p>29/11/09 Phil: New Remittance Advice script
<p>24/11/09 Tim: WWW_Users.php - Allow for case where Last visited date isn'nt set, and set it.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-04 09:50:05
|
Revision: 3140
http://web-erp.svn.sourceforge.net/web-erp/?rev=3140&view=rev
Author: tim_schofield
Date: 2009-12-04 09:49:56 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
Items are posted directly to the GL so posted should be immediately set to 1.
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/doc/Change.log.html
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2009-12-04 08:23:57 UTC (rev 3139)
+++ trunk/ConfirmDispatch_Invoice.php 2009-12-04 09:49:56 UTC (rev 3140)
@@ -1234,7 +1234,8 @@
periodno,
account,
narrative,
- amount
+ amount,
+ posted
)
VALUES (
10,
@@ -1243,7 +1244,8 @@
" . $PeriodNo . ",
" . GetCOGSGLAccount($Area, $OrderLine->StockID, $_SESSION['Items']->DefaultSalesType, $db) . ",
'" . $_SESSION['Items']->DebtorNo . " - " . $OrderLine->StockID . " x " . $OrderLine->QtyDispatched . " @ " . $OrderLine->StandardCost . "',
- " . $OrderLine->StandardCost * $OrderLine->QtyDispatched . "
+ " . $OrderLine->StandardCost * $OrderLine->QtyDispatched . ",
+ 1
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The cost of sales GL posting could not be inserted because');
@@ -1260,7 +1262,9 @@
periodno,
account,
narrative,
- amount)
+ amount,
+ posted
+ )
VALUES (
10,
" . $InvoiceNo . ",
@@ -1268,7 +1272,8 @@
" . $PeriodNo . ",
" . $StockGLCode['stockact'] . ",
'" . $_SESSION['Items']->DebtorNo . " - " . $OrderLine->StockID . " x " . $OrderLine->QtyDispatched . " @ " . $OrderLine->StandardCost . "',
- " . (-$OrderLine->StandardCost * $OrderLine->QtyDispatched) . "
+ " . (-$OrderLine->StandardCost * $OrderLine->QtyDispatched) . ",
+ 1
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock side of the cost of sales GL posting could not be inserted because');
@@ -1288,7 +1293,8 @@
periodno,
account,
narrative,
- amount
+ amount,
+ posted
)
VALUES (
10,
@@ -1297,7 +1303,8 @@
" . $PeriodNo . ",
" . $SalesGLAccounts['salesglcode'] . ",
'" . $_SESSION['Items']->DebtorNo . " - " . $OrderLine->StockID . " x " . $OrderLine->QtyDispatched . " @ " . $OrderLine->Price . "',
- " . (-$OrderLine->Price * $OrderLine->QtyDispatched/$_SESSION['CurrencyRate']) . "
+ " . (-$OrderLine->Price * $OrderLine->QtyDispatched/$_SESSION['CurrencyRate']) . ",
+ 1
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The sales GL posting could not be inserted because');
@@ -1313,7 +1320,8 @@
periodno,
account,
narrative,
- amount
+ amount,
+ posted
)
VALUES (
10,
@@ -1322,7 +1330,8 @@
" . $PeriodNo . ",
" . $SalesGLAccounts['discountglcode'] . ",
'" . $_SESSION['Items']->DebtorNo . " - " . $OrderLine->StockID . " @ " . ($OrderLine->DiscountPercent * 100) . "%',
- " . ($OrderLine->Price * $OrderLine->QtyDispatched * $OrderLine->DiscountPercent/$_SESSION['CurrencyRate']) . "
+ " . ($OrderLine->Price * $OrderLine->QtyDispatched * $OrderLine->DiscountPercent/$_SESSION['CurrencyRate']) . ",
+ 1
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The sales discount GL posting could not be inserted because');
@@ -1346,7 +1355,8 @@
periodno,
account,
narrative,
- amount
+ amount,
+ posted
)
VALUES (
10,
@@ -1355,7 +1365,8 @@
" . $PeriodNo . ",
" . $_SESSION['CompanyRecord']['debtorsact'] . ",
'" . $_SESSION['Items']->DebtorNo . "',
- " . (($_SESSION['Items']->total + $_SESSION['Items']->FreightCost + $TaxTotal)/$_SESSION['CurrencyRate']) . "
+ " . (($_SESSION['Items']->total + $_SESSION['Items']->FreightCost + $TaxTotal)/$_SESSION['CurrencyRate']) . ",
+ 1
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The total debtor GL posting could not be inserted because');
@@ -1373,7 +1384,8 @@
periodno,
account,
narrative,
- amount
+ amount,
+ posted
)
VALUES (
10,
@@ -1382,7 +1394,8 @@
" . $PeriodNo . ",
" . $_SESSION['CompanyRecord']['freightact'] . ",
'" . $_SESSION['Items']->DebtorNo . "',
- " . (-($_SESSION['Items']->FreightCost)/$_SESSION['CurrencyRate']) . "
+ " . (-($_SESSION['Items']->FreightCost)/$_SESSION['CurrencyRate']) . ",
+ 1
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The freight GL posting could not be inserted because');
@@ -1398,7 +1411,8 @@
periodno,
account,
narrative,
- amount
+ amount,
+ posted
)
VALUES (
10,
@@ -1407,7 +1421,8 @@
" . $PeriodNo . ",
" . $TaxGLCodes[$TaxAuthID] . ",
'" . $_SESSION['Items']->DebtorNo . "',
- " . (-$TaxAmount/$_SESSION['CurrencyRate']) . "
+ " . (-$TaxAmount/$_SESSION['CurrencyRate']) . ",
+ 1
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The tax GL posting could not be inserted because');
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-12-04 08:23:57 UTC (rev 3139)
+++ trunk/doc/Change.log.html 2009-12-04 09:49:56 UTC (rev 3140)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>04/12/09 Tim: ConfirmDispatch_Invoice.php - Items are posted directly to the GL so posted should be immediately set to 1.
<p>04/12/09 Tim: PO_Items.php - Show the suppliers uom correctly, and have button correctly shown on screen.
<p>01/12/09 Tim: StockTransferontrolled.php - Correct for batch controlled Items.
<p>29/11/09 Phil: New Remittance Advice script
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-04 10:21:55
|
Revision: 3141
http://web-erp.svn.sourceforge.net/web-erp/?rev=3141&view=rev
Author: tim_schofield
Date: 2009-12-04 10:21:45 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
Change to make the file name have a default extension of pdf as per suggestion from Javier
Modified Paths:
--------------
trunk/doc/Change.log.html
trunk/reportwriter/WriteForm.inc
trunk/reportwriter/WriteReport.inc
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-12-04 09:49:56 UTC (rev 3140)
+++ trunk/doc/Change.log.html 2009-12-04 10:21:45 UTC (rev 3141)
@@ -1,5 +1,7 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>04/12/09 Tim: WriteForm.inc - Change to make the file name have a default extension of pdf as per suggestion from Javier
+<p>04/12/09 Tim: WriteReport.inc - Change to make the file name have a default extension of pdf as per suggestion from Javier
<p>04/12/09 Tim: ConfirmDispatch_Invoice.php - Items are posted directly to the GL so posted should be immediately set to 1.
<p>04/12/09 Tim: PO_Items.php - Show the suppliers uom correctly, and have button correctly shown on screen.
<p>01/12/09 Tim: StockTransferontrolled.php - Correct for batch controlled Items.
Modified: trunk/reportwriter/WriteForm.inc
===================================================================
--- trunk/reportwriter/WriteForm.inc 2009-12-04 09:49:56 UTC (rev 3140)
+++ trunk/reportwriter/WriteForm.inc 2009-12-04 10:21:45 UTC (rev 3141)
@@ -600,7 +600,7 @@
// Add additional headers needed for MSIE and send page
header('Pragma: cache');
header('Cache-Control: public, must-revalidate, max-age=0');
- $pdf->Output($Prefs['reportname'].'.pdf','D');
+ $pdf->Output($Prefs['reportname'].'.pdf','I');
exit(); // needs to be here to properly render the pdf file.
}
Modified: trunk/reportwriter/WriteReport.inc
===================================================================
--- trunk/reportwriter/WriteReport.inc 2009-12-04 09:49:56 UTC (rev 3140)
+++ trunk/reportwriter/WriteReport.inc 2009-12-04 10:21:45 UTC (rev 3141)
@@ -270,7 +270,7 @@
}
function Stream($FileName) {
- $this->Output($FileName,'D');
+ $this->Output($FileName,'I');
}
} // end class
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-04 11:52:17
|
Revision: 3142
http://web-erp.svn.sourceforge.net/web-erp/?rev=3142&view=rev
Author: tim_schofield
Date: 2009-12-04 11:51:33 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
Correction to produce sales order correctly
Modified Paths:
--------------
trunk/SpecialOrder.php
trunk/doc/Change.log.html
Modified: trunk/SpecialOrder.php
===================================================================
--- trunk/SpecialOrder.php 2009-12-04 10:21:45 UTC (rev 3141)
+++ trunk/SpecialOrder.php 2009-12-04 11:51:33 UTC (rev 3142)
@@ -424,8 +424,9 @@
$result =DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
$BranchDetails=DB_fetch_array($result);
-
- $HeaderSQL = "INSERT INTO salesorders (debtorno,
+ $OrderNo=GetNextTransNo (30, $db);
+ $HeaderSQL = "INSERT INTO salesorders (orderno,
+ debtorno,
branchcode,
customerref,
orddate,
@@ -442,7 +443,7 @@
contactemail,
fromstkloc,
deliverydate)
- VALUES ('" . $_SESSION['SPL']->CustomerID . "',
+ VALUES (".$OrderNo.",'" . $_SESSION['SPL']->CustomerID . "',
'" . $_SESSION['SPL']->BranchCode . "',
'". $_SESSION['SPL']->CustRef ."',
'" . Date("Y-m-d") . "',
@@ -461,17 +462,17 @@
'" . $OrderDate . "')";
$ErrMsg = _('The sales order cannot be added because');
- $InsertQryResult = DB_query($HeaderSQL,$db,$ErrMsg);
+ $InsertQryResult = DB_query($HeaderSQL,$db,$ErrMsg, $DbMsg);
// $SalesOrderNo = DB_Last_Insert_ID($db,'salesorders','orderno');
- $SalesOrderNo = GetNextTransNo(30, $db);
+// $SalesOrderNo = GetNextTransNo(30, $db);
$StartOf_LineItemsSQL = "INSERT INTO salesorderdetails (orderno,
stkcode,
unitprice,
quantity,
orderlineno)
- VALUES (" . $SalesOrderNo;
+ VALUES (" . $OrderNo;
$ErrMsg = _('There was a problem inserting a line into the sales order because');
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-12-04 10:21:45 UTC (rev 3141)
+++ trunk/doc/Change.log.html 2009-12-04 11:51:33 UTC (rev 3142)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>04/12/09 Tim: SpecialOrder.php - Correction to produce sales order correctly
<p>04/12/09 Tim: WriteForm.inc - Change to make the file name have a default extension of pdf as per suggestion from Javier
<p>04/12/09 Tim: WriteReport.inc - Change to make the file name have a default extension of pdf as per suggestion from Javier
<p>04/12/09 Tim: ConfirmDispatch_Invoice.php - Items are posted directly to the GL so posted should be immediately set to 1.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-09 12:02:05
|
Revision: 3145
http://web-erp.svn.sourceforge.net/web-erp/?rev=3145&view=rev
Author: tim_schofield
Date: 2009-12-09 12:01:59 +0000 (Wed, 09 Dec 2009)
Log Message:
-----------
Correct inconsistency with area code field length in cogsglpostings table
Modified Paths:
--------------
trunk/doc/Change.log.html
trunk/sql/mysql/upgrade3.11-3.12.sql
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-12-06 21:22:16 UTC (rev 3144)
+++ trunk/doc/Change.log.html 2009-12-09 12:01:59 UTC (rev 3145)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>09/12/09 Pak Ricard: upgrade3.11-3.12.sql - Correct inconsistency with area code field length in cogsglpostings table
<p>04/12/09 Tim: SpecialOrder.php - Correction to produce sales order correctly
<p>04/12/09 Tim: WriteForm.inc - Change to make the file name have a default extension of pdf as per suggestion from Javier
<p>04/12/09 Tim: WriteReport.inc - Change to make the file name have a default extension of pdf as per suggestion from Javier
Modified: trunk/sql/mysql/upgrade3.11-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11-3.12.sql 2009-12-06 21:22:16 UTC (rev 3144)
+++ trunk/sql/mysql/upgrade3.11-3.12.sql 2009-12-09 12:01:59 UTC (rev 3145)
@@ -45,4 +45,6 @@
DELETE FROM `factorcompanies` WHERE `coyname`='None';
INSERT INTO `config` (`confname`, `confvalue`) VALUES ('LogPath', '');
-INSERT INTO `config` (`confname`, `confvalue`) VALUES ('LogSeverity', '0');
\ No newline at end of file
+INSERT INTO `config` (`confname`, `confvalue`) VALUES ('LogSeverity', '0');
+
+ALTER TABLE `cogsglpostings` CHANGE `area` `area` CHAR( 3 ) NOT NULL;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-09 22:29:26
|
Revision: 3146
http://web-erp.svn.sourceforge.net/web-erp/?rev=3146&view=rev
Author: tim_schofield
Date: 2009-12-09 22:28:33 +0000 (Wed, 09 Dec 2009)
Log Message:
-----------
Correctly align numbers in tables.
Modified Paths:
--------------
trunk/BOMInquiry.php
trunk/BankReconciliation.php
trunk/ConfirmDispatch_Invoice.php
trunk/DeliveryDetails.php
trunk/FTP_RadioBeacon.php
trunk/FixedAssetCategories.php
trunk/FixedAssetJournal.php
trunk/GLAccountInquiry.php
trunk/GLJournal.php
trunk/OrderDetails.php
trunk/PO_Items.php
trunk/PO_SelectOSPurchOrder.php
trunk/Payments.php
trunk/Prices.php
trunk/Prices_Customer.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/PurchData.php
trunk/ReverseGRN.php
trunk/SalesAnalRepts.php
trunk/SelectCompletedOrder.php
trunk/SelectCreditItems.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectWorkOrder.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shipt_Select.php
trunk/SpecialOrder.php
trunk/StockCategories.php
trunk/StockLocMovements.php
trunk/StockLocTransferReceive.php
trunk/StockQuantityByDate.php
trunk/StockSerialItemResearch.php
trunk/StockSerialItems.php
trunk/StockStatus.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/SuppCreditGRNs.php
trunk/SuppInvGLAnalysis.php
trunk/SuppInvGRNs.php
trunk/SuppShiptChgs.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierCredit.php
trunk/SupplierInvoice.php
trunk/SupplierTransInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderCosting.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/WorkOrderStatus.php
trunk/Z_CheckAllocationsFrom.php
trunk/Z_CheckAllocs.php
trunk/Z_CheckDebtorsControl.php
trunk/Z_CheckGLTransBalance.php
trunk/Z_CurrencyDebtorsBalances.php
trunk/Z_CurrencySuppliersBalances.php
trunk/doc/Change.log.html
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/BOMInquiry.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -122,7 +122,7 @@
$tabindex=$j+4;
printf("<td><input tabindex='".$tabindex."' type=submit name='StockID' VALUE='%s'</td>
<td>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
<td>%s</td></tr>",
$myrow['stockid'],
$myrow['description'],
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/BankReconciliation.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -154,7 +154,7 @@
echo ' (' . $BankCurrCode . ' @ ' . $ExRate .')';
}
echo '</b></td>
- <td valign=bottom align=right><b>' . number_format($Balance/$ExRate,2) . '</b></td></tr>';
+ <td valign=bottom class=number><b>' . number_format($Balance/$ExRate,2) . '</b></td></tr>';
$SQL = 'SELECT amount/exrate AS amt,
amountcleared,
@@ -205,8 +205,8 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td align=right>%01.2f</td>
- <td align=right>%01.2f</td>
+ <td class=number>%01.2f</td>
+ <td class=number>%01.2f</td>
</tr>',
ConvertSQLDate($myrow['transdate']),
$myrow['typename'],
@@ -225,7 +225,7 @@
}
//end of while loop
echo '<tr></tr>
- <tr><td colspan=6>' . _('Total of all unpresented cheques') . '</td><td align=right>' . number_format($TotalUnpresentedCheques,2) . '</td></tr>';
+ <tr><td colspan=6>' . _('Total of all unpresented cheques') . '</td><td class=number>' . number_format($TotalUnpresentedCheques,2) . '</td></tr>';
$SQL = 'SELECT amount/exrate AS amt,
amountcleared,
@@ -277,8 +277,8 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td align=right>%01.2f</td>
- <td align=right>%01.2f</td>
+ <td class=number>%01.2f</td>
+ <td class=number>%01.2f</td>
</tr>',
ConvertSQLDate($myrow['transdate']),
$myrow['typename'],
@@ -297,14 +297,14 @@
}
}
//end of while loop
- echo '<tr></tr><tr><td colspan=6>' . _('Total of all uncleared deposits') . '</td><td align=right>' . number_format($TotalUnclearedDeposits,2) . '</td></tr>';
+ echo '<tr></tr><tr><td colspan=6>' . _('Total of all uncleared deposits') . '</td><td class=number>' . number_format($TotalUnclearedDeposits,2) . '</td></tr>';
$FXStatementBalance = ($Balance/$ExRate) - $TotalUnpresentedCheques -$TotalUnclearedDeposits;
- echo '<tr></tr><tr><td colspan=6><b>' . _('Bank statement balance should be') . ' (' . $BankCurrCode . ')</b></td><td align=right>' . number_format($FXStatementBalance,2) . '</td></tr>';
+ echo '<tr></tr><tr><td colspan=6><b>' . _('Bank statement balance should be') . ' (' . $BankCurrCode . ')</b></td><td class=number>' . number_format($FXStatementBalance,2) . '</td></tr>';
if (isset($_POST['DoExchangeDifference'])){
echo '<input type="hidden" name="DoExchangeDifference" value=' . $FXStatementBalance . '>';
echo '<tr><td colspan=6>' . _('Enter the actual bank statement balance') . ' (' . $BankCurrCode . ')</b></td>
- <td align=right><input type="text" name="BankStatmentBalance" maxlength=15 size=15 value=' . $_POST['BankStatmentBalance'] . '><td></tr>';
+ <td class=number><input type="text" name="BankStatmentBalance" maxlength=15 size=15 value=' . $_POST['BankStatmentBalance'] . '><td></tr>';
echo '<tr><td colspan=7 align="center"><input type="submit" name="PostExchangeDifference" value="' . _('Calculate and Post Exchange Difference') . '" onclick="return confirm(\'' . _('This will create a general ledger journal to write off the exchange difference in the current balance of the account. It is important that the exchange rate above reflects the current value of the bank account currency') . ' - ' . _('Are You Sure?') . '\');"></td></tr>';
}
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/ConfirmDispatch_Invoice.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -441,11 +441,11 @@
$j++;
if ($_SESSION['Items']->Any_Already_Delivered()==1 and (!isset($_SESSION['Items']->FreightCost) or $_POST['ChargeFreightCost']==0)) {
- echo '<td colspan=2 align=right>'. _('Charge Freight Cost inc Tax').'</td>
+ echo '<td colspan=2 class=number>'. _('Charge Freight Cost inc Tax').'</td>
<td><input tabindex='.$j.' type="text" class="number" size="10" maxlength="12" name="ChargeFreightCost" VALUE="0"></td>';
$_SESSION['Items']->FreightCost=0;
} else {
- echo '<td colspan=2 align=right>'. _('Charge Freight Cost inc Tax').'</td>
+ echo '<td colspan=2 class=number>'. _('Charge Freight Cost inc Tax').'</td>
<td><input tabindex='.$j.' type="text" class="number" size="10" maxlength="12" name="ChargeFreightCost" VALUE="' . $_SESSION['Items']->FreightCost . '"></td>';
$_POST['ChargeFreightCost'] = $_SESSION['Items']->FreightCost;
}
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/DeliveryDetails.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -751,7 +751,7 @@
$DisplayTotal = number_format($_SESSION['Items'.$identifier]->total,2);
echo '<tr>
- <td colspan=6 align=right><b>'. _('TOTAL Excl Tax/Freight') .'</b></td>
+ <td colspan=6 class=number><b>'. _('TOTAL Excl Tax/Freight') .'</b></td>
<td class=number>'.$DisplayTotal.'</td>
</tr></table>';
Modified: trunk/FTP_RadioBeacon.php
===================================================================
--- trunk/FTP_RadioBeacon.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/FTP_RadioBeacon.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -87,7 +87,7 @@
<td><font size=2>%s</font></td>
<td><font size=2>%s</font></td>
<td><font size=2>%s</font></td>
- <td align=right><font size=2>%s</font></td>
+ <td class=number><font size=2>%s</font></td>
<td><font size=2>%s</font></td></tr>",
$ModifyPage,
$myrow['orderno'],
@@ -108,7 +108,7 @@
<td><font size=2>%s</font></td>
<td><font size=2>%s</font></td>
<td><font size=2>%s</font></td>
- <td align=right><font size=2>%s</font></td>
+ <td class=number><font size=2>%s</font></td>
<td><font size=2>%s</font></td></tr>",
$ModifyPage,
$myrow['orderno'],
Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/FixedAssetCategories.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -227,10 +227,10 @@
printf("<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
<td><a href=\"%sSelectedCategory=%s\">" . _('Edit') . "</td>
<td><a href=\"%sSelectedCategory=%s&delete=yes\" onclick=\"return confirm('" . _('Are you sure you wish to delete this asset category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . "');\">" . _('Delete') . "</td>
</tr>",
Modified: trunk/FixedAssetJournal.php
===================================================================
--- trunk/FixedAssetJournal.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/FixedAssetJournal.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -393,9 +393,9 @@
}
echo '<tr class="EvenTableRows"><td></td>
- <td align=right><b> Total </b></td>
- <td align=right class="number"><b>' . number_format($debittotal,2) . '</b></td>
- <td align=right class="number"><b>' . number_format($credittotal,2) . '</b></td>';
+ <td class=number><b> Total </b></td>
+ <td class=number class="number"><b>' . number_format($debittotal,2) . '</b></td>
+ <td class=number class="number"><b>' . number_format($credittotal,2) . '</b></td>';
if ($debittotal!=$credittotal) {
echo '<td align=center style="background-color: #fddbdb"><b>Required to balance - ' .
number_format(abs($debittotal-$credittotal),2);
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/GLAccountInquiry.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -294,9 +294,9 @@
echo '</b></td>';
if ($RunningTotal >0){
- echo '<td align=right><b>' . number_format(($RunningTotal),2) . '</b></td><td colspan=2></td></tr>';
+ echo '<td class=number><b>' . number_format(($RunningTotal),2) . '</b></td><td colspan=2></td></tr>';
}else {
- echo '<td></td><td align=right><b>' . number_format((-$RunningTotal),2) . '</b></td><td colspan=2></td></tr>';
+ echo '<td></td><td class=number><b>' . number_format((-$RunningTotal),2) . '</b></td><td colspan=2></td></tr>';
}
echo '</table>';
} /* end of if Show button hit */
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/GLJournal.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -395,9 +395,9 @@
}
echo '<tr class="EvenTableRows"><td></td>
- <td align=right><b> Total </b></td>
- <td align=right class="number"><b>' . number_format($debittotal,2) . '</b></td>
- <td align=right class="number"><b>' . number_format($credittotal,2) . '</b></td>';
+ <td class=number><b> Total </b></td>
+ <td class=number class="number"><b>' . number_format($debittotal,2) . '</b></td>
+ <td class=number class="number"><b>' . number_format($credittotal,2) . '</b></td>';
if ($debittotal!=$credittotal) {
echo '<td align=center style="background-color: #fddbdb"><b>Required to balance - ' .
number_format(abs($debittotal-$credittotal),2);
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/OrderDetails.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -173,12 +173,12 @@
echo '<td>' . $myrow['stkcode'] . '</td>
<td>' . $myrow['description'] . '</td>
- <td align=right>' . $myrow['quantity'] . '</td>
+ <td class=number>' . $myrow['quantity'] . '</td>
<td>' . $myrow['units'] . '</td>
- <td align=right>' . number_format($myrow['unitprice'],2) . '</td>
- <td align=right>' . number_format(($myrow['discountpercent'] * 100),2) . '%' . '</td>
- <td align=right>' . number_format($myrow['quantity'] * $myrow['unitprice'] * (1 - $myrow['discountpercent']),2) . '</td>
- <td align=right>' . number_format($myrow['qtyinvoiced'],2) . '</td>
+ <td class=number>' . number_format($myrow['unitprice'],2) . '</td>
+ <td class=number>' . number_format(($myrow['discountpercent'] * 100),2) . '%' . '</td>
+ <td class=number>' . number_format($myrow['quantity'] * $myrow['unitprice'] * (1 - $myrow['discountpercent']),2) . '</td>
+ <td class=number>' . number_format($myrow['qtyinvoiced'],2) . '</td>
<td>' . $DisplayActualDeliveryDate . '</td>
</tr>';
@@ -192,8 +192,8 @@
$DisplayWeight = number_format($OrderTotalWeight,2);
echo '<tr>
- <td colspan=5 align=right><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
- <td colspan=2 align=right>' . $DisplayTotal . '</td>
+ <td colspan=5 class=number><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
+ <td colspan=2 class=number>' . $DisplayTotal . '</td>
</tr>
</table>';
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/PO_Items.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -948,7 +948,7 @@
} else {
$uom=$POLine->Units;
}
- // echo "<td>$POLine->StockID</td><td>$POLine->ItemDescription</td>td> align=right>$DisplayQuantity</td><td>$POLine->Units</td><td>$POLine->ReqDelDate</td>td> align=right>$DisplayPrice</td>td> align=right>$DisplayLineTotal</font></td><td><a href='" . $_SERVER['PHP_SELF'] . "?" . SID . "&Edit=" . $POLine->LineNo . "'>" . _('Select') . "</a></td></tr>";
+ // echo "<td>$POLine->StockID</td><td>$POLine->ItemDescription</td>td> class=number>$DisplayQuantity</td><td>$POLine->Units</td><td>$POLine->ReqDelDate</td>td> class=number>$DisplayPrice</td>td> class=number>$DisplayLineTotal</font></td><td><a href='" . $_SERVER['PHP_SELF'] . "?" . SID . "&Edit=" . $POLine->LineNo . "'>" . _('Select') . "</a></td></tr>";
echo "<td>$POLine->StockID</td>
<td>".$POLine->ItemDescription."</td>
<td><input type=text class=number name=Qty$POLine->LineNo size=11 value=".$DisplayQuantity."></td>
@@ -963,7 +963,7 @@
}
$DisplayTotal = number_format($_SESSION['PO'.$identifier]->total,2);
- echo '<tr><td colspan=6 align=right>' . _('TOTAL') . _(' excluding Tax') . '</td><td class=number><b>' . $DisplayTotal . '</b></td></tr></table>';
+ echo '<tr><td colspan=6 class=number>' . _('TOTAL') . _(' excluding Tax') . '</td><td class=number><b>' . $DisplayTotal . '</b></td></tr></table>';
echo '<br><div class="centre"><input type="submit" name="UpdateLines" value="Update Order Lines">';
echo '<br><input type="submit" name="Commit" value="Process Order">';
if (!isset($_POST['NewItem']) and isset($_GET['Edit'])) {
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/PO_SelectOSPurchOrder.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -218,8 +218,8 @@
printf("<td><input type=submit name='SelectedStockItem' VALUE='%s'</td>
<td>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
<td>%s</td></tr>",
$myrow['stockid'],
$myrow['description'],
@@ -460,7 +460,7 @@
// the tailed two column
// <td>%s</font></td>
-// <td align=right>%s</font></td>
+// <td class=number>%s</font></td>
// $myrow['requisitionno'],
// $myrow['initiator']);
// '</td><td class="tableheader">' . _('Requisition') .
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/Payments.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -853,7 +853,7 @@
}
echo '<tr>
<td align=left>' . $PaymentItem->cheque . '</td>
- <td align=right>' . number_format($PaymentItem->Amount,2) . '</td>
+ <td class=number>' . number_format($PaymentItem->Amount,2) . '</td>
<td>' . $PaymentItem->GLCode . ' - ' . $PaymentItem->GLActName . '</td>
<td>' . $PaymentItem->Narrative . '</td>
<td>' . $PaymentItem->tag . ' - ' . $tagname . '</td>
@@ -862,7 +862,7 @@
$PaymentTotal += $PaymentItem->Amount;
}
- echo '<tr><td></td><td align=right><b>' . number_format($PaymentTotal,2) . '</b></td><td></td><td></td><td></td></tr></table>';
+ echo '<tr><td></td><td class=number><b>' . number_format($PaymentTotal,2) . '</b></td><td></td><td></td><td></td></tr></table>';
echo '<br><font size=3 color=BLUE><div class="centre">' . _('General Ledger Payment Analysis Entry') . '</div></font><br><table>';
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/Prices.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -174,7 +174,7 @@
printf("<td>%s</td>
<td>%s</td>
- <td align=right>%0.2f</td>
+ <td class=number>%0.2f</td>
<td><a href='%s?%s&Item=%s&TypeAbbrev=%s&CurrAbrev=%s&Price=%s&Edit=1'>" . _('Edit') . "</td>
<td><a href='%s?%s&Item=%s&TypeAbbrev=%s&CurrAbrev=%s&delete=yes' onclick=\"return confirm('" . _('Are you sure you wish to delete this price?') . "');\">" . _('Delete') . '</td></tr>',
$myrow['currency'],
@@ -194,7 +194,7 @@
} else {
printf("<td>%s</td>
<td>%s</td>
- <td align=right>%0.2f</td></tr>",
+ <td class=number>%0.2f</td></tr>",
$myrow['currency'],
$myrow['sales_type'],
$myrow['price']);
Modified: trunk/Prices_Customer.php
===================================================================
--- trunk/Prices_Customer.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/Prices_Customer.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -154,7 +154,7 @@
} else {
echo '<tr><th>' . _('Normal Price') . '</th></tr>';
while ($myrow = DB_fetch_array($result)) {
- printf('<tr class="EvenTableRows"><td align=right>%0.2f</td></tr>', $myrow['price']);
+ printf('<tr class="EvenTableRows"><td class=number>%0.2f</td></tr>', $myrow['price']);
}
}
@@ -195,7 +195,7 @@
}
printf("<tr bgcolor='#CCCCCC'>
- <td align=right>%0.2f</td>
+ <td class=number>%0.2f</td>
<td>%s</td>
<td><a href='%s?Item=%s&Price=%s&Branch=%s&Edit=1'>" . _('Edit') . "</td>
<td><a href='%s?Item=%s&Branch=%s&delete=yes'>" . _('Delete') . "</td></tr>",
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/PrintCustTrans.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -774,7 +774,7 @@
echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br>';
echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br>';
- echo '</td><td WIDTH=50% align=right>';
+ echo '</td><td WIDTH=50% class=number>';
/*Now the customer charged to details in a sub table within a cell of the main table*/
@@ -916,11 +916,11 @@
printf ('<td>%s</td>
<td>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
</tr>',
$myrow2['stockid'],
$myrow2['description'],
@@ -963,7 +963,7 @@
echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br>';
echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br>';
echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br>';
- echo '</td><td align=right>' . _('Page') . ": $PageNumber</td></tr></table>";
+ echo '</td><td class=number>' . _('Page') . ": $PageNumber</td></tr></table>";
echo "<table class='table1'><tr>
<th>" . _('Item Code') . "</th>
<th>" . _('Item Description') . "</th>
@@ -1008,7 +1008,7 @@
echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br>';
echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br>';
echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br>';
- echo '</td><td align=right>' . _('Page') . ": $PageNumber</td></tr></table>";
+ echo '</td><td class=number>' . _('Page') . ": $PageNumber</td></tr></table>";
echo "<table class='table1'><tr>
<th>" . _('Item Code') . "</th>
<th>" . _('Item Description') . "</th>
@@ -1047,18 +1047,18 @@
}
/*Print out the invoice text entered */
echo '<table class=table1><tr>
- <td align=right>' . _('Sub Total') . "</td>
- <td align=right bgcolor='#EEEEEE' WIDTH=15%>$DisplaySubTot</td></tr>";
- echo '<tr><td align=right>' . _('Freight') . "</td>
- <td align=right bgcolor='#EEEEEE'>$DisplayFreight</td></tr>";
- echo '<tr><td align=right>' . _('Tax') . "</td>
- <td align=right bgcolor='#EEEEEE'>$DisplayTax</td></tr>";
+ <td class=number>' . _('Sub Total') . "</td>
+ <td class=number bgcolor='#EEEEEE' WIDTH=15%>$DisplaySubTot</td></tr>";
+ echo '<tr><td class=number>' . _('Freight') . "</td>
+ <td class=number bgcolor='#EEEEEE'>$DisplayFreight</td></tr>";
+ echo '<tr><td class=number>' . _('Tax') . "</td>
+ <td class=number bgcolor='#EEEEEE'>$DisplayTax</td></tr>";
if ($InvOrCredit=='Invoice'){
- echo '<tr><td Align=RIGHT><b>' . _('TOTAL INVOICE') . "</b></td>
- <td align=right bgcolor='#EEEEEE'><U><b>$DisplayTotal</b></U></td></tr>";
+ echo '<tr><td class=number><b>' . _('TOTAL INVOICE') . "</b></td>
+ <td class=number bgcolor='#EEEEEE'><U><b>$DisplayTotal</b></U></td></tr>";
} else {
- echo '<tr><td Align=RIGHT><font color=RED><b>' . _('TOTAL CREDIT') . "</b></font></td>
- <td align=right bgcolor='#EEEEEE'><font color=RED><U><b>$DisplayTotal</b></U></font></td></tr>";
+ echo '<tr><td class=number><font color=RED><b>' . _('TOTAL CREDIT') . "</b></font></td>
+ <td class=number bgcolor='#EEEEEE'><font color=RED><U><b>$DisplayTotal</b></U></font></td></tr>";
}
echo '</table>';
} /* end of check to see that there was an invoice record to print */
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/PrintCustTransPortrait.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -819,7 +819,7 @@
echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br>';
echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br>';
- echo '</td><td WIDTH=50% align=right>';
+ echo '</td><td WIDTH=50% class=number>';
/*Now the customer charged to details in a sub table within a cell of the main table*/
@@ -963,11 +963,11 @@
printf ('<td>%s</td>
<td>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
</tr>',
$myrow2['stockid'],
$myrow2['description'],
@@ -1009,7 +1009,7 @@
echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br>';
echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br>';
echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br>';
- echo '</td><td align=right>' . _('Page') . ": $PageNumber</td></tr></table>";
+ echo '</td><td class=number>' . _('Page') . ": $PageNumber</td></tr></table>";
echo "<table WIDTH=100% cellpadding=5><tr>
<th>" . _('Item Code') . "</th>
<th>" . _('Item Description') . "</th>
@@ -1053,7 +1053,7 @@
echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br>';
echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br>';
echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br>';
- echo '</td><td align=right>' . _('Page') . ": $PageNumber</td></tr></table>";
+ echo '</td><td class=number>' . _('Page') . ": $PageNumber</td></tr></table>";
echo "<table WIDTH=100% cellpadding=5><tr>
<th>" . _('Item Code') . "</th>
<th>" . _('Item Description') . "</th>
@@ -1092,18 +1092,18 @@
}
/*Print out the invoice text entered */
echo '<table WIDTH=100%><tr>
- <td align=right>' . _('Sub Total') . "</td>
- <td align=right bgcolor='#EEEEEE' WIDTH='15%'>$DisplaySubTot</td></tr>";
- echo '<tr><td align=right>' . _('Freight') . "</td>
- <td align=right bgcolor='#EEEEEE'>$DisplayFreight</td></tr>";
- echo '<tr><td align=right>' . _('Tax') . "</td>
- <td align=right bgcolor='#EEEEEE'>$DisplayTax</td></tr>";
+ <td class=number>' . _('Sub Total') . "</td>
+ <td class=number bgcolor='#EEEEEE' WIDTH='15%'>$DisplaySubTot</td></tr>";
+ echo '<tr><td class=number>' . _('Freight') . "</td>
+ <td class=number bgcolor='#EEEEEE'>$DisplayFreight</td></tr>";
+ echo '<tr><td class=number>' . _('Tax') . "</td>
+ <td class=number bgcolor='#EEEEEE'>$DisplayTax</td></tr>";
if ($InvOrCredit=='Invoice'){
- echo '<tr><td Align=RIGHT><b>' . _('TOTAL INVOICE') . "</b></td>
- <td align=right bgcolor='#EEEEEE'><U><b>$DisplayTotal</b></U></td></tr>";
+ echo '<tr><td class=number><b>' . _('TOTAL INVOICE') . "</b></td>
+ <td class=number bgcolor='#EEEEEE'><U><b>$DisplayTotal</b></U></td></tr>";
} else {
- echo '<tr><td Align=RIGHT><font color=RED><b>' . _('TOTAL CREDIT') . "</b></font></td>
- <td align=right bgcolor='#EEEEEE'><font color=RED><U><b>$DisplayTotal</b></U></font></td></tr>";
+ echo '<tr><td class=number><font color=RED><b>' . _('TOTAL CREDIT') . "</b></font></td>
+ <td class=number bgcolor='#EEEEEE'><font color=RED><U><b>$DisplayTotal</b></U></font></td></tr>";
}
echo '</table>';
} /* end of check to see that there was an invoice record to print */
Modified: trunk/PurchData.php
===================================================================
--- trunk/PurchData.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/PurchData.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -180,11 +180,11 @@
$DisplayPreferred = _('No');
}
printf("<td>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td align=right>%s " . _('days') . "</td>
+ <td class=number>%s " . _('days') . "</td>
<td>%s</td>
<td><a href='%s?%s&StockID=%s&SupplierID=%s&Edit=1&EffectiveFrom=%s'>" . _('Edit') . "</a></td>
<td><a href='%s?%s&StockID=%s&SupplierID=%s&Delete=1&EffectiveFrom=%s' onclick=\"return confirm('" . _('Are you sure you wish to delete this suppliers price?') . "');\">" . _('Delete') . "</a></td>
Modified: trunk/ReverseGRN.php
===================================================================
--- trunk/ReverseGRN.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/ReverseGRN.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -357,9 +357,9 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
<td>%s</td>
</tr>",
$myrow['grnno'],
Modified: trunk/SalesAnalRepts.php
===================================================================
--- trunk/SalesAnalRepts.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/SalesAnalRepts.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -391,7 +391,7 @@
if (!isset($_POST['ReportHeading'])) {
$_POST['ReportHeading']='';
}
- echo '<table WIDTH=100% colspan=4><tr><td align=right>' . _('Report Heading') . ":</td><td colspan=2><input type='TEXT' size=80 maxlength=80 name=ReportHeading value='" . $_POST['ReportHeading'] . "'></td></tr>";
+ echo '<table WIDTH=100% colspan=4><tr><td class=number>' . _('Report Heading') . ":</td><td colspan=2><input type='TEXT' size=80 maxlength=80 name=ReportHeading value='" . $_POST['ReportHeading'] . "'></td></tr>";
echo '<tr><td>' . _('Group By 1') . ': <select name=GroupByData1>';
Modified: trunk/SelectCompletedOrder.php
===================================================================
--- trunk/SelectCompletedOrder.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/SelectCompletedOrder.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -486,9 +486,9 @@
printf("<td><font size=1><input type='submit' name='SelectedStockItem' value='%s'</font></td>
<td><font size=1>%s</font></td>
- <td align=right><font size=1>%s</font></td>
- <td align=right><font size=1>%s</font></td>
- <td align=right><font size=1>%s</font></td>
+ <td class=number><font size=1>%s</font></td>
+ <td class=number><font size=1>%s</font></td>
+ <td class=number><font size=1>%s</font></td>
<td><font size=1>%s</font></td></tr>",
$myrow['stockid'],
$myrow['description'],
@@ -548,7 +548,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
</tr>",
$ViewPage,
$myrow['orderno'],
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/SelectCreditItems.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -708,7 +708,7 @@
if ($LineItem->Controlled==0){
echo '<td><input type=TEXT class="number" name="Quantity_' . $LineItem->LineNumber . '" maxlength=6 size=6 VALUE=' . $LineItem->Quantity . '></td>';
} else {
- echo '<td align=right><a href="' . $rootpath . '/CreditItemsControlled.php?' . SID . '&LineNo=' . $LineItem->LineNumber . '">' . $LineItem->Quantity . '</a>
+ echo '<td class=number><a href="' . $rootpath . '/CreditItemsControlled.php?' . SID . '&LineNo=' . $LineItem->LineNumber . '">' . $LineItem->Quantity . '</a>
<input type=hidden name="Quantity_' . $LineItem->LineNumber . '" VALUE=' . $LineItem->Quantity . '></td>';
}
@@ -780,7 +780,7 @@
<td colspan=5></td>';
- echo '<td colspan=2 align=right>'. _('Credit Freight').'</td>
+ echo '<td colspan=2 class=number>'. _('Credit Freight').'</td>
<td><input type=TEXT class="number" size=6 maxlength=6 name=ChargeFreightCost VALUE=' . $_SESSION['CreditItems']->FreightCost . '></td>';
$FreightTaxTotal =0; //initialise tax total
@@ -827,7 +827,7 @@
echo '<tr>
- <td colspan=7 align=right>' . _('Credit Totals') . "</td>
+ <td colspan=7 class=number>' . _('Credit Totals') . "</td>
<td class=number><hr><b>$DisplayTotal</b><hr></td>
<td colspan=2></td>
<td class=number><hr><b>" . number_format($TaxTotal,2) . "<hr></td>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/SelectOrderItems.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -1276,7 +1276,7 @@
<td><input class="number" onKeyPress="return restrictToNumbers(this, event)" type=text name="Discount_' . $OrderLine->LineNumber . '" size=5 maxlength=4 value=' . ($OrderLine->DiscountPercent * 100) . '></td>
<td><input class="number" onKeyPress="return restrictToNumbers(this, event)" type=text name="GPPercent_' . $OrderLine->LineNumber . '" size=3 maxlength=40 value=' . $OrderLine->GPPercent . '></td>';
} else {
- echo '<td align=right>' . $OrderLine->Price . '</td><td></td>';
+ echo '<td class=number>' . $OrderLine->Price . '</td><td></td>';
echo '<input type=hidden name="Price_' . $OrderLine->LineNumber . '" value=' . $OrderLine->Price . '>';
}
if ($_SESSION['Items'.$identifier]->Some_Already_Delivered($OrderLine->LineNumber)){
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/SelectProduct.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -423,7 +423,7 @@
echo '<tr><td width="40%" valign="top">
<table>'; //nested table
- echo '<tr><th align=right>' . _('Item Type:') . '</th><td colspan=2>';
+ echo '<tr><th class=number>' . _('Item Type:') . '</th><td colspan=2>';
switch ($myrow['mbflag']) {
case 'A':
@@ -450,7 +450,7 @@
echo _('Manufactured Item');
break;
}
- echo '</td><th align=right>' . _('Control Level:') .'</th><td>';
+ echo '</td><th class=number>' . _('Control Level:') .'</th><td>';
if ($myrow['serialised'] == 1) {
echo _('serialised');
} elseif ($myrow['controlled'] == 1) {
@@ -458,10 +458,10 @@
} else {
echo _('N/A');
}
- echo '</td><th align=right>' . _('Units') . ':</th><td>' . $myrow['units'] . '</td></tr>';
- echo '<tr><th align=right>' . _('Volume') . ':</th><td align=right colspan=2>' . number_format($myrow['volume'], 3) . '</td>
- <th align=right>' . _('Weight') . ':</th><td align=right>' . number_format($myrow['kgs'], 3) . '</td>
- <th align=right>' . _('EOQ') . ':</th><td align=right>' . number_format($myrow['eoq'],$myrow['decimalplaces']) . '</td></tr>';
+ echo '</td><th class=number>' . _('Units') . ':</th><td>' . $myrow['units'] . '</td></tr>';
+ echo '<tr><th class=number>' . _('Volume') . ':</th><td class=number colspan=2>' . number_format($myrow['volume'], 3) . '</td>
+ <th class=number>' . _('Weight') . ':</th><td class=number>' . number_format($myrow['kgs'], 3) . '</td>
+ <th class=number>' . _('EOQ') . ':</th><td class=number>' . number_format($myrow['eoq'],$myrow['decimalplaces']) . '</td></tr>';
if (in_array($PricesSecurity,$_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)){
echo '<tr><th colspan=2>' . _('Sell Price') . ':</th><td>';
@@ -506,8 +506,8 @@
echo '</td></tr>';
while ($PriceRow = DB_fetch_row($PriceResult)) {
$Price = $PriceRow[1];
- echo '<tr><td></td><th>' . $PriceRow[0] . '</th><td align=right>' . number_format($Price,2) . '</td>
- <th align=right>' . _('Gross Profit') . '</th><td align=right>';
+ echo '<tr><td></td><th>' . $PriceRow[0] . '</th><td class=number>' . number_format($Price,2) . '</td>
+ <th class=number>' . _('Gross Profit') . '</th><td class=number>';
if ($Price > 0) {
$GP = number_format(($Price - $Cost) * 100 / $Price, 2);
} else {
@@ -532,7 +532,7 @@
} else {
$Cost = $myrow['cost'];
}
- echo '<th align=right>' . _('Cost') . '</th><td align=right>' . number_format($Cost,3) . '</td>';
+ echo '<th class=number>' . _('Cost') . '</th><td class=number>' . number_format($Cost,3) . '</td>';
} //end of if PricesSecuirty allows viewing of prices
echo '</table>'; //end of first nested table
// Item Category Property mod: display the item properties
@@ -570,7 +570,7 @@
. ':</th>';
switch ($PropertyRow['controltype']) {
case 0; //textbox
- echo '<td align=right width=60><input type="text" name="PropValue' .
+ echo '<td class=number width=60><input type="text" name="PropValue' .
$PropertyCounter . '" value="'. $PropertyValue.'">';
break;
case 1; //select box
@@ -693,9 +693,9 @@
$Demand += $DemandRow[0];
}
- echo '<tr><th align=right width="15%">' . _('Quantity On Hand') . ':</th><td width="17%" align=right>' . $QOH . '</td></tr>';
- echo '<tr><th align=right width="15%">' . _('Quantity Demand') . ':</th><td width="17%" align=right>' . number_format($Demand,$myrow['decimalplaces']) . '</td></tr>';
- echo '<tr><th align=right width="15%">' . _('Quantity On Order') . ':</th><td width="17%" align=right>' . $QOO . '</td></tr>
+ echo '<tr><th class=number width="15%">' . _('Quantity On Hand') . ':</th><td width="17%" class=number>' . $QOH . '</td></tr>';
+ echo '<tr><th class=number width="15%">' . _('Quantity Demand') . ':</th><td width="17%" class=number>' . number_format($Demand,$myrow['decimalplaces']) . '</td></tr>';
+ echo '<tr><th class=number width="15%">' . _('Quantity On Order') . ':</th><td width="17%" class=number>' . $QOO . '</td></tr>
</table>';//end of nested table
echo '</td>'; //end cell of master table
@@ -722,7 +722,7 @@
$db);
while ($SuppRow = DB_fetch_array($SuppResult)) {
echo '<tr><td>' . $SuppRow['suppname'] . '</td>
- <td align=right>' . number_format($SuppRow['price']/$SuppRow['conversionfactor'],2) . '</td>
+ <td class=number>' . number_format($SuppRow['price']/$SuppRow['conversionfactor'],2) . '</td>
<td>' . $SuppRow['currcode'] . '</td>
<td>' . ConvertSQLDate($SuppRow['effectivefrom']) . '</td>
<td>' . $SuppRow['leadtime'] . '</td>';
Modified: trunk/SelectRecurringSalesOrder.php
===================================================================
--- trunk/SelectRecurringSalesOrder.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/SelectRecurringSalesOrder.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -110,7 +110,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
</tr>",
$ModifyPage,
$myrow['recurrorderno'],
Modified: trunk/SelectWorkOrder.php
===================================================================
--- trunk/SelectWorkOrder.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/SelectWorkOrder.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -212,7 +212,7 @@
printf("<td><input type=submit name='SelectedStockItem' VALUE='%s'</td>
<td>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
<td>%s</td>
</tr>",
$myrow['stockid'],
@@ -344,9 +344,9 @@
<td><a href='%s'>" . _('Issue To') . "</a></td>
<td><a href='%s'>" . _('Costing') . "</a></td>
<td>%s - %s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
<td>%s</td>
</tr>",
$ModifyPage,
Modified: trunk/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/ShipmentCosting.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -438,22 +438,22 @@
/* Item / Qty Inv/ FX price/ Local Val/ Portion of chgs/ Shipt Cost/ Std Cost/ Variance/ Var % */
echo '<td>' . $myrow['itemcode'] . ' - ' . $myrow['itemdescription'] . '</td>
- <td align=right>' . number_format($myrow['totqtyinvoiced']) . '</td>
- <td align=right>' . number_format($myrow['totqtyrecd']) . '</td>
- <td align=right>' . number_format($ItemCharges) . '</td>
- <td align=right>' . number_format($PortionOfCharges) . '</td>
- <td align=right>' . number_format($ItemShipmentCost,2) . '</td>
- <td align=right>' . number_format($StdCostUnit,2) . '</td>
- <td align=right>' . number_format($Variance,2) . '</td>
- <td align=right>' . $VariancePercentage . '%</td></tr>';
+ <td class=number>' . number_format($myrow['totqtyinvoiced']) . '</td>
+ <td class=number>' . number_format($myrow['totqtyrecd']) . '</td>
+ <td class=number>' . number_format($ItemCharges) . '</td>
+ <td class=number>' . number_format($PortionOfCharges) . '</td>
+ <td class=number>' . number_format($ItemShipmentCost,2) . '</td>
+ <td class=number>' . number_format($StdCostUnit,2) . '</td>
+ <td class=number>' . number_format($Variance,2) . '</td>
+ <td class=number>' . $VariancePercentage . '%</td></tr>';
}
}
-echo '<tr><td colspan=3 align=right><font color=BLUE><b>'. _('Total Shipment Charges'). '</b></font></td>
- <td align=right>' . number_format($TotalInvoiceValueOfShipment) . '</td>
- <td align=right>' . number_format($TotalCostsToApportion) .'</td></tr>';
+echo '<tr><td colspan=3 class=number><font color=BLUE><b>'. _('Total Shipment Charges'). '</b></font></td>
+ <td class=number>' . number_format($TotalInvoiceValueOfShipment) . '</td>
+ <td class=number>' . number_format($TotalCostsToApportion) .'</td></tr>';
-echo '<tr><td colspan=6 align=right>' . _('Total Value of all variances on this shipment') . '</td>
- <td align=right>' . number_format($TotalShiptVariance,2) . '</td></tr>';
+echo '<tr><td colspan=6 class=number>' . _('Total Value of all variances on this shipment') . '</td>
+ <td class=number>' . number_format($TotalShiptVariance,2) . '</td></tr>';
echo '</table><hr>';
@@ -519,13 +519,13 @@
<td>' . $myrow['suppreference'] . '</td>
<td>' . ConvertSQLDate($myrow['trandate']) . '</td>
<td>' . $myrow['stockid'] . '</td>
- <td align=right>' . number_format($myrow['value']) . '</td></tr>';
+ <td class=number>' . number_format($myrow['value']) . '</td></tr>';
$TotalItemShipmentChgs += $myrow['value'];
}
-echo '<tr><td colspan=5 align=right><font color=BLUE><b>'. _('Total Charges Against Shipment Items'). ':</b></font></td>
- <td align=right>' . number_format($TotalItemShipmentChgs) . '</td></tr>';
+echo '<tr><td colspan=5 class=number><font color=BLUE><b>'. _('Total Charges Against Shipment Items'). ':</b></font></td>
+ <td class=number>' . number_format($TotalItemShipmentChgs) . '</td></tr>';
echo '</table>';
@@ -587,15 +587,15 @@
<td>' .$myrow['typename'] . '</td>
<td>' . $myrow['suppreference'] . '</td>
<td>' . ConvertSQLDate($myrow['trandate']) . '</td>
- <td align=right>' . number_format($myrow['value']) . '</td></tr>';
+ <td class=number>' . number_format($myrow['value']) . '</td></tr>';
$TotalGeneralShipmentChgs += $myrow['value'];
}
echo '<tr>
- <td align=right colspan=4><font color=BLUE><b>'. _('Total General Shipment Charges'). ':</b></font></td>
- <td align=right>' . number_format($TotalGeneralShipmentChgs) . '</td></tr>';
+ <td class=number colspan=4><font color=BLUE><b>'. _('Total General Shipment Charges'). ':</b></font></td>
+ <td class=number>' . number_format($TotalGeneralShipmentChgs) . '</td></tr>';
echo '</table>';
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/Shipments.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -413,12 +413,12 @@
echo '<td>'.$LnItm->OrderNo.'</td>
- <td>'. $LnItm->StockID .' - '. $LnItm->ItemDescription. '</td><td align=right>' . number_format($LnItm->QuantityOrd,2) . '</td>
+ <td>'. $LnItm->StockID .' - '. $LnItm->ItemDescription. '</td><td class=number>' . number_format($LnItm->QuantityOrd,2) . '</td>
<td>'. $LnItm->UOM .'</td>
- <td align=right>' . number_format($LnItm->QuantityRecd,2) . '</td>
- <td align=right>' . number_format($LnItm->QtyInvoiced,2) . '</td>
- <td align=right>' . number_format($LnItm->UnitPrice,2) . '</td>
- <td align=right>' . number_format($LnItm->StdCostUnit,2) . '</td>
+ <td class=number>' . number_format($LnItm->QuantityRecd,2) . '</td>
+ <td class=number>' . number_format($LnItm->QtyInvoiced,2) . '</td>
+ <td class=number>' . number_format($LnItm->UnitPrice,2) . '</td>
+ <td class=number>' . number_format($LnItm->StdCostUnit,2) . '</td>
<td><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . 'Delete=' . $LnItm->PODetailItem . '">'. _('Delete'). '</a></td>
</tr>';
}//for each line on the shipment
@@ -488,10 +488,10 @@
echo '<td>' . $myrow['orderno'] . '</td>
<td>' . $myrow['itemcode'] . ' - ' . $myrow['itemdescription'] . '</td>
- <td align=right>' . number_format($myrow['quantityord'],2) . '</td>
+ <td class=number>' . number_format($myrow['quantityord'],2) . '</td>
<td>' . $myrow['units'] . '</td>
- <td align=right>' . number_format($myrow['quantityrecd'],2) . '</td>
- <td align=right>' . ConvertSQLDate($myrow['deliverydate']) . '</td>
+ <td class=number>' . number_format($myrow['quantityrecd'],2) . '</td>
+ <td class=number>' . ConvertSQLDate($myrow['deliverydate']) . '</td>
<td><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&Add=' . $myrow['podetailitem'] . '">'. _('Add').'</a></td>
</tr>';
Modified: trunk/Shipt_Select.php
===================================================================
--- trunk/Shipt_Select.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/Shipt_Select.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -212,8 +212,8 @@
Code Description On Hand Orders Ostdg Units Code Description On Hand Orders Ostdg Units */
printf('<td><input type=submit name="SelectedStockItem" VALUE="%s"</td>
<td>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
<td>%s</td></tr>',
$myrow['stockid'], $myrow['description'], $myrow['qoh'], $myrow['qord'],$myrow['units']);
Modified: trunk/SpecialOrder.php
===================================================================
--- trunk/SpecialOrder.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/SpecialOrder.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -578,13 +578,13 @@
}
echo '<td>' . $SPLLine->ItemDescription . '</td>
<td>' . $SPLLine->ReqDelDate . "</td>
- <td align=right>$DisplayQuantity</td>
- <td align=right>$DisplayCost</td>
- <td align=right>$DisplayPrice</td>
- <td align=right>$DisplayLineCostTotal</td>
- <td align=right>$DisplayLineTotal</td>
- <td align=right>$DisplayLineCostTotalCurr</td>
- <td align=right>$DisplayLineTotalCurr</td>
+ <td class=number>$DisplayQuantity</td>
+ <td class=number>$DisplayCost</td>
+ <td class=number>$DisplayPrice</td>
+ <td class=number>$DisplayLineCostTotal</td>
+ <td class=number>$DisplayLineTotal</td>
+ <td class=number>$DisplayLineCostTotalCurr</td>
+ <td class=number>$DisplayLineTotalCurr</td>
<td><a href='" . $_SERVER['PHP_SELF'] . "?" . SID .'&Delete=' . $SPLLine->LineNo . "'>" . _('Delete') . '</a></td></tr>';
$_SESSION['SPL']->total = $_SESSION['SPL']->total + $DisplayLineTotalCurr;
@@ -592,8 +592,8 @@
$DisplayTotal = number_format($_SESSION['SPL']->total,2);
echo '<tr>
- <td colspan=8 align=right>' . _('TOTAL Excl Tax') . "</td>
- <td align=right><b>$DisplayTotal</b></td>
+ <td colspan=8 class=number>' . _('TOTAL Excl Tax') . "</td>
+ <td class=number><b>$DisplayTotal</b></td>
</tr></table>";
}
Modified: trunk/StockCategories.php
===================================================================
--- trunk/StockCategories.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/StockCategories.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -207,11 +207,11 @@
printf("<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
<td><a href=\"%sSelectedCategory=%s\">" . _('Edit') . "</td>
<td><a href=\"%sSelectedCategory=%s&delete=yes\" onclick=\"return confirm('" . _('Are you sure you wish to delete this stock category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . "');\">" . _('Delete') . "</td>
</tr>",
Modified: trunk/StockLocMovements.php
===================================================================
--- trunk/StockLocMovements.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/StockLocMovements.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -106,10 +106,10 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
<td>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
</tr>",
strtoupper($myrow['stockid']),
strtoupper($myrow['stockid']),
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/StockLocTransferReceive.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -435,7 +435,7 @@
<td>' . $TrfLine->StockID . '</td>
<td>' . $TrfLine->ItemDescription . '</td>';
- echo '<td align=right>' . number_format($TrfLine->ShipQty, $TrfLine->DecimalPlaces) . '</td>';
+ echo '<td class=number>' . number_format($TrfLine->ShipQty, $TrfLine->DecimalPlaces) . '</td>';
if (isset($_POST['Qty' . $i]) and is_numeric($_POST['Qty' . $i])){
$_SESSION['Transfer']->TransferItem[$i]->Quantity= $_POST['Qty' . $i];
$Qty = $_POST['Qty' . $i];
@@ -513,7 +513,7 @@
while ($myrow=DB_fetch_array($TrfResult)){
- echo '<tr><td align=right>' . $myrow['reference'] . '</td>
+ echo '<tr><td class=number>' . $myrow['reference'] . '</td>
<td>' . $myrow['trffromloc'] . '</td>
<td>' . ConvertSQLDate($myrow['shipdate']) . '</td>
<td><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&Trf_ID=' . $myrow['reference'] . '">'. _('Receive'). '</a></td></tr>';
Modified: trunk/StockQuantityByDate.php
===================================================================
--- trunk/StockQuantityByDate.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/StockQuantityByDate.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -122,7 +122,7 @@
if($NumRows == 0){
printf("<td><a TARGET='_blank' href='StockStatus.php?%s'>%s</td>
<td>%s</td>
- <td align=right>%s</td>",
+ <td class=number>%s</td>",
SID . '&StockID=' . strtoupper($myrows['stockid']),
strtoupper($myrows['stockid']),
$myrows['description'],
@@ -130,7 +130,7 @@
} else {
printf("<td><a TARGET='_blank' href='StockStatus.php?%s'>%s</td>
<td>%s</td>
- <td align=right>%s</td>",
+ <td class=number>%s</td>",
SID . '&StockID=' . strtoupper($myrows['stockid']),
strtoupper($myrows['stockid']),
$myrows['description'],
Modified: trunk/StockSerialItemResearch.php
===================================================================
--- trunk/StockSerialItemResearch.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/StockSerialItemResearch.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -80,16 +80,16 @@
while ($myrow=DB_fetch_row($result)) {
printf("<tr>
<td>%s<br>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
<td>%s (%s)</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
<td>%s - %s</td>
<td>%s </td>
<td>%s </td>
<td>%s </td>
<td>%s </td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
</tr>",
$myrow[1],
$myrow[0],
Modified: trunk/StockSerialItems.php
===================================================================
--- trunk/StockSerialItems.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/StockSerialItems.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -112,7 +112,7 @@
);
} else {
printf("<td>%s</td>
- <td align=right>%s</td>",
+ <td class=number>%s</td>",
$myrow['serialno'],
number_format($myrow['quantity'],$DecimalPlaces)
);
Modified: trunk/StockStatus.php
===================================================================
--- trunk/StockStatus.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/StockStatus.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -202,11 +202,11 @@
echo '<td>' . $myrow['locationname'] . '</td>';
- printf("<td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>",
+ printf("<td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>",
number_format($myrow['quantity'], $DecimalPlaces),
number_format($myrow['reorderlevel'], $DecimalPlaces),
number_format($DemandQty, $DecimalPlaces),
@@ -225,7 +225,7 @@
/* It must be a dummy, assembly or kitset part */
printf("<td>%s</td>
- <td align=right>%s</td>
+ <td class=number>%s</td>
</tr>",
$myrow['locationname'],
number_format($DemandQty, $DecimalPlaces)
@@ -322,9 +322,9 @@
}
printf("<td>%s</td>
- <td align=right>%s</td>
- <td align=right>%s</td>
- <td align=right>%s%%</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s%%</td>
</tr>",
$ph[0],
number_format($ph[1],$DecimalPlaces),
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/StockTransfers.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -478,7 +478,7 @@
}
if ($_SESSION['Transfer']->TransferItem[0]->Controlled==1){
- echo '<td align=right><input type=hidden name="Quantity" VALUE=' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '><a href="' . $rootpath .'/StockTransferControlled.php?' . SID . '">' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '</a></td></tr>';
+ echo '<td class=number><input type=hidden name="Quantity" VALUE=' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '><a href="' . $rootpath .'/StockTransferControlled.php?' . SID . '">' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '</a></td></tr>';
} else {
echo '<td><input type=text class="number" name="Quantity" size=12 maxlength=12 Value=' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '></td></tr>';
}
Modified: trunk/StockUsage.php
===================================================================
--- trunk/StockUsage.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/StockUsage.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -150,7 +150,7 @@
$TotalUsage += $myrow['qtyused'];
$PeriodsCounter++;
- printf('<td>%s</td><td align=right>%s</td></tr>', $DisplayDate, number_format($myrow['qtyused'],$DecimalPlaces));
+ printf('<td>%s</td><td class=number>%s</td></tr>', $DisplayDate, number_format($myrow['qtyused'],$DecimalPlaces));
//end of page full new headings if
}
Modified: trunk/SuppCreditGRNs.php
===================================================================
--- trunk/SuppCreditGRNs.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/SuppCreditGRNs.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -83,9 +83,9 @@
echo '<tr><td>' . $EnteredGRN->GRNNo . '</td>
<td>' . $EnteredGRN->ItemCode . '</td>
<td>' . $EnteredGRN->ItemDescription . '</td>
- <td align=right>' . number_format($EnteredGRN->This_QuantityInv,2) . '</td>
- <td align=right>' . number_format($EnteredGRN->ChgPrice,2) . '</td>
- <td align=right>' . number_format($EnteredGRN->ChgPrice * $EnteredGRN->This_QuantityInv,2) . '</td>
+ <td class=number>' . number_format($EnteredGRN->This_QuantityInv,2) . '</td>
+ <td class=number>' . number_format($EnteredGRN->ChgPrice,2) . '</td>
+ <td class=number>' . number_format($EnteredGRN->ChgPrice * $EnteredGRN->This_QuantityInv,2) . '</td>
<td><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . 'Delete=' . $EnteredGRN->GRNNo . '">' . _('Delete') . '</a></td></tr>';
$TotalValueCharged = $TotalValueCharged + ($EnteredGRN->ChgPrice * $EnteredGRN->This_QuantityInv);
@@ -97,8 +97,8 @@
}
}
-echo '<tr><td colspan=5 align=right><font size=4 color=BLUE>' . _('Total Value Credited Against Goods') . ':</font></td>
- <td align=right><font size=4 color=BLUE><U>' . number_format($TotalValueCharged,2) . '</U></font></td></tr>';
+echo '<tr><td colspan=5 class=number><font size=4 color=BLUE>' . _('Total Value Credited Against Goods') . ':</font></td>
+ <td class=number><font size=4 color=BLUE><U>' . number_format($TotalValueCharged,2) . '</U></font></td></tr>';
echo '</table><br><a href="' . $rootpath . '/SupplierCredit.php?' . SID . '">' . _('Back to Credit Note Entry') . '</a><hr>';
/* Now get all the GRNs for this supplier from the database
@@ -168,11 +168,11 @@
<td>' . $myrow['itemcode'] . '</td>
<td>' . $myrow['itemdescription'] . '</td>
<td>' . ConvertSQLDate($myrow['deliverydate']) . '</td>
- <td align=right>' . number_format($myrow['qtyrecd'],2) . '</td>
- <td align=right>' . number_format($myrow['quantityinv'],2) . '</td>
- <td align=right>' . number_format($myrow['qtyrecd'] - $myrow['quantityinv'],2) . '</td>
- <td align=right>' . number_format($myrow['unitprice'],2) . '</td>
- <td align=right>' . number_format($myrow['unitprice']*($myrow['qtyrecd'] - $myrow['quantityinv']),2) . '</td>
+ <td class=number>' . number_format($myrow['qtyrecd'],2) . '</td>
+ <td class=number>' . number_format($myrow['quantityinv'],2) . '</td>
+ <td class=number>' . number_format($myrow['qtyrecd'] - $myrow['quantityinv'],2) . '</td>
+ <td class=number>' . number_format($myrow['unitprice'],2) . '</td>
+ <td class=number>' . number_format($myrow['unitprice']*($myrow['qtyrecd'] - $myrow['quantityinv']),2) . '</td>
</tr>';
$i++;
if ($i>15){
@@ -221,9 +221,9 @@
echo '<tr><td>' . $_POST['GRNNo'] . '</td>
<td>' . $myrow['itemcode'] . ' ' . $myrow['itemdescription'] . '</td>
- <td align=right>' . number_format($myrow['qtyostdg'],2) . '</td>
+ <td class=number>' . number_format($myrow['qtyostdg'],2) . '</td>
<td><input type=Text Name="This_QuantityCredited" Value=' . $myrow['qtyostdg'] . ' size=11 maxlength=10></td>
- <td align=right>' . $myrow['unitprice'] . '</td>
+ <td class=number>' . $myrow['unitprice'] . '</td>
<td><input type=Text Name="ChgPrice" Value=' . $myrow['unitprice'] . ' size=11 maxlength=10></td>
</tr>';
echo '</table>';
Modified: trunk/SuppInvGLAnalysis.php
===================================================================
--- trunk/SuppInvGLAnalysis.php 2009-12-09 12:01:59 UTC (rev 3145)
+++ trunk/SuppInvGLAnalysis.php 2009-12-09 22:28:33 UTC (rev 3146)
@@ -58,7 +58,7 @@
echo '<tr><td>' . $EnteredGLCode->GLCode . '</td>
<td>' . $EnteredGLCode->GLActName . '</td>
- <td align=right>' . number_format($EnteredGLCode->Amount,2) . '</td>
+ <td class=number>' . number_format($EnteredGLCode->Amount,2) . '</td>
<td>' . $EnteredGLCode->ShiptRef . '</td>
<td>' .$EnteredGLCode->JobRef . '</td>
<td>' . $EnteredGLCode->Narrative . '</td>
@@ -78,8 +78,8 @@
}
}
-echo '<tr><td colspan=2 align=right><font size=4 color=BLUE>' . _('Total') . ':</font></td>
- <td align=right><font size=4 color=BLUE><U>' . number_format($TotalGLValue,2) . '</U></font></td></tr>';
+echo '<tr><td colspan=2 class=number><font size=4 color=BLUE>'...
[truncated message content] |
|
From: <dai...@us...> - 2009-12-10 08:18:30
|
Revision: 3148
http://web-erp.svn.sourceforge.net/web-erp/?rev=3148&view=rev
Author: daintree
Date: 2009-12-10 08:18:24 +0000 (Thu, 10 Dec 2009)
Log Message:
-----------
Made clear remaining link mean clear remaining someone relabelled it hopefully but forgot to change the code to actually do it
Modified Paths:
--------------
trunk/SelectOrderItems.php
trunk/includes/DefineCartClass.php
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2009-12-10 07:54:04 UTC (rev 3147)
+++ trunk/SelectOrderItems.php 2009-12-10 08:18:24 UTC (rev 3148)
@@ -998,10 +998,11 @@
if(isset($_GET['Delete'])){
//page called attempting to delete a line - GET['Delete'] = the line number to delete
- if($_SESSION['Items'.$identifier]->Some_Already_Delivered($_GET['Delete'])==0){
+ $QuantityAlreadyDelivered = $_SESSION['Items'.$identifier]->Some_Already_Delivered($_GET['Delete']);
+ if($QuantityAlreadyDelivered == 0){
$_SESSION['Items'.$identifier]->remove_from_cart($_GET['Delete'], 'Yes'); /*Do update DB */
} else {
- prnMsg( _('This item cannot be deleted because some of it has already been invoiced'),'warn');
+ $_SESSION['Items'.$identifier]->LineItems[$_GET['Delete']]->Quantity = $QuantityAlreadyDelivered;
}
}
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2009-12-10 07:54:04 UTC (rev 3147)
+++ trunk/includes/DefineCartClass.php 2009-12-10 08:18:24 UTC (rev 3148)
@@ -268,7 +268,7 @@
/* Checks if there have been deliveries of a specific line item */
if ($this->LineItems[$LineNumber]->QtyInv !=0){
- return 1;
+ return $this->LineItems[$LineNumber]->QtyInv;
}
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-11 10:02:29
|
Revision: 3149
http://web-erp.svn.sourceforge.net/web-erp/?rev=3149&view=rev
Author: tim_schofield
Date: 2009-12-11 10:01:53 +0000 (Fri, 11 Dec 2009)
Log Message:
-----------
Add ORDER BY to show the supplier info in effective date order. Ensure that preferred supplier is shown first, and provide a direct link to purchase ordering.
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/doc/Change.log.html
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2009-12-10 08:18:24 UTC (rev 3148)
+++ trunk/SelectProduct.php 2009-12-11 10:01:53 UTC (rev 3149)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.49 $ */
+/* $Revision: 1.50 $ */
$PageSecurity = 2;
$PricesSecurity = 9;
@@ -718,7 +718,8 @@
purchdata.preferred
FROM purchdata INNER JOIN suppliers
ON purchdata.supplierno=suppliers.supplierid
- WHERE purchdata.stockid = '" . $StockID . "'",
+ WHERE purchdata.stockid = '" . $StockID . "'
+ ORDER BY purchdata.preferred DESC, purchdata.effectivefrom DESC",
$db);
while ($SuppRow = DB_fetch_array($SuppResult)) {
echo '<tr><td>' . $SuppRow['suppname'] . '</td>
@@ -735,6 +736,7 @@
echo '<td>' . _('No') . '</td>';
break;
}
+ echo '<td><a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity=1">' . _('Order') . ' </a></td>';
echo '</tr>';
}
echo '</tr></table></td>';
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-12-10 08:18:24 UTC (rev 3148)
+++ trunk/doc/Change.log.html 2009-12-11 10:01:53 UTC (rev 3149)
@@ -1,5 +1,7 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>11/12/09 Tim: SelectProducts.php - Ensure that preferred supplier is shown first, and provide a direct link to purchase ordering.
+<p>11/12/09 Pak Ricard: Selectproduct.php - Add ORDER BY to show the supplier info in effective date order.
<p>09/12/09 Tim: Correctly align numbers in tables.
<p>09/12/09 Pak Ricard: upgrade3.11-3.12.sql - Correct inconsistency with area code field length in cogsglpostings table
<p>04/12/09 Tim: SpecialOrder.php - Correction to produce sales order correctly
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-11 10:23:27
|
Revision: 3150
http://web-erp.svn.sourceforge.net/web-erp/?rev=3150&view=rev
Author: tim_schofield
Date: 2009-12-11 10:23:18 +0000 (Fri, 11 Dec 2009)
Log Message:
-----------
Print the correct suppliers unit of measure.
Modified Paths:
--------------
trunk/PO_PDFPurchOrder.php
trunk/doc/Change.log.html
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2009-12-11 10:01:53 UTC (rev 3149)
+++ trunk/PO_PDFPurchOrder.php 2009-12-11 10:23:18 UTC (rev 3150)
@@ -157,11 +157,13 @@
deliverydate,
itemdescription,
unitprice,
- units,
+ unitname as units,
quantityord,
decimalplaces
FROM purchorderdetails LEFT JOIN stockmaster
ON purchorderdetails.itemcode=stockmaster.stockid
+ LEFT JOIN unitsofmeasure
+ ON purchorderdetails.uom=unitsofmeasure.unitid
WHERE orderno =" . $OrderNo;
$result=DB_query($sql,$db);
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-12-11 10:01:53 UTC (rev 3149)
+++ trunk/doc/Change.log.html 2009-12-11 10:23:18 UTC (rev 3150)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>11/12/09 Tim: PO_PDFPurchOrder.php - Print the correct suppliers unit of measure.
<p>11/12/09 Tim: SelectProducts.php - Ensure that preferred supplier is shown first, and provide a direct link to purchase ordering.
<p>11/12/09 Pak Ricard: Selectproduct.php - Add ORDER BY to show the supplier info in effective date order.
<p>09/12/09 Tim: Correctly align numbers in tables.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-11 14:30:36
|
Revision: 3152
http://web-erp.svn.sourceforge.net/web-erp/?rev=3152&view=rev
Author: tim_schofield
Date: 2009-12-11 14:28:49 +0000 (Fri, 11 Dec 2009)
Log Message:
-----------
Updating the eol-style on all files
Modified Paths:
--------------
branches/3.11-UTF8/ConfirmDispatch_Invoice.php
branches/3.11-UTF8/CustomerBranches.php
branches/3.11-UTF8/DemandWorkOrders.php
branches/3.11-UTF8/Logout.php
branches/3.11-UTF8/Numbers/Words/lang.et.php
branches/3.11-UTF8/PrintSalesOrder_generic.php
branches/3.11-UTF8/SelectSalesOrder.php
branches/3.11-UTF8/Suppliers.php
branches/3.11-UTF8/SystemParameters.php
branches/3.11-UTF8/WOSerialNos.php
branches/3.11-UTF8/Z_MakeNewCompany.php
branches/3.11-UTF8/Z_poAdmin.php
branches/3.11-UTF8/Z_poEditLangHeader.php
branches/3.11-UTF8/api/api_locations.php
branches/3.11-UTF8/api/api_salesorders.php
branches/3.11-UTF8/doc/INSTALL.txt
branches/3.11-UTF8/doc/Manual/ManualSalesAnalysis.html
branches/3.11-UTF8/fonts/helvetica.php
branches/3.11-UTF8/fonts/helveticab.php
branches/3.11-UTF8/fonts/helveticabi.php
branches/3.11-UTF8/fonts/helveticai.php
branches/3.11-UTF8/fonts/makefont/makefont.php
branches/3.11-UTF8/fonts/times.php
branches/3.11-UTF8/fonts/timesb.php
branches/3.11-UTF8/fonts/timesbi.php
branches/3.11-UTF8/fonts/timesi.php
branches/3.11-UTF8/fpdi/decoders/ASCII85Decode.php
branches/3.11-UTF8/fpdi/decoders/LZWDecode.php
branches/3.11-UTF8/fpdi/fpdf_tpl.php
branches/3.11-UTF8/fpdi/fpdi.php
branches/3.11-UTF8/fpdi/fpdi_pdf_parser.php
branches/3.11-UTF8/fpdi/pdf_context.php
branches/3.11-UTF8/fpdi/pdf_parser.php
branches/3.11-UTF8/fpdi/wrapper_functions.php
branches/3.11-UTF8/geocode.php
branches/3.11-UTF8/includes/PDFSalesOrder_generic.inc
branches/3.11-UTF8/install/index.php
branches/3.11-UTF8/install/save.php
branches/3.11-UTF8/install/timezone.php
branches/3.11-UTF8/reportwriter/WriteReport.inc
branches/3.11-UTF8/reportwriter/admin/forms/ReportsRename.html
branches/3.11-UTF8/reportwriter/forms/ReportsFilter.html
branches/3.11-UTF8/reportwriter/forms/ReportsList.html
branches/3.11-UTF8/reportwriter/forms/ReportsPageUpdate.html
branches/3.11-UTF8/reportwriter/forms/ReportsSave.html
branches/3.11-stable/ConfirmDispatch_Invoice.php
branches/3.11-stable/CustomerBranches.php
branches/3.11-stable/DemandWorkOrders.php
branches/3.11-stable/Logout.php
branches/3.11-stable/Numbers/Words/lang.et.php
branches/3.11-stable/PrintSalesOrder_generic.php
branches/3.11-stable/Suppliers.php
branches/3.11-stable/SystemParameters.php
branches/3.11-stable/WOSerialNos.php
branches/3.11-stable/Z_MakeNewCompany.php
branches/3.11-stable/Z_poAdmin.php
branches/3.11-stable/Z_poEditLangHeader.php
branches/3.11-stable/api/api_locations.php
branches/3.11-stable/api/api_salesorders.php
branches/3.11-stable/doc/INSTALL.txt
branches/3.11-stable/doc/Manual/ManualSalesAnalysis.html
branches/3.11-stable/fonts/helvetica.php
branches/3.11-stable/fonts/helveticab.php
branches/3.11-stable/fonts/helveticabi.php
branches/3.11-stable/fonts/helveticai.php
branches/3.11-stable/fonts/makefont/makefont.php
branches/3.11-stable/fonts/times.php
branches/3.11-stable/fonts/timesb.php
branches/3.11-stable/fonts/timesbi.php
branches/3.11-stable/fonts/timesi.php
branches/3.11-stable/fpdi/decoders/ASCII85Decode.php
branches/3.11-stable/fpdi/decoders/LZWDecode.php
branches/3.11-stable/fpdi/fpdf_tpl.php
branches/3.11-stable/fpdi/fpdi.php
branches/3.11-stable/fpdi/fpdi_pdf_parser.php
branches/3.11-stable/fpdi/pdf_context.php
branches/3.11-stable/fpdi/pdf_parser.php
branches/3.11-stable/fpdi/wrapper_functions.php
branches/3.11-stable/geocode.php
branches/3.11-stable/includes/PDFSalesOrder_generic.inc
branches/3.11-stable/install/index.php
branches/3.11-stable/install/save.php
branches/3.11-stable/install/timezone.php
branches/3.11-stable/reportwriter/WriteReport.inc
branches/3.11-stable/reportwriter/admin/forms/ReportsRename.html
branches/3.11-stable/reportwriter/forms/ReportsFilter.html
branches/3.11-stable/reportwriter/forms/ReportsList.html
branches/3.11-stable/reportwriter/forms/ReportsPageUpdate.html
branches/3.11-stable/reportwriter/forms/ReportsSave.html
branches/TAX_CHANGES/Z_poAddLanguage.php
branches/TAX_CHANGES/Z_poAdmin.php
branches/TAX_CHANGES/Z_poEditLangHeader.php
branches/TAX_CHANGES/Z_poRebuildDefault.php
branches/TAX_CHANGES/doc/INSTALL.txt
branches/TAX_CHANGES/doc/Manual/ManualARInquiries.html
branches/TAX_CHANGES/doc/Manual/ManualARReports.html
branches/TAX_CHANGES/doc/Manual/ManualARTransactions.html
branches/TAX_CHANGES/doc/Manual/ManualAccountsReceivable.html
branches/TAX_CHANGES/doc/Manual/ManualContents.php
branches/TAX_CHANGES/doc/Manual/ManualContributors.html
branches/TAX_CHANGES/doc/Manual/ManualCreatingNewSystem.html
branches/TAX_CHANGES/doc/Manual/ManualCreditStatus.html
branches/TAX_CHANGES/doc/Manual/ManualFooter.html
branches/TAX_CHANGES/doc/Manual/ManualGeneralLedger.html
branches/TAX_CHANGES/doc/Manual/ManualGettingStarted.html
branches/TAX_CHANGES/doc/Manual/ManualHeader.html
branches/TAX_CHANGES/doc/Manual/ManualIntroduction.html
branches/TAX_CHANGES/doc/Manual/ManualInventory.html
branches/TAX_CHANGES/doc/Manual/ManualMultilanguage.html
branches/TAX_CHANGES/doc/Manual/ManualNewScripts.html
branches/TAX_CHANGES/doc/Manual/ManualPaymentTerms.html
branches/TAX_CHANGES/doc/Manual/ManualPrices.html
branches/TAX_CHANGES/doc/Manual/ManualSalesAnalysis.html
branches/TAX_CHANGES/doc/Manual/ManualSalesOrders.html
branches/TAX_CHANGES/doc/Manual/ManualSalesPeople.html
branches/TAX_CHANGES/doc/Manual/ManualSalesTypes.html
branches/TAX_CHANGES/doc/Manual/ManualSecuritySchema.html
branches/TAX_CHANGES/doc/Manual/ManualShipments.html
branches/TAX_CHANGES/doc/Manual/ManualSpecialUtilities.html
branches/TAX_CHANGES/doc/Manual/ManualSystemConventions.html
branches/TAX_CHANGES/doc/Manual/ManualTax.html
branches/TAX_CHANGES/fonts/helveticabi.php
branches/TAX_CHANGES/fonts/makefont/makefont.php
branches/TAX_CHANGES/includes/fpdf.php
branches/rel2-9b/Logout.php
branches/rel2-9b/Z_poAddLanguage.php
branches/rel2-9b/Z_poAdmin.php
branches/rel2-9b/Z_poEditLangHeader.php
branches/rel2-9b/Z_poEditLangModule.php
branches/rel2-9b/Z_poRebuildDefault.php
branches/rel2-9b/doc/INSTALL.txt
branches/rel2-9b/doc/Manual/ManualARInquiries.html
branches/rel2-9b/doc/Manual/ManualARReports.html
branches/rel2-9b/doc/Manual/ManualARTransactions.html
branches/rel2-9b/doc/Manual/ManualAccountsReceivable.html
branches/rel2-9b/doc/Manual/ManualContents.php
branches/rel2-9b/doc/Manual/ManualContributors.html
branches/rel2-9b/doc/Manual/ManualCreatingNewSystem.html
branches/rel2-9b/doc/Manual/ManualCreditStatus.html
branches/rel2-9b/doc/Manual/ManualFooter.html
branches/rel2-9b/doc/Manual/ManualGeneralLedger.html
branches/rel2-9b/doc/Manual/ManualGettingStarted.html
branches/rel2-9b/doc/Manual/ManualHeader.html
branches/rel2-9b/doc/Manual/ManualIntroduction.html
branches/rel2-9b/doc/Manual/ManualInventory.html
branches/rel2-9b/doc/Manual/ManualMultilanguage.html
branches/rel2-9b/doc/Manual/ManualNewScripts.html
branches/rel2-9b/doc/Manual/ManualPaymentTerms.html
branches/rel2-9b/doc/Manual/ManualPrices.html
branches/rel2-9b/doc/Manual/ManualSalesAnalysis.html
branches/rel2-9b/doc/Manual/ManualSalesOrders.html
branches/rel2-9b/doc/Manual/ManualSalesPeople.html
branches/rel2-9b/doc/Manual/ManualSalesTypes.html
branches/rel2-9b/doc/Manual/ManualSecuritySchema.html
branches/rel2-9b/doc/Manual/ManualShipments.html
branches/rel2-9b/doc/Manual/ManualSpecialUtilities.html
branches/rel2-9b/doc/Manual/ManualSystemConventions.html
branches/rel2-9b/doc/Manual/ManualTax.html
branches/rel2-9b/includes/Login.php
branches/utf-8/AgedDebtors.php
branches/utf-8/AgedSuppliers.php
branches/utf-8/BOMExtendedQty.php
branches/utf-8/BOMIndented.php
branches/utf-8/BOMIndentedReverse.php
branches/utf-8/BOMListing.php
branches/utf-8/ConfirmDispatch_Invoice.php
branches/utf-8/CustomerBranches.php
branches/utf-8/DebtorsAtPeriodEnd.php
branches/utf-8/DeliveryDetails.php
branches/utf-8/DemandWorkOrders.php
branches/utf-8/Factors.php
branches/utf-8/GLBalanceSheet.php
branches/utf-8/GLProfit_Loss.php
branches/utf-8/GoodsReceived.php
branches/utf-8/InventoryQuantities.php
branches/utf-8/InventoryValuation.php
branches/utf-8/Logout.php
branches/utf-8/MRPPlannedPurchaseOrders.php
branches/utf-8/MRPPlannedWorkOrders.php
branches/utf-8/MRPReport.php
branches/utf-8/MRPReschedules.php
branches/utf-8/MRPShortages.php
branches/utf-8/Numbers/Words/lang.et.php
branches/utf-8/OutstandingGRNs.php
branches/utf-8/PDFBankingSummary.php
branches/utf-8/PDFChequeListing.php
branches/utf-8/PDFCustomerList.php
branches/utf-8/PDFDIFOT.php
branches/utf-8/PDFDeliveryDifferences.php
branches/utf-8/PDFGrn.php
branches/utf-8/PDFLowGP.php
branches/utf-8/PDFOrderStatus.php
branches/utf-8/PDFOrdersInvoiced.php
branches/utf-8/PDFPriceList.php
branches/utf-8/PDFQuotation.php
branches/utf-8/PDFReceipt.php
branches/utf-8/PDFStockCheckComparison.php
branches/utf-8/PDFStockLocTransfer.php
branches/utf-8/PDFStockNegatives.php
branches/utf-8/PDFStockTransfer.php
branches/utf-8/PDFTopItems.php
branches/utf-8/PO_Header.php
branches/utf-8/PO_Items.php
branches/utf-8/PO_OrderDetails.php
branches/utf-8/PO_PDFPurchOrder.php
branches/utf-8/PO_SelectOSPurchOrder.php
branches/utf-8/PaymentTerms.php
branches/utf-8/PrintCheque.php
branches/utf-8/PrintCustOrder_generic.php
branches/utf-8/PrintCustStatements.php
branches/utf-8/PrintCustTransPortrait.php
branches/utf-8/PrintSalesOrder_generic.php
branches/utf-8/ReorderLevel.php
branches/utf-8/SelectCustomer.php
branches/utf-8/SelectSalesOrder.php
branches/utf-8/Suppliers.php
branches/utf-8/Tax.php
branches/utf-8/WOSerialNos.php
branches/utf-8/Z_CreateCompanyTemplateFile.php
branches/utf-8/Z_MakeNewCompany.php
branches/utf-8/Z_poAdmin.php
branches/utf-8/Z_poEditLangHeader.php
branches/utf-8/api/api_locations.php
branches/utf-8/api/api_salesorders.php
branches/utf-8/doc/INSTALL.txt
branches/utf-8/doc/Manual/ManualSalesAnalysis.html
branches/utf-8/fpdi/decoders/ASCII85Decode.php
branches/utf-8/fpdi/decoders/LZWDecode.php
branches/utf-8/fpdi/fpdf_tpl.php
branches/utf-8/fpdi/fpdi.php
branches/utf-8/fpdi/fpdi_pdf_parser.php
branches/utf-8/fpdi/pdf_context.php
branches/utf-8/fpdi/pdf_parser.php
branches/utf-8/fpdi/wrapper_functions-borrar.php
branches/utf-8/geocode.php
branches/utf-8/includes/ConnectDB.inc
branches/utf-8/includes/DefinePOClass.php
branches/utf-8/includes/LanguageSetup.php
branches/utf-8/includes/PDFSalesOrder_generic.inc
branches/utf-8/includes/PDFStarter.php
branches/utf-8/includes/class.pdf.php
branches/utf-8/includes/tcpdf/2dbarcodes.php
branches/utf-8/includes/tcpdf/CHANGELOG.TXT
branches/utf-8/includes/tcpdf/README.TXT
branches/utf-8/includes/tcpdf/barcodes.php
branches/utf-8/includes/tcpdf/cache/utf8test.txt
branches/utf-8/includes/tcpdf/config/lang/eng.php
branches/utf-8/includes/tcpdf/config/lang/ita.php
branches/utf-8/includes/tcpdf/config/tcpdf_config (original).php
branches/utf-8/includes/tcpdf/config/tcpdf_config.php
branches/utf-8/includes/tcpdf/config/tcpdf_config_alt.php
branches/utf-8/includes/tcpdf/doc/com-tecnick-tcpdf/_unicode_data.php.html
branches/utf-8/includes/tcpdf/doc/media/style.css
branches/utf-8/includes/tcpdf/examples/example_001.php
branches/utf-8/includes/tcpdf/examples/example_002.php
branches/utf-8/includes/tcpdf/examples/example_003.php
branches/utf-8/includes/tcpdf/examples/example_004.php
branches/utf-8/includes/tcpdf/examples/example_005.php
branches/utf-8/includes/tcpdf/examples/example_006.php
branches/utf-8/includes/tcpdf/examples/example_007.php
branches/utf-8/includes/tcpdf/examples/example_008.php
branches/utf-8/includes/tcpdf/examples/example_009.php
branches/utf-8/includes/tcpdf/examples/example_010.php
branches/utf-8/includes/tcpdf/examples/example_011.php
branches/utf-8/includes/tcpdf/examples/example_012.php
branches/utf-8/includes/tcpdf/examples/example_013.php
branches/utf-8/includes/tcpdf/examples/example_014.php
branches/utf-8/includes/tcpdf/examples/example_015.php
branches/utf-8/includes/tcpdf/examples/example_016.php
branches/utf-8/includes/tcpdf/examples/example_017.php
branches/utf-8/includes/tcpdf/examples/example_018.php
branches/utf-8/includes/tcpdf/examples/example_019.php
branches/utf-8/includes/tcpdf/examples/example_020.php
branches/utf-8/includes/tcpdf/examples/example_021.php
branches/utf-8/includes/tcpdf/examples/example_022.php
branches/utf-8/includes/tcpdf/examples/example_023.php
branches/utf-8/includes/tcpdf/examples/example_024.php
branches/utf-8/includes/tcpdf/examples/example_025.php
branches/utf-8/includes/tcpdf/examples/example_026.php
branches/utf-8/includes/tcpdf/examples/example_027.php
branches/utf-8/includes/tcpdf/examples/example_028.php
branches/utf-8/includes/tcpdf/examples/example_029.php
branches/utf-8/includes/tcpdf/examples/example_030.php
branches/utf-8/includes/tcpdf/examples/example_031.php
branches/utf-8/includes/tcpdf/examples/example_032.php
branches/utf-8/includes/tcpdf/examples/example_033.php
branches/utf-8/includes/tcpdf/examples/example_034.php
branches/utf-8/includes/tcpdf/examples/example_035.php
branches/utf-8/includes/tcpdf/examples/example_036.php
branches/utf-8/includes/tcpdf/examples/example_037.php
branches/utf-8/includes/tcpdf/examples/example_038.php
branches/utf-8/includes/tcpdf/examples/example_039.php
branches/utf-8/includes/tcpdf/examples/example_040.php
branches/utf-8/includes/tcpdf/examples/example_041.php
branches/utf-8/includes/tcpdf/examples/example_042.php
branches/utf-8/includes/tcpdf/examples/example_043.php
branches/utf-8/includes/tcpdf/examples/example_044.php
branches/utf-8/includes/tcpdf/examples/example_045.php
branches/utf-8/includes/tcpdf/examples/example_046.php
branches/utf-8/includes/tcpdf/examples/example_047.php
branches/utf-8/includes/tcpdf/examples/example_048.php
branches/utf-8/includes/tcpdf/examples/example_049.php
branches/utf-8/includes/tcpdf/examples/example_050.php
branches/utf-8/includes/tcpdf/examples/example_051.php
branches/utf-8/includes/tcpdf/examples/example_052.php
branches/utf-8/includes/tcpdf/fonts/almohanad.php
branches/utf-8/includes/tcpdf/fonts/arialunicid0.php
branches/utf-8/includes/tcpdf/fonts/javiergb.php
branches/utf-8/includes/tcpdf/fonts/javierjp.php
branches/utf-8/includes/tcpdf/fonts/symbol.php
branches/utf-8/includes/tcpdf/fonts/utils/makeallttffonts.php
branches/utf-8/includes/tcpdf/fonts/zapfdingbats.php
branches/utf-8/includes/tcpdf/fonts/zarbold.php
branches/utf-8/includes/tcpdf/htmlcolors.php
branches/utf-8/includes/tcpdf/tcpdf.php
branches/utf-8/includes/tcpdf/unicode_data.php
branches/utf-8/install/index.php
branches/utf-8/install/save.php
branches/utf-8/install/timezone.php
branches/utf-8/reportwriter/WriteReport.inc
branches/utf-8/reportwriter/admin/forms/ReportsRename.html
branches/utf-8/reportwriter/forms/ReportsFilter.html
branches/utf-8/reportwriter/forms/ReportsList.html
branches/utf-8/reportwriter/forms/ReportsPageUpdate.html
branches/utf-8/reportwriter/forms/ReportsSave.html
branches/utf-8/sql/mysql/upgrade3.12-3.13.sql
trunk/ConfirmDispatch_Invoice.php
trunk/CustomerBranches.php
trunk/DeliveryDetails.php
trunk/DemandWorkOrders.php
trunk/Factors.php
trunk/GLBalanceSheet.php
trunk/Logout.php
trunk/Numbers/Words/lang.et.php
trunk/PaymentTerms.php
trunk/PrintSalesOrder_generic.php
trunk/SelectCustomer.php
trunk/SelectSalesOrder.php
trunk/Suppliers.php
trunk/WOSerialNos.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_MakeNewCompany.php
trunk/Z_poAdmin.php
trunk/Z_poEditLangHeader.php
trunk/api/api_locations.php
trunk/api/api_salesorders.php
trunk/doc/INSTALL.txt
trunk/doc/Manual/ManualSalesAnalysis.html
trunk/fonts/helvetica.php
trunk/fonts/helveticab.php
trunk/fonts/helveticabi.php
trunk/fonts/helveticai.php
trunk/fonts/makefont/makefont.php
trunk/fonts/times.php
trunk/fonts/timesb.php
trunk/fonts/timesbi.php
trunk/fonts/timesi.php
trunk/fpdi/decoders/ASCII85Decode.php
trunk/fpdi/decoders/LZWDecode.php
trunk/fpdi/fpdf_tpl.php
trunk/fpdi/fpdi.php
trunk/fpdi/fpdi_pdf_parser.php
trunk/fpdi/pdf_context.php
trunk/fpdi/pdf_parser.php
trunk/fpdi/wrapper_functions.php
trunk/geocode.php
trunk/includes/ConnectDB.inc
trunk/includes/PDFSalesOrder_generic.inc
trunk/install/index.php
trunk/install/save.php
trunk/install/timezone.php
trunk/reportwriter/WriteReport.inc
trunk/reportwriter/admin/forms/ReportsRename.html
trunk/reportwriter/forms/ReportsFilter.html
trunk/reportwriter/forms/ReportsList.html
trunk/reportwriter/forms/ReportsPageUpdate.html
trunk/reportwriter/forms/ReportsSave.html
Property Changed:
----------------
branches/3.11-UTF8/AccountGroups.php
branches/3.11-UTF8/AccountSections.php
branches/3.11-UTF8/AddCustomerContacts.php
branches/3.11-UTF8/AddCustomerNotes.php
branches/3.11-UTF8/AddCustomerTypeNotes.php
branches/3.11-UTF8/AgedDebtors.php
branches/3.11-UTF8/AgedSuppliers.php
branches/3.11-UTF8/Areas.php
branches/3.11-UTF8/AuditTrail.php
branches/3.11-UTF8/BOMExtendedQty.php
branches/3.11-UTF8/BOMIndented.php
branches/3.11-UTF8/BOMIndentedReverse.php
branches/3.11-UTF8/BOMInquiry.php
branches/3.11-UTF8/BOMListing.php
branches/3.11-UTF8/BOMs.php
branches/3.11-UTF8/BankAccounts.php
branches/3.11-UTF8/BankMatching.php
branches/3.11-UTF8/BankReconciliation.php
branches/3.11-UTF8/COGSGLPostings.php
branches/3.11-UTF8/CompanyPreferences.php
branches/3.11-UTF8/ConfirmDispatchControlled_Invoice.php
branches/3.11-UTF8/ConfirmDispatch_Invoice.php
branches/3.11-UTF8/CreditItemsControlled.php
branches/3.11-UTF8/CreditStatus.php
branches/3.11-UTF8/Credit_Invoice.php
branches/3.11-UTF8/Currencies.php
branches/3.11-UTF8/CustEDISetup.php
branches/3.11-UTF8/CustLoginSetup.php
branches/3.11-UTF8/CustWhereAlloc.php
branches/3.11-UTF8/CustomerAllocations.php
branches/3.11-UTF8/CustomerBranches.php
branches/3.11-UTF8/CustomerInquiry.php
branches/3.11-UTF8/CustomerReceipt.php
branches/3.11-UTF8/CustomerTransInquiry.php
branches/3.11-UTF8/CustomerTypes.php
branches/3.11-UTF8/Customers.php
branches/3.11-UTF8/DebtorsAtPeriodEnd.php
branches/3.11-UTF8/DeliveryDetails.php
branches/3.11-UTF8/DemandWorkOrders.php
branches/3.11-UTF8/DiscountCategories.php
branches/3.11-UTF8/DiscountMatrix.php
branches/3.11-UTF8/EDIMessageFormat.php
branches/3.11-UTF8/EDIProcessOrders.php
branches/3.11-UTF8/EDISendInvoices.php
branches/3.11-UTF8/EmailConfirmation.php
branches/3.11-UTF8/EmailCustTrans.php
branches/3.11-UTF8/ExchangeRateTrend.php
branches/3.11-UTF8/FTP_RadioBeacon.php
branches/3.11-UTF8/Factors.php
branches/3.11-UTF8/FreightCosts.php
branches/3.11-UTF8/GLAccountInquiry.php
branches/3.11-UTF8/GLAccounts.php
branches/3.11-UTF8/GLBalanceSheet.php
branches/3.11-UTF8/GLBudgets.php
branches/3.11-UTF8/GLCodesInquiry.php
branches/3.11-UTF8/GLJournal.php
branches/3.11-UTF8/GLProfit_Loss.php
branches/3.11-UTF8/GLTagProfit_Loss.php
branches/3.11-UTF8/GLTags.php
branches/3.11-UTF8/GLTransInquiry.php
branches/3.11-UTF8/GLTrialBalance.php
branches/3.11-UTF8/GeocodeSetup.php
branches/3.11-UTF8/GetStockImage.php
branches/3.11-UTF8/GoodsReceived.php
branches/3.11-UTF8/GoodsReceivedControlled.php
branches/3.11-UTF8/InventoryPlanning.php
branches/3.11-UTF8/InventoryPlanningPrefSupplier.php
branches/3.11-UTF8/InventoryQuantities.php
branches/3.11-UTF8/InventoryValuation.php
branches/3.11-UTF8/Locations.php
branches/3.11-UTF8/Logout.php
branches/3.11-UTF8/MRP.php
branches/3.11-UTF8/MRPCalendar.php
branches/3.11-UTF8/MRPCreateDemands.php
branches/3.11-UTF8/MRPDemandTypes.php
branches/3.11-UTF8/MRPDemands.php
branches/3.11-UTF8/MRPPlannedPurchaseOrders.php
branches/3.11-UTF8/MRPPlannedWorkOrders.php
branches/3.11-UTF8/MRPReport.php
branches/3.11-UTF8/MRPReschedules.php
branches/3.11-UTF8/MRPShortages.php
branches/3.11-UTF8/MailInventoryValuation.php
branches/3.11-UTF8/MailSalesReport.php
branches/3.11-UTF8/MailSalesReport_csv.php
branches/3.11-UTF8/Numbers/Words/lang.bg.php
branches/3.11-UTF8/Numbers/Words/lang.cs.php
branches/3.11-UTF8/Numbers/Words/lang.de.php
branches/3.11-UTF8/Numbers/Words/lang.dk.php
branches/3.11-UTF8/Numbers/Words/lang.en_100.php
branches/3.11-UTF8/Numbers/Words/lang.en_GB.php
branches/3.11-UTF8/Numbers/Words/lang.en_US.php
branches/3.11-UTF8/Numbers/Words/lang.es.php
branches/3.11-UTF8/Numbers/Words/lang.es_AR.php
branches/3.11-UTF8/Numbers/Words/lang.et.php
branches/3.11-UTF8/Numbers/Words/lang.fr.php
branches/3.11-UTF8/Numbers/Words/lang.fr_BE.php
branches/3.11-UTF8/Numbers/Words/lang.he.php
branches/3.11-UTF8/Numbers/Words/lang.hu_HU.php
branches/3.11-UTF8/Numbers/Words/lang.id.php
branches/3.11-UTF8/Numbers/Words/lang.it_IT.php
branches/3.11-UTF8/Numbers/Words/lang.lt.php
branches/3.11-UTF8/Numbers/Words/lang.nl.php
branches/3.11-UTF8/Numbers/Words/lang.pl.php
branches/3.11-UTF8/Numbers/Words/lang.pt_BR.php
branches/3.11-UTF8/Numbers/Words/lang.ru.php
branches/3.11-UTF8/Numbers/Words/lang.sv.php
branches/3.11-UTF8/Numbers/Words.php
branches/3.11-UTF8/OrderDetails.php
branches/3.11-UTF8/OutstandingGRNs.php
branches/3.11-UTF8/PDFBankingSummary.php
branches/3.11-UTF8/PDFChequeListing.php
branches/3.11-UTF8/PDFCustomerList.php
branches/3.11-UTF8/PDFDIFOT.php
branches/3.11-UTF8/PDFDeliveryDifferences.php
branches/3.11-UTF8/PDFGrn.php
branches/3.11-UTF8/PDFLowGP.php
branches/3.11-UTF8/PDFOrderStatus.php
branches/3.11-UTF8/PDFOrdersInvoiced.php
branches/3.11-UTF8/PDFPriceList.php
branches/3.11-UTF8/PDFQuotation.php
branches/3.11-UTF8/PDFStockCheckComparison.php
branches/3.11-UTF8/PDFStockLocTransfer.php
branches/3.11-UTF8/PDFStockNegatives.php
branches/3.11-UTF8/PDFStockTransfer.php
branches/3.11-UTF8/POReport.php
branches/3.11-UTF8/PO_AuthorisationLevels.php
branches/3.11-UTF8/PO_Chk_ShiptRef_JobRef.php
branches/3.11-UTF8/PO_Header.php
branches/3.11-UTF8/PO_Items.php
branches/3.11-UTF8/PO_OrderDetails.php
branches/3.11-UTF8/PO_PDFPurchOrder.php
branches/3.11-UTF8/PO_SelectOSPurchOrder.php
branches/3.11-UTF8/PO_SelectPurchOrder.php
branches/3.11-UTF8/PaymentAllocations.php
branches/3.11-UTF8/PaymentMethods.php
branches/3.11-UTF8/PaymentTerms.php
branches/3.11-UTF8/Payments.php
branches/3.11-UTF8/PeriodsInquiry.php
branches/3.11-UTF8/Prices.php
branches/3.11-UTF8/PricesBasedOnMarkUp.php
branches/3.11-UTF8/Prices_Customer.php
branches/3.11-UTF8/PrintCheque.php
branches/3.11-UTF8/PrintCustOrder.php
branches/3.11-UTF8/PrintCustOrder_generic.php
branches/3.11-UTF8/PrintCustStatements.php
branches/3.11-UTF8/PrintCustTrans.php
branches/3.11-UTF8/PrintCustTransPortrait.php
branches/3.11-UTF8/PrintSalesOrder_generic.php
branches/3.11-UTF8/PurchData.php
branches/3.11-UTF8/RecurringSalesOrders.php
branches/3.11-UTF8/RecurringSalesOrdersProcess.php
branches/3.11-UTF8/ReorderLevel.php
branches/3.11-UTF8/ReverseGRN.php
branches/3.11-UTF8/SalesAnalReptCols.php
branches/3.11-UTF8/SalesAnalRepts.php
branches/3.11-UTF8/SalesAnalysis_UserDefined.php
branches/3.11-UTF8/SalesCategories.php
branches/3.11-UTF8/SalesGLPostings.php
branches/3.11-UTF8/SalesGraph.php
branches/3.11-UTF8/SalesInquiry.php
branches/3.11-UTF8/SalesPeople.php
branches/3.11-UTF8/SalesTypes.php
branches/3.11-UTF8/SelectCompletedOrder.php
branches/3.11-UTF8/SelectCreditItems.php
branches/3.11-UTF8/SelectCustomer.php
branches/3.11-UTF8/SelectGLAccount.php
branches/3.11-UTF8/SelectOrderItems.php
branches/3.11-UTF8/SelectProduct.php
branches/3.11-UTF8/SelectRecurringSalesOrder.php
branches/3.11-UTF8/SelectSalesOrder.php
branches/3.11-UTF8/SelectSupplier.php
branches/3.11-UTF8/SelectWorkOrder.php
branches/3.11-UTF8/ShipmentCosting.php
branches/3.11-UTF8/Shipments.php
branches/3.11-UTF8/Shippers.php
branches/3.11-UTF8/Shipt_Select.php
branches/3.11-UTF8/ShiptsList.php
branches/3.11-UTF8/SpecialOrder.php
branches/3.11-UTF8/StockAdjustments.php
branches/3.11-UTF8/StockAdjustmentsControlled.php
branches/3.11-UTF8/StockCategories.php
branches/3.11-UTF8/StockCheck.php
branches/3.11-UTF8/StockCostUpdate.php
branches/3.11-UTF8/StockCounts.php
branches/3.11-UTF8/StockLocMovements.php
branches/3.11-UTF8/StockLocStatus.php
branches/3.11-UTF8/StockLocTransfer.php
branches/3.11-UTF8/StockLocTransferReceive.php
branches/3.11-UTF8/StockMovements.php
branches/3.11-UTF8/StockQties_csv.php
branches/3.11-UTF8/StockQuantityByDate.php
branches/3.11-UTF8/StockReorderLevel.php
branches/3.11-UTF8/StockSerialItemResearch.php
branches/3.11-UTF8/StockSerialItems.php
branches/3.11-UTF8/StockStatus.php
branches/3.11-UTF8/StockTransferControlled.php
branches/3.11-UTF8/StockTransfers.php
branches/3.11-UTF8/StockUsage.php
branches/3.11-UTF8/StockUsageGraph.php
branches/3.11-UTF8/Stocks.php
branches/3.11-UTF8/SuppCreditGRNs.php
branches/3.11-UTF8/SuppInvGLAnalysis.php
branches/3.11-UTF8/SuppInvGRNs.php
branches/3.11-UTF8/SuppPaymentRun.php
branches/3.11-UTF8/SuppShiptChgs.php
branches/3.11-UTF8/SuppTransGLAnalysis.php
branches/3.11-UTF8/SupplierAllocations.php
branches/3.11-UTF8/SupplierBalsAtPeriodEnd.php
branches/3.11-UTF8/SupplierContacts.php
branches/3.11-UTF8/SupplierCredit.php
branches/3.11-UTF8/SupplierInquiry.php
branches/3.11-UTF8/SupplierInvoice.php
branches/3.11-UTF8/SupplierTransInquiry.php
branches/3.11-UTF8/Suppliers.php
branches/3.11-UTF8/SystemCheck.php
branches/3.11-UTF8/SystemParameters.php
branches/3.11-UTF8/Tax.php
branches/3.11-UTF8/TaxAuthorities.php
branches/3.11-UTF8/TaxAuthorityRates.php
branches/3.11-UTF8/TaxCategories.php
branches/3.11-UTF8/TaxGroups.php
branches/3.11-UTF8/TaxProvinces.php
branches/3.11-UTF8/UnitsOfMeasure.php
branches/3.11-UTF8/UserSettings.php
branches/3.11-UTF8/WOSerialNos.php
branches/3.11-UTF8/WWW_Access.php
branches/3.11-UTF8/WWW_Users.php
branches/3.11-UTF8/WhereUsedInquiry.php
branches/3.11-UTF8/WorkCentres.php
branches/3.11-UTF8/WorkOrderCosting.php
branches/3.11-UTF8/WorkOrderEntry.php
branches/3.11-UTF8/WorkOrderIssue.php
branches/3.11-UTF8/WorkOrderReceive.php
branches/3.11-UTF8/WorkOrderStatus.php
branches/3.11-UTF8/Z_ChangeBranchCode.php
branches/3.11-UTF8/Z_ChangeCustomerCode.php
branches/3.11-UTF8/Z_ChangeStockCode.php
branches/3.11-UTF8/Z_CheckAllocationsFrom.php
branches/3.11-UTF8/Z_CheckAllocs.php
branches/3.11-UTF8/Z_CheckDebtorsControl.php
branches/3.11-UTF8/Z_CheckGLTransBalance.php
branches/3.11-UTF8/Z_CopyBOM.php
branches/3.11-UTF8/Z_CreateChartDetails.php
branches/3.11-UTF8/Z_CreateCompany.php
branches/3.11-UTF8/Z_CurrencyDebtorsBalances.php
branches/3.11-UTF8/Z_CurrencySuppliersBalances.php
branches/3.11-UTF8/Z_DataExport.php
branches/3.11-UTF8/Z_DeleteCreditNote.php
branches/3.11-UTF8/Z_DeleteInvoice.php
branches/3.11-UTF8/Z_DeleteSalesTransActions.php
branches/3.11-UTF8/Z_DescribeTable.php
branches/3.11-UTF8/Z_ImportChartOfAccounts.php
branches/3.11-UTF8/Z_ImportGLAccountGroups.php
branches/3.11-UTF8/Z_ImportGLAccountSections.php
branches/3.11-UTF8/Z_ImportPartCodes.php
branches/3.11-UTF8/Z_ImportStocks.php
branches/3.11-UTF8/Z_MakeNewCompany.php
branches/3.11-UTF8/Z_MakeStockLocns.php
branches/3.11-UTF8/Z_PriceChanges.php
branches/3.11-UTF8/Z_ReApplyCostToSA.php
branches/3.11-UTF8/Z_RePostGLFromPeriod.php
branches/3.11-UTF8/Z_ReverseSuppPaymentRun.php
branches/3.11-UTF8/Z_SalesIntegrityCheck.php
branches/3.11-UTF8/Z_UpdateChartDetailsBFwd.php
branches/3.11-UTF8/Z_Upgrade3.10.php
branches/3.11-UTF8/Z_Upgrade_3.01-3.02.php
branches/3.11-UTF8/Z_Upgrade_3.04-3.05.php
branches/3.11-UTF8/Z_Upgrade_3.05-3.06.php
branches/3.11-UTF8/Z_Upgrade_3.07-3.08.php
branches/3.11-UTF8/Z_Upgrade_3.08-3.09.php
branches/3.11-UTF8/Z_Upgrade_3.09-3.10.php
branches/3.11-UTF8/Z_Upgrade_3.10-3.11.php
branches/3.11-UTF8/Z_UploadForm.php
branches/3.11-UTF8/Z_UploadResult.php
branches/3.11-UTF8/Z_index.php
branches/3.11-UTF8/Z_poAddLanguage.php
branches/3.11-UTF8/Z_poAdmin.php
branches/3.11-UTF8/Z_poEditLangHeader.php
branches/3.11-UTF8/Z_poEditLangModule.php
branches/3.11-UTF8/Z_poEditLangRemaining.php
branches/3.11-UTF8/Z_poRebuildDefault.php
branches/3.11-UTF8/api/api_branches.php
branches/3.11-UTF8/api/api_currencies.php
branches/3.11-UTF8/api/api_customers.php
branches/3.11-UTF8/api/api_customertypes.php
branches/3.11-UTF8/api/api_debtortransactions.php
branches/3.11-UTF8/api/api_errorcodes.php
branches/3.11-UTF8/api/api_glaccounts.php
branches/3.11-UTF8/api/api_glgroups.php
branches/3.11-UTF8/api/api_glsections.php
branches/3.11-UTF8/api/api_holdreasons.php
branches/3.11-UTF8/api/api_locations.php
branches/3.11-UTF8/api/api_paymentterms.php
branches/3.11-UTF8/api/api_php.php
branches/3.11-UTF8/api/api_purchdata.php
branches/3.11-UTF8/api/api_salesareas.php
branches/3.11-UTF8/api/api_salesman.php
branches/3.11-UTF8/api/api_salesorders.php
branches/3.11-UTF8/api/api_salestypes.php
branches/3.11-UTF8/api/api_shippers.php
branches/3.11-UTF8/api/api_stock.php
branches/3.11-UTF8/api/api_stockcategories.php
branches/3.11-UTF8/api/api_suppliers.php
branches/3.11-UTF8/api/api_taxgroups.php
branches/3.11-UTF8/api/api_webERPsettings.php
branches/3.11-UTF8/api/api_workorders.php
branches/3.11-UTF8/api/api_xml-rpc.php
branches/3.11-UTF8/companies/weberpdemo/reportwriter/CustomerList.rpt.txt
branches/3.11-UTF8/companies/weberpdemo/reportwriter/InvoiceReport.rpt.txt
branches/3.11-UTF8/config.distrib.php
branches/3.11-UTF8/css/default/default.css
branches/3.11-UTF8/css/default/login.css
branches/3.11-UTF8/css/fresh/default.css
branches/3.11-UTF8/css/fresh/login.css
branches/3.11-UTF8/css/gel/default.css
branches/3.11-UTF8/css/gel/login.css
branches/3.11-UTF8/css/jelly/default.css
branches/3.11-UTF8/css/jelly/login.css
branches/3.11-UTF8/css/jelly/readme.txt
branches/3.11-UTF8/css/professional/default.css
branches/3.11-UTF8/css/professional/login.css
branches/3.11-UTF8/css/professional- rtl/default.css
branches/3.11-UTF8/css/professional- rtl/login.css
branches/3.11-UTF8/css/silverwolf/default.css
branches/3.11-UTF8/css/silverwolf/login.css
branches/3.11-UTF8/doc/Change.log.html
branches/3.11-UTF8/doc/INSTALL.txt
branches/3.11-UTF8/doc/LICENSE.txt
branches/3.11-UTF8/doc/Manual/ManualAPIFunctions.php
branches/3.11-UTF8/doc/Manual/ManualARInquiries.html
branches/3.11-UTF8/doc/Manual/ManualARReports.html
branches/3.11-UTF8/doc/Manual/ManualARTransactions.html
branches/3.11-UTF8/doc/Manual/ManualAccountsPayable.html
branches/3.11-UTF8/doc/Manual/ManualAccountsReceivable.html
branches/3.11-UTF8/doc/Manual/ManualContents.php
branches/3.11-UTF8/doc/Manual/ManualContributors.html
branches/3.11-UTF8/doc/Manual/ManualCreatingNewSystem.html
branches/3.11-UTF8/doc/Manual/ManualCreditStatus.html
branches/3.11-UTF8/doc/Manual/ManualCurrencies.html
branches/3.11-UTF8/doc/Manual/ManualDevelopmentStructure.html
branches/3.11-UTF8/doc/Manual/ManualFooter.html
branches/3.11-UTF8/doc/Manual/ManualGeneralLedger.html
branches/3.11-UTF8/doc/Manual/ManualGettingStarted.html
branches/3.11-UTF8/doc/Manual/ManualHeader.html
branches/3.11-UTF8/doc/Manual/ManualIntroduction.html
branches/3.11-UTF8/doc/Manual/ManualInventory.html
branches/3.11-UTF8/doc/Manual/ManualMRP.html
branches/3.11-UTF8/doc/Manual/ManualManufacturing.html
branches/3.11-UTF8/doc/Manual/ManualMultilanguage.html
branches/3.11-UTF8/doc/Manual/ManualNewScripts.html
branches/3.11-UTF8/doc/Manual/ManualPaymentTerms.html
branches/3.11-UTF8/doc/Manual/ManualPrices.html
branches/3.11-UTF8/doc/Manual/ManualReportBuilder.html
branches/3.11-UTF8/doc/Manual/ManualRequirements.html
branches/3.11-UTF8/doc/Manual/ManualSalesAnalysis.html
branches/3.11-UTF8/doc/Manual/ManualSalesOrders.html
branches/3.11-UTF8/doc/Manual/ManualSalesPeople.html
branches/3.11-UTF8/doc/Manual/ManualSalesTypes.html
branches/3.11-UTF8/doc/Manual/ManualSecuritySchema.html
branches/3.11-UTF8/doc/Manual/ManualShipments.html
branches/3.11-UTF8/doc/Manual/ManualSpecialUtilities.html
branches/3.11-UTF8/doc/Manual/ManualSystemConventions.html
branches/3.11-UTF8/doc/Manual/ManualTax.html
branches/3.11-UTF8/doc/README.txt
branches/3.11-UTF8/doc/UPGRADING.txt
branches/3.11-UTF8/fonts/courier.php
branches/3.11-UTF8/fonts/helvetica.php
branches/3.11-UTF8/fonts/helveticab.php
branches/3.11-UTF8/fonts/helveticabi.php
branches/3.11-UTF8/fonts/helveticai.php
branches/3.11-UTF8/fonts/makefont/cp1250.map
branches/3.11-UTF8/fonts/makefont/cp1251.map
branches/3.11-UTF8/fonts/makefont/cp1252.map
branches/3.11-UTF8/fonts/makefont/cp1253.map
branches/3.11-UTF8/fonts/makefont/cp1254.map
branches/3.11-UTF8/fonts/makefont/cp1255.map
branches/3.11-UTF8/fonts/makefont/cp1257.map
branches/3.11-UTF8/fonts/makefont/cp1258.map
branches/3.11-UTF8/fonts/makefont/cp874.map
branches/3.11-UTF8/fonts/makefont/iso-8859-1.map
branches/3.11-UTF8/fonts/makefont/iso-8859-11.map
branches/3.11-UTF8/fonts/makefont/iso-8859-15.map
branches/3.11-UTF8/fonts/makefont/iso-8859-16.map
branches/3.11-UTF8/fonts/makefont/iso-8859-2.map
branches/3.11-UTF8/fonts/makefont/iso-8859-4.map
branches/3.11-UTF8/fonts/makefont/iso-8859-5.map
branches/3.11-UTF8/fonts/makefont/iso-8859-7.map
branches/3.11-UTF8/fonts/makefont/iso-8859-9.map
branches/3.11-UTF8/fonts/makefont/koi8-r.map
branches/3.11-UTF8/fonts/makefont/koi8-u.map
branches/3.11-UTF8/fonts/makefont/makefont.php
branches/3.11-UTF8/fonts/symbol.php
branches/3.11-UTF8/fonts/times.php
branches/3.11-UTF8/fonts/timesb.php
branches/3.11-UTF8/fonts/timesbi.php
branches/3.11-UTF8/fonts/timesi.php
branches/3.11-UTF8/fpdi/decoders/ASCII85Decode.php
branches/3.11-UTF8/fpdi/decoders/LZWDecode.php
branches/3.11-UTF8/fpdi/fpdf_tpl.php
branches/3.11-UTF8/fpdi/fpdi.php
branches/3.11-UTF8/fpdi/fpdi_pdf_parser.php
branches/3.11-UTF8/fpdi/pdf_context.php
branches/3.11-UTF8/fpdi/pdf_parser.php
branches/3.11-UTF8/fpdi/wrapper_functions.php
branches/3.11-UTF8/geo_displaymap_customers.php
branches/3.11-UTF8/geo_displaymap_suppliers.php
branches/3.11-UTF8/geocode.php
branches/3.11-UTF8/geocode_genxml_customers.php
branches/3.11-UTF8/geocode_genxml_suppliers.php
branches/3.11-UTF8/includes/AccountSectionsDef.inc
branches/3.11-UTF8/includes/Add_SerialItems.php
branches/3.11-UTF8/includes/Add_SerialItemsOut.php
branches/3.11-UTF8/includes/CSVSalesAnalysis.inc
branches/3.11-UTF8/includes/ConnectDB.inc
branches/3.11-UTF8/includes/ConnectDB_mysql.inc
branches/3.11-UTF8/includes/ConnectDB_mysqli.inc
branches/3.11-UTF8/includes/ConnectDB_postgres.inc
branches/3.11-UTF8/includes/ConstructSQLForUserDefinedSalesReport.inc
branches/3.11-UTF8/includes/DateFunctions.inc
branches/3.11-UTF8/includes/DefineCartClass.php
branches/3.11-UTF8/includes/DefineCustAllocsClass.php
branches/3.11-UTF8/includes/DefineJournalClass.php
branches/3.11-UTF8/includes/DefinePOClass.php
branches/3.11-UTF8/includes/DefinePaymentClass.php
branches/3.11-UTF8/includes/DefineReceiptClass.php
branches/3.11-UTF8/includes/DefineSerialItems.php
branches/3.11-UTF8/includes/DefineShiptClass.php
branches/3.11-UTF8/includes/DefineSpecialOrderClass.php
branches/3.11-UTF8/includes/DefineStockAdjustment.php
branches/3.11-UTF8/includes/DefineStockTransfer.php
branches/3.11-UTF8/includes/DefineStockTransfers.php
branches/3.11-UTF8/includes/DefineSuppAllocsClass.php
branches/3.11-UTF8/includes/DefineSuppTransClass.php
branches/3.11-UTF8/includes/EDIVariableSubstitution.inc
branches/3.11-UTF8/includes/EDIconfig.inc
branches/3.11-UTF8/includes/FPDF_Chinese.php
branches/3.11-UTF8/includes/FPDF_Japanese.php
branches/3.11-UTF8/includes/FPDF_Korean.php
branches/3.11-UTF8/includes/FailedLogin.php
branches/3.11-UTF8/includes/FreightCalculation.inc
branches/3.11-UTF8/includes/GLPostings.inc
branches/3.11-UTF8/includes/GetConfig.php
branches/3.11-UTF8/includes/GetPaymentMethods.php
branches/3.11-UTF8/includes/GetPrice.inc
branches/3.11-UTF8/includes/GetSalesTransGLCodes.inc
branches/3.11-UTF8/includes/InputSerialItems.php
branches/3.11-UTF8/includes/InputSerialItemsExisting.php
branches/3.11-UTF8/includes/InputSerialItemsFile.php
branches/3.11-UTF8/includes/InputSerialItemsKeyed.php
branches/3.11-UTF8/includes/InputSerialItemsSequential.php
branches/3.11-UTF8/includes/LanguageSetup.php
branches/3.11-UTF8/includes/Login.php
branches/3.11-UTF8/includes/MiscFunctions.php
branches/3.11-UTF8/includes/PDFAgedDebtorsPageHeader.inc
branches/3.11-UTF8/includes/PDFAgedSuppliersPageHeader.inc
branches/3.11-UTF8/includes/PDFBOMListingPageHeader.inc
branches/3.11-UTF8/includes/PDFBalanceSheetPageHeader.inc
branches/3.11-UTF8/includes/PDFBankingSummaryPageHeader.inc
branches/3.11-UTF8/includes/PDFChequeListingPageHeader.inc
branches/3.11-UTF8/includes/PDFCustomerListPageHeader.inc
branches/3.11-UTF8/includes/PDFDIFOTPageHeader.inc
branches/3.11-UTF8/includes/PDFDebtorBalsPageHeader.inc
branches/3.11-UTF8/includes/PDFDeliveryDifferencesPageHeader.inc
branches/3.11-UTF8/includes/PDFGrnHeader.inc
branches/3.11-UTF8/includes/PDFInventoryPlanPageHeader.inc
branches/3.11-UTF8/includes/PDFInventoryValnPageHeader.inc
branches/3.11-UTF8/includes/PDFLowGPPageHeader.inc
branches/3.11-UTF8/includes/PDFOrderPageHeader.inc
branches/3.11-UTF8/includes/PDFOrderPageHeader_generic.inc
branches/3.11-UTF8/includes/PDFOrderStatusPageHeader.inc
branches/3.11-UTF8/includes/PDFOrdersInvoicedPageHeader.inc
branches/3.11-UTF8/includes/PDFOstdgGRNsPageHeader.inc
branches/3.11-UTF8/includes/PDFPaymentRunPageHeader.inc
branches/3.11-UTF8/includes/PDFPaymentRun_PymtFooter.php
branches/3.11-UTF8/includes/PDFPriceListPageHeader.inc
branches/3.11-UTF8/includes/PDFProfitAndLossPageHeader.inc
branches/3.11-UTF8/includes/PDFQuotationPageHeader.inc
branches/3.11-UTF8/includes/PDFSalesAnalPageHeader.inc
branches/3.11-UTF8/includes/PDFSalesAnalysis.inc
branches/3.11-UTF8/includes/PDFSalesOrder_generic.inc
branches/3.11-UTF8/includes/PDFStarter.php
branches/3.11-UTF8/includes/PDFStatementPageHeader.inc
branches/3.11-UTF8/includes/PDFStockCheckPageHeader.inc
branches/3.11-UTF8/includes/PDFStockComparisonPageHeader.inc
branches/3.11-UTF8/includes/PDFStockLocTransferHeader.inc
branches/3.11-UTF8/includes/PDFStockNegativesHeader.inc
branches/3.11-UTF8/includes/PDFStockTransferHeader.inc
branches/3.11-UTF8/includes/PDFSupplierBalsPageHeader.inc
branches/3.11-UTF8/includes/PDFTaxPageHeader.inc
branches/3.11-UTF8/includes/PDFTransPageHeader.inc
branches/3.11-UTF8/includes/PDFTransPageHeaderPortrait.inc
branches/3.11-UTF8/includes/PDFTrialBalancePageHeader.inc
branches/3.11-UTF8/includes/PO_PDFOrderPageHeader.inc
branches/3.11-UTF8/includes/PO_ReadInOrder.inc
branches/3.11-UTF8/includes/PO_UnsetFormVbls.php
branches/3.11-UTF8/includes/RFC822.php
branches/3.11-UTF8/includes/SQL_CommonFunctions.inc
branches/3.11-UTF8/includes/SelectOrderItems_IntoCart.inc
branches/3.11-UTF8/includes/class.pdf.php
branches/3.11-UTF8/includes/footer.inc
branches/3.11-UTF8/includes/fpdf.php
branches/3.11-UTF8/includes/header.inc
branches/3.11-UTF8/includes/htmlMimeMail.php
branches/3.11-UTF8/includes/mimePart.php
branches/3.11-UTF8/includes/php-gettext/gettext.inc
branches/3.11-UTF8/includes/php-gettext/gettext.php
branches/3.11-UTF8/includes/php-gettext/streams.php
branches/3.11-UTF8/includes/phplot/phplot.php
branches/3.11-UTF8/includes/phplot/phplot_data.php
branches/3.11-UTF8/includes/phplot/rgb.inc.php
branches/3.11-UTF8/includes/session.inc
branches/3.11-UTF8/includes/smtp.php
branches/3.11-UTF8/index.php
branches/3.11-UTF8/install/index.php
branches/3.11-UTF8/install/save.php
branches/3.11-UTF8/install/timezone.csv
branches/3.11-UTF8/install/timezone.php
branches/3.11-UTF8/javascripts/MiscFunctions.js
branches/3.11-UTF8/locale/en_GB/LC_MESSAGES/messages.po
branches/3.11-UTF8/locale/en_US/LC_MESSAGES/messages.po
branches/3.11-UTF8/phpinfo.php
branches/3.11-UTF8/report_runner.php
branches/3.11-UTF8/reportwriter/FormMaker.php
branches/3.11-UTF8/reportwriter/ReportMaker.php
branches/3.11-UTF8/reportwriter/WriteForm.inc
branches/3.11-UTF8/reportwriter/WriteReport.inc
branches/3.11-UTF8/reportwriter/admin/RCFunctions.inc
branches/3.11-UTF8/reportwriter/admin/ReportCreator.php
branches/3.11-UTF8/reportwriter/admin/defaults.php
branches/3.11-UTF8/reportwriter/admin/forms/ReportsCritSetup.html
branches/3.11-UTF8/reportwriter/admin/forms/ReportsDBSetup.html
branches/3.11-UTF8/reportwriter/admin/forms/ReportsFieldSetup.html
branches/3.11-UTF8/reportwriter/admin/forms/ReportsHome.html
branches/3.11-UTF8/reportwriter/admin/forms/ReportsID.html
branches/3.11-UTF8/reportwriter/admin/forms/ReportsImport.html
branches/3.11-UTF8/reportwriter/admin/forms/ReportsPageSetup.html
branches/3.11-UTF8/reportwriter/admin/forms/ReportsRename.html
branches/3.11-UTF8/reportwriter/admin/forms/TplFrmCBlk.html
branches/3.11-UTF8/reportwriter/admin/forms/TplFrmCDta.html
branches/3.11-UTF8/reportwriter/admin/forms/TplFrmData.html
branches/3.11-UTF8/reportwriter/admin/forms/TplFrmImg.html
branches/3.11-UTF8/reportwriter/admin/forms/TplFrmLine.html
branches/3.11-UTF8/reportwriter/admin/forms/TplFrmPgNum.html
branches/3.11-UTF8/reportwriter/admin/forms/TplFrmRect.html
branches/3.11-UTF8/reportwriter/admin/forms/TplFrmTBlk.html
branches/3.11-UTF8/reportwriter/admin/forms/TplFrmTbl.html
branches/3.11-UTF8/reportwriter/admin/forms/TplFrmText.html
branches/3.11-UTF8/reportwriter/admin/forms/TplFrmTtl.html
branches/3.11-UTF8/reportwriter/forms/FormsFilter.html
branches/3.11-UTF8/reportwriter/forms/FormsList.html
branches/3.11-UTF8/reportwriter/forms/ReportsFieldSetup.html
branches/3.11-UTF8/reportwriter/forms/ReportsFilter.html
branches/3.11-UTF8/reportwriter/forms/ReportsList.html
branches/3.11-UTF8/reportwriter/forms/ReportsPageUpdate.html
branches/3.11-UTF8/reportwriter/forms/ReportsSave.html
branches/3.11-UTF8/reportwriter/forms/TplFrmLine.html
branches/3.11-UTF8/reportwriter/install/ReportListForm.php
branches/3.11-UTF8/reportwriter/install/ReportListLinks.php
branches/3.11-UTF8/reportwriter/languages/en_US/reports.php
branches/3.11-UTF8/sql/mysql/upgrade2.7-2.8.sql
branches/3.11-UTF8/sql/mysql/upgrade2.8-2.9.sql
branches/3.11-UTF8/sql/mysql/upgrade2.9-2.9a.sql
branches/3.11-UTF8/sql/mysql/upgrade2.9a-2.9b.sql
branches/3.11-UTF8/sql/mysql/upgrade2.9b-3.0.sql
branches/3.11-UTF8/sql/mysql/upgrade3.00-3.01.sql
branches/3.11-UTF8/sql/mysql/upgrade3.01-3.02.sql
branches/3.11-UTF8/sql/mysql/upgrade3.02-3.03.sql
branches/3.11-UTF8/sql/mysql/upgrade3.03-3.04.sql
branches/3.11-UTF8/sql/mysql/upgrade3.04-3.05.sql
branches/3.11-UTF8/sql/mysql/upgrade3.05-3.06.sql
branches/3.11-UTF8/sql/mysql/upgrade3.06-3.07.sql
branches/3.11-UTF8/sql/mysql/upgrade3.07-3.08.sql
branches/3.11-UTF8/sql/mysql/upgrade3.08-3.09.sql
branches/3.11-UTF8/sql/mysql/upgrade3.09-3.10.sql
branches/3.11-UTF8/sql/mysql/upgrade3.10-3.11.sql
branches/3.11-UTF8/sql/mysql/weberp-demo.sql
branches/3.11-UTF8/sql/mysql/weberp-new.sql
branches/3.11-UTF8/xmlrpc/debugger/action.php
branches/3.11-UTF8/xmlrpc/debugger/common.php
branches/3.11-UTF8/xmlrpc/debugger/controller.php
branches/3.11-UTF8/xmlrpc/debugger/index.php
branches/3.11-UTF8/xmlrpc/lib/compat/array_key_exists.php
branches/3.11-UTF8/xmlrpc/lib/compat/is_a.php
branches/3.11-UTF8/xmlrpc/lib/compat/is_callable.php
branches/3.11-UTF8/xmlrpc/lib/compat/is_scalar.php
branches/3.11-UTF8/xmlrpc/lib/compat/var_export.php
branches/3.11-UTF8/xmlrpc/lib/compat/version_compare.php
branches/3.11-UTF8/xmlrpc/lib/xmlrpc.inc
branches/3.11-UTF8/xmlrpc/lib/xmlrpc_wrappers.inc
branches/3.11-UTF8/xmlrpc/lib/xmlrpcs.inc
branches/3.11-stable/AccountGroups.php
branches/3.11-stable/AccountSections.php
branches/3.11-stable/AddCustomerContacts.php
branches/3.11-stable/AddCustomerNotes.php
branches/3.11-stable/AddCustomerTypeNotes.php
branches/3.11-stable/AgedDebtors.php
branches/3.11-stable/AgedSuppliers.php
branches/3.11-stable/Areas.php
branches/3.11-stable/AuditTrail.php
branches/3.11-stable/BOMExtendedQty.php
branches/3.11-stable/BOMIndented.php
branches/3.11-stable/BOMIndentedReverse.php
branches/3.11-stable/BOMInquiry.php
branches/3.11-stable/BOMListing.php
branches/3.11-stable/BOMs.php
branches/3.11-stable/BankAccounts.php
branches/3.11-stable/BankMatching.php
branches/3.11-stable/BankReconciliation.php
branches/3.11-stable/COGSGLPostings.php
branches/3.11-stable/CompanyPreferences.php
branches/3.11-stable/ConfirmDispatchControlled_Invoice.php
branches/3.11-stable/ConfirmDispatch_Invoice.php
branches/3.11-stable/CreditItemsControlled.php
branches/3.11-stable/CreditStatus.php
branches/3.11-stable/Credit_Invoice.php
branches/3.11-stable/Currencies.php
branches/3.11-stable/CustEDISetup.php
branches/3.11-stable/CustLoginSetup.php
branches/3.11-stable/CustWhereAlloc.php
branches/3.11-stable/CustomerAllocations.php
branches/3.11-stable/CustomerBranches.php
branches/3.11-stable/CustomerInquiry.php
branches/3.11-stable/CustomerReceipt.php
branches/3.11-stable/CustomerTransInquiry.php
branches/3.11-stable/CustomerTypes.php
branches/3.11-stable/Customers.php
branches/3.11-stable/DebtorsAtPeriodEnd.php
branches/3.11-stable/DeliveryDetails.php
branches/3.11-stable/DemandWorkOrders.php
branches/3.11-stable/DiscountCategories.php
branches/3.11-stable/DiscountMatrix.php
branches/3.11-stable/EDIMessageFormat.php
branches/3.11-stable/EDIProcessOrders.php
branches/3.11-stable/EDISendInvoices.php
branches/3.11-stable/EmailConfirmation.php
branches/3.11-stable/EmailCustTrans.php
branches/3.11-stable/ExchangeRateTrend.php
branches/3.11-stable/FTP_RadioBeacon.php
branches/3.11-stable/Factors.php
branches/3.11-stable/FreightCosts.php
branches/3.11-stable/GLAccountInquiry.php
branches/3.11-stable/GLAccounts.php
branches/3.11-stable/GLBalanceSheet.php
branches/3.11-stable/GLBudgets.php
branches/3.11-stable/GLCodesInquiry.php
branches/3.11-stable/GLJournal.php
branches/3.11-stable/GLProfit_Loss.php
branches/3.11-stable/GLTagProfit_Loss.php
branches/3.11-stable/GLTags.php
branches/3.11-stable/GLTransInquiry.php
branches/3.11-stable/GLTrialBalance.php
branches/3.11-stable/GeocodeSetup.php
branches/3.11-stable/GetStockImage.php
branches/3.11-stable/GoodsReceived.php
branches/3.11-stable/GoodsReceivedControlled.php
branches/3.11-stable/InventoryPlanning.php
branches/3.11-stable/InventoryPlanningPrefSupplier.php
branches/3.11-stable/InventoryQuantities.php
branches/3.11-stable/InventoryValuation.php
branches/3.11-stable/Locations.php
branches/3.11-stable/Logout.php
branches/3.11-stable/MRP.php
branches/3.11-stable/MRPCalendar.php
branches/3.11-stable/MRPCreateDemands.php
branches/3.11-stable/MRPDemandTypes.php
branches/3.11-stable/MRPDemands.php
branches/3.11-stable/MRPPlannedPurchaseOrders.php
branches/3.11-stable/MRPPlannedWorkOrders.php
branches/3.11-stable/MRPReport.php
branches/3.11-stable/MRPReschedules.php
branches/3.11-stable/MRPShortages.php
branches/3.11-stable/MailInventoryValuation.php
branches/3.11-stable/MailSalesReport.php
branches/3.11-stable/MailSalesReport_csv.php
branches/3.11-stable/Numbers/Words/lang.bg.php
branches/3.11-stable/Numbers/Words/lang.cs.php
branches/3.11-stable/Numbers/Words/lang.de.php
branches/3.11-stable/Numbers/Words/lang.dk.php
branches/3.11-stable/Numbers/Words/lang.en_100.php
branches/3.11-stable/Numbers/Words/lang.en_GB.php
branches/3.11-stable/Numbers/Words/lang.en_US.php
branches/3.11-stable/Numbers/Words/lang.es.php
branches/3.11-stable/Numbers/Words/lang.es_AR.php
branches/3.11-stable/Numbers/Words/lang.et.php
branches/3.11-stable/Numbers/Words/lang.fr.php
branches/3.11-stable/Numbers/Words/lang.fr_BE.php
branches/3.11-stable/Numbers/Words/lang.he.php
branches/3.11-stable/Numbers/Words/lang.hu_HU.php
branches/3.11-stable/Numbers/Words/lang.id.php
branches/3.11-stable/Numbers/Words/lang.it_IT.php
branches/3.11-stable/Numbers/Words/lang.lt.php
branches/3.11-stable/Numbers/Words/lang.nl.php
branches/3.11-stable/Numbers/Words/lang.pl.php
branches/3.11-stable/Numbers/Words/lang.pt_BR.php
branches/3.11-stable/Numbers/Words/lang.ru.php
branches/3.11-stable/Numbers/Words/lang.sv.php
branches/3.11-stable/Numbers/Words.php
branches/3.11-stable/OrderDetails.php
branches/3.11-stable/OutstandingGRNs.php
branches/3.11-stable/PDFBankingSummary.php
branches/3.11-stable/PDFChequeListing.php
branches/3.11-stable/PDFCustomerList.php
branches/3.11-stable/PDFDIFOT.php
branches/3.11-stable/PDFDeliveryDifferences.php
branches/3.11-stable/PDFGrn.php
branches/3.11-stable/PDFLowGP.php
branches/3.11-stable/PDFOrderStatus.php
branches/3.11-stable/PDFOrdersInvoiced.php
branches/3.11-stable/PDFPriceList.php
branches/3.11-stable/PDFQuotation.php
branches/3.11-stable/PDFStockCheckComparison.php
branches/3.11-stable/PDFStockLocTransfer.php
branches/3.11-stable/PDFStockNegatives.php
branches/3.11-stable/PDFStockTransfer.php
branches/3.11-stable/POReport.php
branches/3.11-stable/PO_AuthorisationLevels.php
branches/3.11-stable/PO_Chk_ShiptRef_JobRef.php
branches/3.11-stable/PO_Header.php
branches/3.11-stable/PO_Items.php
branches/3.11-stable/PO_OrderDetails.php
branches/3.11-stable/PO_PDFPurchOrder.php
branches/3.11-stable/PO_SelectOSPurchOrder.php
branches/3.11-stable/PO_SelectPurchOrder.php
branches/3.11-stable/PaymentAllocations.php
branches/3.11-stable/PaymentMethods.php
branches/3.11-stable/PaymentTerms.php
branches/3.11-stable/Payments.php
branches/3.11-stable/PeriodsInquiry.php
branches/3.11-stable/Prices.php
branches/3.11-stable/PricesBasedOnMarkUp.php
branches/3.11-stable/Prices_Customer.php
branches/3.11-stable/PrintCheque.php
branches/3.11-stable/PrintCustOrder.php
branches/3.11-stable/PrintCustOrder_generic.php
branches/3.11-stable/PrintCustStatements.php
branches/3.11-stable/PrintCustTrans.php
branches/3.11-stable/PrintCustTransPortrait.php
branches/3.11-stable/PrintSalesOrder_generic.php
branches/3.11-stable/PurchData.php
branches/3.11-stable/RecurringSalesOrders.php
branches/3.11-stable/RecurringSalesOrdersProcess.php
branches/3.11-stable/ReorderLevel.php
branches/3.11-stable/ReverseGRN.php
branches/3.11-stable/SalesAnalReptCols.php
branches/3.11-stable/SalesAnalRepts.php
branches/3.11-stable/SalesAnalysis_UserDefined.php
branches/3.11-stable/SalesCategories.php
branches/3.11-stable/SalesGLPostings.php
branches/3.11-stable/SalesGraph.php
branches/3.11-stable/SalesInquiry.php
branches/3.11-stable/SalesPeople.php
branches/3.11-stable/SalesTypes.php
branches/3.11-stable/SelectCompletedOrder.php
branches/3.11-stable/SelectCreditItems.php
branches/3.11-stable/SelectCustomer.php
branches/3.11-stable/SelectGLAccount.php
branches/3.11-stable/SelectOrderItems.php
branches/3.11-stable/SelectProduct.php
branches/3.11-stable/SelectRecurringSalesOrder.php
branches/3.11-stable/SelectSalesOrder.php
branches/3.11-stable/SelectSupplier.php
branches/3.11-stable/SelectWorkOrder.php
branches/3.11-stable/ShipmentCosting.php
branches/3.11-stable/Shipments.php
branches/3.11-stable/Shippers.php
branches/3.11-stable/Shipt_Select.php
branches/3.11-stable/ShiptsList.php
branches/3.11-stable/SpecialOrder.php
branches/3.11-stable/StockAdjustments.php
branches/3.11-stable/StockAdjustmentsControlled.php
branches/3.11-stable/StockCategories.php
branches/3.11-stable/StockCheck.php
branches/3.11-stable/StockCostUpdate.php
branches/3.11-stable/StockCounts.php
branches/3.11-stable/StockLocMovements.php
branches/3.11-stable/StockLocStatus.php
branches/3.11-stable/StockLocTransfer.php
branches/3.11-stable/StockLocTransferReceive.php
branches/3.11-stable/StockMovements.php
branches/3.11-stable/StockQties_csv.php
branches/3.11-stable/StockQuantityByDate.php
branches/3.11-stable/StockReorderLevel.php
branches/3.11-stable/StockSerialItemResearch.php
branches/3.11-stable/StockSerialItems.php
branches/3.11-stable/StockStatus.php
branches/3.11-stable/StockTransferControlled.php
branches/3.11-stable/StockTransfers.php
branches/3.11-stable/StockUsage.php
branches/3.11-stable/StockUsageGraph.php
branches/3.11-stable/Stocks.php
branches/3.11-stable/SuppCreditGRNs.php
branches/3.11-stable/SuppInvGLAnalysis.php
branches/3.11-stable/SuppInvGRNs.php
branches/3.11-stable/SuppPaymentRun.php
branches/3.11-stable/SuppShiptChgs.php
branches/3.11-stable/SuppTransGLAnalysis.php
branches/3.11-stable/SupplierAllocations.php
branches/3.11-stable/SupplierBalsAtPeriodEnd.php
branches/3.11-stable/SupplierContacts.php
branches/3.11-stable/SupplierCredit.php
branches/3.11-stable/SupplierInquiry.php
branches/3.11-stable/SupplierInvoice.php
branches/3.11-stable/SupplierTransInquiry.php
branches/3.11-stable/Suppliers.php
branches/3.11-stable/SystemCheck.php
branches/3.11-stable/SystemParameters.php
branches/3.11-stable/Tax.php
branches/3.11-stable/TaxAuthorities.php
branches/3.11-stable/TaxAuthorityRates.php
branches/3.11-stable/TaxCategories.php
branches/3.11-stable/TaxGroups.php
branches/3.11-stable/TaxProvinces.php
branches/3.11-stable/UnitsOfMeasure.php
branches/3.11-stable/UserSettings.php
branches/3.11-stable/WOSerialNos.php
branches/3.11-stable/WWW_Access.php
branches/3.11-stable/WWW_Users.php
branches/3.11-stable/WhereUsedInquiry.php
branches/3.11-stable/WorkCentres.php
branches/3.11-stable/WorkOrderCosting.php
branches/3.11-stable/WorkOrderEntry.php
branches/3.11-stable/WorkOrderIssue.php
branches/3.11-stable/WorkOrderReceive.php
branches/3.11-stable/WorkOrderStatus.php
branches/3.11-stable/Z_ChangeBranchCode.php
branches/3.11-stable/Z_ChangeCustomerCode.php
branches/3.11-stable/Z_ChangeStockCode.php
branches/3.11-stable/Z_CheckAllocationsFrom.php
branches/3.11-stable/Z_CheckAllocs.php
branches/3.11-stable/Z_CheckDebtorsControl.php
branches/3.11-stable/Z_CheckGLTransBalance.php
branches/3.11-stable/Z_CopyBOM.php
branches/3.11-stable/Z_CreateChartDetails.php
branches/3.11-stable/Z_CreateCompany.php
branches/3.11-stable/Z_CurrencyDebtorsBalances.php
branches/3.11-stable/Z_CurrencySuppliersBalances.php
branches/3.11-stable/Z_DataExport.php
branches/3.11-stable/Z_DeleteCreditNote.php
branches/3.11-stable/Z_DeleteInvoice.php
branches/3.11-stable/Z_DeleteSalesTransActions.php
branches/3.11-stable/Z_DescribeTable.php
branches/3.11-stable/Z_ImportChartOfAccounts.php
branches/3.11-stable/Z_ImportGLAccountGroups.php
branches/3.11-stable/Z_ImportGLAccountSections.php
branches/3.11-stable/Z_ImportPartCodes.php
branches/3.11-stable/Z_ImportStocks.php
branches/3.11-stable/Z_MakeNewCompany.php
branches/3.11-stable/Z_MakeStockLocns.php
branches/3.11-stable/Z_PriceChanges.php
branches/3.11-stable/Z_ReApplyCostToSA.php
branches/3.11-stable/Z_RePostGLFromPeriod.php
branches/3.11-stable/Z_ReverseSuppPaymentRun.php
branches/3.11-stable/Z_SalesIntegrityCheck.php
branches/3.11-stable/Z_UpdateChartDetailsBFwd.php
branches/3.11-stable/Z_Upgrade3.10.php
branches/3.11-stable/Z_Upgrade_3.01-3.02.php
branches/3.11-stable/Z_Upgrade_3.04-3.05.php
branches/3.11-stable/Z_Upgrade_3.05-3.06.php
branches/3.11-stable/Z_Upgrade_3.07-3.08.php
branches/3.11-stable/Z_Upgrade_3.08-3.09.php
branches/3.11-stable/Z_Upgrade_3.09-3.10.php
branches/3.11-stable/Z_Upgrade_3.10-3.11.php
branches/3.11-stable/Z_UploadForm.php
branches/3.11-stable/Z_UploadResult.php
branches/3.11-stable/Z_index.php
branches/3.11-stable/Z_poAddLanguage.php
branches/3.11-stable/Z_poAdmin.php
branches/3.11-stable/Z_poEditLangHeader.php
branches/3.11-stable/Z_poEditLangModule.php
branches/3.11-stable/Z_poEditLangRemaining.php
branches/3.11-stable/Z_poRebuildDefault.php
branches/3.11-stable/api/api_branches.php
branches/3.11-stable/api/api_currencies.php
branches/3.11-stable/api/api_customers.php
branches/3.11-stable/api/api_customertypes.php
branches/3.11-stable/api/api_debtortransactions.php
branches/3.11-stable/api/api_errorcodes.php
branches/3.11-stable/api/api_glaccounts.php
branches/3.11-stable/api/api_glgroups.php
branches/3.11-stable/api/api_glsections.php
branches/3.11-stable/api/api_holdreasons.php
branches/3.11-stable/api/api_locations.php
branches/3.11-stable/api/api_paymentterms.php
branches/3.11-stable/api/api_php.php
branches/3.11-stable/api/api_purchdata.php
branches/3.11-stable/api/api_salesareas.php
branches/3.11-stable/api/api_salesman.php
branches/3.11-stable/api/api_salesorders.php
branches/3.11-stable/api/api_salestypes.php
branches/3.11-stable/api/api_shippers.php
branches/3.11-stable/api/api_stock.php
branches/3.11-stable/api/api_stockc...
[truncated message content] |
|
From: <tim...@us...> - 2009-12-12 12:20:24
|
Revision: 3153
http://web-erp.svn.sourceforge.net/web-erp/?rev=3153&view=rev
Author: tim_schofield
Date: 2009-12-12 12:15:22 +0000 (Sat, 12 Dec 2009)
Log Message:
-----------
Bux fixes to asset manager.
Modified Paths:
--------------
trunk/FixedAssetJournal.php
trunk/FixedAssetRegister.php
trunk/doc/Change.log.html
Modified: trunk/FixedAssetJournal.php
===================================================================
--- trunk/FixedAssetJournal.php 2009-12-11 14:28:49 UTC (rev 3152)
+++ trunk/FixedAssetJournal.php 2009-12-12 12:15:22 UTC (rev 3153)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.2 $ */
+/* $Revision: 1.1 $ */
include('includes/DefineJournalClass.php');
@@ -69,11 +69,11 @@
$raterow=DB_fetch_array($rateresult);
$assetarray[$i]['DepreciationRate']=$raterow['value'];
+
$bsnamesql='SELECT accountname FROM chartmaster WHERE accountcode='.$assetarray[$i]['bsdepn'];
$bsnameresult=DB_query($bsnamesql, $db);
$bsnamerow=DB_fetch_array($bsnameresult);
$assetarray[$i]['bsdepnaccount']=$bsnamerow['accountname'];
-
$plnamesql='SELECT accountname FROM chartmaster WHERE accountcode='.$assetarray[$i]['pldepn'];
$plnameresult=DB_query($plnamesql, $db);
$plnamerow=DB_fetch_array($plnameresult);
@@ -393,9 +393,9 @@
}
echo '<tr class="EvenTableRows"><td></td>
- <td class=number><b> Total </b></td>
- <td class=number class="number"><b>' . number_format($debittotal,2) . '</b></td>
- <td class=number class="number"><b>' . number_format($credittotal,2) . '</b></td>';
+ <td align=right><b> Total </b></td>
+ <td align=right class="number"><b>' . number_format($debittotal,2) . '</b></td>
+ <td align=right class="number"><b>' . number_format($credittotal,2) . '</b></td>';
if ($debittotal!=$credittotal) {
echo '<td align=center style="background-color: #fddbdb"><b>Required to balance - ' .
number_format(abs($debittotal-$credittotal),2);
@@ -423,4 +423,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/FixedAssetRegister.php
===================================================================
--- trunk/FixedAssetRegister.php 2009-12-11 14:28:49 UTC (rev 3152)
+++ trunk/FixedAssetRegister.php 2009-12-12 12:15:22 UTC (rev 3153)
@@ -16,6 +16,7 @@
echo '<form name="RegisterForm" method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '"><table>';
echo '<tr><th>'._('Asset Category').'</th>';
echo '<td><select name=assetcategory>';
+echo '<option value="%">ALL</option>';
while ($myrow=DB_fetch_array($result)) {
if (isset($_POST['assetcategory']) and $myrow['categoryid']==$_POST['assetcategory']) {
echo '<option selected value='.$myrow['categoryid'].'>'.$myrow['categorydescription'].'</option>';
@@ -23,16 +24,69 @@
echo '<option value='.$myrow['categoryid'].'>'.$myrow['categorydescription'].'</option>';
}
}
-echo '</select></table><br>';
+echo '</select></td></tr>';
+
+$sql = "SELECT locationid, locationdescription FROM fixedassetlocations";
+$result = DB_query($sql,$db);
+echo '<tr><th>'._('Asset Location').'</th>';
+echo '<td><select name=assetlocation>';
+echo '<option value="All">ALL</option>';
+while ($myrow=DB_fetch_array($result)) {
+ if (isset($_POST['assetlocation']) and $myrow['locationdescription']==$_POST['assetlocation']) {
+ echo '<option selected value="'.$myrow['locationdescription'].'">'.$myrow['locationdescription'].'</option>';
+ } else {
+ echo '<option value="'.$myrow['locationdescription'].'">'.$myrow['locationdescription'].'</option>';
+ }
+}
+echo '</select></td></tr>';
+
+$sql = "SELECT stockid, description FROM stockmaster LEFT JOIN stockcategory ON stockmaster.categoryid=stockcategory.categoryid WHERE stocktype='A'";
+$result = DB_query($sql,$db);
+
+echo '<tr><th>'._('Asset Type').'</th>';
+echo '<td><select name=assettype>';
+echo '<option value="%">ALL</option>';
+while ($myrow=DB_fetch_array($result)) {
+ if (isset($_POST['assettype']) and $myrow['stockid']==$_POST['assettype']) {
+ echo '<option selected value='.$myrow['stockid'].'>'.$myrow['description'].'</option>';
+ } else {
+ echo '<option value='.$myrow['stockid'].'>'.$myrow['description'].'</option>';
+ }
+}
+
+echo '</select></td></tr>';
+
+//FULUSI CHANGE BELOW TO ADD TIME
+echo '<tr>
+ <th>'._(' From Date')."</th>
+ <td><input type='text' class='date' alt='".$_SESSION['DefaultDateFormat'].
+ "' name='fromDate' maxlength=10 size=11 value='".$_POST['fromDate']."'></td>";
+
+echo '</tr>';
+echo '<tr>
+ <th>'._('To Date ')."</th>
+ <td><input type='text' class='date' alt='".$_SESSION['DefaultDateFormat'].
+ "' name='toDate' maxlength=10 size=11 value='".$_POST['toDate']."'></td>";
+
+echo '</tr>';
+//end of FULUSI STUFF
+
+echo '</table><br>';
+
echo '<div class="centre"><input type="Submit" name="submit" value="' . _('Show Assets') . '"></div>';
echo '</form>';
if (isset($_POST['submit'])) {
+ $dateFrom = FormatDateForSQL($_POST['fromDate']);
+ $dateTo = FormatDateForSQL($_POST['toDate']);
+
+
$sql='SELECT assetmanager.id,
assetmanager.stockid,
stockmaster.longdescription,
+ stockmaster.categoryid,
assetmanager.serialno,
fixedassetlocations.locationdescription,
assetmanager.cost,
@@ -45,10 +99,12 @@
LEFT JOIN stockmaster ON assetmanager.stockid=stockmaster.stockid
LEFT JOIN stockcategory ON stockmaster.categoryid=stockcategory.categoryid
LEFT JOIN fixedassetlocations ON assetmanager.location=fixedassetlocations.locationid
- WHERE stockmaster.categoryid="'.$_POST['assetcategory'].'"';
+ WHERE stockmaster.categoryid like "'.$_POST['assetcategory'].'"
+ AND stockmaster.stockid like "'.$_POST['assettype'].'"
+ AND assetmanager.datepurchased BETWEEN "'.$dateFrom.'" AND "'.$dateTo.'"';
$result=DB_query($sql, $db);
- echo '<br><table width=80%><tr>';
+ echo '<br><table width=80% cellspacing="9"><tr>';
echo '<th colspan=6></th>';
echo '<th colspan=3>'._('External Depreciation').'</th>';
echo '<th colspan=3>'._('Internal Depreciation').'</th><th></th></tr><tr>';
@@ -68,7 +124,7 @@
while ($myrow=DB_fetch_array($result)) {
-
+ $ancestors=array();
$ancestors[0]=$myrow['locationdescription'];
$i=0;
while ($ancestors[$i]!='') {
@@ -81,7 +137,7 @@
$i++;
$ancestors[$i]=$parentrow['locationdescription'];
}
- $catidsql='SELECT stkcatpropid FROM stockcatproperties WHERE categoryid="'.$_POST['assetcategory']
+ $catidsql='SELECT stkcatpropid FROM stockcatproperties WHERE categoryid="'.$myrow['categoryid']
.'" AND label="'. _('Annual Internal Depreciation Percentage').'"';
$catidresult=DB_query($catidsql, $db);
$catidrow=DB_fetch_array($catidresult);
@@ -94,28 +150,32 @@
if (($InternalDepreciation+$myrow['disposalvalue'])>$myrow['cost']) {
$InternalDepreciation=$myrow['cost']-$myrow['disposalvalue'];
}
- echo '<tr><td style="vertical-align:top">'.$myrow['id'].'</td>';
- echo '<td style="vertical-align:top">'.$myrow['stockid'].'</td>';
- echo '<td style="vertical-align:top">'.$myrow['longdescription'].'</td>';
- echo '<td style="vertical-align:top">'.$myrow['serialno'].'</td>';
- echo '<td>'.$myrow['locationdescription'].'<br>';
- for ($i=1;$i<sizeOf($ancestors)-1;$i++) {
- for ($j=0;$j<$i; $j++) {
- echo ' ';
+
+ if (in_array($_POST['assetlocation'],$ancestors) or $_POST['assetlocation']=='All') {
+
+ echo '<tr><td style="vertical-align:top">'.$myrow['id'].'</td>';
+ echo '<td style="vertical-align:top">'.$myrow['stockid'].'</td>';
+ echo '<td style="vertical-align:top">'.$myrow['longdescription'].'</td>';
+ echo '<td style="vertical-align:top">'.$myrow['serialno'].'</td>';
+ echo '<td>'.$myrow['locationdescription'].'<br>';
+ for ($i=1;$i<sizeOf($ancestors)-1;$i++) {
+ for ($j=0;$j<$i; $j++) {
+ echo ' ';
+ }
+ echo '|_'.$ancestors[$i].'<br>';
}
- echo '|_'.$ancestors[$i].'<br>';
+ echo '</td><td style="vertical-align:top">'.ConvertSQLDate($myrow['datepurchased']).'</td>';
+ echo '<td style="vertical-align:top" class=number>'.number_format($myrow['cost'],2).'</td>';
+ echo '<td style="vertical-align:top" class=number>'.number_format($myrow['depn'],2).'</td>';
+ echo '<td style="vertical-align:top" class=number>'.number_format($myrow['cost']-$myrow['depn'],2).'</td>';
+ echo '<td style="vertical-align:top" class=number>'.number_format($myrow['cost'],2).'</td>';
+ echo '<td style="vertical-align:top" class=number>'.number_format($InternalDepreciation,2).'</td>';
+ echo '<td style="vertical-align:top" class=number>'.number_format($myrow['cost']-$InternalDepreciation,2).'</td>';
+ echo '<td style="vertical-align:top" class=number>'.number_format($myrow['disposalvalue'],2).'</td></tr>';
}
- echo '</td><td style="vertical-align:top">'.ConvertSQLDate($myrow['datepurchased']).'</td>';
- echo '<td style="vertical-align:top" class=number>'.number_format($myrow['cost'],2).'</td>';
- echo '<td style="vertical-align:top" class=number>'.number_format($myrow['depn'],2).'</td>';
- echo '<td style="vertical-align:top" class=number>'.number_format($myrow['cost']-$myrow['depn'],2).'</td>';
- echo '<td style="vertical-align:top" class=number>'.number_format($myrow['cost'],2).'</td>';
- echo '<td style="vertical-align:top" class=number>'.number_format($InternalDepreciation,2).'</td>';
- echo '<td style="vertical-align:top" class=number>'.number_format($myrow['cost']-$InternalDepreciation,2).'</td>';
- echo '<td style="vertical-align:top" class=number>'.number_format($myrow['disposalvalue'],2).'</td></tr>';
}
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-12-11 14:28:49 UTC (rev 3152)
+++ trunk/doc/Change.log.html 2009-12-12 12:15:22 UTC (rev 3153)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>12/12/09 Simon Peter Otandeka - FixedAssetRegister.php and FixedAssetJournal.php - Bux fixes to asset manager.
<p>11/12/09 Tim: PO_PDFPurchOrder.php - Print the correct suppliers unit of measure.
<p>11/12/09 Tim: SelectProducts.php - Ensure that preferred supplier is shown first, and provide a direct link to purchase ordering.
<p>11/12/09 Pak Ricard: Selectproduct.php - Add ORDER BY to show the supplier info in effective date order.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-14 19:33:25
|
Revision: 3224
http://web-erp.svn.sourceforge.net/web-erp/?rev=3224&view=rev
Author: tim_schofield
Date: 2009-12-14 19:33:20 +0000 (Mon, 14 Dec 2009)
Log Message:
-----------
Merge utf-8 branch into the main line
Added Paths:
-----------
trunk/reports/
Removed Paths:
-------------
trunk/reports/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-14 20:07:30
|
Revision: 3227
http://web-erp.svn.sourceforge.net/web-erp/?rev=3227&view=rev
Author: tim_schofield
Date: 2009-12-14 20:07:21 +0000 (Mon, 14 Dec 2009)
Log Message:
-----------
Merge utf-8 branch into the main line
Modified Paths:
--------------
trunk/AgedDebtors.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/EmailConfirmation.php
trunk/GLTrialBalance.php
trunk/InventoryPlanning.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReschedules.php
trunk/OutstandingGRNs.php
trunk/PDFBankingSummary.php
trunk/PDFCustomerList.php
trunk/PDFGrn.php
trunk/PDFLowGP.php
trunk/PDFPriceList.php
trunk/PDFQuotation.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_OrderDetails.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/PrintCustOrder.php
trunk/PrintCustTransPortrait.php
trunk/ReorderLevel.php
trunk/SalesAnalysis_UserDefined.php
trunk/StockCheck.php
trunk/SuppInvGRNs.php
trunk/SuppPaymentRun.php
trunk/Tax.php
trunk/config.distrib.php
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/utf-8_xfer:3160-3162
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/AgedDebtors.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,26 +1,25 @@
<?php
+ /* $Id: AgedDebtors.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
+
+/* $Revision: 1.20 $ */
+
$PageSecurity = 2;
include('includes/session.inc');
-/* $Revision: 1.19 $ */
+if (isset($_POST['PrintPDF'])
+ and isset($_POST['FromCriteria'])
+ and strlen($_POST['FromCriteria'])>=1
+ and isset($_POST['ToCriteria'])
+ and strlen($_POST['ToCriteria'])>=1) {
-If (isset($_POST['PrintPDF'])
- AND isset($_POST['FromCriteria'])
- AND strlen($_POST['FromCriteria'])>=1
- AND isset($_POST['ToCriteria'])
- AND strlen($_POST['ToCriteria'])>=1){
-
-
include('includes/PDFStarter.php');
+ $pdf->addInfo('Title',_('Aged Customer Balance Listing'));
+ $pdf->addInfo('Subject',_('Aged Customer Balances'));
+ $FontSize = 12;
+ $PageNumber = 0;
+ $line_height = 12;
- $FontSize=12;
- $pdf->addinfo('Title',_('Aged Customer Balance Listing'));
- $pdf->addinfo('Subject',_('Aged Customer Balances'));
-
- $PageNumber=0;
- $line_height=12;
-
/*Now figure out the aged analysis for the customer range under review */
if (trim($_POST['Salesman'])!=''){
$SalesLimit = " and debtorsmaster.debtorno in (SELECT DISTINCT debtorno FROM custbranch where salesman = '".$_POST['Salesman']."') ";
@@ -262,6 +261,8 @@
}
$CustomerResult = DB_query($SQL,$db,'','',False,False); /*dont trap errors handled below*/
+ //$ListCount = count ($CustomerResult); // Javier
+
if (DB_error_no($db) !=0) {
$title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '.... ';
include('includes/header.inc');
@@ -282,8 +283,10 @@
$TotOD1=0;
$TotOD2=0;
- While ($AgedAnalysis = DB_fetch_array($CustomerResult,$db)){
+ $ListCount = DB_num_rows($CustomerResult); //UldisN
+ while ($AgedAnalysis = DB_fetch_array($CustomerResult,$db)){
+
$DisplayDue = number_format($AgedAnalysis['due']-$AgedAnalysis['overdue1'],2);
$DisplayCurrent = number_format($AgedAnalysis['balance']-$AgedAnalysis['due'],2);
$DisplayBalance = number_format($AgedAnalysis['balance'],2);
@@ -423,10 +426,13 @@
$LeftOvers = $pdf->addTextWrap(400,$YPos,60,$FontSize,$DisplayTotOverdue1,'right');
$LeftOvers = $pdf->addTextWrap(460,$YPos,60,$FontSize,$DisplayTotOverdue2,'right');
+/* Javier: This actually would produce the output
$buf = $pdf->output();
- $len = strlen($buf);
+ $len = strlen($buf);
+*/
- if ($len < 1000) {
+// if ($len < 1000) {
+ if ($ListCount == 0) {
$title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
prnMsg(_('There are no customers meeting the criteria specified to list'),'info');
@@ -438,14 +444,20 @@
exit;
}
+/* Javier: TCPDF sends its own http header, would be an error to send it twice.
header('Content-type: application/pdf');
header("Content-Length: $len");
header('Content-Disposition: inline; filename=AgedDebtors.pdf');
header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
+ $pdf->stream(); */
- $pdf->stream();
+// This else was missed
+ else {
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_' . 'AgedDebtors_' . date('Y-m-d') . '.pdf');
+ $pdf-> __destruct();
+ }
} else { /*The option to print PDF was not hit */
@@ -509,4 +521,4 @@
} /*end of else not PrintPDF */
-?>
\ No newline at end of file
+?>
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/BOMExtendedQty.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,5 +1,9 @@
<?php
-/* $Revision: 1.7 $ */
+
+/* $Id$ */
+
+/* $Revision: 1.8 $ */
+
// BOMExtendedQty.php - Quantiy Extended Bill of Materials
$PageSecurity = 2;
include('includes/session.inc');
@@ -7,13 +11,12 @@
If (isset($_POST['PrintPDF'])) {
include('includes/PDFStarter.php');
-
+ $pdf->addInfo('Title',_('Quantity Extended BOM Listing'));
+ $pdf->addInfo('Subject',_('Quantity Extended BOM Listing'));
$FontSize=9;
- $pdf->addinfo('Title',_('Quantity Extended BOM Listing'));
- $pdf->addinfo('Subject',_('Quantity Extended BOM Listing'));
-
$PageNumber=1;
$line_height=12;
+
if (!$_POST['Quantity'] || !is_numeric($_POST['Quantity'])) {
$_POST['Quantity'] = 1;
}
@@ -203,6 +206,7 @@
stockmaster.decimalplaces,
stockmaster.mbflag';
$result = DB_query($sql,$db);
+ $ListCount = DB_num_rows($result); // UldisN
While ($myrow = DB_fetch_array($result,$db)){
@@ -247,11 +251,12 @@
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
$Right_Margin);
}
-
+/* Uldisn:This actually would produce the output
$pdfcode = $pdf->output();
$len = strlen($pdfcode);
-
- if ($len<=20){
+*/
+// if ($len<=20){
+ if ($ListCount == 0) { //UldisN
$title = _('Print Indented BOM Listing Error');
include('includes/header.inc');
prnMsg(_('There were no items for the selected assembly'),'error');
@@ -259,16 +264,20 @@
include('includes/footer.inc');
exit;
} else {
+/* UldisN
header('Content-type: application/pdf');
header("Content-Length: " . $len);
header('Content-Disposition: inline; filename=Customer_trans.pdf');
header('Expires: 0');
header('Cache-Control: private, post-check=0, pre-check=0');
header('Pragma: public');
-
+
$pdf->Output('BOMExtendedQty', 'I');
- }
-
+*/
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf-> __destruct();
+ }
+
} else { /*The option to print PDF was not hit so display form */
$title=_('Quantity Extended BOM Listing');
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/BOMIndented.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,5 +1,9 @@
<?php
-/* $Revision: 1.4 $ */
+
+/* $Id: */
+
+/* $Revision: 1.5 $ */
+
// BOMIndented.php - Indented Bill of Materials
$PageSecurity = 2;
include('includes/session.inc');
@@ -7,11 +11,9 @@
If (isset($_POST['PrintPDF'])) {
include('includes/PDFStarter.php');
-
- $FontSize=9;
- $pdf->addinfo('Title',_('Indented BOM Listing'));
- $pdf->addinfo('Subject',_('Indented BOM Listing'));
-
+ $pdf->addInfo('Title',_('Indented BOM Listing'));
+ $pdf->addInfo('Subject',_('Indented BOM Listing'));
+ $FontSize=9;
$PageNumber=1;
$line_height=12;
@@ -22,13 +24,13 @@
$sql = 'DROP TABLE IF EXISTS passbom2';
$result = DB_query($sql,$db);
$sql = 'CREATE TEMPORARY TABLE passbom (
- part char(20),
+ part char(20),
sortpart text)';
$ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = 'CREATE TEMPORARY TABLE tempbom (
- parent char(20),
+ parent char(20),
component char(20),
sortpart text,
level int,
@@ -176,11 +178,13 @@
WHERE tempbom.component = stockmaster.stockid
ORDER BY sortpart';
$result = DB_query($sql,$db);
-
+
// $fill is used to alternate between lines with transparent and painted background
$fill = false;
$pdf->SetFillColor(224,235,255);
-
+
+ $ListCount = DB_num_rows($result); // UldisN
+
While ($myrow = DB_fetch_array($result,$db)){
$YPos -=$line_height;
@@ -221,11 +225,13 @@
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
$Right_Margin,$assemblydesc);
}
-
+ /* UldisN
$pdfcode = $pdf->output();
$len = strlen($pdfcode);
if ($len<=20){
+ */
+ if ($ListCount == 0) {
$title = _('Print Indented BOM Listing Error');
include('includes/header.inc');
prnMsg(_('There were no items for the selected assembly'),'error');
@@ -233,16 +239,21 @@
include('includes/footer.inc');
exit;
} else {
+ /* UldisN
header('Content-type: application/pdf');
header("Content-Length: " . $len);
header('Content-Disposition: inline; filename=Customer_trans.pdf');
header('Expires: 0');
header('Cache-Control: private, post-check=0, pre-check=0');
header('Pragma: public');
-
+
$pdf->Output('BOMIndented.pdf', 'I');
+ */
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_Customer_trans_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf-> __destruct();
+
}
-
+
} else { /*The option to print PDF was not hit so display form */
$title=_('Indented BOM Listing');
@@ -320,4 +331,4 @@
} // End of PrintHeader function
-?>
\ No newline at end of file
+?>
Modified: trunk/EmailConfirmation.php
===================================================================
--- trunk/EmailConfirmation.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/EmailConfirmation.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -19,9 +19,8 @@
}
$MailTo = $_GET['EMail'];
-$headers = 'From: Bethany Manufacturing <sa...@be...>' . "\n";
-$headers .= "MIME-Version: 1.0\n"
- ."Content-Type: text/html; charset=\"iso-8859-1\"\n";
+$headers = 'From: Bethany Manufacturing <sa...@be...>' . '\n';
+$headers .= 'MIME-Version: 1.0\n' . 'Content-Type: text/html; charset="' . _('ISO-8859-1') . '"\n';
/*retrieve the order details from the database to print */
$ErrMsg = _('There was a problem retrieving the order header details for Order Number') . ' ' . $_GET['TransNo'] . ' ' . _('from the database');
@@ -294,4 +293,4 @@
?>
</table>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/GLTrialBalance.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,6 +1,7 @@
<?php
/* $Revision: 1.21 $ */
+/* $Id$ */
/*Through deviousness and cunning, this system allows trial balances for any date range that recalcuates the p & l balances
and shows the balance sheets as at the end of the period selected - so first off need to show the input of criteria screen
@@ -94,10 +95,11 @@
} else if (isset($_POST['PrintPDF'])) {
include('includes/PDFStarter.php');
+
+ $pdf->addInfo('Title', _('Trial Balance') );
+ $pdf->addInfo('Subject', _('Trial Balance') );
$PageNumber = 0;
$FontSize = 10;
- $pdf->addinfo('Title', _('Trial Balance') );
- $pdf->addinfo('Subject', _('Trial Balance') );
$line_height = 12;
$NumberOfMonths = $_POST['ToPeriod'] - $_POST['FromPeriod'] + 1;
@@ -145,6 +147,15 @@
include('includes/footer.inc');
exit;
}
+ if (DB_num_rows($AccountsResult)==0){
+ $title = _('Print Trial Balance Error');
+ include('includes/header.inc');
+ echo '<p>';
+ prnMsg( _('There were no entries to print out for the selections specified') );
+ echo '<br><a href="'. $rootpath.'/index.php?' . SID . '">'. _('Back to the menu'). '</a>';
+ include('includes/footer.inc');
+ exit;
+ }
include('includes/PDFTrialBalancePageHeader.inc');
@@ -174,7 +185,7 @@
}elseif ($myrow['parentgroupname']==$ParentGroups[$Level]){
$YPos -= (.5 * $line_height);
$pdf->line($Left_Margin+250, $YPos+$line_height,$Left_Margin+500, $YPos+$line_height);
- $pdf->selectFont('./fonts/Helvetica-Bold.afm');
+ $pdf->setFont('','B');
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Total'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+60,$YPos,190,$FontSize,$ParentGroups[$Level]);
$LeftOvers = $pdf->addTextWrap($Left_Margin+250,$YPos,70,$FontSize,number_format($GrpActual[$Level],2),'right');
@@ -183,7 +194,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+430,$YPos,70,$FontSize,number_format($GrpPrdBudget[$Level],2),'right');
$pdf->line($Left_Margin+250, $YPos,$Left_Margin+500, $YPos); /*Draw the bottom line */
$YPos -= (2 * $line_height);
- $pdf->selectFont('./fonts/Helvetica.afm');
+ $pdf->setFont('','');
$ParentGroups[$Level]=$myrow['groupname'];
$GrpActual[$Level] =0;
$GrpBudget[$Level] =0;
@@ -191,10 +202,10 @@
$GrpPrdBduget[$Level] =0;
} else {
- do{
+ do {
$YPos -= $line_height;
$pdf->line($Left_Margin+250, $YPos+$line_height,$Left_Margin+500, $YPos+$line_height);
- $pdf->selectFont('./fonts/Helvetica-Bold.afm');
+ $pdf->setFont('','B');
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Total'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+60,$YPos,190,$FontSize,$ParentGroups[$Level]);
$LeftOvers = $pdf->addTextWrap($Left_Margin+250,$YPos,70,$FontSize,number_format($GrpActual[$Level],2),'right');
@@ -203,19 +214,19 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+430,$YPos,70,$FontSize,number_format($GrpPrdBudget[$Level],2),'right');
$pdf->line($Left_Margin+250, $YPos,$Left_Margin+500, $YPos); /*Draw the bottom line */
$YPos -= (2 * $line_height);
- $pdf->selectFont('./fonts/Helvetica.afm');
+ $pdf->setFont('','');
$ParentGroups[$Level]='';
$GrpActual[$Level] =0;
$GrpBudget[$Level] =0;
$GrpPrdActual[$Level] =0;
$GrpPrdBduget[$Level] =0;
$Level--;
- }while ($myrow['parentgroupname']!=$ParentGroups[$Level] AND $Level>0);
+ } while ($myrow['parentgroupname']!=$ParentGroups[$Level] AND $Level>0);
if ($Level>0){
$YPos -= $line_height;
$pdf->line($Left_Margin+250, $YPos+$line_height,$Left_Margin+500, $YPos+$line_height);
- $pdf->selectFont('./fonts/Helvetica-Bold.afm');
+ $pdf->setFont('','B');
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Total'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+60, $YPos, 190, $FontSize, $ParentGroups[$Level]);
$LeftOvers = $pdf->addTextWrap($Left_Margin+250,$YPos,70,$FontSize,number_format($GrpActual[$Level],2),'right');
@@ -224,7 +235,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+430,$YPos,70,$FontSize,number_format($GrpPrdBudget[$Level],2),'right');
$pdf->line($Left_Margin+250, $YPos,$Left_Margin+500, $YPos); /*Draw the bottom line */
$YPos -= (2 * $line_height);
- $pdf->selectFont('./fonts/Helvetica.afm');
+ $pdf->setFont('','');
$GrpActual[$Level] =0;
$GrpBudget[$Level] =0;
$GrpPrdActual[$Level] =0;
@@ -236,13 +247,13 @@
}
$YPos -= (2 * $line_height);
// Print account group name
- $pdf->selectFont('./fonts/Helvetica-Bold.afm');
+ $pdf->setFont('','B');
$ActGrp = $myrow['groupname'];
$ParentGroups[$Level]=$myrow['groupname'];
$FontSize = 10;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,200,$FontSize,$myrow['groupname']);
$FontSize = 8;
- $pdf->selectFont('./fonts/Helvetica.afm');
+ $pdf->setFont('','');
$YPos -= (2 * $line_height);
}
@@ -299,7 +310,7 @@
$YPos -= (.5 * $line_height);
$pdf->line($Left_Margin+250, $YPos+$line_height,$Left_Margin+500, $YPos+$line_height);
- $pdf->selectFont('./fonts/Helvetica-Bold.afm');
+ $pdf->setFont('','B');
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Total'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+60,$YPos,190,$FontSize,$ParentGroups[$Level]);
$LeftOvers = $pdf->addTextWrap($Left_Margin+250,$YPos,70,$FontSize,number_format($GrpActual[$Level],2),'right');
@@ -325,29 +336,17 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+370,$YPos,70,$FontSize,number_format($CheckPeriodActual,2),'right');
$LeftOvers = $pdf->addTextWrap($Left_Margin+430,$YPos,70,$FontSize,number_format($CheckPeriodBudget,2),'right');
$pdf->line($Left_Margin+250, $YPos,$Left_Margin+500, $YPos);
-
- $pdfcode = $pdf->output();
- $len = strlen($pdfcode);
-
- if ($len<=20){
- $title = _('Print Trial Balance Error');
- include('includes/header.inc');
- echo '<p>';
- prnMsg( _('There were no entries to print out for the selections specified') );
- echo '<br><a href="'. $rootpath.'/index.php?' . SID . '">'. _('Back to the menu'). '</a>';
- include('includes/footer.inc');
- exit;
- } else {
+
+ /*
header('Content-type: application/pdf');
header('Content-Length: ' . $len);
header('Content-Disposition: inline; filename=CustomerList.pdf');
header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
-
- $pdf->Output('GLTrialBalance.pdf','I');
-
- }
+*/
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_GL_Trial_Balance_' . Date('Y-m-d') . '.pdf');
+ $pdf->__destruct();
exit;
} else {
@@ -679,4 +678,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/InventoryPlanning.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,19 +1,18 @@
<?php
-/* $Revision: 1.19 $ */
+/* $Id: InventoryPlanning.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
$PageSecurity = 2;
include('includes/session.inc');
+if (isset($_POST['PrintPDF'])
+ and isset($_POST['FromCriteria'])
+ and strlen($_POST['FromCriteria'])>=1
+ and isset($_POST['ToCriteria'])
+ and strlen($_POST['ToCriteria'])>=1) {
-If (isset($_POST['PrintPDF'])
- AND isset($_POST['FromCriteria'])
- AND strlen($_POST['FromCriteria'])>=1
- AND isset($_POST['ToCriteria'])
- AND strlen($_POST['ToCriteria'])>=1){
+ include ('includes/class.pdf.php');
- include ('includes/class.pdf.php');
-
/* A4_Landscape */
$Page_Width=842;
@@ -23,26 +22,33 @@
$Left_Margin=25;
$Right_Margin=22;
- $PageSize = array(0,0,$Page_Width,$Page_Height);
- $pdf = & new Cpdf($PageSize);
+// Javier: now I use the native constructor
+// $PageSize = array(0,0,$Page_Width,$Page_Height);
- $PageNumber = 0;
-
- $pdf->selectFont('./fonts/Helvetica.afm');
-
/* Standard PDF file creation header stuff */
- $pdf->addinfo('Author','webERP ' . $Version);
- $pdf->addinfo('Creator','webERP http://www.weberp.org');
- $pdf->addinfo('Title',_('Inventory Planning Report') . ' ' . Date($_SESSION['DefaultDateFormat']));
+// Javier: better to not use references
+// $pdf = & new Cpdf($PageSize);
+ $pdf = new Cpdf('L', 'pt', 'A4');
+ $pdf->addInfo('Creator','webERP http://www.weberp.org');
+ $pdf->addInfo('Author','webERP ' . $Version);
+ $pdf->addInfo('Title',_('Inventory Planning Report') . ' ' . Date($_SESSION['DefaultDateFormat']));
+ $pdf->addInfo('Subject',_('Inventory Planning'));
- $line_height=12;
+/* Javier: I have brought this piece from the pdf class constructor to get it closer to the admin/user,
+ I corrected it to match TCPDF, but it still needs some check, after which,
+ I think it should be moved to each report to provide flexible Document Header and Margins in a per-report basis. */
+ $pdf->setAutoPageBreak(0); // Javier: needs check.
+ $pdf->setPrintHeader(false); // Javier: I added this must be called before Add Page
+ $pdf->AddPage();
+// $this->SetLineWidth(1); Javier: It was ok for FPDF but now is too gross with TCPDF. TCPDF defaults to 0'57 pt (0'2 mm) which is ok.
+ $pdf->cMargin = 0; // Javier: needs check.
+/* END Brought from class.pdf.php constructor */
- $pdf->addinfo('Subject',_('Inventory Planning'));
+// Javier:
+ $PageNumber = 1;
+ $line_height = 12;
- $PageNumber=1;
- $line_height=12;
-
/*Now figure out the inventory data to report for the category range under review
need QOH, QOO, QDem, Sales Mth -1, Sales Mth -2, Sales Mth -3, Sales Mth -4*/
if ($_POST['Location']=='All'){
@@ -85,7 +91,7 @@
stockmaster.stockid";
}
- $InventoryResult = DB_query($SQL,$db,'','',false,false);
+ $InventoryResult = DB_query($SQL, $db, '', '', false, false);
if (DB_error_no($db) !=0) {
$title = _('Inventory Planning') . ' - ' . _('Problem Report') . '....';
@@ -116,7 +122,7 @@
$Period_4 = $CurrentPeriod -4;
$Period_5 = $CurrentPeriod -5;
- While ($InventoryPlan = DB_fetch_array($InventoryResult,$db)){
+ while ($InventoryPlan = DB_fetch_array($InventoryResult,$db)){
if ($Category!=$InventoryPlan['categoryid']){
$FontSize=10;
@@ -160,7 +166,7 @@
AND stockmoves.hidemovt=0";
}
- $SalesResult=DB_query($SQL,$db,'','',FALSE,FALSE);
+ $SalesResult = DB_query($SQL,$db,'','', false, false);
if (DB_error_no($db) !=0) {
$title = _('Inventory Planning') . ' - ' . _('Problem Report') . '....';
@@ -194,7 +200,8 @@
AND salesorderdetails.completed = 0";
}
- $DemandResult = DB_query($SQL,$db,'','',FALSE,FALSE);
+ $DemandResult = DB_query($SQL, $db, '', '', false , false);
+ $ListCount = DB_num_rows($DemandResult);
if (DB_error_no($db) !=0) {
$title = _('Inventory Planning') . ' - ' . _('Problem Report') . '....';
@@ -208,7 +215,7 @@
exit;
}
-//Also need to add in the demand as a component of an assembly items if this items has any assembly parents.
+// Also need to add in the demand as a component of an assembly items if this items has any assembly parents.
if ($_POST['Location']=='All'){
$SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
@@ -336,26 +343,16 @@
$pdf->line($Left_Margin, $YPos+$line_height,$Page_Width-$Right_Margin, $YPos+$line_height);
- $pdfcode = $pdf->output();
- $len = strlen($pdfcode);
-
- if ($len<=20){
+ if ($ListCount == 0){
$title = _('Print Inventory Planning Report Empty');
include('includes/header.inc');
- prnMsg( _('There were no items in the range and location specified'),'error');
+ prnMsg( _('There were no items in the range and location specified'), 'error');
echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
} else {
- header('Content-type: application/pdf');
- header('Content-Length: ' . $len);
- header('Content-Disposition: inline; filename=InventoryPlanning.pdf');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
-
- $pdf->Output('InventoryPlanning', 'I');
-
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_Inventory_Planning_' . Date('Y-m-d') . '.pdf');
+ $pdf-> __destruct();
}
} else { /*The option to print PDF was not hit */
Modified: trunk/MRPPlannedPurchaseOrders.php
===================================================================
--- trunk/MRPPlannedPurchaseOrders.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/MRPPlannedPurchaseOrders.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.5 $ */
+/* $Id$ */
// MRPPlannedPurchaseOrders.php - Report of purchase parts that MRP has determined should have
// purchase orders created for them
$PageSecurity = 2;
@@ -7,13 +8,12 @@
If (isset($_POST['PrintPDF'])) {
include('includes/PDFStarter.php');
-
+ $pdf->addInfo('Title',_('MRP Planned Purchase Orders Report'));
+ $pdf->addInfo('Subject',_('MRP Planned Purchase Orders'));
$FontSize=9;
- $pdf->addinfo('Title',_('MRP Planned Purchase Orders Report'));
- $pdf->addinfo('Subject',_('MRP Planned Purchase Orders'));
-
$PageNumber=1;
$line_height=12;
+
$Xpos = $Left_Margin+1;
$wheredate = " ";
$reportdate = " ";
@@ -107,8 +107,15 @@
include('includes/footer.inc');
exit;
}
-
- //include ('includes/MRPPlannedPurchaseOrdersPageHeader.inc');
+ if (DB_num_rows($result)==0){ //then there is nothing to print
+ $title = _('Print MRP Planned Purchase Orders Error');
+ include('includes/header.inc');
+ prnMsg(_('There were no items with planned purchase orders'),'info');
+ echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ include('includes/footer.inc');
+ exit;
+ }
+
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,
$Page_Width,$Right_Margin,$_POST['Consolidation'],$reportdate);
@@ -194,7 +201,6 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
$Right_Margin,$_POST['Consolidation'],$reportdate);
- // include('includes/MRPPlannedPurchaseOrdersPageHeader.inc');
}
} /*end while loop */
@@ -235,27 +241,9 @@
$DisplayTotalVal = number_format($Total_Extcost,2);
$pdf->addTextWrap(310,$YPos,60,$FontSize,$DisplayTotalVal, 'right');
- $pdfcode = $pdf->output();
- $len = strlen($pdfcode);
-
- if ($len<=20){
- $title = _('Print MRP Planned Purchase Orders Error');
- include('includes/header.inc');
- prnMsg(_('There were no items with planned purchase orders'),'error');
- echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
- include('includes/footer.inc');
- exit;
- } else {
- header('Content-type: application/pdf');
- header("Content-Length: " . $len);
- header('Content-Disposition: inline; filename=MRPPlannedOrders.pdf');
- header('Expires: 0');
- header('Cache-Control: private, post-check=0, pre-check=0');
- header('Pragma: public');
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_MRP_Planned_Purchase_Orders_' . Date('Y-m-d') . '.pdf');
+ $pdf->__destruct();
- $pdf->Output('MRPPlannedPurchaseOrders.pdf', 'I');
- }
-
} else { /*The option to print PDF was not hit so display form */
$title=_('MRP Planned Purchase Orders Reporting');
Modified: trunk/MRPPlannedWorkOrders.php
===================================================================
--- trunk/MRPPlannedWorkOrders.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/MRPPlannedWorkOrders.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.6 $ */
+/* $Id$ */
// MRPPlannedWorkOrders.php - Report of manufactured parts that MRP has determined should have
// work orders created for them
$PageSecurity = 2;
@@ -8,10 +9,10 @@
include('includes/PDFStarter.php');
+ $pdf->addInfo('Title',_('MRP Planned Work Orders Report'));
+ $pdf->addInfo('Subject',_('MRP Planned Work Orders'));
+
$FontSize=9;
- $pdf->addinfo('Title',_('MRP Planned Work Orders Report'));
- $pdf->addinfo('Subject',_('MRP Planned Work Orders'));
-
$PageNumber=1;
$line_height=12;
$Xpos = $Left_Margin+1;
@@ -109,8 +110,15 @@
include('includes/footer.inc');
exit;
}
+ if (DB_num_rows($result)==0){ //then there's nothing to print
+ $title = _('Print MRP Planned Work Orders');
+ include('includes/header.inc');
+ prnMsg(_('There were no items with demand greater than supply'),'info');
+ echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ include('includes/footer.inc');
+ exit;
+ }
- //include ('includes/MRPPlannedWorkOrdersPageHeader.inc');
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,
$Page_Width,$Right_Margin,$_POST['Consolidation'],$reportdate);
@@ -211,27 +219,9 @@
$DisplayTotalVal = number_format($Total_Extcost,2);
$pdf->addTextWrap(310,$YPos,60,$FontSize,$DisplayTotalVal, 'right');
- $pdfcode = $pdf->output();
- $len = strlen($pdfcode);
-
- if ($len<=20){
- $title = _('Print MRP Planned Work Orders');
- include('includes/header.inc');
- prnMsg(_('There were no items with demand greater than supply'),'error');
- echo "<br><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
- include('includes/footer.inc');
- exit;
- } else {
- header('Content-type: application/pdf');
- header("Content-Length: " . $len);
- header('Content-Disposition: inline; filename=MRPPlannedWorkOrders.pdf');
- header('Expires: 0');
- header('Cache-Control: private, post-check=0, pre-check=0');
- header('Pragma: public');
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_MRP_Planned_Work_Orders_' . Date('Y-m-d') . '.pdf');
+ $pdf->__destruct();
- $pdf->Output('MRPPlannedWorkOrders.pdf', 'I');
- }
-
} else { /*The option to print PDF was not hit so display form */
$title=_('MRP Planned Work Orders Reporting');
Modified: trunk/MRPReschedules.php
===================================================================
--- trunk/MRPReschedules.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/MRPReschedules.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,5 +1,8 @@
<?php
-/* $Revision: 1.3 $ */
+
+/*$Id$*/
+
+/* $Revision: 1.4 $ */
// MRPReschedules.php - Report of purchase orders and work orders that MRP determines should be
// rescheduled.
$PageSecurity = 2;
@@ -8,11 +11,9 @@
If (isset($_POST['PrintPDF'])) {
include('includes/PDFStarter.php');
-
+ $pdf->addInfo('Title',_('MRP Reschedule Report'));
+ $pdf->addInfo('Subject',_('MRP Reschedules'));
$FontSize=9;
- $pdf->addinfo('Title',_('MRP Reschedule Report'));
- $pdf->addinfo('Subject',_('MRP Reschedules'));
-
$PageNumber=1;
$line_height=12;
@@ -42,6 +43,18 @@
exit;
}
+ if (DB_num_rows($result) == 0) {
+ $title = _('MRP Reschedules') . ' - ' . _('Problem Report');
+ include('includes/header.inc');
+ prnMsg( _('No MRP reschedule retrieved'), 'warn');
+ echo "<br><a href='" .$rootpath .'/index.php?' . SID . "'>" . _('Back to the menu') . '</a>';
+ if ($debug==1){
+ echo "<br>$sql";
+ }
+ include('includes/footer.inc');
+ exit;
+ }
+
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
$Right_Margin);
$Tot_Val=0;
@@ -94,7 +107,7 @@
//$pdf->addTextWrap(80,$YPos,260-$Left_Margin,$FontSize,_('Grand Total Value'), 'right');
//$DisplayTotalVal = number_format($Tot_Val,2);
//$pdf->addTextWrap(500,$YPos,60,$FontSize,$DisplayTotalVal, 'right');
-
+/* UldisN
$pdfcode = $pdf->output();
$len = strlen($pdfcode);
@@ -115,6 +128,9 @@
$pdf->Output('MRPRescedules.pdf', 'I');
}
+*/
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_MRPReschedules_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf->__destruct(); //UldisN
} else { /*The option to print PDF was not hit so display form */
@@ -178,4 +194,4 @@
$YPos =$YPos - (2*$line_height);
$PageNumber++;
} // End of PrintHeader function
-?>
\ No newline at end of file
+?>
Modified: trunk/OutstandingGRNs.php
===================================================================
--- trunk/OutstandingGRNs.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/OutstandingGRNs.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,5 +1,9 @@
<?php
+
+/*$Id$*/
+
/* $Revision: 1.11 $ */
+
$PageSecurity = 2;
include('includes/session.inc');
@@ -10,12 +14,9 @@
AND strlen($_POST['ToCriteria'])>=1){
include('includes/PDFStarter.php');
-
-
- $FontSize=10;
- $pdf->addinfo('Title',_('Outstanding GRNs Report'));
- $pdf->addinfo('Subject',_('Outstanding GRNs Valuation'));
-
+ $pdf->addInfo('Title',_('Outstanding GRNs Report'));
+ $pdf->addInfo('Subject',_('Outstanding GRNs Valuation'));
+ $FontSize=10;
$PageNumber=1;
$line_height=12;
$Left_Margin=30;
@@ -58,6 +59,18 @@
exit;
}
+ if (DB_num_rows($GRNsResult) == 0) {
+ $title = _('Outstanding GRN Valuation') . ' - ' . _('Problem Report');
+ include('includes/header.inc');
+ prnMsg(_('No outstanding GRNs valuation details retrieved'), 'warn');
+ echo "<br><a href='" .$rootpath ."/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ if ($debug==1){
+ echo "<br>$SQL";
+ }
+ include('includes/footer.inc');
+ exit;
+ }
+
include ('includes/PDFOstdgGRNsPageHeader.inc');
$Tot_Val=0;
@@ -129,7 +142,7 @@
$LeftOvers = $pdf->addTextWrap(500,$YPos,60,$FontSize,$DisplayTotalVal, 'right');
$pdf->line($Left_Margin, $YPos+$line_height-2,$Page_Width-$Right_Margin, $YPos+$line_height-2);
$YPos -=(2*$line_height);
-
+/* UldisN
$pdfcode = $pdf->output();
$len = strlen($pdfcode);
@@ -149,7 +162,10 @@
header('Pragma: public');
$pdf->Output('OutstandingGRNs.pdf','I');
- }
+ }
+*/
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_OSGRNsValuation_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf->__destruct(); //UldisN
} else { /*The option to print PDF was not hit */
$title=_('Outstanding GRNs Report');
@@ -168,4 +184,4 @@
} /*end of else not PrintPDF */
-?>
\ No newline at end of file
+?>
Modified: trunk/PDFBankingSummary.php
===================================================================
--- trunk/PDFBankingSummary.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/PDFBankingSummary.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,7 +1,9 @@
<?php
-/* $Revision: 1.11 $ */
+/*$Id$*/
+/* $Revision: 1.14 $ */
+
$PageSecurity = 3;
include ('includes/session.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -58,10 +60,10 @@
$DbgMsg = _('The SQL used to get the receipt header information that failed was');
$Result=DB_query($SQL,$db,$ErrMsg,$DbgMsg);
- if (DB_num_rows($Result)==0){
+ if (DB_num_rows($Result) == 0){
$title = _('Create PDF Print-out For A Batch Of Receipts');
include ('includes/header.inc');
- prnMsg(_('The receipt batch number') . ' ' . $_POST['BatchNo'] . ' ' . _('was not found in the database') . '. ' . _('Please try again selecting a different batch number'),'error');
+ prnMsg(_('The receipt batch number') . ' ' . $_POST['BatchNo'] . ' ' . _('was not found in the database') . '. ' . _('Please try again selecting a different batch number'), 'warn');
include('includes/footer.inc');
exit;
}
@@ -118,17 +120,25 @@
exit;
}
+if (DB_num_rows($GLRecs) == 0){
+ $title = _('Create PDF Print-out For A Batch Of Receipts');
+ include ('includes/header.inc');
+ prnMsg(_('No GL receipts retrieved for batch number') . ' ' . $_POST['BatchNo'], 'warn');
+ if ($debug==1){
+ prnMsg(_('The SQL used to get the GL receipt information that no any record retrieved') . ':<br>' . $SQL,'error');
+ }
+ include('includes/footer.inc');
+ exit;
+}
+
include('includes/PDFStarter.php');
/*PDFStarter.php has all the variables for page size and width set up depending on the users default preferences for paper size */
-
-$pdf->addinfo('Title',_('Banking Summary'));
-$pdf->addinfo('Subject',_('Banking Summary Number') . ' ' . $_POST['BatchNo']);
-
+$pdf->addInfo('Title',_('Banking Summary'));
+$pdf->addInfo('Subject',_('Banking Summary Number') . ' ' . $_POST['BatchNo']);
$line_height=12;
$PageNumber = 0;
-
$TotalBanked = 0;
include ('includes/PDFBankingSummaryPageHeader.inc');
@@ -166,7 +176,7 @@
$YPos-=$line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,number_format($TotalBanked,2), 'right');
$LeftOvers = $pdf->addTextWrap($Left_Margin+65,$YPos,300,$FontSize,_('TOTAL') . ' ' . $Currency . ' ' . _('BANKED'), 'left');
-
+/* UldisN
$buf = $pdf->output();
$len = strlen($buf);
header('Content-type: application/pdf');
@@ -177,6 +187,11 @@
header('Pragma: public');
$pdf->stream();
+*/
+$pdf->OutputD($_SESSION['DatabaseName'] . '_BankingSummary_' . date('Y-m-d').'.pdf');//UldisN
+$pdf->__destruct(); //UldisN
+}
+/*
} else {
$title = _('Create PDF Print Out For A Batch Of Receipts');
include ('includes/header.inc');
@@ -185,5 +200,6 @@
echo '<br><div class="centre"><a href="'.$_SERVER['PHP_SELF'].'">'._('Return to Entry screen').'</a>';
include ('includes/footer.inc');
}
+*/
-?>
\ No newline at end of file
+?>
Modified: trunk/PDFCustomerList.php
===================================================================
--- trunk/PDFCustomerList.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/PDFCustomerList.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,12 +1,19 @@
<?php
/* $Revision: 1.13 $ */
+/* $Id$ */
+
$PageSecurity = 2;
include('includes/session.inc');
if (isset($_POST['PrintPDF'])){
include('includes/PDFStarter.php');
+ $pdf->addInfo('Title', _('Customer Listing') );
+ $pdf->addInfo('Subject', _('Customer Listing') );
+ $line_height=12;
+ $PageNumber = 0;
+ $FontSize=10;
if ($_POST['Activity']!='All'){
if (!is_numeric($_POST['ActivityAmount'])){
@@ -19,14 +26,6 @@
}
}
- $PageNumber = 0;
-
- $FontSize=10;
- $pdf->addinfo('Title', _('Customer Listing') );
- $pdf->addinfo('Subject', _('Customer Listing') );
-
- $line_height=12;
-
/* Now figure out the customer data to report for the selections made */
if (in_array('All', $_POST['Areas'])){
@@ -241,6 +240,16 @@
exit;
}
+ if (DB_num_rows($CustomersResult) == 0) {
+ $title = _('Customer List') . ' - ' . _('Problem Report') . '....';
+ include('includes/header.inc');
+ prnMsg( _('This report has no output because there were no customers retrieved'), 'error' );
+ echo '<br><a href="' .$rootpath .'/index.php?' . SID . '">'. _('Back to the menu'). '</a>';
+ include('includes/footer.inc');
+ exit;
+ }
+
+
include('includes/PDFCustomerListPageHeader.inc');
$Area ='';
@@ -288,10 +297,10 @@
if ($YPos < ($Bottom_Margin + 80)){
include('includes/PDFCustomerListPageHeader.inc');
}
- $pdf->selectFont('./fonts/Helvetica-Bold.afm');
+ $pdf->setFont('','B');
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,260-$Left_Margin,$FontSize,_('Customers in') . ' ' . $Customers['areadescription']);
$Area = $Customers['area'];
- $pdf->selectFont('./fonts/Helvetica.afm');
+ $pdf->setFont('','');
$FontSize=8;
$YPos -=$line_height;
}
@@ -302,9 +311,9 @@
if ($YPos < ($Bottom_Margin + 80)){
include('includes/PDFCustomerListPageHeader.inc');
}
- $pdf->selectFont('./fonts/Helvetica-Bold.afm');
+ $pdf->setFont('','B');
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,300-$Left_Margin,$FontSize,$Customers['salesmanname']);
- $pdf->selectFont('./fonts/Helvetica.afm');
+ $pdf->setFont('','');
$SalesPerson = $Customers['salesman'];
$FontSize=8;
$YPos -=$line_height;
@@ -312,7 +321,6 @@
$YPos -=$line_height;
-
$LeftOvers = $pdf->addTextWrap(20,$YPos,60,$FontSize,$Customers['debtorno']);
$LeftOvers = $pdf->addTextWrap(80,$YPos,150,$FontSize,$Customers['name']);
$LeftOvers = $pdf->addTextWrap(80,$YPos-10,150,$FontSize,$Customers['address1']);
@@ -351,29 +359,8 @@
} /*end if $PrintThisCustomer == true */
} /*end while loop */
-
- $pdfcode = $pdf->output('PDFCustomerList.pdf', 'I');
- $len = strlen($pdfcode);
-
- if ($len<=20){
- $title = _('Print Customer List Error');
- include('includes/header.inc');
- echo '<p>';
- prnMsg( _('There were no customers to print out for the selections specified') );
- echo '<br><a href="'. $rootpath.' /index.php?' . SID . '">'. _('Back to the menu'). '</a>';
- include('includes/footer.inc');
- exit;
- } else {
- header('Content-type: application/pdf');
- header('Content-Length: ' . $len);
- header('Content-Disposition: inline; filename=CustomerList.pdf');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
-
- $pdf->Output('PDFCustomerList.pdf', 'I');
-
- }
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_CustomerList_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf->__destruct(); //UldisN
exit;
} else {
@@ -424,4 +411,4 @@
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
\ No newline at end of file
+?>
Modified: trunk/PDFGrn.php
===================================================================
--- trunk/PDFGrn.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/PDFGrn.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,4 +1,7 @@
<?php
+
+/*$Id$*/
+
/* $Revision: 1.5 $ */
$PageSecurity = 2;
@@ -6,10 +9,8 @@
include('includes/PDFStarter.php');
-
+$pdf->addInfo('Title', _('Goods Received Note') );
$FontSize=10;
-$pdf->addinfo('Title', _('Goods Received Note') );
-
$PageNumber=1;
$line_height=12;
@@ -22,6 +23,9 @@
$sql='SELECT itemcode, grnno, deliverydate, itemdescription, qtyrecd, supplierid from grns where grnbatch='.
$_GET['GRNNo'];
$result=DB_query($sql, $db);
+
+$ListCount = DB_num_rows($result); // UldisN
+
$counter=1;
while ($myrow=DB_fetch_array($result)) {
$StockID=$myrow[0];
@@ -48,10 +52,11 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos-(10*$counter+130),300-$Left_Margin,$FontSize, _('Signed for ').'______________________');
-$pdfcode = $pdf->output();
-$len = strlen($pdfcode);
+//$pdfcode = $pdf->output();
+//$len = strlen($pdfcode);
-if ($len<=20){
+//if ($len<=20){
+if ($ListCount == 0) { //UldisN
$title = _('Print Price List Error');
include('includes/header.inc');
prnMsg(_('There were no stock transfer details to print'),'warn');
@@ -59,6 +64,7 @@
include('includes/footer.inc');
exit;
} else {
+/* UldisN
header('Content-type: application/pdf');
header('Content-Length: ' . $len);
header('Content-Disposition: inline; filename=GRN.pdf');
@@ -67,6 +73,9 @@
header('Pragma: public');
$pdf->Output('GRN.pdf', 'I');
+*/
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_GRN_' . date('Y-m-d').'.pdf');//UldisN
+ $pdf->__destruct(); //UldisN
}
Modified: trunk/PDFLowGP.php
===================================================================
--- trunk/PDFLowGP.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/PDFLowGP.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,7 +1,9 @@
<?php
-/* $Revision: 1.14 $ */
+/*$Id$*/
+/* $Revision: 1.15 $ */
+
$PageSecurity = 2;
include('includes/session.inc');
@@ -12,8 +14,12 @@
if (isset($_POST['PrintPDF'])) {
include('includes/PDFStarter.php');
+ $pdf->addInfo('Title', _('Low Gross Profit Sales'));
+ $pdf->addInfo('Subject', _('Low Gross Profit Sales'));
+ $FontSize=10;
+ $PageNumber=1;
+ $line_height=12;
-
$title = _('Low GP sales') . ' - ' . _('Problem Report');
if (! Is_Date($_POST['FromDate']) OR ! Is_Date($_POST['ToDate'])){
@@ -23,12 +29,7 @@
exit;
}
- $FontSize=10;
- $pdf->addinfo('Title',_('Low Gross Profit Sales'));
- $pdf->addinfo('Subject',_('Low Gross Profit Sales'));
- $PageNumber=1;
- $line_height=12;
/*Now figure out the data to report for the category range under review */
$SQL = "SELECT stockmaster.categoryid,
@@ -66,6 +67,18 @@
exit;
}
+ if (DB_num_rows($LowGPSalesResult) == 0) {
+
+ include('includes/header.inc');
+ prnMsg(_('No low GP items retrieved'), 'warn');
+ echo "<br><a href='" . $rootpath . "/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+ if ($debug==1){
+ echo "<br>$SQL";
+ }
+ include('includes/footer.inc');
+ exit;
+ }
+
include ('includes/PDFLowGPPageHeader.inc');
$Tot_Val=0;
$Category = '';
@@ -99,7 +112,7 @@
$FontSize =10;
$YPos -= (2*$line_height);
-
+/* UldisN
$pdfcode = $pdf->output();
$len = strlen($pdfcode);
@@ -119,8 +132,11 @@
header('Pragma: public');
$pdf->Output('PDFLowGP.pdf', 'I');
+ }
+*/
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_LowGPSales_' . date('Y-m-d') . '.pdf');//UldisN
+ $pdf->__destruct(); //UldisN
- }
} else { /*The option to print PDF was not hit */
include('includes/header.inc');
@@ -151,4 +167,4 @@
} /*end of else not PrintPDF */
-?>
\ No newline at end of file
+?>
Modified: trunk/PDFPriceList.php
===================================================================
--- trunk/PDFPriceList.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/PDFPriceList.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -1,21 +1,21 @@
<?php
-/* $Revision: 1.14 $ */
+/* $Id$ */
+/* $Revision: 1.15 $ */
+
$PageSecurity = 2;
include('includes/session.inc');
-If (isset($_POST['PrintPDF'])
- AND isset($_POST['FromCriteria'])
- AND strlen($_POST['FromCriteria'])>=1
- AND isset($_POST['ToCriteria'])
- AND strlen($_POST['ToCriteria'])>=1){
+if (isset($_POST['PrintPDF'])
+ and isset($_POST['FromCriteria'])
+ and strlen($_POST['FromCriteria'])>=1
+ and isset($_POST['ToCriteria'])
+ and strlen($_POST['ToCriteria'])>=1){
include('includes/PDFStarter.php');
-
+ $pdf->addInfo('Title', _('Price Listing Report') );
+ $pdf->addInfo('Subject', _('Price List') );
$FontSize=10;
- $pdf->addinfo('Title', _('Price Listing Report') );
- $pdf->addinfo('Subject', _('Price List') );
-
$PageNumber=1;
$line_height=12;
@@ -97,6 +97,8 @@
}
$PricesResult = DB_query($SQL,$db,'','',false,false);
+ $ListSize = count ($PricesResult); //Javier
+
if (DB_error_no($db) !=0) {
$title = _('Price List') . ' - ' . _('Problem Report....');
include('includes/header.inc');
@@ -113,7 +115,7 @@
$CurrCode ='';
$Category = '';
$CatTot_Val=0;
- While ($PriceList = DB_fetch_array($PricesResult,$db)){
+ while ($PriceList = DB_fetch_array($PricesResult,$db)){
if ($CurrCode != $PriceList['currabrev']){
$FontSize=10;
@@ -124,7 +126,7 @@
$YPos -= $line_height;
}
- if ($Category!=$PriceList['categoryid']){
+ if ($Category!= $PriceList['categoryid']){
$FontSize=10;
$YPos -=(2*$line_height);
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,300-$Left_Margin,$FontSize,$PriceList['categoryid'] . ' - ' . $PriceList['categorydescription']);
@@ -137,7 +139,8 @@
$YPos -=$line_height;
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,$PriceList['stockid']); $LeftOvers = $pdf->addTextWrap(120,$YPos,260,$FontSize,$PriceList['description']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,$PriceList['stockid']);
+ $LeftOvers = $pdf->addTextWrap(120,$YPos,260,$FontSize,$PriceList['description']);
if ($_POST['CustomerSpecials']=='Customer Special Prices Only'){
/*Need to show to which branch the price relates */
@@ -170,28 +173,37 @@
} /*end inventory valn while loop */
- $FontSize =10;
/*Print out the category totals */
- $pdfcode = $pdf->output();
- $len = strlen($pdfcode);
-
- if ($len<=20){
+// Javier: this was actually the Price List that was PDF-Created but it seems it was intended to be only the check that I named ListSize.
+/* $FontSize =10;
+ $FileName= $_SESSION['DatabaseName'] . '_' .'PriceList_' . date('Y-m-d').'.pdf';
+// $pdfcode = $pdf->output();
+ $pdfcode = $pdf->OutputD($Filename);
+ $len = strlen($pdfcode); */
+// if ($len<=20){
+ if ($ListSize == 0) {
$title = _('Print Price List Error');
include('includes/header.inc');
prnMsg(_('There were no price details to print out for the customer or category specified'),'warn');
echo '<br><a href="'.$rootpath.'/index.php?' . SID . '">'. _('Back to the menu').'</a>';
include('includes/footer.inc');
exit;
- } else {
- header('Content-type: application/pdf');
+ } else {
+
+// Javier: TCPDF sends its own http header, it's an error to send it twice.
+ /* header('Content-type: application/pdf');
header('Content-Length: ' . $len);
header('Content-Disposition: inline; filename=PriceList.pdf');
header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
- $FileName=$_SESSION['DatabaseName'].'_'.date('Y-m-d').'.pdf';
- $pdf->Output($FileName,'I');
+ header('Pragma: public'); */
+// $FontSize =10;
+ $FileName= $_SESSION['DatabaseName'] . '_' .'PriceList_' . date('Y-m-d').'.pdf';
+// $pdf->Output($FileName,'I');
+// Javier: This is a recursive script, so it needs to be downloaded.
+ $pdf->OutputD($FileName);
+ $pdf-> __destruct();
}
} else { /*The option to print PDF was not hit */
@@ -208,7 +220,7 @@
$sql='SELECT categoryid, categorydescription FROM stockcategory ORDER BY categoryid';
$CatResult= DB_query($sql,$db);
- While ($myrow = DB_fetch_array($CatResult)){
+ while ($myrow = DB_fetch_array($CatResult)){
echo "<option VALUE='" . $myrow['categoryid'] . "'>" . $myrow['categoryid'] . ' - ' . $myrow['categorydescription'];
}
echo '</select></td></tr>';
@@ -218,7 +230,7 @@
/*Set the index for the categories result set back to 0 */
DB_data_seek($CatResult,0);
- While ($myrow = DB_fetch_array($CatResult)){
+ while ($myrow = DB_fetch_array($CatResult)){
echo '<option VALUE="' . $myrow['categoryid'] . '">' . $myrow['categoryid'] . ' - ' . $myrow['categorydescription'];
}
echo '</select></td></tr>';
@@ -242,9 +254,10 @@
echo '<option selected Value="Sales Type Prices">'. _('Default Sales Type Prices');
echo '</select></td></tr>';
- echo '</table><div class="centre"><input type=Submit Name="PrintPDF" Value="'. _('Print PDF'). '"></div>';
+ /*echo '</table><div class="centre"><input type=Submit Name="PrintPDF" Value="'. _('Print PDF'). '"></div>';*/
+ echo '</table><div class="centre"><input type=Submit Name="PrintPDF" Value="'. _('Print PDF'). '"></div></form>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
\ No newline at end of file
+?>
Modified: trunk/PDFQuotation.php
===================================================================
--- trunk/PDFQuotation.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/PDFQuotation.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -81,18 +81,15 @@
LETS GO */
$PaperSize = 'A4_Landscape';
include('includes/PDFStarter.php');
-
+$pdf->addInfo('Title', _('Customer Quotation') );
+$pdf->addInfo('Subject', _('Quotation') . ' ' . $_GET['QuotationNo']);
$FontSize=12;
+$PageNumber = 1;
+$line_height=24;
$pdf->selectFont('./fonts/Helvetica.afm');
-$pdf->addinfo('Title', _('Customer Quotation') );
-$pdf->addinfo('Subject', _('Quotation') . ' ' . $_GET['QuotationNo']);
-$line_height=24;
-
/* Now ... Has the order got any line items still outstanding to be invoiced */
-$PageNumber = 1;
-
$ErrMsg = _('There was a problem retrieving the quotation line details for quotation Number') . ' ' .
$_GET['QuotationNo'] . ' ' . _('from the database');
@@ -110,14 +107,18 @@
$result=DB_query($sql,$db, $ErrMsg);
+$ListCount = 0; // UldisN
+
if (DB_num_rows($result)>0){
/*Yes there are line items to start the ball rolling with a page header */
include('includes/PDFQuotationPageHeader.inc');
-
+
$QuotationTotal =0;
-
+
while ($myrow2=DB_fetch_array($result)){
+ $ListCount ++;
+
if ((strlen($myrow2['narrative']) >200 AND $YPos-$line_height <= 75)
OR (strlen($myrow2['narrative']) >1 AND $YPos-$line_height <= 62)
OR $YPos-$line_height <= 50){
@@ -223,9 +224,9 @@
} /*end if there are line details to show on the quotation*/
-$pdfcode = $pdf->output('PDFQuotation.pdf', 'I');
-$len = strlen($pdfcode);
-if ($len<=20){
+//$pdfcode = $pdf->output('PDFQuotation.pdf', 'I');
+//$len = strlen($pdfcode);
+if ($ListCount == 0){
$title = _('Print Quotation Error');
include('includes/header.inc');
echo '<p>'. _('There were no items on the quotation') . '. ' . _('The quotation cannot be printed').
@@ -234,6 +235,7 @@
include('includes/footer.inc');
exit;
} else {
+/*
header('Content-type: application/pdf');
header('Content-Length: ' . $len);
header('Content-Disposition: inline; filename=Quotation.pdf');
@@ -242,5 +244,8 @@
header('Pragma: public');
//echo 'here';
$pdf->Output('PDFQuotation.pdf', 'I');
+*/
+ $pdf->OutputI($_SESSION['DatabaseName'] . '_Quotation_' . date('Y-m-d') . '.pdf');//UldisN
+ $pdf->__destruct(); //UldisN
}
-?>
\ No newline at end of file
+?>
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2009-12-14 19:52:35 UTC (rev 3226)
+++ trunk/PO_Header.php 2009-12-14 20:07:21 UTC (rev 3227)
@@ -111,7 +111,7 @@
$_POST['StatComments']=' - '.$_POST['StatComments'];
}
- if ($NewStatus==_('Authorised')) {
+ if ($NewStatus == PurchOrder::STATUS_AUTHORISED) {
if ($AuthorityLevel>$OrderTotal) {
$StatusComment=$date.' - Authorised by <a href="mailto:'.$emailrow['email'].'">'.$_SESSION['UserID'].
'</a>'.$_POST['StatComments'].'<br>'.$_POST['statcommentscomplete'];
@@ -126,7 +126,7 @@
}
}
- if ($NewStatus==_('Cancelled') and $OK_to_updstat==1) {
+ if ($NewStatus == PurchOrder::STATUS_CANCELLED and $OK_to_updstat==1) {
if ($AuthorityLevel>$OrderTotal or $_SESSION['UserID']==$_SESSION['PO'.$identifier]->Initiator ) {
$StatusComment=$date.' - Cancelled by <a href="mailto:'.$emailrow['email'].'">'.$_SESSION['UserID'].
'</a>'.$_POST['StatComments'].'<br>'.$_POST['statcommentscomplete'];
@@ -141,7 +141,7 @@
}
}
- if ($NewStatus==_('Rejected') and $OK_to_updstat==1) {
+ if ($NewStatus == PurchOrder::STATUS_REJECTED and $OK_to_updstat==1) {
if ($AuthorityLevel>$OrderTotal) {
$StatusComment=$date.' - Rejected by <a href="mailto:'.$emailrow['email'].'">'.$_SESSION['UserID'].
'</a>'.$_POST['StatComments'].'<br>'.$_POST['statcommentscomplete'];
@@ -156,7 +156,7 @@
}
}
- if ($NewStatus==_('Pending') and $OK_to_updstat==1) {
+ if ($NewStatus == PurchOrder::STATUS_PENDING and $OK_to_updstat==1) {
if ($AuthorityLevel>$OrderTotal or $_SESSION['UserID']==$_SESSION['PO'.$identifier]->Initiator ) {
$StatusComment=$date.' - Returned to Pending status by <a href="mailto:'.$emailrow['email'].'">'.$_SESSION['UserID'].
'</a>'.$_POST['StatComments'].'<br>'.$_POST['statcommentscomplete'];
@@ -170,7 +170,7 @@
_('If you think this is a mistake please contact the systems administrator') , 'warn');
}
}
-
+
if ($OK_to_updstat==1){
// unset($_SESSION['PO'.$identifier]->LineItems);
// unset($_SESSION['PO'.$identifier]);
@@ -180,7 +180,7 @@
if($_SESSION['ExistingOrder']!=0){
- $SQL = "UPDATE purchorders SET
+ $SQL = "UPDATE purchorders SET
status='" . $_POST['Stat']. "',
stat_comment='" . $StatusComment ."'
WHERE purchorders.orderno =" . $_SESSION['ExistingOrder'];
@@ -281,8 +281,8 @@
echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PO_Items.php?' . SID . 'identifier='.$identifier. "'>";
echo '<p>';
- prnMsg(_('You should automatically be forwarded to the entry of the purchase order line items page') . '. ' .
- _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ') ' .
+ prnMsg(_('You should automatically be forwarded to the entry of the purchase order line items page') . '. ' .
+ _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ') ' .
"<a href='$rootpath/PO_Items.php?" . SID. 'identifier='.$identifier . "'>" . _('click here') . '</a> ' . _('to continue'),'info');
include('includes/footer.inc');
exit;
@@ -308,9 +308,9 @@
if($_SESSION['PO'.$identifier]->Any_Already_Received()==1){
$OK_to_delete =0;
- prnMsg( _('This order cannot be cancelled because some of it has already been received') . '. ' .
- _('The line item quantities may be modified to quantities more than already received') . '. ' .
- _('Prices cannot be altered for lines that have already been received') .' '.
+ prnMsg( _('This order cannot be cancelled because some of it has already been received') . '. ' .
+ _('The line item quantities may be modified to quantities more than already received') . '. ' .
+ _('Prices cannot be altered for lines that have already been received') .' '.
_('and quantities cannot be reduced below the quantity already received'),'warn');
}
@@ -336,7 +336,7 @@
$DelResult=DB_query($sql,$db,$ErrMsg);
$sql="UPDATE purchorders
- SET status='Cancelled',
+ SET status='".PurchOrder::STATUS_CANCELLED."',
stat_comment='".$StatusComment."'
WHERE orderno=".$_SESSION['ExistingOrder'];
@@ -384,14 +384,14 @@
/* change supplier only allowed with appropriate permissions -
* button only displayed to modify is AccessLevel >10
* (see below)*/
- if ($_SESSION['PO'.$identifier]->Stat==_('Pending') and $_SESSION['UserID']==$_SESSION['PO'.$identifier]->Initiator) {
+ if ($_SESSION['PO'.$identifier]->Stat == PurchOrder::STATUS_PENDING and $_SESSION['UserID']==$_SESSION['PO'.$identifier]->Initiator) {
if ($_SESSION['PO'.$identifier]->Any_Already_Received()==0){
$emailsql='SELECT email FROM www_users WHERE userid="'.$_SESSION['PO'.$identifier]->Initiator.'"';
$emailresult=DB_query($emailsql, $db);
$emailrow=DB_fetch_array($emailresult);
$date = date($_SESSION['DefaultDateFormat']);
$_SESSION['RequireSupplierSelection']=1;
- $_SESSION['PO'.$identifier]->Stat=_('Pending');
+ $_SESSION['PO'.$identifier]->Stat = PurchOrder::STATUS_PENDING;
$StatusComment=$date.' - Supplier changed by <a href="mailto:'.$emailrow['email'].'">'.$_SESSION['UserID'].
'</a> - '.$_POST['StatComments'].'<br>'.$_POST['statcommentscomplete'];
$_SESSION['PO'.$identifier]->StatComments=$StatusComment;
@@ -457,7 +457,7 @@
$myrow=DB_fetch_array($result_SuppSelect);
$_POST['Select'] = $myrow['supplierid'];
} elseif (DB_num_rows($result_SuppSelect)==0){
- prnMsg( _('No supplier records contain the selected text') . ' - ' .
+ prnMsg( _('No supplier records contain the selected text') . ' - ' .
_('please alter your search criteria and try again'),'info');
}
} /*one of keywords or SuppCode was more than a zero length string */
@@ -523,7 +523,7 @@
ON suppliers.currcode=currencies.currabrev
WHERE supplierid='" . $_POST['Select'] . "'";
- $ErrMsg = _('The supplier record of the supplier selected') . ': ' . $_POST['Select'] . ' ' .
+ $ErrMsg = _('The supplier record of the supplier selected') . ': ' . $_POST['Select'] . ' ' .
_('cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the supplier details and failed was');
$result =DB_query($sql,$db,$ErrMsg,$DbgMsg);
@@ -586,7 +586,7 @@
ON suppliers.currcode=currencies.currabrev
WHERE supplierid='" . $_POST['Select'] . "'";
- $ErrMsg = _('The supplier record of the supplier selected') . ': ' . $_POST['Select'] . ' ' .
+ $ErrMsg = _('The supplier record of the supplier selected') . ': ' . $_POST['Select'] . ' ' .
_('cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the supplier details and failed was');
$result =DB_query($sql,$db,$ErrMsg,$DbgMsg);
@@ -633,7 +633,7 @@
if ($_SESSION['RequireSupplierSelection'] ==1 OR !isset($_SESSION['PO'.$identifier]->SupplierID) OR
$_SESSION['PO'.$identifier]->SupplierID=='' ) {
//if (true) {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' .
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' .
_('Purchase Order') . '" alt="">' . ' ' . _('Purchase Order: Select Supplier') . '';
echo "<form action='" . $_SERVER['PHP_SELF'] . '?' . SID . "identifier=".$identifier."' method=post name='choosesupplier'>";
if (strlen($msg)>1){
@@ -710,12 +710,15 @@
// Be careful not made confused by orderno and realorderno
// $orderno = previous_id("purchorders","orderno");
// $_SESSION['PO'.$identifier]->OrderNo2 = $orderno;
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' .
- _('Purchase Order') . '" alt="">';
- echo ' '.$_SESSION['PO'.$identifier]->SupplierName . '</u> </b> - ' . _('All amounts stated in') . ' ' .
- $_SESSION['PO'.$identifier]->CurrCode . '<br>';
+ echo '<p class="page_title_text">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order') . '" alt="">
+ ' . $_...
[truncated message content] |
|
From: <tim...@us...> - 2009-12-14 20:21:45
|
Revision: 3228
http://web-erp.svn.sourceforge.net/web-erp/?rev=3228&view=rev
Author: tim_schofield
Date: 2009-12-14 20:21:39 +0000 (Mon, 14 Dec 2009)
Log Message:
-----------
Include pdflanguage field in www_users
Modified Paths:
--------------
trunk/doc/Change.log.html
trunk/sql/mysql/upgrade3.11.1-3.12.sql
Removed Paths:
-------------
trunk/sql/mysql/upgrade3.12-3.13.sql
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-12-14 20:07:21 UTC (rev 3227)
+++ trunk/doc/Change.log.html 2009-12-14 20:21:39 UTC (rev 3228)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>14/12/09 Tim: upgrade3.11-3.12.sql - Include pdflanguage field in www_users
<p>12/12/09 Simon Peter Otandeka - FixedAssetRegister.php and FixedAssetJournal.php - Bux fixes to asset manager.
<p>11/12/09 Tim: PO_PDFPurchOrder.php - Print the correct suppliers unit of measure.
<p>11/12/09 Tim: SelectProducts.php - Ensure that preferred supplier is shown first, and provide a direct link to purchase ordering.
Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-3.12.sql 2009-12-14 20:07:21 UTC (rev 3227)
+++ trunk/sql/mysql/upgrade3.11.1-3.12.sql 2009-12-14 20:21:39 UTC (rev 3228)
@@ -45,4 +45,6 @@
DELETE FROM `factorcompanies` WHERE `coyname`='None';
INSERT INTO `config` (`confname`, `confvalue`) VALUES ('LogPath', '');
-INSERT INTO `config` (`confname`, `confvalue`) VALUES ('LogSeverity', '0');
\ No newline at end of file
+INSERT INTO `config` (`confname`, `confvalue`) VALUES ('LogSeverity', '0');
+
+ALTER TABLE `www_users` ADD COLUMN `pdflanguage` tinyint(1) NOT NULL DEFAULT '0';
Deleted: trunk/sql/mysql/upgrade3.12-3.13.sql
===================================================================
--- trunk/sql/mysql/upgrade3.12-3.13.sql 2009-12-14 20:07:21 UTC (rev 3227)
+++ trunk/sql/mysql/upgrade3.12-3.13.sql 2009-12-14 20:21:39 UTC (rev 3228)
@@ -1,2 +0,0 @@
-ALTER TABLE `www_users` ADD COLUMN `pdflanguage` tinyint(1) NOT NULL DEFAULT '0';
-ALTER TABLE `cogsglpostings` CHANGE `area` CHAR(3) NOT NULL DEFAULT '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-16 11:43:19
|
Revision: 3233
http://web-erp.svn.sourceforge.net/web-erp/?rev=3233&view=rev
Author: tim_schofield
Date: 2009-12-16 11:41:34 +0000 (Wed, 16 Dec 2009)
Log Message:
-----------
Set Id property on file
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AccountSections.php
trunk/AddCustomerContacts.php
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/Areas.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/COGSGLPostings.php
trunk/CompanyPreferences.php
trunk/ConfirmDispatchControlled_Invoice.php
trunk/ConfirmDispatch_Invoice.php
trunk/CreditItemsControlled.php
trunk/CreditStatus.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustWhereAlloc.php
trunk/CustomerAllocations.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerTransInquiry.php
trunk/CustomerTypes.php
trunk/DailySalesInquiry.php
trunk/DebtorsAtPeriodEnd.php
trunk/DemandWorkOrders.php
trunk/DiscountCategories.php
trunk/DiscountMatrix.php
trunk/EDIMessageFormat.php
trunk/EDIProcessOrders.php
trunk/EDISendInvoices.php
trunk/EmailConfirmation.php
trunk/EmailCustTrans.php
trunk/ExchangeRateTrend.php
trunk/FTP_RadioBeacon.php
trunk/Factors.php
trunk/FixedAssetCategories.php
trunk/FixedAssetJournal.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/FreightCosts.php
trunk/GLAccountInquiry.php
trunk/GLAccounts.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLCodesInquiry.php
trunk/GLJournal.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTags.php
trunk/GLTransInquiry.php
trunk/GLTrialBalance.php
trunk/GLTrialBalance_csv.php
trunk/GeocodeSetup.php
trunk/GetStockImage.php
trunk/GoodsReceived.php
trunk/GoodsReceivedControlled.php
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
trunk/InventoryQuantities.php
trunk/InventoryValuation.php
trunk/Locations.php
trunk/Logout.php
trunk/MRP.php
trunk/MRPCreateDemands.php
trunk/MRPDemandTypes.php
trunk/MRPDemands.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReport.php
trunk/MRPReschedules.php
trunk/MRPShortages.php
trunk/MailInventoryValuation.php
trunk/MailSalesReport.php
trunk/MailSalesReport_csv.php
trunk/OrderDetails.php
trunk/OutstandingGRNs.php
trunk/PDFBankingSummary.php
trunk/PDFChequeListing.php
trunk/PDFCustomerList.php
trunk/PDFDIFOT.php
trunk/PDFDeliveryDifferences.php
trunk/PDFGrn.php
trunk/PDFLowGP.php
trunk/PDFOrderStatus.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPriceList.php
trunk/PDFQuotation.php
trunk/PDFReceipt.php
trunk/PaymentAllocations.php
trunk/PaymentMethods.php
trunk/PaymentTerms.php
trunk/Payments.php
trunk/config.distrib.php
trunk/geo_displaymap_customers.php
trunk/geo_displaymap_suppliers.php
trunk/geocode.php
trunk/geocode_genxml_customers.php
trunk/geocode_genxml_suppliers.php
trunk/includes/DateFunctions.inc
trunk/includes/class.pdf.php
trunk/index.php
Property Changed:
----------------
trunk/AccountGroups.php
trunk/AccountSections.php
trunk/AddCustomerContacts.php
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/Areas.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/COGSGLPostings.php
trunk/CompanyPreferences.php
trunk/ConfirmDispatchControlled_Invoice.php
trunk/ConfirmDispatch_Invoice.php
trunk/CreditItemsControlled.php
trunk/CreditStatus.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustWhereAlloc.php
trunk/CustomerAllocations.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerTransInquiry.php
trunk/CustomerTypes.php
trunk/DailySalesInquiry.php
trunk/DebtorsAtPeriodEnd.php
trunk/DemandWorkOrders.php
trunk/DiscountCategories.php
trunk/DiscountMatrix.php
trunk/EDIMessageFormat.php
trunk/EDIProcessOrders.php
trunk/EDISendInvoices.php
trunk/EmailConfirmation.php
trunk/EmailCustTrans.php
trunk/ExchangeRateTrend.php
trunk/FTP_RadioBeacon.php
trunk/Factors.php
trunk/FixedAssetCategories.php
trunk/FixedAssetJournal.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/FreightCosts.php
trunk/GLAccountInquiry.php
trunk/GLAccounts.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLCodesInquiry.php
trunk/GLJournal.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTags.php
trunk/GLTransInquiry.php
trunk/GLTrialBalance.php
trunk/GLTrialBalance_csv.php
trunk/GeocodeSetup.php
trunk/GetStockImage.php
trunk/GoodsReceived.php
trunk/GoodsReceivedControlled.php
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
trunk/InventoryQuantities.php
trunk/InventoryValuation.php
trunk/Locations.php
trunk/Logout.php
trunk/MRP.php
trunk/MRPCreateDemands.php
trunk/MRPDemandTypes.php
trunk/MRPDemands.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReport.php
trunk/MRPReschedules.php
trunk/MRPShortages.php
trunk/MailInventoryValuation.php
trunk/MailSalesReport.php
trunk/MailSalesReport_csv.php
trunk/OrderDetails.php
trunk/OutstandingGRNs.php
trunk/PDFBankingSummary.php
trunk/PDFChequeListing.php
trunk/PDFCustomerList.php
trunk/PDFDIFOT.php
trunk/PDFDeliveryDifferences.php
trunk/PDFGrn.php
trunk/PDFLowGP.php
trunk/PDFOrderStatus.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPriceList.php
trunk/PDFQuotation.php
trunk/PDFReceipt.php
trunk/PaymentAllocations.php
trunk/PaymentMethods.php
trunk/PaymentTerms.php
trunk/Payments.php
trunk/config.distrib.php
trunk/geo_displaymap_customers.php
trunk/geo_displaymap_suppliers.php
trunk/geocode.php
trunk/geocode_genxml_customers.php
trunk/geocode_genxml_suppliers.php
trunk/index.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/AccountGroups.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.23 $ */
+/* $Id$*/
$PageSecurity = 10;
Property changes on: trunk/AccountGroups.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/AccountSections.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.7 $ */
+/* $Id$*/
$PageSecurity = 10;
Property changes on: trunk/AccountSections.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/AddCustomerContacts.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.6 $ */
+/* $Id$*/
$PageSecurity = 3;
include('includes/session.inc');
$title = _('Customer Contacts');
Property changes on: trunk/AddCustomerContacts.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/AddCustomerNotes.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.4 $ */
+/* $Id$*/
$PageSecurity = 3;
include('includes/session.inc');
$title = _('Customer Notes');
Property changes on: trunk/AddCustomerNotes.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/AddCustomerTypeNotes.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.3 $ */
+/* $Id$*/
$PageSecurity = 3;
include('includes/session.inc');
$title = _('Customer Type (Group) Notes');
Property changes on: trunk/AddCustomerTypeNotes.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/AgedDebtors.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
- /* $Id: AgedDebtors.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
+ /* $Id$ */
/* $Revision: 1.20 $ */
Property changes on: trunk/AgedDebtors.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/AgedSuppliers.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/* $Id$ */
+/* $Id$*/
/* $Revision: 1.13 $ */
Property changes on: trunk/AgedSuppliers.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/Areas.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.22 $ */
+/* $Id$*/
$PageSecurity = 3;
include('includes/session.inc');
Property changes on: trunk/Areas.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/BOMExtendedQty.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/* $Id$ */
+/* $Id$*/
/* $Revision: 1.8 $ */
Property changes on: trunk/BOMExtendedQty.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/BOMIndented.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/* $Id: */
+/* $Id$*/
/* $Revision: 1.5 $ */
Property changes on: trunk/BOMIndented.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/BOMIndentedReverse.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/* $Id$ */
+/* $Id$*/
/* $Revision: 1.1 $ */
Property changes on: trunk/BOMIndentedReverse.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/BOMInquiry.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.12 $ */
+/* $Id$*/
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/BOMInquiry.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/BOMListing.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.14 $ */
Property changes on: trunk/BOMListing.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/BOMs.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.37 $ */
+/* $Id$*/
$PageSecurity = 9;
Property changes on: trunk/BOMs.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/BankAccounts.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.21 $ */
+/* $Id$*/
$PageSecurity = 10;
Property changes on: trunk/BankAccounts.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/BankMatching.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.23 $ */
+/* $Id$*/
$PageSecurity = 7;
Property changes on: trunk/BankMatching.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/BankReconciliation.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,7 @@
<?php
/* $Revision: 1.15 $ */
+/* $Id$*/
$PageSecurity = 7;
Property changes on: trunk/BankReconciliation.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/COGSGLPostings.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.15 $ */
+/* $Id$*/
$PageSecurity = 10;
Property changes on: trunk/COGSGLPostings.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/CompanyPreferences.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,7 @@
<?php
/* $Revision: 1.18 $ */
+/* $Id$*/
$PageSecurity =10;
Property changes on: trunk/CompanyPreferences.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ConfirmDispatchControlled_Invoice.php
===================================================================
--- trunk/ConfirmDispatchControlled_Invoice.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/ConfirmDispatchControlled_Invoice.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,7 @@
<?php
/* $Revision: 1.13 $ */
+/* $Id$*/
+
include('includes/DefineCartClass.php');
include('includes/DefineSerialItems.php');
$PageSecurity = 11;
Property changes on: trunk/ConfirmDispatchControlled_Invoice.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/ConfirmDispatch_Invoice.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,7 @@
<?php
/* $Revision: 1.67 $ */
+/* $Id$*/
/* Session started in session.inc for password checking and authorisation level check */
include('includes/DefineCartClass.php');
Property changes on: trunk/ConfirmDispatch_Invoice.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/CreditItemsControlled.php
===================================================================
--- trunk/CreditItemsControlled.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/CreditItemsControlled.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.11 $ */
+/* $Id$*/
include('includes/DefineCartClass.php');
include('includes/DefineSerialItems.php');
$PageSecurity = 3;
Property changes on: trunk/CreditItemsControlled.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/CreditStatus.php
===================================================================
--- trunk/CreditStatus.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/CreditStatus.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.16 $ */
+/* $Id$*/
$PageSecurity = 3;
include('includes/session.inc');
Property changes on: trunk/CreditStatus.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/Credit_Invoice.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.35 $ */
+/* $Id$*/
$PageSecurity =3;
Property changes on: trunk/Credit_Invoice.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/Currencies.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.20 $ */
+/* $Id$*/
$PageSecurity = 9;
include('includes/session.inc');
Property changes on: trunk/Currencies.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/CustEDISetup.php
===================================================================
--- trunk/CustEDISetup.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/CustEDISetup.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.11 $ */
+/* $Id$*/
$PageSecurity = 11;
Property changes on: trunk/CustEDISetup.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/CustLoginSetup.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.2 $ */
+/* $Id$*/
$PageSecurity = 15;
Property changes on: trunk/CustLoginSetup.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/CustWhereAlloc.php
===================================================================
--- trunk/CustWhereAlloc.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/CustWhereAlloc.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.10 $ */
+/* $Id$*/
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/CustWhereAlloc.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/CustomerAllocations.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.30 $ */
+/* $Id$*/
/*
Call this page with:
Property changes on: trunk/CustomerAllocations.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/CustomerBranches.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,7 @@
<?php
/* $Revision: 1.53 $ */
+/* $Id$*/
$PageSecurity = 3;
Property changes on: trunk/CustomerBranches.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/CustomerInquiry.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,7 @@
<?php
/* $Revision: 1.30 $ */
+/* $Id$*/
include('includes/SQL_CommonFunctions.inc');
Property changes on: trunk/CustomerInquiry.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/CustomerTransInquiry.php
===================================================================
--- trunk/CustomerTransInquiry.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/CustomerTransInquiry.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,7 @@
<?php
/* $Revision: 1.17 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/CustomerTransInquiry.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/CustomerTypes.php
===================================================================
--- trunk/CustomerTypes.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/CustomerTypes.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.6 $ */
+/* $Id$*/
$PageSecurity = 15;
Property changes on: trunk/CustomerTypes.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/DailySalesInquiry.php
===================================================================
--- trunk/DailySalesInquiry.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/DailySalesInquiry.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,7 @@
<?php
/* $Revision: 1.00$ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/DailySalesInquiry.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/DebtorsAtPeriodEnd.php
===================================================================
--- trunk/DebtorsAtPeriodEnd.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/DebtorsAtPeriodEnd.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,7 +1,7 @@
<?php
$PageSecurity = 2;
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.16 $ */
include('includes/session.inc');
Property changes on: trunk/DebtorsAtPeriodEnd.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/DemandWorkOrders.php
===================================================================
--- trunk/DemandWorkOrders.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/DemandWorkOrders.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
// create work orders for all finished products with sales orders that exceed on hand and on work order quantities
+/* $Id$*/
$PageSecurity = 10;
Property changes on: trunk/DemandWorkOrders.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/DiscountCategories.php
===================================================================
--- trunk/DiscountCategories.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/DiscountCategories.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.10 $ */
+/* $Id$*/
$PageSecurity = 11;
Property changes on: trunk/DiscountCategories.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/DiscountMatrix.php
===================================================================
--- trunk/DiscountMatrix.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/DiscountMatrix.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.9 $ */
+/* $Id$*/
$PageSecurity = 11;
include('includes/session.inc');
Property changes on: trunk/DiscountMatrix.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/EDIMessageFormat.php
===================================================================
--- trunk/EDIMessageFormat.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/EDIMessageFormat.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.10 $ */
+/* $Id$*/
$PageSecurity = 10;
Property changes on: trunk/EDIMessageFormat.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/EDIProcessOrders.php
===================================================================
--- trunk/EDIProcessOrders.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/EDIProcessOrders.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,7 @@
<?php
/* $Revision: 1.20 $ */
+/* $Id$*/
$PageSecurity =11;
Property changes on: trunk/EDIProcessOrders.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/EDISendInvoices.php
===================================================================
--- trunk/EDISendInvoices.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/EDISendInvoices.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,7 @@
<?php
/* $Revision: 1.11 $ */
+/* $Id$*/
$PageSecurity =15;
Property changes on: trunk/EDISendInvoices.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/EmailConfirmation.php
===================================================================
--- trunk/EmailConfirmation.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/EmailConfirmation.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/EmailConfirmation.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/EmailCustTrans.php
===================================================================
--- trunk/EmailCustTrans.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/EmailCustTrans.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.8 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/EmailCustTrans.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/ExchangeRateTrend.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.3 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/ExchangeRateTrend.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/FTP_RadioBeacon.php
===================================================================
--- trunk/FTP_RadioBeacon.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/FTP_RadioBeacon.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.10 $ */
+/* $Id$*/
/*Variables required to configure this script must be set in config.php */
Property changes on: trunk/FTP_RadioBeacon.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Factors.php
===================================================================
--- trunk/Factors.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/Factors.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,4 +1,5 @@
<?php
+/* $Id$*/
$PageSecurity = 5;
include ('includes/session.inc');
$title = _('Factor Company Maintenance');
Property changes on: trunk/Factors.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/FixedAssetCategories.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.2 $ */
+/* $Id$*/
$PageSecurity = 11;
Property changes on: trunk/FixedAssetCategories.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/FixedAssetJournal.php
===================================================================
--- trunk/FixedAssetJournal.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/FixedAssetJournal.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,7 @@
<?php
/* $Revision: 1.1 $ */
+/* $Id$*/
include('includes/DefineJournalClass.php');
Property changes on: trunk/FixedAssetJournal.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/FixedAssetLocations.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,4 +1,6 @@
<?php
+
+/* $Id$*/
$PageSecurity = 11;
include('includes/session.inc');
Property changes on: trunk/FixedAssetLocations.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/FixedAssetRegister.php
===================================================================
--- trunk/FixedAssetRegister.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/FixedAssetRegister.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
$PageSecurity = 11;
include('includes/session.inc');
Property changes on: trunk/FixedAssetRegister.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/FixedAssetTransfer.php
===================================================================
--- trunk/FixedAssetTransfer.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/FixedAssetTransfer.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
$PageSecurity = 11;
include('includes/session.inc');
Property changes on: trunk/FixedAssetTransfer.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/FreightCosts.php
===================================================================
--- trunk/FreightCosts.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/FreightCosts.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,4 +1,6 @@
<?php
+
+/* $Id$*/
/* $Revision: 1.14 $ */
$PageSecurity = 11;
Property changes on: trunk/FreightCosts.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GLAccountInquiry.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,8 +1,8 @@
<?php
+/* $Id$*/
/* $Revision: 1.28 $ */
-
$PageSecurity = 8;
include ('includes/session.inc');
$title = _('General Ledger Account Inquiry');
Property changes on: trunk/GLAccountInquiry.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GLAccounts.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.21 $ */
+/* $Id$*/
$PageSecurity = 10;
include('includes/session.inc');
Property changes on: trunk/GLAccounts.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GLBalanceSheet.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -2,7 +2,7 @@
/* $Revision: 1.21 $ */
-/* $Id $ */
+/* $Id$*/
/*Through deviousness and cunning, this system allows shows the balance sheets as at the end of any period selected - so first off need to show the input of criteria screen while the user is selecting the period end of the balance date meanwhile the system is posting any unposted transactions */
Property changes on: trunk/GLBalanceSheet.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GLBudgets.php
===================================================================
--- trunk/GLBudgets.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GLBudgets.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
$PageSecurity = 10;
include('includes/session.inc');
Property changes on: trunk/GLBudgets.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GLCodesInquiry.php
===================================================================
--- trunk/GLCodesInquiry.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GLCodesInquiry.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
/* $Revision: 1.9 $ */
$PageSecurity = 8;
Property changes on: trunk/GLCodesInquiry.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GLJournal.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
/* $Revision: 1.27 $ */
include('includes/DefineJournalClass.php');
Property changes on: trunk/GLJournal.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GLProfit_Loss.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/* $Id$ */
+/* $Id$*/
$PageSecurity = 8;
Property changes on: trunk/GLProfit_Loss.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GLTagProfit_Loss.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/* $Id$ */
+/* $Id$*/
$PageSecurity = 8;
Property changes on: trunk/GLTagProfit_Loss.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GLTags.php
===================================================================
--- trunk/GLTags.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GLTags.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
$PageSecurity = 10;
include('includes/session.inc');
$title = _('General Ledger Tags');
Property changes on: trunk/GLTags.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GLTransInquiry.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
/* $Revision: 1.16 $ */
$PageSecurity = 8;
Property changes on: trunk/GLTransInquiry.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GLTrialBalance.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,7 +1,7 @@
<?php
/* $Revision: 1.21 $ */
-/* $Id$ */
+/* $Id$*/
/*Through deviousness and cunning, this system allows trial balances for any date range that recalcuates the p & l balances
and shows the balance sheets as at the end of the period selected - so first off need to show the input of criteria screen
Property changes on: trunk/GLTrialBalance.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GLTrialBalance_csv.php
===================================================================
--- trunk/GLTrialBalance_csv.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GLTrialBalance_csv.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/* $Id */
+/* $Id*/
/*Through deviousness and cunning, this system allows trial balances for any date range that recalcuates the p & l balances
and shows the balance sheets as at the end of the period selected - so first off need to show the input of criteria screen
Property changes on: trunk/GLTrialBalance_csv.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GeocodeSetup.php
===================================================================
--- trunk/GeocodeSetup.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GeocodeSetup.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
$PageSecurity = 3;
include('includes/session.inc');
$title = _('Geocode Maintenance');
Property changes on: trunk/GeocodeSetup.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GetStockImage.php
===================================================================
--- trunk/GetStockImage.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GetStockImage.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,4 +1,6 @@
<?php
+
+/* $Id$*/
$PageSecurity = 1;
include ('includes/session.inc');
/*
Property changes on: trunk/GetStockImage.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GoodsReceived.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.44 $ */
Property changes on: trunk/GoodsReceived.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/GoodsReceivedControlled.php
===================================================================
--- trunk/GoodsReceivedControlled.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/GoodsReceivedControlled.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.15 $ */
+/* $Id$*/
include('includes/DefinePOClass.php');
include('includes/DefineSerialItems.php');
Property changes on: trunk/GoodsReceivedControlled.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/InventoryPlanning.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/* $Id: InventoryPlanning.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
+/* $Id$ */
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/InventoryPlanning.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/InventoryPlanningPrefSupplier.php
===================================================================
--- trunk/InventoryPlanningPrefSupplier.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/InventoryPlanningPrefSupplier.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/* $Id: InventoryPlanningPrefSupplier.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
+/* $Id$ */
function standard_deviation($Data){
$Total = 0;
Property changes on: trunk/InventoryPlanningPrefSupplier.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/InventoryQuantities.php
===================================================================
--- trunk/InventoryQuantities.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/InventoryQuantities.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -2,7 +2,7 @@
/* $Revision: 1.4 $ */
-/* $Id$ */
+/* $Id$ */
// InventoryQuantities.php - Report of parts with quantity. Sorts by part and shows
// all locations where there are quantities of the part
Property changes on: trunk/InventoryQuantities.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/InventoryValuation.php
===================================================================
--- trunk/InventoryValuation.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/InventoryValuation.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,7 +1,7 @@
<?php
/* $Revision: 1.17 $ */
-/* $Id$ */
+/* $Id$ */
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/InventoryValuation.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/Locations.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
/* $Revision: 1.25 $ */
$PageSecurity = 11;
Property changes on: trunk/Locations.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Logout.php
===================================================================
--- trunk/Logout.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/Logout.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.17 $ */
+/* $Id$*/
$PageSecurity =1;
include('includes/session.inc');
@@ -34,6 +35,4 @@
session_destroy();
?>
</body>
-</html>
-
-
+</html>
\ No newline at end of file
Property changes on: trunk/Logout.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/MRP.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.7 $ */
+/* $Id$*/
$PageSecurity=9;
Property changes on: trunk/MRP.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/MRPCreateDemands.php
===================================================================
--- trunk/MRPCreateDemands.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/MRPCreateDemands.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.8 $ */
+/* $Id$*/
// MRPCreateDemands.php - Create mrpdemands based on sales order history
$PageSecurity=9;
Property changes on: trunk/MRPCreateDemands.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/MRPDemandTypes.php
===================================================================
--- trunk/MRPDemandTypes.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/MRPDemandTypes.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.3 $ */
+/* $Id$*/
$PageSecurity=9;
Property changes on: trunk/MRPDemandTypes.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/MRPDemands.php
===================================================================
--- trunk/MRPDemands.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/MRPDemands.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.5 $ */
+/* $Id$*/
// Add, Edit, Delete, and List MRP demand records. Table is mrpdemands.
// Have separate functions for each routine. Use pass-by-reference - (&$db,&$StockID) -
// to pass values of $db and $StockID to functions. - when just used $db as variable,
Property changes on: trunk/MRPDemands.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/MRPPlannedPurchaseOrders.php
===================================================================
--- trunk/MRPPlannedPurchaseOrders.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/MRPPlannedPurchaseOrders.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
/* $Revision: 1.5 $ */
-/* $Id$ */
+/* $Id$*/
// MRPPlannedPurchaseOrders.php - Report of purchase parts that MRP has determined should have
// purchase orders created for them
$PageSecurity = 2;
Property changes on: trunk/MRPPlannedPurchaseOrders.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/MRPPlannedWorkOrders.php
===================================================================
--- trunk/MRPPlannedWorkOrders.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/MRPPlannedWorkOrders.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
/* $Revision: 1.6 $ */
-/* $Id$ */
+/* $Id$*/
// MRPPlannedWorkOrders.php - Report of manufactured parts that MRP has determined should have
// work orders created for them
$PageSecurity = 2;
Property changes on: trunk/MRPPlannedWorkOrders.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/MRPReport.php
===================================================================
--- trunk/MRPReport.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/MRPReport.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.5 $ */
Property changes on: trunk/MRPReport.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/MRPReschedules.php
===================================================================
--- trunk/MRPReschedules.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/MRPReschedules.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/*$Id$ */
/* $Revision: 1.4 $ */
// MRPReschedules.php - Report of purchase orders and work orders that MRP determines should be
Property changes on: trunk/MRPReschedules.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/MRPShortages.php
===================================================================
--- trunk/MRPShortages.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/MRPShortages.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/*$Id$ */
/* $Revision: 1.7 $ */
// MRPShortages.php - Report of parts with demand greater than supply as determined by MRP
Property changes on: trunk/MRPShortages.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/MailInventoryValuation.php
===================================================================
--- trunk/MailInventoryValuation.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/MailInventoryValuation.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/* $Id: MailInventoryValuation.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
+/* $Id$ */
$PageSecurity = 1;
$AllowAnyone = true;
Property changes on: trunk/MailInventoryValuation.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/MailSalesReport.php
===================================================================
--- trunk/MailSalesReport.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/MailSalesReport.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.7 $ */
+/* $Id$*/
/*Now this is not secure so a malicious user could send multiple emails of the report to the intended receipients
The intention is that this script is called from cron at intervals defined with a command like:
@@ -46,4 +47,4 @@
$result = $mail->send($Recipients);
}
-?>
+?>
\ No newline at end of file
Property changes on: trunk/MailSalesReport.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/MailSalesReport_csv.php
===================================================================
--- trunk/MailSalesReport_csv.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/MailSalesReport_csv.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.8 $ */
+/* $Id$*/
/*Now this is not secure so a malicious user could send multiple emails of the report to the intended receipients
The intention is that this script is called from cron at intervals defined with a command like:
Property changes on: trunk/MailSalesReport_csv.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/OrderDetails.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,7 +1,7 @@
<?php
/* $Revision: 1.25 $ */
+/* $Id$*/
-
$PageSecurity = 2;
/* Session started in header.inc for password checking and authorisation level check */
Property changes on: trunk/OrderDetails.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/OutstandingGRNs.php
===================================================================
--- trunk/OutstandingGRNs.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/OutstandingGRNs.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/*$Id$ */
/* $Revision: 1.11 $ */
Property changes on: trunk/OutstandingGRNs.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFBankingSummary.php
===================================================================
--- trunk/PDFBankingSummary.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PDFBankingSummary.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.14 $ */
Property changes on: trunk/PDFBankingSummary.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFChequeListing.php
===================================================================
--- trunk/PDFChequeListing.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PDFChequeListing.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.13 $ */
Property changes on: trunk/PDFChequeListing.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFCustomerList.php
===================================================================
--- trunk/PDFCustomerList.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PDFCustomerList.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,7 +1,7 @@
<?php
/* $Revision: 1.13 $ */
-/* $Id$ */
+/* $Id$*/
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/PDFCustomerList.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFDIFOT.php
===================================================================
--- trunk/PDFDIFOT.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PDFDIFOT.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.4 $ */
Property changes on: trunk/PDFDIFOT.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFDeliveryDifferences.php
===================================================================
--- trunk/PDFDeliveryDifferences.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PDFDeliveryDifferences.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.15 $ */
Property changes on: trunk/PDFDeliveryDifferences.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFGrn.php
===================================================================
--- trunk/PDFGrn.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PDFGrn.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.5 $ */
Property changes on: trunk/PDFGrn.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFLowGP.php
===================================================================
--- trunk/PDFLowGP.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PDFLowGP.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.15 $ */
Property changes on: trunk/PDFLowGP.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFOrderStatus.php
===================================================================
--- trunk/PDFOrderStatus.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PDFOrderStatus.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.10 $ */
Property changes on: trunk/PDFOrderStatus.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFOrdersInvoiced.php
===================================================================
--- trunk/PDFOrdersInvoiced.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PDFOrdersInvoiced.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.10 $ */
Property changes on: trunk/PDFOrdersInvoiced.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFPriceList.php
===================================================================
--- trunk/PDFPriceList.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PDFPriceList.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/* $Id$ */
+/* $Id$*/
/* $Revision: 1.15 $ */
$PageSecurity = 2;
Property changes on: trunk/PDFPriceList.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFQuotation.php
===================================================================
--- trunk/PDFQuotation.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PDFQuotation.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
/* $Revision: 1.11 $ */
$PageSecurity = 2;
Property changes on: trunk/PDFQuotation.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFReceipt.php
===================================================================
--- trunk/PDFReceipt.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PDFReceipt.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,5 @@
<?php
-/* $Id $ */
+/* $Id$*/
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/PDFReceipt.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PaymentAllocations.php
===================================================================
--- trunk/PaymentAllocations.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PaymentAllocations.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
/* $Revision: 1.6 $ */
/*
This page is called from SupplierInquiry.php when the 'view payments' button is selected
Property changes on: trunk/PaymentAllocations.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PaymentMethods.php
===================================================================
--- trunk/PaymentMethods.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PaymentMethods.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.9 $ */
+/* $Id$*/
$PageSecurity = 15;
Property changes on: trunk/PaymentMethods.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PaymentTerms.php
===================================================================
--- trunk/PaymentTerms.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/PaymentTerms.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.18 $ */
+/* $Id$*/
$PageSecurity = 10;
Property changes on: trunk/PaymentTerms.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/Payments.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
/* $Revision: 1.39 $ */
$PageSecurity = 5;
Property changes on: trunk/Payments.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/config.distrib.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,6 +1,6 @@
<?php
-/* $Id: config.distrib.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
+/* $Id$ */
// User configurable variables
//---------------------------------------------------
Property changes on: trunk/config.distrib.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/geo_displaymap_customers.php
===================================================================
--- trunk/geo_displaymap_customers.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/geo_displaymap_customers.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
-<?
+<?php
+/* $Id$*/
$PageSecurity = 3;
$title = _('Geocoded Customer Branches Report');
Property changes on: trunk/geo_displaymap_customers.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/geo_displaymap_suppliers.php
===================================================================
--- trunk/geo_displaymap_suppliers.php 2009-12-15 22:21:57 UTC (rev 3232)
+++ trunk/geo_displaymap_suppliers.php 2009-12-16 11:41:34 UTC (rev 3233)
@@ -1,5 +1,6 @@
-<?
+<?php
+/* $Id$*/
$PageSecurity = 3;
$title = _('Geocoded Supplier Report');
Property changes on: trunk/geo_displaymap_suppliers.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/geocode.php
===================================================================
--- trunk/geocode.php 2009-12-15 22:21:57 UT...
[truncated message content] |
|
From: <tim...@us...> - 2009-12-16 13:34:22
|
Revision: 3236
http://web-erp.svn.sourceforge.net/web-erp/?rev=3236&view=rev
Author: tim_schofield
Date: 2009-12-16 13:34:13 +0000 (Wed, 16 Dec 2009)
Log Message:
-----------
Set Id property on files
Modified Paths:
--------------
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockLocTransfer.php
trunk/PDFStockNegatives.php
trunk/PDFStockTransfer.php
trunk/PDFTopItems.php
trunk/POReport.php
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Chk_ShiptRef_JobRef.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_OrderDetails.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/PO_SelectPurchOrder.php
trunk/PeriodsInquiry.php
trunk/Prices.php
trunk/PricesBasedOnMarkUp.php
trunk/Prices_Customer.php
trunk/PrintCheque.php
trunk/PrintCustOrder.php
trunk/PrintCustOrder_generic.php
trunk/PrintCustStatements.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/PrintSalesOrder_generic.php
trunk/PurchData.php
trunk/RecurringSalesOrders.php
trunk/RecurringSalesOrdersProcess.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
trunk/ReportBug.php
trunk/ReverseGRN.php
trunk/SalesAnalReptCols.php
trunk/SalesAnalRepts.php
trunk/SalesAnalysis_UserDefined.php
trunk/SalesCategories.php
trunk/SalesGLPostings.php
trunk/SalesGraph.php
trunk/SalesInquiry.php
trunk/SalesPeople.php
trunk/SalesTypes.php
trunk/SelectCompletedOrder.php
trunk/SelectCreditItems.php
trunk/SelectCustomer.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shippers.php
trunk/Shipt_Select.php
trunk/ShiptsList.php
trunk/SpecialOrder.php
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
trunk/StockCategories.php
trunk/StockCheck.php
trunk/StockCostUpdate.php
trunk/StockCounts.php
trunk/StockDispatch.php
trunk/StockLocMovements.php
trunk/StockLocStatus.php
trunk/StockLocTransfer.php
trunk/StockLocTransferReceive.php
trunk/StockMovements.php
trunk/StockQties_csv.php
trunk/StockQuantityByDate.php
trunk/StockReorderLevel.php
trunk/StockSerialItemResearch.php
trunk/StockSerialItems.php
trunk/StockStatus.php
trunk/StockTransferControlled.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/StockUsageGraph.php
trunk/Stocks.php
trunk/SuppCreditGRNs.php
trunk/SuppInvGLAnalysis.php
trunk/SuppInvGRNs.php
trunk/SuppPaymentRun.php
trunk/SuppPriceList.php
trunk/SuppShiptChgs.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierBalsAtPeriodEnd.php
trunk/SupplierContacts.php
trunk/SupplierCredit.php
trunk/SupplierInquiry.php
trunk/SupplierInvoice.php
trunk/SupplierTransInquiry.php
trunk/Suppliers.php
trunk/SystemCheck.php
trunk/SystemParameters.php
trunk/Tax.php
trunk/TaxAuthorities.php
trunk/TaxAuthorityRates.php
trunk/TaxCategories.php
trunk/TaxGroups.php
trunk/TaxProvinces.php
trunk/TopItems.php
trunk/UnitsOfMeasure.php
trunk/UserSettings.php
trunk/WOSerialNos.php
trunk/WWW_Access.php
trunk/WWW_Users.php
trunk/WhereUsedInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderCosting.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/WorkOrderStatus.php
trunk/Z_ChangeBranchCode.php
trunk/Z_ChangeCustomerCode.php
trunk/Z_ChangeStockCode.php
trunk/Z_CheckAllocationsFrom.php
trunk/Z_CheckAllocs.php
trunk/Z_CheckDebtorsControl.php
trunk/Z_CheckGLTransBalance.php
trunk/Z_CopyBOM.php
trunk/Z_CreateChartDetails.php
trunk/Z_CreateCompany.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_CurrencyDebtorsBalances.php
trunk/Z_CurrencySuppliersBalances.php
trunk/Z_DataExport.php
trunk/Z_DeleteCreditNote.php
trunk/Z_DeleteInvoice.php
trunk/Z_DeleteSalesTransActions.php
trunk/Z_DescribeTable.php
trunk/Z_ImportChartOfAccounts.php
trunk/Z_ImportGLAccountGroups.php
trunk/Z_ImportGLAccountSections.php
trunk/Z_ImportPartCodes.php
trunk/Z_ImportStocks.php
trunk/Z_MakeNewCompany.php
trunk/Z_MakeStockLocns.php
trunk/Z_PriceChanges.php
trunk/Z_ReApplyCostToSA.php
trunk/Z_RePostGLFromPeriod.php
trunk/Z_ReverseSuppPaymentRun.php
trunk/Z_SalesIntegrityCheck.php
trunk/Z_UpdateChartDetailsBFwd.php
trunk/Z_Upgrade3.10.php
trunk/Z_Upgrade_3.01-3.02.php
trunk/Z_Upgrade_3.04-3.05.php
trunk/Z_Upgrade_3.05-3.06.php
trunk/Z_Upgrade_3.07-3.08.php
trunk/Z_Upgrade_3.08-3.09.php
trunk/Z_Upgrade_3.09-3.10.php
trunk/Z_Upgrade_3.10-3.11.php
trunk/Z_UploadForm.php
trunk/Z_UploadResult.php
trunk/Z_index.php
trunk/Z_poAddLanguage.php
trunk/Z_poAdmin.php
trunk/Z_poEditLangHeader.php
trunk/Z_poEditLangModule.php
trunk/Z_poEditLangRemaining.php
trunk/Z_poRebuildDefault.php
trunk/phpinfo.php
trunk/report_runner.php
Property Changed:
----------------
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockLocTransfer.php
trunk/PDFStockNegatives.php
trunk/PDFStockTransfer.php
trunk/PDFTopItems.php
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Chk_ShiptRef_JobRef.php
trunk/PO_OrderDetails.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/PO_SelectPurchOrder.php
trunk/PeriodsInquiry.php
trunk/Prices.php
trunk/PricesBasedOnMarkUp.php
trunk/Prices_Customer.php
trunk/PrintCheque.php
trunk/PrintCustOrder.php
trunk/PrintCustOrder_generic.php
trunk/PrintCustStatements.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/PrintSalesOrder_generic.php
trunk/PurchData.php
trunk/RecurringSalesOrders.php
trunk/RecurringSalesOrdersProcess.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
trunk/ReportBug.php
trunk/ReverseGRN.php
trunk/SalesAnalReptCols.php
trunk/SalesAnalRepts.php
trunk/SalesAnalysis_UserDefined.php
trunk/SalesGLPostings.php
trunk/SalesGraph.php
trunk/SalesPeople.php
trunk/SalesTypes.php
trunk/SelectCompletedOrder.php
trunk/SelectCreditItems.php
trunk/SelectCustomer.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shippers.php
trunk/Shipt_Select.php
trunk/ShiptsList.php
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
trunk/StockCategories.php
trunk/StockCheck.php
trunk/StockCostUpdate.php
trunk/StockCounts.php
trunk/StockDispatch.php
trunk/StockLocMovements.php
trunk/StockLocStatus.php
trunk/StockLocTransfer.php
trunk/StockLocTransferReceive.php
trunk/StockMovements.php
trunk/StockQties_csv.php
trunk/StockReorderLevel.php
trunk/StockSerialItemResearch.php
trunk/StockSerialItems.php
trunk/StockStatus.php
trunk/StockTransferControlled.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/StockUsageGraph.php
trunk/SuppCreditGRNs.php
trunk/SuppInvGLAnalysis.php
trunk/SuppPaymentRun.php
trunk/SuppPriceList.php
trunk/SuppShiptChgs.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierBalsAtPeriodEnd.php
trunk/SupplierContacts.php
trunk/SupplierInquiry.php
trunk/SupplierTransInquiry.php
trunk/SystemCheck.php
trunk/SystemParameters.php
trunk/Tax.php
trunk/TaxAuthorities.php
trunk/TaxAuthorityRates.php
trunk/TaxCategories.php
trunk/TaxGroups.php
trunk/TaxProvinces.php
trunk/TopItems.php
trunk/UnitsOfMeasure.php
trunk/UserSettings.php
trunk/WOSerialNos.php
trunk/WWW_Access.php
trunk/WWW_Users.php
trunk/WhereUsedInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderCosting.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/WorkOrderStatus.php
trunk/Z_ChangeBranchCode.php
trunk/Z_ChangeCustomerCode.php
trunk/Z_ChangeStockCode.php
trunk/Z_CheckAllocationsFrom.php
trunk/Z_CheckAllocs.php
trunk/Z_CheckDebtorsControl.php
trunk/Z_CheckGLTransBalance.php
trunk/Z_CopyBOM.php
trunk/Z_CreateChartDetails.php
trunk/Z_CreateCompany.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_CurrencyDebtorsBalances.php
trunk/Z_CurrencySuppliersBalances.php
trunk/Z_DataExport.php
trunk/Z_DeleteCreditNote.php
trunk/Z_DeleteInvoice.php
trunk/Z_DeleteSalesTransActions.php
trunk/Z_DescribeTable.php
trunk/Z_ImportChartOfAccounts.php
trunk/Z_ImportGLAccountGroups.php
trunk/Z_ImportGLAccountSections.php
trunk/Z_ImportPartCodes.php
trunk/Z_ImportStocks.php
trunk/Z_MakeNewCompany.php
trunk/Z_MakeStockLocns.php
trunk/Z_PriceChanges.php
trunk/Z_ReApplyCostToSA.php
trunk/Z_RePostGLFromPeriod.php
trunk/Z_ReverseSuppPaymentRun.php
trunk/Z_SalesIntegrityCheck.php
trunk/Z_UpdateChartDetailsBFwd.php
trunk/Z_Upgrade3.10.php
trunk/Z_Upgrade_3.01-3.02.php
trunk/Z_Upgrade_3.04-3.05.php
trunk/Z_Upgrade_3.05-3.06.php
trunk/Z_Upgrade_3.07-3.08.php
trunk/Z_Upgrade_3.08-3.09.php
trunk/Z_Upgrade_3.09-3.10.php
trunk/Z_Upgrade_3.10-3.11.php
trunk/Z_UploadForm.php
trunk/Z_UploadResult.php
trunk/Z_index.php
trunk/Z_poAddLanguage.php
trunk/Z_poAdmin.php
trunk/Z_poRebuildDefault.php
trunk/phpinfo.php
trunk/report_runner.php
Modified: trunk/PDFRemittanceAdvice.php
===================================================================
--- trunk/PDFRemittanceAdvice.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PDFRemittanceAdvice.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Id $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/PDFRemittanceAdvice.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFStockCheckComparison.php
===================================================================
--- trunk/PDFStockCheckComparison.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PDFStockCheckComparison.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.18 $ */
Property changes on: trunk/PDFStockCheckComparison.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFStockLocTransfer.php
===================================================================
--- trunk/PDFStockLocTransfer.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PDFStockLocTransfer.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.12 $ */
Property changes on: trunk/PDFStockLocTransfer.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFStockNegatives.php
===================================================================
--- trunk/PDFStockNegatives.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PDFStockNegatives.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,7 +1,7 @@
<?php
/* $Revision: 1.7 $ */
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.8 $ */
Property changes on: trunk/PDFStockNegatives.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFStockTransfer.php
===================================================================
--- trunk/PDFStockTransfer.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PDFStockTransfer.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.5 $ */
Property changes on: trunk/PDFStockTransfer.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PDFTopItems.php
===================================================================
--- trunk/PDFTopItems.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PDFTopItems.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.2 $ */
+/* $Id$*/
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/PDFTopItems.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/POReport.php
===================================================================
--- trunk/POReport.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/POReport.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,7 +1,6 @@
<?php
/* $Id$ */
-/* $Revision: 1.4 $ */
// POReport.php
// Inquiry on Purchase Orders
Modified: trunk/PO_AuthorisationLevels.php
===================================================================
--- trunk/PO_AuthorisationLevels.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PO_AuthorisationLevels.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,4 +1,7 @@
<?php
+
+/* $Id$*/
+
$PageSecurity=15;
include('includes/session.inc');
Property changes on: trunk/PO_AuthorisationLevels.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PO_AuthoriseMyOrders.php
===================================================================
--- trunk/PO_AuthoriseMyOrders.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PO_AuthoriseMyOrders.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,4 +1,6 @@
<?php
+
+/* $Id$*/
$PageSecurity = 4;
include('includes/session.inc');
Property changes on: trunk/PO_AuthoriseMyOrders.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PO_Chk_ShiptRef_JobRef.php
===================================================================
--- trunk/PO_Chk_ShiptRef_JobRef.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PO_Chk_ShiptRef_JobRef.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,7 @@
<?php
/* $Revision: 1.7 $ */
+/* $Id$*/
+
/*Code to check that ShiptRef and Contract or JobRef entered are valid entries
This is used by the UpdateLine button when a purchase order line item is updated and
by the EnterLine button when a new purchase order line item is entered
@@ -38,4 +40,4 @@
}
}
*/
-?>
+?>
\ No newline at end of file
Property changes on: trunk/PO_Chk_ShiptRef_JobRef.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PO_Header.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,7 +1,6 @@
<?php
/* $Id$ */
-/* $Revision: 1.35 $ */
/*
* PO_Header.php
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PO_Items.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,7 +1,6 @@
<?php
/* $Id$ */
-/* $Revision: 1.43 $ */
$PageSecurity = 4;
Modified: trunk/PO_OrderDetails.php
===================================================================
--- trunk/PO_OrderDetails.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PO_OrderDetails.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
/* $Revision: 1.15 $ */
$PageSecurity = 2;
Property changes on: trunk/PO_OrderDetails.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PO_PDFPurchOrder.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.30 $ */
Property changes on: trunk/PO_PDFPurchOrder.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PO_SelectOSPurchOrder.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.21 $ */
Property changes on: trunk/PO_SelectOSPurchOrder.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PO_SelectPurchOrder.php
===================================================================
--- trunk/PO_SelectPurchOrder.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PO_SelectPurchOrder.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.14 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/PO_SelectPurchOrder.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PeriodsInquiry.php
===================================================================
--- trunk/PeriodsInquiry.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PeriodsInquiry.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,6 @@
<?php
+/* $Id$*/
/* $Revision: 1.8 $ */
$PageSecurity = 2;
Property changes on: trunk/PeriodsInquiry.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/Prices.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.14 $ */
+/* $Id$*/
$PageSecurity = 9;
Property changes on: trunk/Prices.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PricesBasedOnMarkUp.php
===================================================================
--- trunk/PricesBasedOnMarkUp.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PricesBasedOnMarkUp.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.9 $ */
+/* $Id$*/
$PageSecurity=2;
Property changes on: trunk/PricesBasedOnMarkUp.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Prices_Customer.php
===================================================================
--- trunk/Prices_Customer.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/Prices_Customer.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.11 $ */
+/* $Id$*/
$PageSecurity = 11;
include('includes/session.inc');
Property changes on: trunk/Prices_Customer.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PrintCheque.php
===================================================================
--- trunk/PrintCheque.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PrintCheque.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.5 $ */
Property changes on: trunk/PrintCheque.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PrintCustOrder.php
===================================================================
--- trunk/PrintCustOrder.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PrintCustOrder.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,9 +1,7 @@
<?php
-/* $Id: PrintCustOrder.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
+/* $Id$ */
-/* $Revision: 1.16 $ */
-
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/PrintCustOrder.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PrintCustOrder_generic.php
===================================================================
--- trunk/PrintCustOrder_generic.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PrintCustOrder_generic.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.20 $ */
Property changes on: trunk/PrintCustOrder_generic.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PrintCustStatements.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.19 $ */
Property changes on: trunk/PrintCustStatements.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PrintCustTrans.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,11 +1,7 @@
<?php
-/* $Revision: 1.52 $ */
+/* $Id$ */
-/* $Id: PrintCustTrans.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
-
-/* $Revision: 1.53 $ */
-
/* Javier: This file has 5 PDF Outputs, one FPDI class, one function,
El único q cambió alguien está en L570, 3 son de fpdi y el 5º está en L457 */
Property changes on: trunk/PrintCustTrans.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PrintCustTransPortrait.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Id: PrintCustTransPortrait.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
+/* $Id$ */
/* Javier: This file has 5 PDF Outputs, one FPDI class, and one function,
The Outputs are L520 and L570, 3 are about FPDI y el 5th is in L457 */
Property changes on: trunk/PrintCustTransPortrait.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PrintSalesOrder_generic.php
===================================================================
--- trunk/PrintSalesOrder_generic.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PrintSalesOrder_generic.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -2,7 +2,7 @@
/* $Revision: 1.2 $ */
-/* $Id$ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/PrintSalesOrder_generic.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/PurchData.php
===================================================================
--- trunk/PurchData.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/PurchData.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.24 $ */
+/* $Id$*/
$PageSecurity = 4;
Property changes on: trunk/PurchData.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/RecurringSalesOrders.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.18 $ */
+/* $Id$*/
/* This is where the details specific to the recurring order are entered and the template committed to the database once the Process button is hit */
include('includes/DefineCartClass.php');
Property changes on: trunk/RecurringSalesOrders.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/RecurringSalesOrdersProcess.php
===================================================================
--- trunk/RecurringSalesOrdersProcess.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/RecurringSalesOrdersProcess.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.17 $ */
+/* $Id$*/
/*need to allow this script to run from Cron or windows scheduler */
$AllowAnyone = true;
Property changes on: trunk/RecurringSalesOrdersProcess.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ReorderLevel.php
===================================================================
--- trunk/ReorderLevel.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/ReorderLevel.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/*$Id$*/
+/* $Id$*/
/* $Revision: 1.6 $ */
Property changes on: trunk/ReorderLevel.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ReorderLevelLocation.php
===================================================================
--- trunk/ReorderLevelLocation.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/ReorderLevelLocation.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,6 @@
<?php
/* $Revision: 1.1 $ */
+/* $Id$*/
// ReorderLevelLocation.php - Report of reorder level by category
$PageSecurity = 2;
Property changes on: trunk/ReorderLevelLocation.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ReportBug.php
===================================================================
--- trunk/ReportBug.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/ReportBug.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,4 +1,5 @@
<?php
+/* $Id$*/
$PageSecurity = 15;
include('includes/session.inc');
Property changes on: trunk/ReportBug.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ReverseGRN.php
===================================================================
--- trunk/ReverseGRN.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/ReverseGRN.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,8 +1,7 @@
<?php
+/* $Id$*/
-/* $Revision: 1.19 $ */
-
$PageSecurity = 11;
/* Session started in header.inc for password checking and authorisation level check */
Property changes on: trunk/ReverseGRN.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SalesAnalReptCols.php
===================================================================
--- trunk/SalesAnalReptCols.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SalesAnalReptCols.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.9 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/SalesAnalReptCols.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SalesAnalRepts.php
===================================================================
--- trunk/SalesAnalRepts.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SalesAnalRepts.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Id$ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/SalesAnalRepts.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SalesAnalysis_UserDefined.php
===================================================================
--- trunk/SalesAnalysis_UserDefined.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SalesAnalysis_UserDefined.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,23 +1,10 @@
<?php
-/* $Id: SalesAnalysis_UserDefined.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
+/* $Id$ */
$PageSecurity = 2;
include('includes/session.inc');
-/*
-include('config.php');
-include('includes/ConnectDB.inc');
-*/
-
-/*
- if (isset($SessionSavePath)){
- session_save_path($SessionSavePath);
-}
-
-session_start();
-*/
-
if (!in_array($PageSecurity,$_SESSION['AllowedPageSecurityTokens'])){
echo '<html><body><br /><br /><br /><br /><br /><br /><br /><div class="centre"><font color="red" size=4><b>' . _('The security settings on your account do not permit you to access this function') . '</b></font></div></body></html>';
exit;
Property changes on: trunk/SalesAnalysis_UserDefined.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SalesCategories.php
===================================================================
--- trunk/SalesCategories.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SalesCategories.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,7 +1,6 @@
<?php
/* $Id$ */
-/* $Revision: 1.11 $ */
$PageSecurity = 11;
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SalesGLPostings.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.19 $ */
+/* $Id$*/
$PageSecurity = 10;
include('includes/session.inc');
Property changes on: trunk/SalesGLPostings.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SalesGraph.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,7 @@
<?php
- $PageSecurity = 6;
+
+/* $Id$*/
+$PageSecurity = 6;
include('includes/session.inc');
include('includes/phplot/phplot.php');
$title=_('Sales Report Graph');
Property changes on: trunk/SalesGraph.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SalesInquiry.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,7 +1,6 @@
<?php
-/* $Id */
-/* $Revision: 1.5 $ */
+/* $Id$*/
// SalesInquiry.php
// Inquiry on Sales Orders - If Date Type is Order Date, salesorderdetails is the main table
// If Date Type is Invoice, stockmoves is the main table
Modified: trunk/SalesPeople.php
===================================================================
--- trunk/SalesPeople.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SalesPeople.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.13 $ */
+/* $Id$*/
$PageSecurity = 3;
Property changes on: trunk/SalesPeople.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SalesTypes.php
===================================================================
--- trunk/SalesTypes.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SalesTypes.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.16 $ */
+/* $Id$*/
$PageSecurity = 15;
Property changes on: trunk/SalesTypes.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SelectCompletedOrder.php
===================================================================
--- trunk/SelectCompletedOrder.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SelectCompletedOrder.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.20 $ */
+/* $Id$*/
$PageSecurity = 1;
Property changes on: trunk/SelectCompletedOrder.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SelectCreditItems.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.29 $ */
+/* $Id$*/
/*The credit selection screen uses the Cart class used for the making up orders
some of the variable names refer to order - please think credit when you read order */
Property changes on: trunk/SelectCreditItems.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SelectCustomer.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.64 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/SelectCustomer.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SelectGLAccount.php
===================================================================
--- trunk/SelectGLAccount.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SelectGLAccount.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.12 $ */
+/* $Id$*/
$PageSecurity = 8;
Property changes on: trunk/SelectGLAccount.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SelectOrderItems.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.113 $ */
+/* $Id$*/
include('includes/DefineCartClass.php');
$PageSecurity = 1;
Property changes on: trunk/SelectOrderItems.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SelectProduct.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.50 $ */
+/* $Id$*/
$PageSecurity = 2;
$PricesSecurity = 9;
Property changes on: trunk/SelectProduct.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SelectRecurringSalesOrder.php
===================================================================
--- trunk/SelectRecurringSalesOrder.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SelectRecurringSalesOrder.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.5 $ */
+/* $Id$*/
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/SelectRecurringSalesOrder.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SelectSalesOrder.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.21 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/SelectSalesOrder.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SelectSupplier.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.44 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/SelectSupplier.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SelectWorkOrder.php
===================================================================
--- trunk/SelectWorkOrder.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SelectWorkOrder.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.9 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/SelectWorkOrder.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/ShipmentCosting.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.18 $ */
+/* $Id$*/
$PageSecurity = 11;
Property changes on: trunk/ShipmentCosting.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/Shipments.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.14 $ */
+/* $Id$*/
$PageSecurity = 11;
include('includes/DefineShiptClass.php');
Property changes on: trunk/Shipments.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Shippers.php
===================================================================
--- trunk/Shippers.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/Shippers.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.11 $ */
+/* $Id$*/
$PageSecurity = 15;
Property changes on: trunk/Shippers.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Shipt_Select.php
===================================================================
--- trunk/Shipt_Select.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/Shipt_Select.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.10 $ */
+/* $Id$*/
$PageSecurity = 11;
Property changes on: trunk/Shipt_Select.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/ShiptsList.php
===================================================================
--- trunk/ShiptsList.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/ShiptsList.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.9 $ */
+/* $Id$*/
$PageSecurity = 2;
include ('includes/session.inc');
Property changes on: trunk/ShiptsList.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SpecialOrder.php
===================================================================
--- trunk/SpecialOrder.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SpecialOrder.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,7 +1,6 @@
<?php
/* $Id$ */
-/* $Revision: 1.20 $ */
$PageSecurity = 4;
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockAdjustments.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.25 $ */
+/* $Id$*/
include('includes/DefineStockAdjustment.php');
include('includes/DefineSerialItems.php');
Property changes on: trunk/StockAdjustments.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockAdjustmentsControlled.php
===================================================================
--- trunk/StockAdjustmentsControlled.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockAdjustmentsControlled.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.7 $ */
+/* $Id$*/
include('includes/DefineSerialItems.php');
include('includes/DefineStockAdjustment.php');
Property changes on: trunk/StockAdjustmentsControlled.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockCategories.php
===================================================================
--- trunk/StockCategories.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockCategories.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.19 $ */
+/* $Id$*/
$PageSecurity = 11;
Property changes on: trunk/StockCategories.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockCheck.php
===================================================================
--- trunk/StockCheck.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockCheck.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
/* $Revision: 1.13 $ */
-/* $Id$ */
+/* $Id$*/
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/StockCheck.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockCostUpdate.php
===================================================================
--- trunk/StockCostUpdate.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockCostUpdate.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.20 $ */
+/* $Id$*/
$PageSecurity = 9; /*viewing possible with inquiries but not mods */
Property changes on: trunk/StockCostUpdate.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockCounts.php
===================================================================
--- trunk/StockCounts.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockCounts.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.11 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/StockCounts.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockDispatch.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Id$ */
+/* $Id$*/
// StockDispatch.php - Report of parts with overstock at one location that can be transferred
// to another location to cover shortage based on reorder level. Creates loctransfer records
// that can be processed using Bulk Inventory Transfer - Receive.
Property changes on: trunk/StockDispatch.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockLocMovements.php
===================================================================
--- trunk/StockLocMovements.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockLocMovements.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,4 +1,5 @@
<?php
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/StockLocMovements.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockLocStatus.php
===================================================================
--- trunk/StockLocStatus.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockLocStatus.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,4 +1,5 @@
<?php
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/StockLocStatus.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockLocTransfer.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.11 $ */
+/* $Id$*/
/* contributed by Chris Bice */
$PageSecurity = 11;
Property changes on: trunk/StockLocTransfer.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockLocTransferReceive.php
===================================================================
--- trunk/StockLocTransferReceive.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockLocTransferReceive.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,4 +1,5 @@
<?php
+/* $Id$*/
include('includes/DefineSerialItems.php');
include('includes/DefineStockTransfers.php');
Property changes on: trunk/StockLocTransferReceive.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockMovements.php
===================================================================
--- trunk/StockMovements.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockMovements.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.15 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/StockMovements.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockQties_csv.php
===================================================================
--- trunk/StockQties_csv.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockQties_csv.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.8 $ */
+/* $Id$*/
$PageSecurity = 5;
@@ -44,4 +44,4 @@
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Property changes on: trunk/StockQties_csv.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockQuantityByDate.php
===================================================================
--- trunk/StockQuantityByDate.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockQuantityByDate.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,7 +1,6 @@
<?php
/* $Id$ */
-/* $Revision: 1.10 $ */
/* Contributed by Chris Bice - gettext by Kitch*/
Modified: trunk/StockReorderLevel.php
===================================================================
--- trunk/StockReorderLevel.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockReorderLevel.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,8 +1,7 @@
<?php
-/* $Revision: 1.12 $ */
+/* $Id$*/
-
$PageSecurity = 4;
include('includes/session.inc');
Property changes on: trunk/StockReorderLevel.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockSerialItemResearch.php
===================================================================
--- trunk/StockSerialItemResearch.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockSerialItemResearch.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.6 $ */
+/* $Id$*/
$PageSecurity = 3;
Property changes on: trunk/StockSerialItemResearch.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockSerialItems.php
===================================================================
--- trunk/StockSerialItems.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockSerialItems.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.8 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/StockSerialItems.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockStatus.php
===================================================================
--- trunk/StockStatus.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockStatus.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,8 +1,7 @@
<?php
-/* $Revision: 1.24 $ */
+/* $Id$*/
-
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/StockStatus.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockTransferControlled.php
===================================================================
--- trunk/StockTransferControlled.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockTransferControlled.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.8 $ */
+/* $Id$*/
include('includes/DefineSerialItems.php');
include('includes/DefineStockTransfers.php');
Property changes on: trunk/StockTransferControlled.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockTransfers.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.24 $ */
+/* $Id$*/
include('includes/DefineSerialItems.php');
include('includes/DefineStockTransfers.php');
Property changes on: trunk/StockTransfers.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockUsage.php
===================================================================
--- trunk/StockUsage.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockUsage.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.15 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/StockUsage.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/StockUsageGraph.php
===================================================================
--- trunk/StockUsageGraph.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/StockUsageGraph.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,4 +1,5 @@
<?php
+/* $Id$*/
$PageSecurity = 2;
include('includes/session.inc');
$result = DB_query("SELECT description FROM stockmaster WHERE stockid='" . trim(strtoupper($_GET['StockID'])) . "'",$db);
Property changes on: trunk/StockUsageGraph.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/Stocks.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,7 +1,6 @@
<?php
/* $Id$ */
-/* $Revision: 1.75 $ */
$PageSecurity = 11;
Modified: trunk/SuppCreditGRNs.php
===================================================================
--- trunk/SuppCreditGRNs.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SuppCreditGRNs.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.11 $ */
+/* $Id$*/
/*The supplier transaction uses the SuppTrans class to hold the information about the credit note
the SuppTrans class contains an array of GRNs objects - containing details of GRNs for invoicing and also
Property changes on: trunk/SuppCreditGRNs.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SuppInvGLAnalysis.php
===================================================================
--- trunk/SuppInvGLAnalysis.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SuppInvGLAnalysis.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.7 $ */
+/* $Id$*/
/*The supplier transaction uses the SuppTrans class to hold the information about the invoice
the SuppTrans class contains an array of GRNs objects - containing details of GRNs for invoicing and also
an array of GLCodes objects - only used if the AP - GL link is effective */
Property changes on: trunk/SuppInvGLAnalysis.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SuppInvGRNs.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,5 @@
<?php
-/* $Revision: 1.21 $ */
/* $Id$*/
/*The supplier transaction uses the SuppTrans class to hold the information about the invoice
Modified: trunk/SuppPaymentRun.php
===================================================================
--- trunk/SuppPaymentRun.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SuppPaymentRun.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Id$ */
+/* $Id$*/
$PageSecurity = 5;
Property changes on: trunk/SuppPaymentRun.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SuppPriceList.php
===================================================================
--- trunk/SuppPriceList.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SuppPriceList.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.2 $ */
+/* $Id$*/
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/SuppPriceList.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SuppShiptChgs.php
===================================================================
--- trunk/SuppShiptChgs.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SuppShiptChgs.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,8 +1,7 @@
<?php
+/* $Id$*/
-/* $Revision: 1.10 $ */
-
/*The supplier transaction uses the SuppTrans class to hold the information about the invoice
the SuppTrans class contains an array of Shipts objects - containing details of all shipment charges for invoicing
Shipment charges are posted to the debit of GRN suspense if the Creditors - GL link is on
Property changes on: trunk/SuppShiptChgs.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SuppTransGLAnalysis.php
===================================================================
--- trunk/SuppTransGLAnalysis.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SuppTransGLAnalysis.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.11 $ */
+/* $Id$*/
/*The supplier transaction uses the SuppTrans class to hold the information about the invoice or credit note
the SuppTrans class contains an array of GRNs objects - containing details of GRNs for invoicing/crediting and also
an array of GLCodes objects - only used if the AP - GL link is effective */
Property changes on: trunk/SuppTransGLAnalysis.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SupplierAllocations.php
===================================================================
--- trunk/SupplierAllocations.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SupplierAllocations.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,8 +1,7 @@
<?php
+/* $Id$*/
-/* $Revision: 1.15 $ */
-
/*
This page can be called with...
Property changes on: trunk/SupplierAllocations.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SupplierBalsAtPeriodEnd.php
===================================================================
--- trunk/SupplierBalsAtPeriodEnd.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SupplierBalsAtPeriodEnd.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Id$ */
+/* $Id$*/
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/SupplierBalsAtPeriodEnd.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SupplierContacts.php
===================================================================
--- trunk/SupplierContacts.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SupplierContacts.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.10 $ */
+/* $Id$*/
$PageSecurity=5;
Property changes on: trunk/SupplierContacts.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SupplierCredit.php
===================================================================
--- trunk/SupplierCredit.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SupplierCredit.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,7 +1,6 @@
<?php
/* $Id$ */
-/* $Revision: 1.23 $ */
/*This page is very largely the same as the SupplierInvoice.php script
the same result could have been acheived by using if statements in that script and just having the one
Modified: trunk/SupplierInquiry.php
===================================================================
--- trunk/SupplierInquiry.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SupplierInquiry.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.22 $ */
+/* $Id$*/
include('includes/SQL_CommonFunctions.inc');
Property changes on: trunk/SupplierInquiry.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SupplierInvoice.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,7 +1,6 @@
<?php
/* $Id$ */
-/* $Revision: 1.45 $ */
/*The supplier transaction uses the SuppTrans class to hold the information about the invoice
the SuppTrans class contains an array of GRNs objects - containing details of GRNs for invoicing
Modified: trunk/SupplierTransInquiry.php
===================================================================
--- trunk/SupplierTransInquiry.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SupplierTransInquiry.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.3 $ */
+/* $Id$*/
$PageSecurity = 2;
Property changes on: trunk/SupplierTransInquiry.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/Suppliers.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,7 +1,6 @@
<?php
/* $Id$ */
-/* $Revision: 1.44 $ */
$PageSecurity = 5;
Modified: trunk/SystemCheck.php
===================================================================
--- trunk/SystemCheck.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SystemCheck.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.5 $ */
+/* $Id$*/
$PageSecurity =10;
include('includes/session.inc');
$title = _('System Check');
Property changes on: trunk/SystemCheck.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/SystemParameters.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Revision: 1.59 $ */
+/* $Id$*/
$PageSecurity =15;
Property changes on: trunk/SystemParameters.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Tax.php
===================================================================
--- trunk/Tax.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/Tax.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,6 +1,6 @@
<?php
-/* $Id$ */
+/* $Id$*/
$PageSecurity = 2;
include('includes/session.inc');
Property changes on: trunk/Tax.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/TaxAuthorities.php
===================================================================
--- trunk/TaxAuthorities.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trunk/TaxAuthorities.php 2009-12-16 13:34:13 UTC (rev 3236)
@@ -1,8 +1,7 @@
<?php
-/* $Revision: 1.19 $ */
+/* $Id$*/
-
$PageSecurity=15;
include('includes/session.inc');
$title = _('Tax Authorities');
Property changes on: trunk/TaxAuthorities.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/TaxAuthorityRates.php
===================================================================
--- trunk/TaxAuthorityRates.php 2009-12-16 11:51:39 UTC (rev 3235)
+++ trun...
[truncated message content] |
|
From: <tim...@us...> - 2009-12-17 13:11:06
|
Revision: 3250
http://web-erp.svn.sourceforge.net/web-erp/?rev=3250&view=rev
Author: tim_schofield
Date: 2009-12-17 13:11:00 +0000 (Thu, 17 Dec 2009)
Log Message:
-----------
Correctly set $Copy for when not customer copy.
Modified Paths:
--------------
trunk/PrintSalesOrder_generic.php
trunk/doc/Change.log.html
Modified: trunk/PrintSalesOrder_generic.php
===================================================================
--- trunk/PrintSalesOrder_generic.php 2009-12-17 09:36:56 UTC (rev 3249)
+++ trunk/PrintSalesOrder_generic.php 2009-12-17 13:11:00 UTC (rev 3250)
@@ -113,6 +113,7 @@
$FontSize=12;
$ListCount = 0; // UldisN
+$Copy='';
for ($i=1;$i<=2;$i++){ /*Print it out twice one copy for customer and one for office */
if ($i==2){
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-12-17 09:36:56 UTC (rev 3249)
+++ trunk/doc/Change.log.html 2009-12-17 13:11:00 UTC (rev 3250)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>17/12/09 Tim: PrintSalesOrder_generic.php - Correctly set $Copy for when not customer copy.
<p>14/12/09 Tim: upgrade3.11-3.12.sql - Include pdflanguage field in www_users
<p>12/12/09 Simon Peter Otandeka - FixedAssetRegister.php and FixedAssetJournal.php - Bux fixes to asset manager.
<p>11/12/09 Tim: PO_PDFPurchOrder.php - Print the correct suppliers unit of measure.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-17 13:13:15
|
Revision: 3251
http://web-erp.svn.sourceforge.net/web-erp/?rev=3251&view=rev
Author: tim_schofield
Date: 2009-12-17 13:13:09 +0000 (Thu, 17 Dec 2009)
Log Message:
-----------
Corrections to addTextWrap() function
Modified Paths:
--------------
trunk/doc/Change.log.html
trunk/includes/class.pdf.php
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-12-17 13:11:00 UTC (rev 3250)
+++ trunk/doc/Change.log.html 2009-12-17 13:13:09 UTC (rev 3251)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>17/12/09 Tim: class.pdf.php - Corrections to addTextWrap() function
<p>17/12/09 Tim: PrintSalesOrder_generic.php - Correctly set $Copy for when not customer copy.
<p>14/12/09 Tim: upgrade3.11-3.12.sql - Include pdflanguage field in www_users
<p>12/12/09 Simon Peter Otandeka - FixedAssetRegister.php and FixedAssetJournal.php - Bux fixes to asset manager.
Modified: trunk/includes/class.pdf.php
===================================================================
--- trunk/includes/class.pdf.php 2009-12-17 13:11:00 UTC (rev 3250)
+++ trunk/includes/class.pdf.php 2009-12-17 13:13:09 UTC (rev 3251)
@@ -30,7 +30,9 @@
protected function setuserpdffont() {
- session_start();
+ if (session_id()=='') {
+ session_start();
+ }
if (isset($_SESSION['PDFLanguage'])) {
@@ -268,7 +270,7 @@
$ls=$l;
$ns++;
}
- $l+=$cw[$c];
+ $l+=$cw[$i];
if($l>$wmax)
break;
else
@@ -277,7 +279,7 @@
if($sep==-1) {
if($i==0) $i++;
- if($this->ws>0) {
+ if(isset($this->ws) and $this->ws>0) {
$this->ws=0;
$this->_out('0 Tw');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2009-12-18 11:11:49
|
Revision: 3253
http://web-erp.svn.sourceforge.net/web-erp/?rev=3253&view=rev
Author: tim_schofield
Date: 2009-12-18 11:11:41 +0000 (Fri, 18 Dec 2009)
Log Message:
-----------
added new pdflanguage field to allow user pdf language support to be specified
Modified Paths:
--------------
trunk/UserSettings.php
trunk/doc/Change.log.html
Modified: trunk/UserSettings.php
===================================================================
--- trunk/UserSettings.php 2009-12-18 10:57:40 UTC (rev 3252)
+++ trunk/UserSettings.php 2009-12-18 11:11:41 UTC (rev 3253)
@@ -10,7 +10,16 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/user.png" title="' . _('User Settings') . '" alt="">' . ' ' . _('User Settings');
+$PDFLanguages = array(_('Latin Western Languages'),
+ _('Eastern European Russian Japanese'),
+ _('Chinese'),
+ _('Korean'),
+ _('Vietnamese'),
+ _('Hebrew'),
+ _('Arabic'),
+ _('Thai'));
+
if (isset($_POST['Modify'])) {
// no input errors assumed initially before we test
$InputError = 0;
@@ -56,7 +65,8 @@
SET displayrecordsmax=" . $_POST['DisplayRecordsMax'] . ",
theme='" . $_POST['Theme'] . "',
language='" . $_POST['Language'] . "',
- email='". $_POST['email'] ."'
+ email='". $_POST['email'] ."',
+ pdflanguage=" . $_POST['PDFLanguage'] . "
WHERE userid = '" . $_SESSION['UserID'] . "'";
$ErrMsg = _('The user alterations could not be processed because');
@@ -71,6 +81,7 @@
theme='" . $_POST['Theme'] . "',
language='" . $_POST['Language'] . "',
email='". $_POST['email'] ."',
+ pdflanguage=" . $_POST['PDFLanguage'] . "
password='" . CryptPass($_POST['pass']) . "'
WHERE userid = '" . $_SESSION['UserID'] . "'";
@@ -179,11 +190,24 @@
$_POST['email'] = $myrow['email'];
}
-echo "<td><input type=text name='email' size=40 value='" . $_POST['email'] . "'></td></tr>
- </table>
+echo "<td><input type=text name='email' size=40 value='" . $_POST['email'] . "'></td></tr>";
+
+if (!isset($_POST['PDFLanguage'])){
+ $_POST['PDFLanguage']=0;
+}
+
+echo '<tr><td>' . _('PDF Language Support') . ': </td><td><select name="PDFLanguage">';
+for($i=0;$i<=7;$i++){
+ if ($_POST['PDFLanguage']==$i){
+ echo '<option selected value=' . $i .'>' . $PDFLanguages[$i] . '</option>';
+ } else {
+ echo '<option value=' . $i .'>' . $PDFLanguages[$i]. '</option>';
+ }
+}
+echo "</select></td></tr></table>
<br><div class='centre'><input type='Submit' name='Modify' value=" . _('Modify') . '></div>
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2009-12-18 10:57:40 UTC (rev 3252)
+++ trunk/doc/Change.log.html 2009-12-18 11:11:41 UTC (rev 3253)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>18/12/09 Tim: UserSettings.php - added new pdflanguage field to allow user pdf language support to be specified
<p>17/12/09 Tim: class.pdf.php - Corrections to addTextWrap() function
<p>17/12/09 Tim: PrintSalesOrder_generic.php - Correctly set $Copy for when not customer copy.
<p>14/12/09 Tim: upgrade3.11-3.12.sql - Include pdflanguage field in www_users
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X