Menu
▾
▴
deleted-70949-cvs
|
From: <tim...@us...> - 2010-03-16 15:02:18
|
Revision: 3390
http://web-erp.svn.sourceforge.net/web-erp/?rev=3390&view=rev
Author: tim_schofield
Date: 2010-03-16 15:02:10 +0000 (Tue, 16 Mar 2010)
Log Message:
-----------
Tim: PO_SelecOSPurchOrder.php - Various layout changes for consistency and to stick to coding guidelines
Modified Paths:
--------------
trunk/PO_SelectPurchOrder.php
trunk/doc/Change.log.html
Modified: trunk/PO_SelectPurchOrder.php
===================================================================
--- trunk/PO_SelectPurchOrder.php 2010-03-16 09:35:52 UTC (rev 3389)
+++ trunk/PO_SelectPurchOrder.php 2010-03-16 15:02:10 UTC (rev 3390)
@@ -1,66 +1,49 @@
<?php
-
/* $Id$*/
-
$PageSecurity = 2;
-
-include('includes/session.inc');
-
+include ('includes/session.inc');
$title = _('Search Purchase Orders');
-
-include('includes/header.inc');
-
-if (isset($_GET['SelectedStockItem'])){
- $SelectedStockItem=$_GET['SelectedStockItem'];
-} elseif (isset($_POST['SelectedStockItem'])){
- $SelectedStockItem=$_POST['SelectedStockItem'];
+include ('includes/header.inc');
+echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Purchase Orders') . '" alt="">' . ' ' . _('Purchase Orders') . '';
+if (isset($_GET['SelectedStockItem'])) {
+ $SelectedStockItem = $_GET['SelectedStockItem'];
+} elseif (isset($_POST['SelectedStockItem'])) {
+ $SelectedStockItem = $_POST['SelectedStockItem'];
}
-
-if (isset($_GET['OrderNumber'])){
- $OrderNumber=$_GET['OrderNumber'];
-} elseif (isset($_POST['OrderNumber'])){
- $OrderNumber=$_POST['OrderNumber'];
+if (isset($_GET['OrderNumber'])) {
+ $OrderNumber = $_GET['OrderNumber'];
+} elseif (isset($_POST['OrderNumber'])) {
+ $OrderNumber = $_POST['OrderNumber'];
}
-
-if (isset($_GET['SelectedSupplier'])){
- $SelectedSupplier=$_GET['SelectedSupplier'];
-} elseif (isset($_POST['SelectedSupplier'])){
- $SelectedSupplier=$_POST['SelectedSupplier'];
+if (isset($_GET['SelectedSupplier'])) {
+ $SelectedSupplier = $_GET['SelectedSupplier'];
+} elseif (isset($_POST['SelectedSupplier'])) {
+ $SelectedSupplier = $_POST['SelectedSupplier'];
}
-
echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method=post>';
-
-
-If ($_POST['ResetPart']){
- unset($SelectedStockItem);
+if (isset($_POST['ResetPart'])) {
+ unset($SelectedStockItem);
}
-
-If (isset($OrderNumber) && $OrderNumber!="") {
- if (!is_numeric($OrderNumber)){
- prnMsg( _('The Order Number entered') . ' <U>' . _('MUST') . '</U> ' . _('be numeric'), 'error');
- unset ($OrderNumber);
+if (isset($OrderNumber) && $OrderNumber != "") {
+ if (!is_numeric($OrderNumber)) {
+ prnMsg(_('The Order Number entered') . ' <U>' . _('MUST') . '</U> ' . _('be numeric'), 'error');
+ unset($OrderNumber);
} else {
echo _('Order Number') . ' - ' . $OrderNumber;
}
} else {
- If ($SelectedSupplier) {
+ if (isset($SelectedSupplier)) {
echo _('For supplier') . ': ' . $SelectedSupplier . ' ' . _('and') . ' ';
echo '<input type=hidden name="SelectedSupplier" value=' . $SelectedSupplier . '>';
}
- If ($SelectedStockItem) {
- echo _('for the part') . ': ' . $SelectedStockItem . ' ' . _('and') . ' <input type=hidden name="SelectedStockItem" value="' . $SelectedStockItem . '">';
- }
}
-
-if ($_POST['SearchParts']){
-
- If ($_POST['Keywords'] AND $_POST['StockCode']) {
- prnMsg( _('Stock description keywords have been used in preference to the Stock code extract entered'),'info');
+if (isset($_POST['SearchParts'])) {
+ if ($_POST['Keywords'] AND $_POST['StockCode']) {
+ prnMsg(_('Stock description keywords have been used in preference to the Stock code extract entered'), 'info');
}
- If ($_POST['Keywords']) {
+ if ($_POST['Keywords']) {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
-
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
SUM(locstock.quantity) as qoh,
@@ -76,8 +59,7 @@
stockmaster.description,
stockmaster.units
ORDER BY stockmaster.stockid";
-
- } elseif ($_POST['StockCode']){
+ } elseif ($_POST['StockCode']) {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
SUM(locstock.quantity) AS qoh,
@@ -93,8 +75,7 @@
stockmaster.description,
stockmaster.units
ORDER BY stockmaster.stockid";
-
- } elseif (!$_POST['StockCode'] AND !$_POST['Keywords']) {
+ } elseif (!$_POST['StockCode'] AND !$_POST['Keywords']) {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
SUM(locstock.quantity) AS qoh,
@@ -108,131 +89,96 @@
stockmaster.description,
stockmaster.units
ORDER BY stockmaster.stockid";
- }
-
+ }
$ErrMsg = _('No stock items were returned by the SQL because');
$DbgMsg = _('The SQL used to retrieve the searched parts was');
- $StockItemsResult = DB_query($SQL,$db,$ErrMsg,$DbgMsg);
-
+ $StockItemsResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
}
-
/* Not appropriate really to restrict search by date since user may miss older
-ouststanding orders
- $OrdersAfterDate = Date("d/m/Y",Mktime(0,0,0,Date("m")-2,Date("d"),Date("Y")));
+* ouststanding orders
+* $OrdersAfterDate = Date("d/m/Y",Mktime(0,0,0,Date("m")-2,Date("d"),Date("Y")));
*/
-
-if ($OrderNumber=="" OR !isset($OrderNumber)){
-
- echo _('Order Number') . ': <input type=text name="OrderNumber" MAXLENGTH =8 size=9> ' . _('Into Stock Location') . ':<select name="StockLocation"> ';
+if (!isset($OrderNumber) or $OrderNumber == "") {
+ echo '<table class=selection><tr><td>';
+ if (isset($SelectedStockItem)) {
+ echo _('For the part') . ':<b>' . $SelectedStockItem . '</b> ' . _('and') . ' <input type=hidden name="SelectedStockItem" value="' . $SelectedStockItem . '">';
+ }
+ echo _('Order Number') . ': <input type=text name="OrderNumber" maxlength=8 size=9> ' . _('Into Stock Location') . ':<select name="StockLocation"> ';
$sql = "SELECT loccode, locationname FROM locations";
- $resultStkLocs = DB_query($sql,$db);
- while ($myrow=DB_fetch_array($resultStkLocs)){
- if (isset($_POST['StockLocation'])){
- if ($myrow['loccode'] == $_POST['StockLocation']){
- echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
+ $resultStkLocs = DB_query($sql, $db);
+ while ($myrow = DB_fetch_array($resultStkLocs)) {
+ if (isset($_POST['StockLocation'])) {
+ if ($myrow['loccode'] == $_POST['StockLocation']) {
+ echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
+ echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
}
- } elseif ($myrow['loccode']==$_SESSION['UserStockLocation']){
+ } elseif ($myrow['loccode'] == $_SESSION['UserStockLocation']) {
echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
} else {
echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'];
}
}
-
- echo '</select> <input type=submit name="SearchOrders" VALUE="' . _('Search Purchase Orders') . '">';
+ echo '</select> <input type=submit name="SearchOrders" value="' . _('Search Purchase Orders') . '"></td></tr></table>';
}
-
-$SQL="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
-$result1 = DB_query($SQL,$db);
-
-?>
-
-<hr>
-<font size=1><?php echo _('To search for purchase orders for a specific part use the part selection facilities below'); ?></font>
-<input type=submit name="SearchParts" VALUE="<?php echo _('Search Parts Now'); ?>">
-<input type=submit name="ResetPart" VALUE="<?php echo _('Show All'); ?>">
-<table>
-<tr>
-<td><font size=1><?php echo _('Select a stock category'); ?>:</font>
-<select name="StockCat">
-<?php
+$SQL = "SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
+$result1 = DB_query($SQL, $db);
+echo '<br><br><table class=selection><tr><td>';
+echo '<font size=1>' . _('To search for purchase orders for a specific part use the part selection facilities below') . '</font>';
+echo '<input type=submit name="SearchParts" value="' . _('Search Parts Now') . '">';
+echo '<input type=submit name="ResetPart" value="' . _('Show All') . '">';
+echo '<tr><td><font size=1>' . _('Select a stock category') . ':</font><select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
- if ($myrow1['categoryid']==$_POST['StockCat']){
- echo "<option selected VALUE='". $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'];
+ if (isset($_POST['StockCat']) and $myrow1['categoryid'] == $_POST['StockCat']) {
+ echo "<option selected value='" . $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'];
} else {
- echo "<option VALUE='". $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'];
+ echo "<option value='" . $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'];
}
}
-?>
-</select>
-<td><font size=1><?php echo _('Enter text extracts in the'); ?> <b><?php echo _('description'); ?></b>:</font></td>
-<td><input type="Text" name="Keywords" size=20 maxlength=25></td></tr>
-<tr><td></td>
-<td><font SIZE 3><b><?php echo _('OR'); ?> </b></font><font size=1><?php echo _('Enter extract of the'); ?> <b><?php echo _('Stock Code'); ?></b>:</font></td>
-<td><input type="Text" name="StockCode" size=15 maxlength=18></td>
-</tr>
-</table>
-
-<hr>
-
-<?php
-
-If ($StockItemsResult) {
-
- echo '<table cellpadding=2 colspan=7 BORDER=2>';
+echo '</select><td><font size=1>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>';
+echo '<td><input type="Text" name="Keywords" size=20 maxlength=25></td></tr><tr><td></td>';
+echo '<td><font size=3><b>' . _('OR') . ' </b></font><font size=1>' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</font></td>';
+echo '<td><input type="text" name="StockCode" size=15 maxlength=18></td></tr></table><br><br>';
+if (isset($StockItemsResult)) {
+ echo '<table cellpadding=2 colspan=7 border=2>';
$TableHeader = '<tr><td class="tableheader">' . _('Code') . '</td>
<td class="tableheader">' . _('Description') . '</td>
<td class="tableheader">' . _('On Hand') . '</td>
<td class="tableheader">' . _('Orders') . '<br>' . _('Outstanding') . '</td>
<td class="tableheader">' . _('Units') . '</td>
</tr>';
-
echo $TableHeader;
-
$j = 1;
- $k=0; //row colour counter
-
- while ($myrow=DB_fetch_array($StockItemsResult)) {
-
- if ($k==1){
+ $k = 0; //row colour counter
+ while ($myrow = DB_fetch_array($StockItemsResult)) {
+ if ($k == 1) {
echo '<tr bgcolor="#CCCCCC">';
- $k=0;
+ $k = 0;
} else {
echo '<tr bgcolor="#EEEEEE">';
- $k=1;
+ $k = 1;
}
-
- printf("<td><input type=submit name='SelectedStockItem' VALUE='%s'</td>
- <td>%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']);
-
+ echo "<td><input type=submit name='SelectedStockItem' value='" . $myrow['stockid'] . "'</td>
+ <td>" . $myrow['description'] . "</td>
+ <td class=number>" . $myrow['qoh'] . "</td>
+ <td class=number>" . $myrow['qord'] . "</td>
+ <td>" . $myrow['units'] . "</td>
+ </tr>";
$j++;
- If ($j == 12){
- $j=1;
+ if ($j == 12) {
+ $j = 1;
echo $TableHeader;
}
-//end of page full new headings if
- }
-//end of while loop
+ //end of page full new headings if
+ }
+ //end of while loop
echo '</table>';
-
}
//end if stock search results to show
- else {
-
+else {
//figure out the SQL required from the inputs available
-
- if (isset($OrderNumber) && $OrderNumber !="") {
+ if (isset($OrderNumber) && $OrderNumber != "") {
$SQL = "SELECT purchorders.orderno,
suppliers.suppname,
purchorders.orddate,
@@ -246,14 +192,14 @@
suppliers
WHERE purchorders.orderno = purchorderdetails.orderno
AND purchorders.supplierno = suppliers.supplierid
- AND purchorders.orderno=". $OrderNumber ."
+ AND purchorders.orderno=" . $OrderNumber . "
GROUP BY purchorders.orderno";
} else {
-
- /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
-
+ /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
+ if (empty($_POST['StockLocation'])) {
+ $_POST['StockLocation'] = '';
+ }
if (isset($SelectedSupplier)) {
-
if (isset($SelectedStockItem)) {
$SQL = "SELECT purchorders.orderno,
suppliers.suppname,
@@ -268,9 +214,9 @@
suppliers
WHERE purchorders.orderno = purchorderdetails.orderno
AND purchorders.supplierno = suppliers.supplierid
- AND purchorderdetails.itemcode='". $SelectedStockItem ."'
- AND purchorders.supplierno='" . $SelectedSupplier ."'
- AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
+ AND purchorderdetails.itemcode='" . $SelectedStockItem . "'
+ AND purchorders.supplierno='" . $SelectedSupplier . "'
+ AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
GROUP BY purchorders.orderno,
suppliers.suppname,
purchorders.orddate,
@@ -292,8 +238,8 @@
suppliers
WHERE purchorders.orderno = purchorderdetails.orderno
AND purchorders.supplierno = suppliers.supplierid
- AND purchorders.supplierno='" . $SelectedSupplier ."'
- AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
+ AND purchorders.supplierno='" . $SelectedSupplier . "'
+ AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
GROUP BY purchorders.orderno,
suppliers.suppname,
purchorders.orddate,
@@ -317,8 +263,8 @@
suppliers
WHERE purchorders.orderno = purchorderdetails.orderno
AND purchorders.supplierno = suppliers.supplierid
- AND purchorderdetails.itemcode='". $SelectedStockItem ."'
- AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
+ AND purchorderdetails.itemcode='" . $SelectedStockItem . "'
+ AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
GROUP BY purchorders.orderno,
suppliers.suppname,
purchorders.orddate,
@@ -340,7 +286,7 @@
suppliers
WHERE purchorders.orderno = purchorderdetails.orderno
AND purchorders.supplierno = suppliers.supplierid
- AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
+ AND purchorders.intostocklocation = '" . $_POST['StockLocation'] . "'
GROUP BY purchorders.orderno,
suppliers.suppname,
purchorders.orddate,
@@ -349,17 +295,14 @@
purchorders.allowprint,
suppliers.currcode";
}
-
} //end selected supplier
- } //end not order number selected
+ } //end not order number selected
$ErrMsg = _('No orders were returned by the SQL because');
- $PurchOrdersResult = DB_query($SQL,$db,$ErrMsg);
-
- if (DB_num_rows($PurchOrdersResult)>0){
+ $PurchOrdersResult = DB_query($SQL, $db, $ErrMsg);
+ if (DB_num_rows($PurchOrdersResult) > 0) {
/*show a table of the orders returned by the SQL */
-
- echo '<table cellpadding=2 colspan=7 WIDTH=100%>';
+ echo '<table cellpadding=2 colspan=7 WIDTH=90%>';
$TableHeader = '<tr><td class="tableheader">' . _('View') . '</td>
<td class="tableheader">' . _('Supplier') . '</td>
<td class="tableheader">' . _('Currency') . '</td>
@@ -368,58 +311,41 @@
<td class="tableheader">' . _('Initiator') . '</td>
<td class="tableheader">' . _('Order Total') . '</td>
</tr>';
-
echo $TableHeader;
-
$j = 1;
- $k=0; //row colour counter
- while ($myrow=DB_fetch_array($PurchOrdersResult)) {
-
-
- if ($k==1){ /*alternate bgcolour of row for highlighting */
+ $k = 0; //row colour counter
+ while ($myrow = DB_fetch_array($PurchOrdersResult)) {
+ if ($k == 1) { /*alternate bgcolour of row for highlighting */
echo '<tr bgcolor="#CCCCCC">';
- $k=0;
+ $k = 0;
} else {
echo '<tr bgcolor="#EEEEEE">';
$k++;
}
-
$ViewPurchOrder = $rootpath . '/PO_OrderDetails.php?' . SID . 'OrderNo=' . $myrow['orderno'];
-
$FormatedOrderDate = ConvertSQLDate($myrow['orddate']);
- $FormatedOrderValue = number_format($myrow['ordervalue'],2);
- /* View Supplier Currency Requisition Order Date Initiator Order Total
- ModifyPage, $myrow["orderno"], $myrow["suppname"], $myrow["currcode"], $myrow["requisitionno"] $FormatedOrderDate, $myrow["initiator"] $FormatedOrderValue */
- printf("<td><a href='%s'>%s</a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- </tr>",
- $ViewPurchOrder,
- $myrow['orderno'],
- $myrow['suppname'],
- $myrow['currcode'],
- $myrow['requisitionno'],
- $FormatedOrderDate,
- $myrow['initiator'],
- $FormatedOrderValue);
-
+ $FormatedOrderValue = number_format($myrow['ordervalue'], 2);
+ /* View Supplier Currency Requisition Order Date Initiator Order Total
+ ModifyPage, $myrow["orderno"], $myrow["suppname"], $myrow["currcode"], $myrow["requisitionno"] $FormatedOrderDate, $myrow["initiator"] $FormatedOrderValue */
+ echo "<td><a href='" . $ViewPurchOrder . "'>" . $myrow['orderno'] . "</a></td>
+ <td>" . $myrow['suppname'] . "</td>
+ <td>" . $myrow['currcode'] . "</td>
+ <td>" . $myrow['requisitionno'] . "</td>
+ <td>" . $FormatedOrderDate . "</td>
+ <td>" . $myrow['initiator'] . "</td>
+ <td class=number>" . $FormatedOrderValue . "</td>
+ </tr>";
$j++;
- If ($j == 12){
- $j=1;
+ if ($j == 12) {
+ $j = 1;
echo $TableHeader;
}
- //end of page full new headings if
+ //end of page full new headings if
}
//end of while loop
-
echo '</table>';
} // end if purchase orders to show
}
-
echo '</form>';
-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 2010-03-16 09:35:52 UTC (rev 3389)
+++ trunk/doc/Change.log.html 2010-03-16 15:02:10 UTC (rev 3390)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Various layout changes for consistency and to stick to coding guidelines</p>
<p>16/03/10 Anand: DateFunctions.inc - When getting the period number compare the same date formats</p>
<p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Correctly position link to create a new order</p>
<p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Change option from Printed to Print in case where order is not yet printed</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-03-17 09:34:10
|
Revision: 3391
http://web-erp.svn.sourceforge.net/web-erp/?rev=3391&view=rev
Author: tim_schofield
Date: 2010-03-17 09:33:57 +0000 (Wed, 17 Mar 2010)
Log Message:
-----------
Tim: Various layout improvements to top items report
Modified Paths:
--------------
trunk/PDFTopItems.php
trunk/TopItems.php
trunk/doc/Change.log.html
trunk/includes/PDFTopItemsHeader.inc
Modified: trunk/PDFTopItems.php
===================================================================
--- trunk/PDFTopItems.php 2010-03-16 15:02:10 UTC (rev 3390)
+++ trunk/PDFTopItems.php 2010-03-17 09:33:57 UTC (rev 3391)
@@ -1,165 +1,127 @@
<?php
/* $Revision: 1.2 $ */
/* $Id$*/
-
$PageSecurity = 2;
-include('includes/session.inc');
-
-
-include('includes/PDFStarter.php');
-
-$FontSize=10;
-$pdf->addinfo('Title', _('Top Items Search Result') );
-
-$PageNumber=1;
-$line_height=12;
-
-
-include('includes/PDFTopItemsHeader.inc');
-
-$FontSize =10;
-
-//the situation if the location and customer type selected "All"
- if(($_GET["location"]=="All")and($_GET["customers"]=="All")){
- $SQL="
- SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
- stockmaster.description,
- stockmaster.units
-
-
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
+include ('includes/session.inc');
+include ('includes/PDFStarter.php');
+$FontSize = 10;
+$pdf->addinfo('Title', _('Top Items Search Result'));
+$PageNumber = 1;
+$line_height = 12;
+include ('includes/PDFTopItemsHeader.inc');
+$FontSize = 10;
+//the situation if the location and customer type selected "All"
+if (($_GET["location"] == "All") and ($_GET["customers"] == "All")) {
+ $SQL = "SELECT salesorderdetails.stkcode,
+ SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
+ SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
+ stockmaster.description,
+ stockmaster.units
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
+ WHERE salesorderdetails.orderno = salesorders.orderno
+ AND salesorderdetails.stkcode = stockmaster.stockid
+ AND salesorders.debtorno = debtorsmaster.debtorno
+ AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_GET["numberofdays"] . " DAY)
+ GROUP BY salesorderdetails.stkcode
+ ORDER BY " . $_GET['order'] . " DESC
+ LIMIT 0," . $_GET['NumberOfTopItems'] . "";
+} else { //the situation if only location type selected "All"
+ if ($_GET["location"] == "All") {
+ $SQL = "SELECT salesorderdetails.stkcode,
+ SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
+ SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
+ stockmaster.description,
+ stockmaster.units
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
- AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL ".$_GET["numberofdays"]." DAY)
- GROUP BY salesorderdetails.stkcode
- ORDER BY ".$_GET['order']." DESC
- LIMIT 0,".$_GET['NumberOfTopItems']."";
- }
- else{ //the situation if only location type selected "All"
- if($_GET["location"]=="All"){
- $SQL="
- SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
+ AND debtorsmaster.typeid = '" . $_GET["customers"] . "'
+ AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_GET["numberofdays"] . " DAY)
+ GROUP BY salesorderdetails.stkcode
+ ORDER BY " . $_GET['order'] . " DESC
+ LIMIT 0," . $_GET['NumberOfTopItems'] . "";
+ } else {
+ //the situation if the customer type selected "All"
+ if ($_GET["customers"] == "All") {
+ $SQL = "
+ SELECT salesorderdetails.stkcode,
+ SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
stockmaster.description,
stockmaster.units
-
-
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
- WHERE salesorderdetails.orderno = salesorders.orderno
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
+ WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.typeid = '".$_GET["customers"]."'
- AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL ".$_GET["numberofdays"]." DAY)
- GROUP BY salesorderdetails.stkcode
- ORDER BY ".$_GET['order']." DESC
- LIMIT 0,".$_GET['NumberOfTopItems']."";
- }
- else {
- //the situation if the customer type selected "All"
- if($_GET["customers"]=="All"){
- $SQL="
- SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
+ AND salesorders.fromstkloc = '" . $_GET["location"] . "'
+ AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_GET["numberofdays"] . " DAY)
+ GROUP BY salesorderdetails.stkcode
+ ORDER BY " . $_GET['order'] . " DESC
+ LIMIT 0," . $_GET['NumberOfTopItems'] . "";
+ } else {
+ //the situation if the location and customer type not selected "All"
+ $SQL = "
+ SELECT salesorderdetails.stkcode,
+ SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
stockmaster.description,
stockmaster.units
-
-
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
- AND salesorders.fromstkloc = '".$_GET["location"]."'
- AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL ".$_GET["numberofdays"]." DAY)
- GROUP BY salesorderdetails.stkcode
- ORDER BY ".$_GET['order']." DESC
- LIMIT 0,".$_GET['NumberOfTopItems']."";
-
- }
- else{
- //the situation if the location and customer type not selected "All"
- $SQL="
- SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
- stockmaster.description,
- stockmaster.units
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
- WHERE salesorderdetails.orderno = salesorders.orderno
- AND salesorderdetails.stkcode = stockmaster.stockid
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND salesorders.fromstkloc = '".$_GET["location"]."'
- AND debtorsmaster.typeid = '".$_GET["customers"]."'
- AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL ".$_GET["numberofdays"]." DAY)
- GROUP BY salesorderdetails.stkcode
- ORDER BY ".$_GET['order']." DESC
- LIMIT 0,".$_GET['NumberOfTopItems']."";
-
- }
- }
+ AND salesorders.fromstkloc = '" . $_GET["location"] . "'
+ AND debtorsmaster.typeid = '" . $_GET["customers"] . "'
+ AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_GET["numberofdays"] . " DAY)
+ GROUP BY salesorderdetails.stkcode
+ ORDER BY " . $_GET['order'] . " DESC
+ LIMIT 0," . $_GET['NumberOfTopItems'] . "";
}
-
-$result = DB_query($SQL,$db);
-
-$YPos=$YPos-6;
-while ($myrow=DB_fetch_array($result)) {
-
- //find the quantity onhand item
- $sqloh="SELECT sum(quantity)as qty
- FROM `locstock`
+ }
+}
+$result = DB_query($SQL, $db);
+$YPos = $YPos - 6;
+while ($myrow = DB_fetch_array($result)) {
+ //find the quantity onhand item
+ $sqloh = "SELECT sum(quantity)as qty
+ FROM `locstock`
WHERE stockid='" . $myrow['0'] . "'";
- $oh = db_query($sqloh,$db,$ErrMsg);
- $ohRow = db_fetch_row($oh);
- $OnHand=$ohRow[0];
-
- $ValueSales=number_format($myrow['2'],2);
-
-
- $Code=$myrow['0'];//stkcode
- $Desc=$myrow['3'];//desc
- $TotalInvoice=$myrow['1'];//total invoice here
- $Unit=$myrow['4'];//unit
-
-
- $LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,300-$Left_Margin,$FontSize, $Code);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,270-$Left_Margin,$FontSize, $Desc);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+370,$YPos,30-$Left_Margin,$FontSize, $TotalInvoice, 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+370,$YPos,300-$Left_Margin,$FontSize, $Unit, 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+400,$YPos,70,$FontSize, $ValueSales, 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+490,$YPos,30,$FontSize, $OnHand, 'right');
-
- if (strlen($LeftOvers)>1){
- $LeftOvers = $pdf->addTextWrap($Left_Margin+1+94,$YPos-$line_height,270,$FontSize,$LeftOvers, 'left');
- $YPos-=$line_height;
- }
-
- if ($YPos-$line_height <= $Bottom_Margin){
- /* We reached the end of the page so finish off the page and start a newy */
- $PageNumber++;
-
- include ('includes/PDFTopItemsHeader.inc');
- $FontSize=10;
- } //end if need a new page headed up
-
- /*increment a line down for the next line item */
- $YPos -= $line_height;
-
-
+ $oh = db_query($sqloh, $db);
+ $ohRow = db_fetch_row($oh);
+ $OnHand = $ohRow[0];
+ $ValueSales = number_format($myrow['2'], 2);
+ $Code = $myrow['0']; //stkcode
+ $Desc = $myrow['3']; //desc
+ $TotalInvoice = $myrow['1']; //total invoice here
+ $Unit = $myrow['4']; //unit
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 1, $YPos, 300 - $Left_Margin, $FontSize, $Code);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 100, $YPos, 270 - $Left_Margin, $FontSize, $Desc);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 330, $YPos, 30, $FontSize, $TotalInvoice, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 370, $YPos, 300 - $Left_Margin, $FontSize, $Unit, 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 400, $YPos, 70, $FontSize, $ValueSales, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 490, $YPos, 30, $FontSize, $OnHand, 'right');
+ if (strlen($LeftOvers) > 1) {
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 1 + 94, $YPos - $line_height, 270, $FontSize, $LeftOvers, 'left');
+ $YPos-= $line_height;
+ }
+ if ($YPos - $line_height <= $Bottom_Margin) {
+ /* We reached the end of the page so finish off the page and start a newy */
+ $PageNumber++;
+ include ('includes/PDFTopItemsHeader.inc');
+ $FontSize = 10;
+ } //end if need a new page headed up
+ /*increment a line down for the next line item */
+ $YPos-= $line_height;
}
-
$pdfcode = $pdf->output();
$len = strlen($pdfcode);
-
-if (DB_num_rows($result)==0){
+if (DB_num_rows($result) == 0) {
$title = _('Print Price List Error');
- include('includes/header.inc');
- prnMsg(_('There were no records returned '),'warn');
- echo '<br><a href="'.$rootpath.'/index.php?' . SID . '">'. _('Back to the menu').'</a>';
- include('includes/footer.inc');
+ include ('includes/header.inc');
+ prnMsg(_('There were no records returned '), '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');
@@ -168,10 +130,7 @@
header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
-
$pdf->Output('TopItems.pdf', 'I');
}
-
-
- /*end of else not PrintPDF */
+/*end of else not PrintPDF */
?>
\ No newline at end of file
Modified: trunk/TopItems.php
===================================================================
--- trunk/TopItems.php 2010-03-16 15:02:10 UTC (rev 3390)
+++ trunk/TopItems.php 2010-03-17 09:33:57 UTC (rev 3391)
@@ -14,7 +14,7 @@
//to view store location
echo '<tr><td width="150">' . _('Select Location') . ' </td><td>:</td><td><select name=Location>';
$sql = 'SELECT loccode,
- locationname
+ locationname
FROM `locations`';
$result = DB_query($sql, $db);
echo "<option value='All'>" . _('All');
@@ -25,7 +25,7 @@
//to view list of customer
echo '<tr><td width="150">' . _('Select Customer Type') . ' </td><td>:</td><td><select name=Customers>';
$sql = 'SELECT typename,
- typeid
+ typeid
FROM debtortype';
$result = DB_query($sql, $db);
echo "<option value='All'>" . _('All');
@@ -44,12 +44,12 @@
</tr>';
//View number of days
echo '<tr><td>' . _('Number Of Days') . ' </td><td>:</td>
- <td><input class="number" tabindex="3" type="Text" name=NumberOfDays size="8" maxlength="8"></td>
+ <td><input class="number" tabindex="3" type="Text" name=NumberOfDays size="8" maxlength="8" value=0></td>
</tr>';
//view number of NumberOfTopItems items
echo '<tr>
<td>' . _('Number Of Top Items') . ' </td><td>:</td>
- <td><input class="number" tabindex="4" type="Text" name=NumberOfTopItems size="8" maxlength="8"></td>
+ <td><input class="number" tabindex="4" type="Text" name=NumberOfTopItems size="8" maxlength="8" value=1></td>
</tr>
<tr>
<td></td>
@@ -62,70 +62,70 @@
//the situation if the location and customer type selected "All"
if (($_POST['Location'] == "All") and ($_POST['Customers'] == "All")) {
$SQL = "
- SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
+ SELECT salesorderdetails.stkcode,
+ SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
stockmaster.description,
stockmaster.units
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
- AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_POST['NumberOfDays'] . " DAY)
- GROUP BY salesorderdetails.stkcode
+ AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_POST['NumberOfDays'] . " DAY)
+ GROUP BY salesorderdetails.stkcode
ORDER BY " . $_POST["order"] . " DESC
LIMIT 0," . $_POST['NumberOfTopItems'] . "";
} else { //the situation if only location type selected "All"
if ($_POST['Location'] == "All") {
$SQL = "
- SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
+ SELECT salesorderdetails.stkcode,
+ SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
stockmaster.description,
stockmaster.units
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
AND debtorsmaster.typeid = '" . $_POST["Customers"] . "'
- AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_POST['NumberOfDays'] . " DAY)
- GROUP BY salesorderdetails.stkcode
+ AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_POST['NumberOfDays'] . " DAY)
+ GROUP BY salesorderdetails.stkcode
ORDER BY " . $_POST["order"] . " DESC
LIMIT 0," . $_POST[NumberOfTopItems] . "";
} else {
//the situation if the customer type selected "All"
if ($_POST['Customers'] == "All") {
$SQL = "
- SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
+ SELECT salesorderdetails.stkcode,
+ SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
stockmaster.description,
stockmaster.units
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
AND salesorders.fromstkloc = '" . $_POST["Location"] . "'
- AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_POST['NumberOfDays'] . " DAY)
- GROUP BY salesorderdetails.stkcode
+ AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_POST['NumberOfDays'] . " DAY)
+ GROUP BY salesorderdetails.stkcode
ORDER BY " . $_POST["order"] . " DESC
LIMIT 0," . $_POST[NumberOfTopItems] . "";
} else {
//the situation if the location and customer type not selected "All"
$SQL = "
- SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
+ SELECT salesorderdetails.stkcode,
+ SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
stockmaster.description,
- stockmaster.units
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
+ stockmaster.units
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
AND salesorders.fromstkloc = '" . $_POST["Location"] . "'
AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'
- AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_POST['NumberOfDays'] . " DAY)
- GROUP BY salesorderdetails.stkcode
+ AND salesorderdetails.ActualDispatchDate >= DATE_SUB(CURDATE(), INTERVAL " . $_POST['NumberOfDays'] . " DAY)
+ GROUP BY salesorderdetails.stkcode
ORDER BY " . $_POST["order"] . " DESC
LIMIT 0," . $_POST[NumberOfTopItems] . "";
}
@@ -137,12 +137,12 @@
$TableHeader = '<tr><th><strong>' . _('#') . '</strong></th>
<th><strong>' . _('Code') . '</strong></th>
<th><strong>' . _('Description') . '</strong></th>
- <th><strong>' . _('Total Invoiced') . '</strong></th>
+ <th><strong>' . _('Total Invoiced') . '</strong></th>
<th><strong>' . _('Units') . '</strong></th>
<th><strong>' . _('Value Sales') . '</strong></th>
<th><strong>' . _('On Hand') . '</strong></th>';
echo $TableHeader;
- echo '
+ echo '
<input type="hidden" value=' . $_POST["Location"] . ' name=location />
<input type="hidden" value=' . $_POST["order"] . ' name=order />
<input type="hidden" value=' . $_POST["NumberOfDays"] . ' name=numberofdays />
@@ -153,10 +153,10 @@
$i = 1;
while ($myrow = DB_fetch_array($result)) {
//find the quantity onhand item
- $sqloh = "SELECT sum(quantity)as qty
- FROM `locstock`
+ $sqloh = "SELECT sum(quantity)as qty
+ FROM `locstock`
WHERE stockid='" . $myrow['0'] . "'";
- $oh = db_query($sqloh, $db, $ErrMsg);
+ $oh = db_query($sqloh, $db);
$ohRow = db_fetch_row($oh);
if ($k == 1) {
echo '<tr class="EvenTableRows">';
@@ -185,7 +185,7 @@
echo '<div class="centre"><input type=Submit Name="PrintPDF" Value="' . _('Print To PDF') . '"></div>';
echo '</form>';
//end of the else statement
-
+
}
include ('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-16 15:02:10 UTC (rev 3390)
+++ trunk/doc/Change.log.html 2010-03-17 09:33:57 UTC (rev 3391)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>17/03/10 Tim: Various layout improvements to top items report</p>
<p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Various layout changes for consistency and to stick to coding guidelines</p>
<p>16/03/10 Anand: DateFunctions.inc - When getting the period number compare the same date formats</p>
<p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Correctly position link to create a new order</p>
Modified: trunk/includes/PDFTopItemsHeader.inc
===================================================================
--- trunk/includes/PDFTopItemsHeader.inc 2010-03-16 15:02:10 UTC (rev 3390)
+++ trunk/includes/PDFTopItemsHeader.inc 2010-03-17 09:33:57 UTC (rev 3391)
@@ -10,11 +10,11 @@
$XPos=0;
$pdf->addJpegFromFile('companies/' . $_SESSION['DatabaseName'] . '/logo.jpg',$XPos+20,$YPos-50,0,60);
-if ($_GET["customers"]!=All){
-$SQL="SELECT typename
- FROM `debtortype`
+if ($_GET["customers"]!='All'){
+$SQL="SELECT typename
+ FROM `debtortype`
WHERE typeid=".$_GET["customers"]."";
-
+
$result = DB_query($SQL,$db);
$myrow=DB_fetch_array($result);
$Customers=$myrow["0"];
@@ -46,12 +46,8 @@
$YPos -=(2*$line_height);
/*Draw a rectangle to put the headings in */
+$pdf->Rectangle($Left_Margin, $YPos+$line_height,$Page_Width-$Left_Margin-$Right_Margin,$line_height*2);
-$pdf->line($Left_Margin, $YPos+$line_height,$Page_Width-$Right_Margin, $YPos+$line_height);
-$pdf->line($Left_Margin, $YPos+$line_height,$Left_Margin, $YPos- $line_height);
-$pdf->line($Left_Margin, $YPos- $line_height,$Page_Width-$Right_Margin, $YPos- $line_height);
-$pdf->line($Page_Width-$Right_Margin, $YPos+$line_height,$Page_Width-$Right_Margin, $YPos- $line_height);
-
/*set up the headings */
$Xpos = $Left_Margin+1;
@@ -64,6 +60,7 @@
$FontSize=8;
+$pdf->Rectangle($Left_Margin, $YPos-$line_height,$Page_Width-$Left_Margin-$Right_Margin,$YPos-$Bottom_Margin);
$YPos -= (1.5 * $line_height);
//$PageNumber++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-03-18 19:15:59
|
Revision: 3392
http://web-erp.svn.sourceforge.net/web-erp/?rev=3392&view=rev
Author: tim_schofield
Date: 2010-03-18 19:15:51 +0000 (Thu, 18 Mar 2010)
Log Message:
-----------
Tim: Add report of supplier ransactions entered on a given date
Modified Paths:
--------------
trunk/Payments.php
trunk/SupplierCredit.php
trunk/SupplierInvoice.php
trunk/doc/Change.log.html
trunk/includes/PDFPaymentRun_PymtFooter.php
trunk/index.php
trunk/sql/mysql/upgrade3.11.1-3.12.sql
Added Paths:
-----------
trunk/PDFSuppTransListing.php
trunk/includes/PDFSuppTransListingPageHeader.inc
Added: trunk/PDFSuppTransListing.php
===================================================================
--- trunk/PDFSuppTransListing.php (rev 0)
+++ trunk/PDFSuppTransListing.php 2010-03-18 19:15:51 UTC (rev 3392)
@@ -0,0 +1,162 @@
+<?php
+
+/* $Id$*/
+
+/* $Revision: 1.13 $ */
+
+$PageSecurity = 3;
+include('includes/SQL_CommonFunctions.inc');
+include ('includes/session.inc');
+
+$InputError=0;
+if (isset($_POST['Date']) AND !Is_Date($_POST['Date'])){
+ $msg = _('The date must be specified in the format') . ' ' . $_SESSION['DefaultDateFormat'];
+ $InputError=1;
+ unset($_POST['Date']);
+}
+
+if (!isset($_POST['Date'])){
+
+ $title = _('Suppier Transaction Listing');
+ include ('includes/header.inc');
+
+ echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . $title . '" alt="">' . ' '
+ . _('Supplier Transaction Listing');
+
+ if ($InputError==1){
+ prnMsg($msg,'error');
+ }
+
+ echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '>';
+ echo '<table>
+ <tr>
+ <td>' . _('Enter the date for which the transactions are to be listed') . ":</td>
+ <td><input type=text name='Date' maxlength=10 size=10 class=date alt='" . $_SESSION['DefaultDateFormat'] . "' VALUE='" . Date($_SESSION['DefaultDateFormat']) . "'></td>
+ </tr>";
+
+ echo '<tr><td>' . _('Transaction type') . '</td><td>';
+
+ echo "<select name='TransType'>";
+
+ echo '<option value=20>' . _('Invoices').'</option>';
+ echo '<option value=21>' . _('Credit Notes').'</option>';
+ echo '<option value=22>' . _('Payments').'</option>';
+
+ echo '</select></td></tr>';
+
+ echo "</select></td></tr></table><div class='centre'><input type=submit name='Go' value='" . _('Create PDF') . "'></div>";
+
+
+ include('includes/footer.inc');
+ exit;
+} else {
+
+ include('includes/ConnectDB.inc');
+}
+
+$sql= "SELECT type,
+ supplierno,
+ suppreference,
+ trandate,
+ ovamount,
+ ovgst,
+ transtext
+ FROM supptrans
+ WHERE type=" . $_POST['TransType'] . "
+ AND date_format(inputdate, '%Y/%m/%d')='".FormatDateForSQL($_POST['Date'])."'";
+
+$result=DB_query($sql,$db,'','',false,false);
+
+if (DB_error_no($db)!=0){
+ $title = _('Payment Listing');
+ include('includes/header.inc');
+ prnMsg(_('An error occurred getting the payments'),'error');
+ if ($Debug==1){
+ prnMsg(_('The SQL used to get the receipt header information that failed was') . ':<br>' . $SQL,'error');
+ }
+ include('includes/footer.inc');
+ exit;
+} elseif (DB_num_rows($result) == 0){
+ $title = _('Payment Listing');
+ include('includes/header.inc');
+ prnMsg (_('There were no bank transactions found in the database within the period from') . ' ' . $_POST['Date'] ._('Please try again selecting a different date range or account'), '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',_('Supplier Transaction Listing'));
+$pdf->addInfo('Subject',_('Supplier transaction listing from') . ' ' . $_POST['Date'] );
+$line_height=12;
+$PageNumber = 1;
+$TotalCheques = 0;
+
+include ('includes/PDFSuppTransListingPageHeader.inc');
+
+while ($myrow=DB_fetch_array($result)){
+
+ $sql='SELECT suppname FROM suppliers WHERE supplierid="'.$myrow['supplierno'].'"';
+ $supplierresult=DB_query($sql, $db);
+ $supplierrow=DB_fetch_array($supplierresult);
+
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,160,$FontSize,$supplierrow['suppname'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+162,$YPos,80,$FontSize,$myrow['suppreference'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+242,$YPos,70,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+312,$YPos,70,$FontSize,number_format($myrow['ovamount'],2), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+382,$YPos,70,$FontSize,number_format($myrow['ovgst'],2), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+452,$YPos,70,$FontSize,number_format($myrow['ovamount']+$myrow['ovgst'],2), 'right');
+
+ $YPos -= ($line_height);
+ $TotalCheques = $TotalCheques - $myrow['ovamount'];
+
+ if ($YPos - (2 *$line_height) < $Bottom_Margin){
+ /*Then set up a new page */
+ $PageNumber++;
+ include ('includes/PDFChequeListingPageHeader.inc');
+ } /*end of new page header */
+} /* end of while there are customer receipts in the batch to print */
+
+
+$YPos-=$line_height;
+$LeftOvers = $pdf->addTextWrap($Left_Margin+452,$YPos,70,$FontSize,number_format(-$TotalCheques,2), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+265,$YPos,300,$FontSize,_('Total') . ' ' . _('Transactions'), 'left');
+
+/* UldisN
+$pdfcode = $pdf->output();
+$len = strlen($pdfcode);
+header('Content-type: application/pdf');
+header('Content-Length: ' . $len);
+header('Content-Disposition: inline; filename=ChequeListing.pdf');
+header('Expires: 0');
+header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+header('Pragma: public');
+
+$pdf->stream();
+*/
+$ReportFileName = $_SESSION['DatabaseName'] . '_ChequeListing_' . date('Y-m-d').'.pdf';
+$pdf->OutputD($ReportFileName);//UldisN
+$pdf->__destruct(); //UldisN
+if ($_POST['Email']=='Yes'){
+ if (file_exists($_SESSION['reports_dir'] . '/'.$ReportFileName)){
+ unlink($_SESSION['reports_dir'] . '/'.$ReportFileName);
+ }
+ $fp = fopen( $_SESSION['reports_dir'] . '/'.$ReportFileName,'wb');
+ fwrite ($fp, $pdfcode);
+ fclose ($fp);
+
+ include('includes/htmlMimeMail.php');
+
+ $mail = new htmlMimeMail();
+ $attachment = $mail->getFile($_SESSION['reports_dir'] . '/'.$ReportFileName);
+ $mail->setText(_('Please find herewith payments listing from') . ' ' . $_POST['Date'] . ' ' . _('to') . ' ' . $_POST['ToDate']);
+ $mail->addAttachment($attachment, 'PaymentListing.pdf', 'application/pdf');
+ $mail->setFrom(array('"' . $_SESSION['CompanyRecord']['coyname'] . '" <' . $_SESSION['CompanyRecord']['email'] . '>'));
+
+ /* $ChkListingRecipients defined in config.php */
+ $result = $mail->send($ChkListingRecipients);
+}
+
+?>
\ No newline at end of file
Property changes on: trunk/PDFSuppTransListing.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2010-03-17 09:33:57 UTC (rev 3391)
+++ trunk/Payments.php 2010-03-18 19:15:51 UTC (rev 3392)
@@ -389,6 +389,7 @@
type,
supplierno,
trandate,
+ inputdate,
suppreference,
rate,
ovamount,
@@ -397,6 +398,7 @@
22,
'" . $_SESSION['PaymentDetail']->SupplierID . "',
'" . FormatDateForSQL($_SESSION['PaymentDetail']->DatePaid) . "',
+ '" . date('Y-m-d H-i-s') . "',
'" . $_SESSION['PaymentDetail']->Paymenttype . "',
" . ($_SESSION['PaymentDetail']->ExRate/$_SESSION['PaymentDetail']->FunctionalExRate) . ",
" . (-$_SESSION['PaymentDetail']->Amount-$_SESSION['PaymentDetail']->Discount) . ",
Modified: trunk/SupplierCredit.php
===================================================================
--- trunk/SupplierCredit.php 2010-03-17 09:33:57 UTC (rev 3391)
+++ trunk/SupplierCredit.php 2010-03-18 19:15:51 UTC (rev 3392)
@@ -5,7 +5,7 @@
/*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
SupplierTransaction.php script. However, to aid readability - variable names have been changed -
-and reduce clutter (in the form of a heap of if statements) two separate scripts have been used,
+and reduce clutter (in the form of a heap of if statements) two separate scripts have been used,
both with very similar code.
This does mean that if the logic is to be changed for supplier transactions then it needs to be changed
@@ -108,9 +108,9 @@
$_SESSION['SuppTrans']->Terms = '0' . $myrow['daysbeforedue'];
}
$_SESSION['SuppTrans']->SupplierID = $_GET['SupplierID'];
-
- $LocalTaxProvinceResult = DB_query("SELECT taxprovinceid
- FROM locations
+
+ $LocalTaxProvinceResult = DB_query("SELECT taxprovinceid
+ FROM locations
WHERE loccode = '" . $_SESSION['UserStockLocation'] . "'", $db);
if(DB_num_rows($LocalTaxProvinceResult)==0){
@@ -118,24 +118,24 @@
include('includes/footer.inc');
exit;
}
-
+
$LocalTaxProvinceRow = DB_fetch_row($LocalTaxProvinceResult);
$_SESSION['SuppTrans']->LocalTaxProvince = $LocalTaxProvinceRow[0];
-
+
$_SESSION['SuppTrans']->GetTaxes();
-
-
+
+
$_SESSION['SuppTrans']->GLLink_Creditors = $_SESSION['CompanyRecord']['gllink_creditors'];
$_SESSION['SuppTrans']->GRNAct = $_SESSION['CompanyRecord']['grnact'];
$_SESSION['SuppTrans']->CreditorsAct = $_SESSION['CompanyRecord']['creditorsact'];
-
+
$_SESSION['SuppTrans']->InvoiceOrCredit = 'Credit Note';
} elseif (!isset($_SESSION['SuppTrans'])){
prnMsg(_('To enter a supplier credit note the supplier must first be selected from the supplier selection screen'),'warn');
echo "<br><a href='$rootpath/SelectSupplier.php?" . SID ."'>" . _('Select A Supplier to Enter an Credit Note For') . '</a>';
- include('includes/footer.inc');
+ include('includes/footer.inc');
exit;
/*It all stops here if there aint no supplier selected */
@@ -155,7 +155,7 @@
}
$_SESSION['SuppTrans']->SuppReference = $_POST['SuppReference'];
-
+
/*if (!isset($_POST['OvAmount'])) {
$_POST['OvAmount'] = 0;
}*/
@@ -307,9 +307,9 @@
echo $TableHeader;
$TotalShiptValue=0;
-
+
$i=0;
-
+
foreach ($_SESSION['SuppTrans']->Shipts as $EnteredShiptRef){
echo '<tr><td>' . $EnteredShiptRef->ShiptRef . '</td><td class=number>' .
@@ -359,7 +359,7 @@
<td class=number><font size=4 color=red><U>' . number_format($TotalGLValue,2) . '</U></font></td>
</tr></table>';
}
-
+
if (!isset($TotalGRNValue)) {
$TotalGRNValue=0;
}
@@ -392,50 +392,50 @@
$TaxTotal =0; //initialise tax total
foreach ($_SESSION['SuppTrans']->Taxes as $Tax) {
-
+
echo '<tr><td>' . $Tax->TaxAuthDescription . '</td><td>';
-
+
/*Set the tax rate to what was entered */
if (isset($_POST['TaxRate' . $Tax->TaxCalculationOrder])){
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate = $_POST['TaxRate' . $Tax->TaxCalculationOrder]/100;
}
-
+
/*If a tax rate is entered that is not the same as it was previously then recalculate automatically the tax amounts */
-
+
if (!isset($_POST['OverRideTax']) or $_POST['OverRideTax']=='Auto'){
-
+
echo ' <input type=TEXT class="number" name=TaxRate' . $Tax->TaxCalculationOrder . ' maxlength=4 size=4 VALUE=' . $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * 100 . '>%';
-
+
/*Now recaluclate the tax depending on the method */
if ($Tax->TaxOnTax ==1){
-
+
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * ($_SESSION['SuppTrans']->OvAmount + $TaxTotal);
-
+
} else { /*Calculate tax without the tax on tax */
-
+
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * $_SESSION['SuppTrans']->OvAmount;
-
+
}
-
-
+
+
echo '<input type=hidden name="TaxAmount' . $Tax->TaxCalculationOrder . '" VALUE=' . round($_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount,2) . '>';
-
+
echo '</td><td class=number>' . number_format($_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount,2);
-
+
} else { /*Tax being entered manually accept the taxamount entered as is*/
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = $_POST['TaxAmount' . $Tax->TaxCalculationOrder];
-
+
echo ' <input type=hidden name=TaxRate' . $Tax->TaxCalculationOrder . ' VALUE=' . $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * 100 . '>';
-
-
+
+
echo '</td><td><input type=TEXT class="number" size=12 maxlength=12 name="TaxAmount' . $Tax->TaxCalculationOrder . '" VALUE=' . round($_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount,2) . '>';
-
+
}
-
+
$TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount;
-
-
- echo '</td></tr>';
+
+
+ echo '</td></tr>';
}
$DisplayTotal = number_format($_SESSION['SuppTrans']->OvAmount + $TaxTotal,2);
@@ -484,13 +484,13 @@
}
}
-
+
/*Need to recalc the taxtotal */
$TaxTotal=0;
foreach ($_SESSION['SuppTrans']->Taxes as $Tax){
$TaxTotal += $Tax->TaxOvAmount;
- }
+ }
$InputError = False;
if ( $TaxTotal + $_SESSION['SuppTrans']->OvAmount <= 0){
@@ -625,7 +625,7 @@
if (strlen($EnteredGRN->ShiptRef)==0 OR $EnteredGRN->ShiptRef=="" OR $EnteredGRN->ShiptRef==0){ /*so its not a shipment item */
/*so its not a shipment item
enter the GL entry to reverse the GRN suspense entry created on delivery at standard cost used on delivery */
-
+
if ($EnteredGRN->StdCostUnit * $EnteredGRN->This_QuantityInv != 0) {
$SQL = 'INSERT INTO gltrans (type,
typeno,
@@ -649,8 +649,8 @@
$Result = DB_query($SQL, $db, $ErrMsg, $Dbg, True);
}
-
+
$PurchPriceVar = round($EnteredGRN->This_QuantityInv * (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit),2);
/*Yes but where to post this difference to - if its a stock item the variance account must be retrieved from the stock category record
if its a nominal purchase order item with no stock item then post it to the account specified in the purchase order detail record */
@@ -853,22 +853,22 @@
foreach ($_SESSION['SuppTrans']->Taxes as $Tax){
/* Now the TAX account */
- $SQL = 'INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
+ $SQL = 'INSERT INTO gltrans (type,
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
VALUES (21, ' .
- $CreditNoteNo . ",
- '" . $SQLCreditNoteDate . "',
- " . $PeriodNo . ',
- ' . $Tax->TaxGLCode . ",
+ $CreditNoteNo . ",
+ '" . $SQLCreditNoteDate . "',
+ " . $PeriodNo . ',
+ ' . $Tax->TaxGLCode . ",
'" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Credit note') . ' ' .
$_SESSION['SuppTrans']->SuppReference . ' ' . $_SESSION['SuppTrans']->CurrCode .
$Tax->TaxOvAmount . ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate .
- "',
+ "',
" . round(-$Tax->TaxOvAmount/ $_SESSION['SuppTrans']->ExRate,2) . ')';
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the tax could not be added because');
@@ -909,6 +909,7 @@
suppreference,
trandate,
duedate,
+ inputdate,
ovamount,
ovgst,
rate,
@@ -919,6 +920,7 @@
'" . $_SESSION['SuppTrans']->SuppReference . "',
'" . $SQLCreditNoteDate . "',
'" . FormatDateForSQL($_SESSION['SuppTrans']->DueDate) . "',
+ '" . Date('Y-m-d H-i-s') . "',
" . round(-$_SESSION['SuppTrans']->OvAmount,2) . ',
' .round(-$TaxTotal,2) . ',
' . $_SESSION['SuppTrans']->ExRate . ",
@@ -929,22 +931,22 @@
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True);
$SuppTransID = DB_Last_Insert_ID($db,'supptrans','id');
-
+
/* Insert the tax totals for each tax authority where tax was charged on the invoice */
foreach ($_SESSION['SuppTrans']->Taxes AS $TaxTotals) {
-
+
$SQL = 'INSERT INTO supptranstaxes (supptransid,
taxauthid,
taxamount)
VALUES (' . $SuppTransID . ',
' . $TaxTotals->TaxAuthID . ',
' . -$TaxTotals->TaxOvAmount . ')';
-
+
$ErrMsg =_('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The supplier transaction taxes records could not be inserted because');
$DbgMsg = _('The following SQL to insert the supplier transaction taxes record was used:');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
}
-
+
/* Now update the GRN and PurchOrderDetails records for amounts invoiced */
foreach ($_SESSION['SuppTrans']->GRNs as $EnteredGRN){
@@ -1014,9 +1016,9 @@
$SQL='COMMIT';
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
-
+
prnMsg(_('Supplier credit note number') . ' ' . $CreditNoteNo . ' ' . _('has been processed'),'success');
- echo '<br><div class="centre"><a href="' . $rootpath . '/SupplierCredit.php?&SupplierID=' .$_SESSION['SuppTrans']->SupplierID . '">' . _('Enter another Credit Note for this Supplier') . '</a></div>';
+ echo '<br><div class="centre"><a href="' . $rootpath . '/SupplierCredit.php?&SupplierID=' .$_SESSION['SuppTrans']->SupplierID . '">' . _('Enter another Credit Note for this Supplier') . '</a></div>';
unset($_SESSION['SuppTrans']->GRNs);
unset($_SESSION['SuppTrans']->Shipts);
unset($_SESSION['SuppTrans']->GLCodes);
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2010-03-17 09:33:57 UTC (rev 3391)
+++ trunk/SupplierInvoice.php 2010-03-18 19:15:51 UTC (rev 3392)
@@ -918,6 +918,7 @@
suppreference,
trandate,
duedate,
+ inputdate,
ovamount,
ovgst,
rate,
@@ -929,6 +930,7 @@
'" . $_SESSION['SuppTrans']->SuppReference . "',
'" . $SQLInvoiceDate . "',
'" . FormatDateForSQL($_SESSION['SuppTrans']->DueDate) . "',
+ '" . date('Y-m-d H-i-s') . "',
" . round($_SESSION['SuppTrans']->OvAmount,2) . ',
' . round($TaxTotal,2) . ',
' . $_SESSION['SuppTrans']->ExRate . ",
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-17 09:33:57 UTC (rev 3391)
+++ trunk/doc/Change.log.html 2010-03-18 19:15:51 UTC (rev 3392)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>18/03/10 Tim: Add report of supplier ransactions entered on a given date</p>
<p>17/03/10 Tim: Various layout improvements to top items report</p>
<p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Various layout changes for consistency and to stick to coding guidelines</p>
<p>16/03/10 Anand: DateFunctions.inc - When getting the period number compare the same date formats</p>
Modified: trunk/includes/PDFPaymentRun_PymtFooter.php
===================================================================
--- trunk/includes/PDFPaymentRun_PymtFooter.php 2010-03-17 09:33:57 UTC (rev 3391)
+++ trunk/includes/PDFPaymentRun_PymtFooter.php 2010-03-18 19:15:51 UTC (rev 3392)
@@ -31,6 +31,7 @@
supplierno,
trandate,
duedate,
+ inputdate,
settled,
rate,
ovamount,
@@ -42,6 +43,7 @@
'" . $SupplierID . "',
'" . FormatDateForSQL($_POST['AmountsDueBy']) . "',
'" . FormatDateForSQL($_POST['AmountsDueBy']) . "',
+ '" . date('Y-m-d H-i-s') . "',
1,
" . $_POST['ExRate'] . ",
" . -$AccumBalance . ",
Added: trunk/includes/PDFSuppTransListingPageHeader.inc
===================================================================
--- trunk/includes/PDFSuppTransListingPageHeader.inc (rev 0)
+++ trunk/includes/PDFSuppTransListingPageHeader.inc 2010-03-18 19:15:51 UTC (rev 3392)
@@ -0,0 +1,60 @@
+<?php
+/* $Id$*/
+if ($PageNumber>1){
+ $pdf->newPage();
+}
+
+$YPos = $Page_Height - $Top_Margin - 50;
+
+$pdf->addJpegFromFile($_SESSION['LogoFile'],$Left_Margin,$YPos,0,50);
+
+$FontSize=15;
+
+Switch ($_POST['TransType']) {
+ case 20:
+ $TransType=_('Suppier Invoices');
+ break;
+ case 21:
+ $TransType=_('Suppier Credit Notes');
+ break;
+ case 22:
+ $TransType=_('Suppier Payments');
+}
+
+$XPos = $Left_Margin;
+$YPos -= 40;
+$pdf->addText($XPos, $YPos,$FontSize, $_SESSION['CompanyRecord']['coyname']);
+$FontSize=12;
+$pdf->addText($XPos, $YPos-20,$FontSize, $TransType . ' ' ._('input on') . ' ' . $_POST['Date']);
+
+$XPos = $Page_Width-$Right_Margin-50;
+$YPos -=30;
+$pdf->addText($XPos, $YPos,$FontSize, _('Page') . ': ' . $PageNumber);
+
+/*Now print out the company name and address */
+$XPos = $Left_Margin;
+$YPos -= $line_height;
+
+/*draw a square grid for entering line items */
+$pdf->line($XPos, $YPos,$Page_Width-$Right_Margin, $YPos);
+$pdf->line($Page_Width-$Right_Margin, $YPos,$Page_Width-$Right_Margin, $Bottom_Margin);
+$pdf->line($Page_Width-$Right_Margin, $Bottom_Margin,$XPos, $Bottom_Margin);
+$pdf->line($XPos, $Bottom_Margin,$XPos, $YPos);
+
+$YPos -= $line_height;
+/*Set up headings */
+$FontSize=8;
+
+$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,160,$FontSize,_('Supplier'), 'centre');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+162,$YPos,80,$FontSize,_('Reference'), 'centre');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+242,$YPos,70,$FontSize,_('Trans Date'), 'centre');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+312,$YPos,70,$FontSize,_('Net Amount'), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+382,$YPos,70,$FontSize,_('Tax Amount'), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+452,$YPos,70,$FontSize,_('Total Amount'), 'right');
+$YPos-=$line_height;
+
+/*draw a line */
+$pdf->line($XPos, $YPos,$Page_Width-$Right_Margin, $YPos);
+
+$YPos -= ($line_height);
+?>
\ No newline at end of file
Property changes on: trunk/includes/PDFSuppTransListingPageHeader.inc
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2010-03-17 09:33:57 UTC (rev 3391)
+++ trunk/index.php 2010-03-18 19:15:51 UTC (rev 3392)
@@ -390,6 +390,11 @@
</tr>
<tr>
<td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFSuppTransListing.php?' . SID . '">' . _('List Daily Transactions') . '</a></p>'; ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="menu_group_item">
<?php echo GetRptLinks('ap'); ?>
</td>
</tr>
Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-3.12.sql 2010-03-17 09:33:57 UTC (rev 3391)
+++ trunk/sql/mysql/upgrade3.11.1-3.12.sql 2010-03-18 19:15:51 UTC (rev 3392)
@@ -51,7 +51,7 @@
ALTER TABLE `purchorderauth` ADD COLUMN `offhold` tinyint(1) NOT NULL DEFAULT 0;
-UPDATE `www_users` SET `modulesallowed` = '1,1,1,1,1,1,1,1,1,1'
+UPDATE `www_users` SET `modulesallowed` = '1,1,1,1,1,1,1,1,1,1'
UPDATE securitytokens SET tokenname = 'Petty Cash' WHERE tokenid = 6;
@@ -120,4 +120,7 @@
ADD CONSTRAINT `pctabs_ibfk_2` FOREIGN KEY (`typetabcode`) REFERENCES `pctypetabs` (`typetabcode`),
ADD CONSTRAINT `pctabs_ibfk_3` FOREIGN KEY (`currency`) REFERENCES `currencies` (`currabrev`),
ADD CONSTRAINT `pctabs_ibfk_4` FOREIGN KEY (`authorizer`) REFERENCES `www_users` (`userid`),
- ADD CONSTRAINT `pctabs_ibfk_5` FOREIGN KEY (`glaccountassignment`) REFERENCES `chartmaster` (`accountcode`);
\ No newline at end of file
+ ADD CONSTRAINT `pctabs_ibfk_5` FOREIGN KEY (`glaccountassignment`) REFERENCES `chartmaster` (`accountcode`);
+
+ALTER TABLE `supptrans`
+ ADD COLUMN `inputdate` datetime NOT NULL AFTER `duedate` ;
\ 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...> - 2010-03-19 06:40:56
|
Revision: 3393
http://web-erp.svn.sourceforge.net/web-erp/?rev=3393&view=rev
Author: tim_schofield
Date: 2010-03-19 06:40:49 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
Tim: Add report of custmer transactions entered on a given date
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/Credit_Invoice.php
trunk/CustomerReceipt.php
trunk/RecurringSalesOrdersProcess.php
trunk/SelectCreditItems.php
trunk/doc/Change.log.html
trunk/index.php
trunk/sql/mysql/upgrade3.11.1-3.12.sql
Added Paths:
-----------
trunk/PDFCustTransListing.php
trunk/includes/PDFCustTransListingPageHeader.inc
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2010-03-18 19:15:51 UTC (rev 3392)
+++ trunk/ConfirmDispatch_Invoice.php 2010-03-19 06:40:49 UTC (rev 3393)
@@ -715,6 +715,7 @@
debtorno,
branchcode,
trandate,
+ inputdate,
prd,
reference,
tpe,
@@ -733,6 +734,7 @@
'" . $_SESSION['Items']->DebtorNo . "',
'" . $_SESSION['Items']->Branch . "',
'" . $DefaultDispatchDate . "',
+ '" . date('Y-m-d H-i-s') . "',
" . $PeriodNo . ",
'',
'" . $_SESSION['Items']->DefaultSalesType . "',
@@ -1447,7 +1449,7 @@
unset($_SESSION['ProcessingOrder']);
echo prnMsg( _('Invoice number'). ' '. $InvoiceNo .' '. _('processed'), 'success');
-
+
echo '<br><div class="centre">';
if ($_SESSION['InvoicePortraitFormat']==0){
@@ -1461,7 +1463,7 @@
} else { /*Process Invoice not set so allow input of invoice data */
-
+
if (!isset($_POST['Consignment'])) {
$_POST['Consignment']='';
}
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2010-03-18 19:15:51 UTC (rev 3392)
+++ trunk/Credit_Invoice.php 2010-03-19 06:40:49 UTC (rev 3393)
@@ -53,7 +53,7 @@
locations.taxprovinceid
FROM debtortrans INNER JOIN debtorsmaster ON
debtortrans.debtorno = debtorsmaster.debtorno
- INNER JOIN custbranch ON
+ INNER JOIN custbranch ON
debtortrans.branchcode = custbranch.branchcode
AND debtortrans.debtorno = custbranch.debtorno
INNER JOIN currencies ON
@@ -92,7 +92,7 @@
$_SESSION['CreditItems']->FreightCost = $myrow['ovfreight'];
$_SESSION['CreditItems']->DispatchTaxProvince = $myrow['taxprovinceid'];
$_SESSION['CreditItems']->GetFreightTaxes();
-
+
DB_free_result($GetInvHdrResult);
/*now populate the line items array with the stock movement records for the invoice*/
@@ -114,8 +114,8 @@
stockmoves.qty as quantity,
stockmoves.discountpercent,
stockmoves.trandate,
- stockmaster.materialcost
- + stockmaster.labourcost
+ stockmaster.materialcost
+ + stockmaster.labourcost
+ stockmaster.overheadcost AS standardcost,
stockmoves.narrative
FROM stockmoves, stockmaster
@@ -132,9 +132,9 @@
if (db_num_rows($LineItemsResult)>0) {
while ($myrow=db_fetch_array($LineItemsResult)) {
-
+
$LineNumber = $_SESSION['CreditItems']->LineCounter;
-
+
$_SESSION['CreditItems']->add_to_cart($myrow['stockid'],
$myrow['quantity'],
$myrow['description'],
@@ -161,7 +161,7 @@
$myrow['standardcost']
);
$_SESSION['CreditItems']->GetExistingTaxes($LineNumber, $myrow['stkmoveno']);
-
+
if ($myrow['controlled']==1){/* Populate the SerialItems array too*/
$SQL = 'SELECT serialno,
@@ -199,12 +199,12 @@
if (isset($_POST['Location'])){
$_SESSION['CreditItems']->Location = $_POST['Location'];
-
+
$NewDispatchTaxProvResult = DB_query("SELECT taxprovinceid FROM locations WHERE loccode='" . $_POST['Location'] . "'",$db);
$myrow = DB_fetch_array($NewDispatchTaxProvResult);
-
+
$_SESSION['CreditItems']->DispatchTaxProvince = $myrow['taxprovinceid'];
-
+
foreach ($_SESSION['CreditItems']->LineItems as $LineItem) {
$_SESSION['CreditItems']->GetTaxes($LineItem->LineNumber);
}
@@ -324,7 +324,7 @@
echo "<td><input tabindex=".$j." type=text class=number name='Price_" . $LnItm->LineNumber . "' maxlength=12 size=6 VALUE=" . $LnItm->Price . "></td>
<td><input tabindex=".$j." type=text class=number name='Discount_" . $LnItm->LineNumber . "' maxlength=3 size=3 VALUE=" . ($LnItm->DiscountPercent * 100) . "></td>
<td class=number>$DisplayLineTotal</td>";
-
+
/*Need to list the taxes applicable to this line */
echo '<td>';
$i=0;
@@ -339,10 +339,10 @@
}
echo '</td>';
echo '<td class=number>';
-
+
$i=0; // initialise the number of taxes iterated through
$TaxLineTotal =0; //initialise tax total for the line
-
+
if (is_array($LnItm->Taxes) ){
foreach ($LnItm->Taxes AS $Tax) {
if ($i>0){
@@ -360,10 +360,10 @@
$TaxGLCodes[$Tax->TaxAuthID] = $Tax->TaxGLCode;
}
}
- echo '</td>';
-
+ echo '</td>';
+
$TaxTotal += $TaxLineTotal;
-
+
$DisplayTaxAmount = number_format($TaxLineTotal ,2);
$DisplayGrossLineTotal = number_format($LineTotal+ $TaxLineTotal,2);
@@ -406,9 +406,9 @@
if ($i>0){
echo '<br>';
}
-
+
echo '<input type=text class=number name=FreightTaxRate' . $FreightTaxLine->TaxCalculationOrder . ' maxlength=4 size=4 VALUE=' . $FreightTaxLine->TaxRate * 100 . '>';
-
+
if ($FreightTaxLine->TaxOnTax ==1){
$TaxTotals[$FreightTaxLine->TaxAuthID] += ($FreightTaxLine->TaxRate * ($_SESSION['CreditItems']->FreightCost + $FreightTaxTotal));
$FreightTaxTotal += ($FreightTaxLine->TaxRate * ($_SESSION['CreditItems']->FreightCost + $FreightTaxTotal));
@@ -450,9 +450,9 @@
/* SQL to process the postings for sales credit notes... First Get the area where the credit note is to from the branches table */
- $SQL = "SELECT area
- FROM custbranch
- WHERE custbranch.debtorno ='". $_SESSION['CreditItems']->DebtorNo . "'
+ $SQL = "SELECT area
+ FROM custbranch
+ WHERE custbranch.debtorno ='". $_SESSION['CreditItems']->DebtorNo . "'
AND custbranch.branchcode = '" . $_SESSION['CreditItems']->Branch . "'";
$Result = DB_query($SQL,$db);
@@ -471,10 +471,10 @@
/*Now Get the next credit note number - function in SQL_CommonFunctions*/
-
+
$CreditNo = GetNextTransNo(11, $db);
$PeriodNo = GetPeriod($DefaultDispatchDate, $db);
-
+
/*Start an SQL transaction */
$SQL = 'BEGIN';
@@ -537,6 +537,7 @@
debtorno,
branchcode,
trandate,
+ inputdate,
prd,
reference,
tpe,
@@ -553,6 +554,7 @@
'" . $_SESSION['CreditItems']->DebtorNo . "',
'" . $_SESSION['CreditItems']->Branch . "',
'" . $DefaultDispatchDate . "',
+ '" . date('Y-m-d H-i-s') . "',
" . $PeriodNo . ", 'Inv-" . $_SESSION['ProcessingCredit'] . "',
'" . $_SESSION['CreditItems']->DefaultSalesType . "',
" . $_SESSION['CreditItems']->OrderNo . ",
@@ -568,17 +570,17 @@
$Result = DB_query($SQL,$db,$ErrMsg, $DbgMsg, true);
$CreditTransID = DB_Last_Insert_ID($db,'debtortrans','id');
-
+
/* Insert the tax totals for each tax authority where tax was charged on the invoice */
foreach ($TaxTotals AS $TaxAuthID => $TaxAmount) {
-
+
$SQL = 'INSERT INTO debtortranstaxes (debtortransid,
taxauthid,
taxamount)
VALUES (' . $CreditTransID . ',
' . $TaxAuthID . ',
' . -($TaxAmount/$_SESSION['CurrencyRate']) . ')';
-
+
$ErrMsg =_('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The debtor transaction taxes records could not be inserted because');
$DbgMsg = _('The following SQL to insert the debtor transaction taxes record was used');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
@@ -637,7 +639,7 @@
if ($_POST['CreditType']=='Return'){
/* some want this some do not */
-
+
$SQL = "UPDATE salesorderdetails
SET qtyinvoiced = qtyinvoiced - " . $OrderLine->QtyDispatched . ",
completed=0
@@ -648,9 +650,9 @@
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The sales order detail record could not be updated for the reduced quantity invoiced because');
$DbgMsg = _('The following SQL to update the sales order detail record was used');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
-
-
-
+
+
+
/* Update location stock records if not a dummy stock item */
if ($MBFlag=='B' OR $MBFlag=='M') {
@@ -672,10 +674,10 @@
$sql = "SELECT
bom.component,
bom.quantity,
- stockmaster.materialcost
- + stockmaster.labourcost
+ stockmaster.materialcost
+ + stockmaster.labourcost
+ stockmaster.overheadcost AS standard
- FROM bom,
+ FROM bom,
stockmaster
WHERE bom.component=stockmaster.stockid
AND bom.parent='" . $OrderLine->StockID . "'
@@ -687,7 +689,7 @@
$AssResult = DB_query($sql,$db, $ErrMsg, $DbgMsg, true);
while ($AssParts = DB_fetch_array($AssResult,$db)){
-
+
$StandardCost += $AssParts['standard'];
/*Determine the type of stock item being credited */
$SQL = "SELECT mbflag
@@ -882,22 +884,22 @@
WHERE stockid='" . $OrderLine->StockID . "'
AND loccode='" . $_SESSION['CreditItems']->Location . "'
AND serialno='" . $Item->BundleRef . "'";
-
+
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be selected because');
$DbgMsg = _('The following SQL to select the serial stock item record was used');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
if (DB_num_rows($Result)==0){
- $SQL = "INSERT INTO stockserialitems (stockid,
- loccode,
- serialno,
+ $SQL = "INSERT INTO stockserialitems (stockid,
+ loccode,
+ serialno,
quantity)
VALUES
- ('" . $OrderLine->StockID . "',
- '" . $_SESSION['CreditItems']->Location . "',
- '" . $Item->BundleRef . "',
+ ('" . $OrderLine->StockID . "',
+ '" . $_SESSION['CreditItems']->Location . "',
+ '" . $Item->BundleRef . "',
". $Item->BundleQty .")";
-
+
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because');
$DbgMsg = _('The following SQL to update the serial stock item record was used');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
@@ -915,13 +917,13 @@
/* now insert the serial stock movement */
- $SQL = "INSERT INTO stockserialmoves (stockmoveno,
- stockid,
- serialno,
- moveqty)
- VALUES (" . $StkMoveNo . ",
- '" . $OrderLine->StockID . "',
- '" . $Item->BundleRef . "',
+ $SQL = "INSERT INTO stockserialmoves (stockmoveno,
+ stockid,
+ serialno,
+ moveqty)
+ VALUES (" . $StkMoveNo . ",
+ '" . $OrderLine->StockID . "',
+ '" . $Item->BundleRef . "',
" . $Item->BundleQty . ")";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because');
$DbgMsg = _('The following SQL to insert the serial stock movement records was used');
@@ -959,7 +961,7 @@
'" . $_SESSION['CreditItems']->DebtorNo . "',
'" . $_SESSION['CreditItems']->Branch . "',
" . $LocalCurrencyPrice . ",
- " . $PeriodNo . ",
+ " . $PeriodNo . ",
'" . _('Ex Inv') . ' - ' . $_SESSION['ProcessingCredit'] . "',
" . $OrderLine->QtyDispatched . ",
" . $OrderLine->DiscountPercent . ",
@@ -1069,7 +1071,7 @@
' . $Tax->TaxRate . ',
' . $Tax->TaxCalculationOrder . ',
' . $Tax->TaxOnTax . ')';
-
+
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Taxes and rates applicable to this credit note line item could not be inserted because');
$DbgMsg = _('The following SQL to insert the stock movement tax detail records was used');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
@@ -1216,7 +1218,7 @@
/* If GLLink_Stock then insert GLTrans to credit stock and debit cost of sales at standard cost*/
- if ($_SESSION['CompanyRecord']['gllink_stock']==1
+ if ($_SESSION['CompanyRecord']['gllink_stock']==1
AND ($OrderLine->StandardCost !=0 OR (isset($StandardCost) and $StandardCost !=0))
AND $_POST['CreditType']!='ReverseOverCharge'){
@@ -1388,24 +1390,24 @@
$Result = DB_query($SQL,$db,$ErrMsg, $DbgMsg, true);
}
- foreach ( $TaxTotals as $TaxAuthID => $TaxAmount){
+ foreach ( $TaxTotals as $TaxAuthID => $TaxAmount){
if ($TaxAmount !=0 ){
$SQL = "INSERT INTO gltrans (
- type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
+ type,
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
amount
- )
+ )
VALUES (
- 11,
- " . $CreditNo . ",
- '" . $DefaultDispatchDate . "',
- " . $PeriodNo . ",
- " . $TaxGLCodes[$TaxAuthID] . ",
- '" . $_SESSION['CreditItems']->DebtorNo . "',
+ 11,
+ " . $CreditNo . ",
+ '" . $DefaultDispatchDate . "',
+ " . $PeriodNo . ",
+ " . $TaxGLCodes[$TaxAuthID] . ",
+ '" . $_SESSION['CreditItems']->DebtorNo . "',
" . ($TaxAmount/$_SESSION['CurrencyRate']) . "
)";
@@ -1418,7 +1420,7 @@
$SQL='COMMIT';
$Result = DB_query($SQL,$db);
-
+
unset($_SESSION['CreditItems']->LineItems);
unset($_SESSION['CreditItems']);
unset($_SESSION['ProcessingCredit']);
@@ -1482,10 +1484,10 @@
echo '<tr><td>' . _('Write off the cost of the goods to') . '</td><td><select TABINDEX='.$j.' name="WriteOffGLCode">';
- $SQL='SELECT accountcode,
- accountname
- FROM chartmaster, accountgroups
- WHERE chartmaster.group_=accountgroups.groupname
+ $SQL='SELECT accountcode,
+ accountname
+ FROM chartmaster, accountgroups
+ WHERE chartmaster.group_=accountgroups.groupname
AND accountgroups.pandl=1 ORDER BY chartmaster.accountcode';
$Result = DB_query($SQL,$db);
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2010-03-18 19:15:51 UTC (rev 3392)
+++ trunk/CustomerReceipt.php 2010-03-19 06:40:49 UTC (rev 3393)
@@ -144,7 +144,7 @@
if (!isset($_POST['CustomerName'])) {
$_POST['CustomerName']='';
}
-
+
$_SESSION['ReceiptBatch']->add_to_batch($_POST['Amount'],
$_POST['CustomerID'],
$_POST['Discount'],
@@ -214,7 +214,7 @@
$CustomerReceiptCounter=1; //Count lines of customer receipts in this batch
echo '<br /><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Allocate') . '" alt="">' . ' ' . _('Summary of Receipt Batch').'</p><br />';
-
+
echo '<table><tr><th>'._('Batch Number').'</th>
<th>'._('Date Banked').'</th>
<th>'._('Customer Name').'</th
@@ -222,7 +222,7 @@
<th>'._('Amount of Receipt').'</th></tr>';
foreach ($_SESSION['ReceiptBatch']->Items as $ReceiptItem) {
-
+
if ($k==1){
echo '<tr class="OddTableRows">';
$k=0;
@@ -241,7 +241,7 @@
echo '<td><a target="_blank" href="' . $rootpath . '/PDFReceipt.php?BatchNumber=' . $_SESSION['ReceiptBatch']->BatchNo. '&ReceiptNumber='.$CustomerReceiptCounter.'">'._('Print a Customer Receipt').'</a></td></tr>';
$CustomerReceiptCounter += 1;
}
-
+
if ($ReceiptItem->GLCode !=''){
if ($_SESSION['CompanyRecord']['gllink_debtors']==1){ /* then enter a GLTrans record */
$SQL = 'INSERT INTO gltrans (type,
@@ -353,6 +353,7 @@
debtorno,
branchcode,
trandate,
+ inputdate,
prd,
reference,
tpe,
@@ -365,6 +366,7 @@
'" . $ReceiptItem->Customer . "',
'',
'" . FormatDateForSQL($_SESSION['ReceiptBatch']->DateBanked) . "',
+ '" . date('Y-m-d H-i-s') . "',
" . $PeriodNo . ",
'" . $_SESSION['ReceiptBatch']->ReceiptType . ' ' . $ReceiptItem->PayeeBankDetail . "',
'',
@@ -515,7 +517,7 @@
if (strlen($_POST['Keywords'])>0) {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
-
+
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name
FROM debtorsmaster
Added: trunk/PDFCustTransListing.php
===================================================================
--- trunk/PDFCustTransListing.php (rev 0)
+++ trunk/PDFCustTransListing.php 2010-03-19 06:40:49 UTC (rev 3393)
@@ -0,0 +1,143 @@
+<?php
+
+/* $Id$*/
+
+/* $Revision: 1.13 $ */
+
+$PageSecurity = 3;
+include('includes/SQL_CommonFunctions.inc');
+include ('includes/session.inc');
+
+$InputError=0;
+if (isset($_POST['Date']) AND !Is_Date($_POST['Date'])){
+ $msg = _('The date must be specified in the format') . ' ' . $_SESSION['DefaultDateFormat'];
+ $InputError=1;
+ unset($_POST['Date']);
+}
+
+if (!isset($_POST['Date'])){
+
+ $title = _('Customer Transaction Listing');
+ include ('includes/header.inc');
+
+ echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . $title . '" alt="">' . ' '
+ . _('Customer Transaction Listing');
+
+ if ($InputError==1){
+ prnMsg($msg,'error');
+ }
+
+ echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '>';
+ echo '<table>
+ <tr>
+ <td>' . _('Enter the date for which the transactions are to be listed') . ":</td>
+ <td><input type=text name='Date' maxlength=10 size=10 class=date alt='" . $_SESSION['DefaultDateFormat'] . "' value='" . Date($_SESSION['DefaultDateFormat']) . "'></td>
+ </tr>";
+
+ echo '<tr><td>' . _('Transaction type') . '</td><td>';
+
+ echo "<select name='TransType'>";
+
+ echo '<option value=10>' . _('Invoices').'</option>';
+ echo '<option value=11>' . _('Credit Notes').'</option>';
+ echo '<option value=12>' . _('Receipts').'</option>';
+
+ echo '</select></td></tr>';
+
+ echo "</select></td></tr></table><div class='centre'><input type=submit name='Go' value='" . _('Create PDF') . "'></div>";
+
+
+ include('includes/footer.inc');
+ exit;
+} else {
+
+ include('includes/ConnectDB.inc');
+}
+
+$sql= "SELECT type,
+ debtorno,
+ transno,
+ trandate,
+ ovamount,
+ ovgst,
+ invtext
+ FROM debtortrans
+ WHERE type=" . $_POST['TransType'] . "
+ AND date_format(inputdate, '%Y/%m/%d')='".FormatDateForSQL($_POST['Date'])."'";
+
+$result=DB_query($sql,$db,'','',false,false);
+
+if (DB_error_no($db)!=0){
+ $title = _('Payment Listing');
+ include('includes/header.inc');
+ prnMsg(_('An error occurred getting the payments'),'error');
+ if ($Debug==1){
+ prnMsg(_('The SQL used to get the receipt header information that failed was') . ':<br>' . $SQL,'error');
+ }
+ include('includes/footer.inc');
+ exit;
+} elseif (DB_num_rows($result) == 0){
+ $title = _('Payment Listing');
+ include('includes/header.inc');
+ prnMsg (_('There were no bank transactions found in the database within the period from') . ' ' . $_POST['Date'] ._('Please try again selecting a different date range or account'), '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',_('Customer Transaction Listing'));
+$pdf->addInfo('Subject',_('Customer transaction listing from') . ' ' . $_POST['Date'] );
+$line_height=12;
+$PageNumber = 1;
+$TotalCheques = 0;
+
+include ('includes/PDFCustTransListingPageHeader.inc');
+
+while ($myrow=DB_fetch_array($result)){
+
+ $sql='SELECT name FROM debtorsmaster WHERE debtorno="'.$myrow['debtorno'].'"';
+ $supplierresult=DB_query($sql, $db);
+ $supplierrow=DB_fetch_array($supplierresult);
+
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,160,$FontSize,$supplierrow['name'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+162,$YPos,80,$FontSize,$myrow['transno'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+242,$YPos,70,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+312,$YPos,70,$FontSize,number_format($myrow['ovamount'],2), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+382,$YPos,70,$FontSize,number_format($myrow['ovgst'],2), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+452,$YPos,70,$FontSize,number_format($myrow['ovamount']+$myrow['ovgst'],2), 'right');
+
+ $YPos -= ($line_height);
+ $TotalCheques = $TotalCheques - $myrow['ovamount'];
+
+ if ($YPos - (2 *$line_height) < $Bottom_Margin){
+ /*Then set up a new page */
+ $PageNumber++;
+ include ('includes/PDFCustTransListingPageHeader.inc');
+ } /*end of new page header */
+} /* end of while there are customer receipts in the batch to print */
+
+
+$YPos-=$line_height;
+$LeftOvers = $pdf->addTextWrap($Left_Margin+452,$YPos,70,$FontSize,number_format(-$TotalCheques,2), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+265,$YPos,300,$FontSize,_('Total') . ' ' . _('Transactions'), 'left');
+
+/* UldisN
+$pdfcode = $pdf->output();
+$len = strlen($pdfcode);
+header('Content-type: application/pdf');
+header('Content-Length: ' . $len);
+header('Content-Disposition: inline; filename=ChequeListing.pdf');
+header('Expires: 0');
+header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+header('Pragma: public');
+
+$pdf->stream();
+*/
+$ReportFileName = $_SESSION['DatabaseName'] . '_CustTransListing_' . date('Y-m-d').'.pdf';
+$pdf->OutputD($ReportFileName);//UldisN
+$pdf->__destruct(); //UldisN
+
+?>
\ No newline at end of file
Property changes on: trunk/PDFCustTransListing.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/RecurringSalesOrdersProcess.php
===================================================================
--- trunk/RecurringSalesOrdersProcess.php 2010-03-18 19:15:51 UTC (rev 3392)
+++ trunk/RecurringSalesOrdersProcess.php 2010-03-19 06:40:49 UTC (rev 3393)
@@ -83,7 +83,7 @@
echo '<br>' . _('Date calculated for the next recurrence was') .': ' . $DelDate;
$OrderNo = GetNextTransNo(30, $db);
-
+
$HeaderSQL = "INSERT INTO salesorders (
orderno,
debtorno,
@@ -633,6 +633,7 @@
debtorno,
branchcode,
trandate,
+ inputdate,
prd,
reference,
tpe,
@@ -650,6 +651,7 @@
'" . $RecurrOrderRow['debtorno'] . "',
'" . $RecurrOrderRow['branchcode'] . "',
'" . $DelDate . "',
+ '" . date('Y-m-d H-i-s') . "',
" . $PeriodNo . ",
'" . $RecurrOrderRow['customerref'] . "',
'" . $RecurrOrderRow['sales_type'] . "',
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2010-03-18 19:15:51 UTC (rev 3392)
+++ trunk/SelectCreditItems.php 2010-03-19 06:40:49 UTC (rev 3393)
@@ -281,7 +281,7 @@
If ($_POST['Keywords']!="") {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
-
+
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
@@ -1066,6 +1066,7 @@
debtorno,
branchcode,
trandate,
+ inputdate,
prd,
tpe,
ovamount,
@@ -1077,7 +1078,9 @@
11,
'" . $_SESSION['CreditItems']->DebtorNo . "',
'" . $_SESSION['CreditItems']->Branch . "',
- '" . $SQLCreditDate . "', " . $PeriodNo . ",
+ '" . $SQLCreditDate . "',
+ '" . date('Y-m-d H-i-s') . "',
+ " . $PeriodNo . ",
'" . $_SESSION['CreditItems']->DefaultSalesType . "',
" . -($_SESSION['CreditItems']->total) . ",
" . -$TaxTotal . ",
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-18 19:15:51 UTC (rev 3392)
+++ trunk/doc/Change.log.html 2010-03-19 06:40:49 UTC (rev 3393)
@@ -1,6 +1,7 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
-<p>18/03/10 Tim: Add report of supplier ransactions entered on a given date</p>
+<p>18/03/10 Tim: Add report of customer transactions entered on a given date</p>
+<p>18/03/10 Tim: Add report of supplier transactions entered on a given date</p>
<p>17/03/10 Tim: Various layout improvements to top items report</p>
<p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Various layout changes for consistency and to stick to coding guidelines</p>
<p>16/03/10 Anand: DateFunctions.inc - When getting the period number compare the same date formats</p>
Added: trunk/includes/PDFCustTransListingPageHeader.inc
===================================================================
--- trunk/includes/PDFCustTransListingPageHeader.inc (rev 0)
+++ trunk/includes/PDFCustTransListingPageHeader.inc 2010-03-19 06:40:49 UTC (rev 3393)
@@ -0,0 +1,60 @@
+<?php
+/* $Id$*/
+if ($PageNumber>1){
+ $pdf->newPage();
+}
+
+$YPos = $Page_Height - $Top_Margin - 50;
+
+$pdf->addJpegFromFile($_SESSION['LogoFile'],$Left_Margin,$YPos,0,50);
+
+$FontSize=15;
+
+Switch ($_POST['TransType']) {
+ case 10:
+ $TransType=_('Customer Invoices');
+ break;
+ case 11:
+ $TransType=_('Customer Credit Notes');
+ break;
+ case 12:
+ $TransType=_('Customer Payments');
+}
+
+$XPos = $Left_Margin;
+$YPos -= 40;
+$pdf->addText($XPos, $YPos,$FontSize, $_SESSION['CompanyRecord']['coyname']);
+$FontSize=12;
+$pdf->addText($XPos, $YPos-20,$FontSize, $TransType . ' ' ._('input on') . ' ' . $_POST['Date']);
+
+$XPos = $Page_Width-$Right_Margin-50;
+$YPos -=30;
+$pdf->addText($XPos, $YPos,$FontSize, _('Page') . ': ' . $PageNumber);
+
+/*Now print out the company name and address */
+$XPos = $Left_Margin;
+$YPos -= $line_height;
+
+/*draw a square grid for entering line items */
+$pdf->line($XPos, $YPos,$Page_Width-$Right_Margin, $YPos);
+$pdf->line($Page_Width-$Right_Margin, $YPos,$Page_Width-$Right_Margin, $Bottom_Margin);
+$pdf->line($Page_Width-$Right_Margin, $Bottom_Margin,$XPos, $Bottom_Margin);
+$pdf->line($XPos, $Bottom_Margin,$XPos, $YPos);
+
+$YPos -= $line_height;
+/*Set up headings */
+$FontSize=8;
+
+$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,160,$FontSize,_('Customer'), 'centre');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+162,$YPos,80,$FontSize,_('Reference'), 'centre');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+242,$YPos,70,$FontSize,_('Trans Date'), 'centre');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+312,$YPos,70,$FontSize,_('Net Amount'), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+382,$YPos,70,$FontSize,_('Tax Amount'), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+452,$YPos,70,$FontSize,_('Total Amount'), 'right');
+$YPos-=$line_height;
+
+/*draw a line */
+$pdf->line($XPos, $YPos,$Page_Width-$Right_Margin, $YPos);
+
+$YPos -= ($line_height);
+?>
\ No newline at end of file
Property changes on: trunk/includes/PDFCustTransListingPageHeader.inc
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2010-03-18 19:15:51 UTC (rev 3392)
+++ trunk/index.php 2010-03-19 06:40:49 UTC (rev 3393)
@@ -307,6 +307,11 @@
</tr>
<tr>
<td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFCustTransListing.php?' . SID . '">' . _('List Daily Transactions') . '</a></p>'; ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="menu_group_item">
<?php echo GetRptLinks('ar'); ?>
</td>
</tr>
Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-3.12.sql 2010-03-18 19:15:51 UTC (rev 3392)
+++ trunk/sql/mysql/upgrade3.11.1-3.12.sql 2010-03-19 06:40:49 UTC (rev 3393)
@@ -123,4 +123,7 @@
ADD CONSTRAINT `pctabs_ibfk_5` FOREIGN KEY (`glaccountassignment`) REFERENCES `chartmaster` (`accountcode`);
ALTER TABLE `supptrans`
- ADD COLUMN `inputdate` datetime NOT NULL AFTER `duedate` ;
\ No newline at end of file
+ ADD COLUMN `inputdate` datetime NOT NULL AFTER `duedate` ;
+
+ALTER TABLE `debtortrans`
+ ADD COLUMN `inputdate` datetime NOT NULL AFTER `trandate` ;
\ 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...> - 2010-03-19 07:53:25
|
Revision: 3394
http://web-erp.svn.sourceforge.net/web-erp/?rev=3394&view=rev
Author: tim_schofield
Date: 2010-03-19 07:53:18 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
Correct error messages when no transactions are available
Modified Paths:
--------------
trunk/PDFCustTransListing.php
trunk/PDFSuppTransListing.php
Modified: trunk/PDFCustTransListing.php
===================================================================
--- trunk/PDFCustTransListing.php 2010-03-19 06:40:49 UTC (rev 3393)
+++ trunk/PDFCustTransListing.php 2010-03-19 07:53:18 UTC (rev 3394)
@@ -70,16 +70,17 @@
if (DB_error_no($db)!=0){
$title = _('Payment Listing');
include('includes/header.inc');
- prnMsg(_('An error occurred getting the payments'),'error');
+ prnMsg(_('An error occurred getting the transactions'),'error');
if ($Debug==1){
- prnMsg(_('The SQL used to get the receipt header information that failed was') . ':<br>' . $SQL,'error');
+ prnMsg(_('The SQL used to get the transaction information that failed was') . ':<br>' . $SQL,'error');
}
include('includes/footer.inc');
exit;
} elseif (DB_num_rows($result) == 0){
$title = _('Payment Listing');
include('includes/header.inc');
- prnMsg (_('There were no bank transactions found in the database within the period from') . ' ' . $_POST['Date'] ._('Please try again selecting a different date range or account'), 'error');
+ echo '<br>';
+ prnMsg (_('There were no transactions found in the database for the date') . ' ' . $_POST['Date'] .'. '._('Please try again selecting a different date'), 'info');
include('includes/footer.inc');
exit;
}
Modified: trunk/PDFSuppTransListing.php
===================================================================
--- trunk/PDFSuppTransListing.php 2010-03-19 06:40:49 UTC (rev 3393)
+++ trunk/PDFSuppTransListing.php 2010-03-19 07:53:18 UTC (rev 3394)
@@ -79,7 +79,8 @@
} elseif (DB_num_rows($result) == 0){
$title = _('Payment Listing');
include('includes/header.inc');
- prnMsg (_('There were no bank transactions found in the database within the period from') . ' ' . $_POST['Date'] ._('Please try again selecting a different date range or account'), 'error');
+ echo '<br>';
+ prnMsg (_('There were no transactions found in the database for the date') . ' ' . $_POST['Date'] .'. '._('Please try again selecting a different date'), 'info');
include('includes/footer.inc');
exit;
}
@@ -136,27 +137,8 @@
$pdf->stream();
*/
-$ReportFileName = $_SESSION['DatabaseName'] . '_ChequeListing_' . date('Y-m-d').'.pdf';
+$ReportFileName = $_SESSION['DatabaseName'] . '_SuppTransListing_' . date('Y-m-d').'.pdf';
$pdf->OutputD($ReportFileName);//UldisN
$pdf->__destruct(); //UldisN
-if ($_POST['Email']=='Yes'){
- if (file_exists($_SESSION['reports_dir'] . '/'.$ReportFileName)){
- unlink($_SESSION['reports_dir'] . '/'.$ReportFileName);
- }
- $fp = fopen( $_SESSION['reports_dir'] . '/'.$ReportFileName,'wb');
- fwrite ($fp, $pdfcode);
- fclose ($fp);
- include('includes/htmlMimeMail.php');
-
- $mail = new htmlMimeMail();
- $attachment = $mail->getFile($_SESSION['reports_dir'] . '/'.$ReportFileName);
- $mail->setText(_('Please find herewith payments listing from') . ' ' . $_POST['Date'] . ' ' . _('to') . ' ' . $_POST['ToDate']);
- $mail->addAttachment($attachment, 'PaymentListing.pdf', 'application/pdf');
- $mail->setFrom(array('"' . $_SESSION['CompanyRecord']['coyname'] . '" <' . $_SESSION['CompanyRecord']['email'] . '>'));
-
- /* $ChkListingRecipients defined in config.php */
- $result = $mail->send($ChkListingRecipients);
-}
-
?>
\ 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...> - 2010-03-21 12:39:46
|
Revision: 3395
http://web-erp.svn.sourceforge.net/web-erp/?rev=3395&view=rev
Author: tim_schofield
Date: 2010-03-21 12:39:40 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
Pak Ricad: MRPShortages.php - Correctuion to mrp shortages report where total supply = 0
Modified Paths:
--------------
trunk/MRPShortages.php
trunk/doc/Change.log.html
Modified: trunk/MRPShortages.php
===================================================================
--- trunk/MRPShortages.php 2010-03-19 07:53:18 UTC (rev 3394)
+++ trunk/MRPShortages.php 2010-03-21 12:39:40 UTC (rev 3395)
@@ -21,12 +21,12 @@
// several subqueries.
$sql = 'CREATE TEMPORARY TABLE demandtotal (
- part char(20),
+ part char(20),
demand double,
KEY `PART` (`part`))';
$result = DB_query($sql,$db,_('Create of demandtotal failed because'));
-
- $sql = 'INSERT INTO demandtotal
+
+ $sql = 'INSERT INTO demandtotal
(part,
demand)
SELECT part,
@@ -36,20 +36,33 @@
$result = DB_query($sql,$db);
$sql = 'CREATE TEMPORARY TABLE supplytotal (
- part char(20),
+ part char(20),
supply double,
KEY `PART` (`part`))';
$result = DB_query($sql,$db,_('Create of supplytotal failed because'));
-
- $sql = 'INSERT INTO supplytotal
+
+/* 21/03/2010: Ricard modification to allow items with total supply = 0 be included in the report */
+
+ $sql = 'INSERT INTO supplytotal
(part,
supply)
- SELECT part,
- SUM(supplyquantity) as supply
- FROM mrpsupplies
- GROUP BY part';
+ SELECT stockid,
+ 0
+ FROM stockmaster';
$result = DB_query($sql,$db);
+ $sql = 'UPDATE supplytotal
+ SET supply = (SELECT SUM(mrpsupplies.supplyquantity)
+ FROM mrpsupplies
+ WHERE supplytotal.part = mrpsupplies.part
+ AND mrpsupplies.supplyquantity > 0)';
+ $result = DB_query($sql,$db);
+
+ $sql = 'UPDATE supplytotal SET supply = 0 WHERE supply IS NULL ';
+ $result = DB_query($sql,$db);
+
+/* End Ricard modification */
+
// Only include directdemand mrprequirements so don't have demand for top level parts and also
// show demand for the lower level parts that the upper level part generates. See MRP.php for
// more notes - Decided not to exclude derived demand so using $sql, not $sqlexclude
@@ -58,12 +71,12 @@
stockmaster.mbflag,
stockmaster.actualcost,
stockmaster.decimalplaces,
- (stockmaster.materialcost + stockmaster.labourcost +
+ (stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost,
demandtotal.demand,
supplytotal.supply,
(demandtotal.demand - supplytotal.supply) *
- (stockmaster.materialcost + stockmaster.labourcost +
+ (stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as extcost
FROM stockmaster
LEFT JOIN demandtotal ON stockmaster.stockid = demandtotal.part
@@ -83,12 +96,12 @@
stockmaster.mbflag,
stockmaster.actualcost,
stockmaster.decimalplaces,
- (stockmaster.materialcost + stockmaster.labourcost +
+ (stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as computedcost,
demandtotal.demand,
supplytotal.supply,
(demandtotal.demand - supplytotal.supply) *
- (stockmaster.materialcost + stockmaster.labourcost +
+ (stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as extcost
FROM stockmaster
LEFT JOIN demandtotal ON stockmaster.stockid = demandtotal.part
@@ -104,7 +117,7 @@
computedcost,
supplytotal.supply,
demandtotal.demand
- HAVING demandtotal.demand > supplytotal.supply
+ HAVING demandtotal.demand > supplytotal.supply
ORDER BY " . $_POST['Sort'] . $sortorder;
$result = DB_query($sql,$db,'','',false,true);
@@ -143,19 +156,19 @@
if ($myrow['demand'] > $myrow['supply']) {
$YPos -=$line_height;
$FontSize=8;
-
+
// Use to alternate between lines with transparent and painted background
if ($_POST['Fill'] == 'yes'){
$fill=!$fill;
}
-
+
// Parameters for addTextWrap are defined in /includes/class.pdf.php
// 1) X position 2) Y position 3) Width
// 4) Height 5) Text 6) Alignment 7) Border 8) Fill - True to use SetFillColor
// and False to set to transparent
$shortage = ($myrow['demand'] - $myrow['supply']) * -1;
$extcost = $shortage * $myrow['computedcost'];
- $pdf->addTextWrap($Left_Margin,$YPos,90,$FontSize,$myrow['stockid'],'',0,$fill);
+ $pdf->addTextWrap($Left_Margin,$YPos,90,$FontSize,$myrow['stockid'],'',0,$fill);
$pdf->addTextWrap(130,$YPos,150,$FontSize,$myrow['description'],'',0,$fill);
$pdf->addTextWrap(280,$YPos,25,$FontSize,$myrow['mbflag'],'right',0,$fill);
$pdf->addTextWrap(305,$YPos,55,$FontSize,number_format($myrow['computedcost'],2),'right',0,$fill);
@@ -166,10 +179,10 @@
$pdf->addTextWrap(460,$YPos,50,$FontSize,number_format($shortage,
$myrow['decimalplaces']),'right',0,$fill);
$pdf->addTextWrap(510,$YPos,60,$FontSize,number_format($myrow['extcost'],2),'right',0,$fill);
-
+
$Total_Shortage += $myrow['extcost'];
$Partctr++;
-
+
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
$Right_Margin);
@@ -209,7 +222,7 @@
header('Expires: 0');
header('Cache-Control: private, post-check=0, pre-check=0');
header('Pragma: public');
-
+
$pdf->Output('MRPShortages.pdf', 'I');
}
*/
@@ -253,7 +266,7 @@
$YPos -=$line_height;
$pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('MRP Shortages Report'));
-$pdf->addTextWrap($Page_Width-$Right_Margin-110,$YPos,160,$FontSize,_('Printed') . ': ' .
+$pdf->addTextWrap($Page_Width-$Right_Margin-110,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
$YPos -=(2*$line_height);
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-19 07:53:18 UTC (rev 3394)
+++ trunk/doc/Change.log.html 2010-03-21 12:39:40 UTC (rev 3395)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>21/03/10 Pak Ricad: MRPShortages.php - Correctuion to mrp shortages report where total supply = 0</p>
<p>18/03/10 Tim: Add report of customer transactions entered on a given date</p>
<p>18/03/10 Tim: Add report of supplier transactions entered on a given date</p>
<p>17/03/10 Tim: Various layout improvements to top items report</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-03-21 13:13:00
|
Revision: 3396
http://web-erp.svn.sourceforge.net/web-erp/?rev=3396&view=rev
Author: tim_schofield
Date: 2010-03-21 13:12:52 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
Simon Peter Otandeka: PDFStatementPageHeader.inc - Correction for right margin variable misnamed
Modified Paths:
--------------
trunk/doc/Change.log.html
trunk/includes/PDFStatementPageHeader.inc
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-21 12:39:40 UTC (rev 3395)
+++ trunk/doc/Change.log.html 2010-03-21 13:12:52 UTC (rev 3396)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>21/03/10 Simon Peter Otandeka: PDFStatementPageHeader.inc - Correction for right margin variable misnamed</p>
<p>21/03/10 Pak Ricad: MRPShortages.php - Correctuion to mrp shortages report where total supply = 0</p>
<p>18/03/10 Tim: Add report of customer transactions entered on a given date</p>
<p>18/03/10 Tim: Add report of supplier transactions entered on a given date</p>
@@ -22,7 +23,7 @@
<p>09/03/10 Tim: PDFStockLocTransfer.php - Add a reprint option</p>
<p>09/03/10 Tim: Updates to Petty Cash Management Report and include new header file</p>
<p>08/03/10 Tim: Small changes to Petty Cash module</p>
-<p>08/03/10 Simon Peter Otandekar: FixedAssetRegister.php Include totals and sub-totals</p>
+<p>08/03/10 Simon Peter Otandeka: FixedAssetRegister.php Include totals and sub-totals</p>
<p>08/03/10 Tim: PrintCustTransPortrait.php Correctly show the prices</p>
<p>08/03/10 Tim: Corrections to DIFOT report to correctly show the logo</p>
<p>05/03/10 Lindsay: PrintCustTrans.php generates HTML for Print, PDF for Print PDF</p>
Modified: trunk/includes/PDFStatementPageHeader.inc
===================================================================
--- trunk/includes/PDFStatementPageHeader.inc 2010-03-21 12:39:40 UTC (rev 3395)
+++ trunk/includes/PDFStatementPageHeader.inc 2010-03-21 13:12:52 UTC (rev 3396)
@@ -2,7 +2,7 @@
/* $Id$*/
/* PDFlib code to set up a new page */
-$Perforation = $Page_Width - $RightMargin - 160;
+$Perforation = $Page_Width - $Right_Margin - 160;
$YPos = $Page_Height - $Top_Margin;
@@ -55,7 +55,7 @@
$LineCount += 1;
$pdf->addText($XPos, $YPos-$LineCount*$LineHeight,$FontSize, $_SESSION['CompanyRecord']['regoffice2']);
}
-if (($_SESSION['CompanyRecord']['regoffice3'] <> '') OR ($_SESSION['CompanyRecord']['regoffice4'] <> '') OR ($_SESSION['CompanyRecord']['regoffice5'] <> '')) {
+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
}
@@ -83,7 +83,7 @@
$LineCountR += 1;
$pdf->addText($Perforation+1, $YPosR-$LineCountR*$LineHeight,$FontSize, $_SESSION['CompanyRecord']['regoffice2']);
}
-if (($_SESSION['CompanyRecord']['regoffice3'] <> '') OR ($_SESSION['CompanyRecord']['regoffice4'] <> '') OR ($_SESSION['CompanyRecord']['regoffice5'] <> '')) {
+if (($_SESSION['CompanyRecord']['regoffice3'] <> '') OR ($_SESSION['CompanyRecord']['regoffice4'] <> '') OR ($_SESSION['CompanyRecord']['regoffice5'] <> '')) {
$LineCountR += 1;
$pdf->addText($Perforation+1, $YPosR-$LineCountR*$LineHeight,$FontSize, $_SESSION['CompanyRecord']['regoffice3'] . ' ' . $_SESSION['CompanyRecord']['regoffice4'] . ' ' . $_SESSION['CompanyRecord']['regoffice5']); // country in 6 not printed
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-03-22 08:29:41
|
Revision: 3397
http://web-erp.svn.sourceforge.net/web-erp/?rev=3397&view=rev
Author: tim_schofield
Date: 2010-03-22 08:29:34 +0000 (Mon, 22 Mar 2010)
Log Message:
-----------
Tim: Change customer statement layout to not have overlapping text
Modified Paths:
--------------
trunk/PrintCustStatements.php
trunk/doc/Change.log.html
trunk/includes/PDFStatementPageHeader.inc
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2010-03-21 13:12:52 UTC (rev 3396)
+++ trunk/PrintCustStatements.php 2010-03-22 08:29:34 UTC (rev 3397)
@@ -14,11 +14,12 @@
if (isset($_GET['PrintPDF'])) {
$FromCust = $_GET['FromCust'];
$ToCust = $_GET['ToCust'];
- $PrintPDF = $_GET['PrintPDF'];
+ $PrintPDF = $_GET['PrintPDF'];
$_POST['FromCust'] = $FromCust;
$_POST['ToCust'] = $ToCust;
$_POST['PrintPDF'] = $PrintPDF;
-}
+ $PaperSize='A4_Landscape';
+}
@@ -126,13 +127,13 @@
OR debtortrans.id=custallocns.transid_allocto)
WHERE custallocns.datealloc >='" .
Date('Y-m-d',Mktime(0,0,0,Date('m')-1,Date('d'),Date('y'))) . "'
- AND debtortrans.debtorno='" . $StmtHeader['debtorno'] . "'
+ AND debtortrans.debtorno='" . $StmtHeader['debtorno'] . "'
AND debtortrans.settled=1
ORDER BY debtortrans.id";
$SetldTrans=DB_query($sql,$db, $ErrMsg);
$NumberOfRecordsReturned += DB_num_rows($SetldTrans);
-
+
}
if ( $NumberOfRecordsReturned >=1){
@@ -169,19 +170,19 @@
$FontSize=9;
$LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize,$myrow['typename'], 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+61,$YPos,50,$FontSize,$myrow['transno'], 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+111,$YPos,50,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,50,$FontSize,$myrow['transno'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,50,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
$FontSize=10;
if ($myrow['total']>0){
$DisplayTotal = number_format($myrow['total'],2);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+150,$YPos,60,$FontSize,$DisplayTotal, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,60,$FontSize,$DisplayTotal, 'right');
} else {
$DisplayTotal = number_format(-$myrow['total'],2);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+210,$YPos,60,$FontSize,$DisplayTotal, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+382,$YPos,60,$FontSize,$DisplayTotal, 'right');
}
- $LeftOvers = $pdf->addTextWrap($Left_Margin+270,$YPos,60,$FontSize,$DisplayAlloc, 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+330,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+459,$YPos,60,$FontSize,$DisplayAlloc, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+536,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
if ($YPos-$line_height <= $Bottom_Margin){
/* head up a new statement page */
@@ -219,26 +220,26 @@
$FontSize=9;
$LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize,$myrow['typename'], 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+61,$YPos,50,$FontSize,$myrow['transno'], 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+111,$YPos,50,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,50,$FontSize,$myrow['transno'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,50,$FontSize,ConvertSQLDate($myrow['trandate']), 'left');
$FontSize=10;
if ($myrow['total']>0){
$DisplayTotal = number_format($myrow['total'],2);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+161,$YPos,55,$FontSize,$DisplayTotal, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,55,$FontSize,$DisplayTotal, 'right');
} else {
$DisplayTotal = number_format(-$myrow['total'],2);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+216,$YPos,55,$FontSize,$DisplayTotal, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+382,$YPos,55,$FontSize,$DisplayTotal, 'right');
}
- $LeftOvers = $pdf->addTextWrap($Left_Margin+271,$YPos,59,$FontSize,$DisplayAlloc, 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+330,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+459,$YPos,59,$FontSize,$DisplayAlloc, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+536,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
/*Now show also in the remittance advice sectin */
$FontSize=8;
- $LeftOvers = $pdf->addTextWrap($Perforation+1,$YPos,30,$FontSize,$myrow['typename'], 'left');
- $LeftOvers = $pdf->addTextWrap($Perforation+35,$YPos,30,$FontSize,$myrow['transno'], 'left');
- $LeftOvers = $pdf->addTextWrap($Perforation+65,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
+ $LeftOvers = $pdf->addTextWrap($Perforation+10,$YPos,30,$FontSize,$myrow['typename'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Perforation+75,$YPos,30,$FontSize,$myrow['transno'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Perforation+90,$YPos,60,$FontSize,$DisplayOutstanding, 'right');
if ($YPos-$line_height <= $Bottom_Margin){
/* head up a new statement page */
@@ -281,7 +282,7 @@
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight +
debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
- ELSE
+ ELSE
CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') . ")) >= 0
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight +
debtortrans.ovdiscount - debtortrans.alloc
@@ -307,8 +308,8 @@
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight +
debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1','MONTH') . "), " .
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1','MONTH') . "), " .
INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') . "))
>= " . $_SESSION['PastDueDays2'] . ")
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight +
@@ -356,19 +357,19 @@
$FontSize=10;
- $pdf->addText($Left_Margin+37, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Current'). ' ');
- $pdf->addText($Left_Margin+110, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Past Due').' ');
- $pdf->addText($Left_Margin+182, $Bottom_Margin+(3*$line_height)+4, $FontSize, $_SESSION['PastDueDays1'] . '-' . $_SESSION['PastDueDays2'] . ' ' . _('days') );
- $pdf->addText($Left_Margin+265, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Over').' ' . $_SESSION['PastDueDays2'] . ' '. _('days'));
- $pdf->addText($Left_Margin+332, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Total Balance') );
+ $pdf->addText($Left_Margin+75, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Current'). ' ');
+ $pdf->addText($Left_Margin+158, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Past Due').' ');
+ $pdf->addText($Left_Margin+242, $Bottom_Margin+(3*$line_height)+4, $FontSize, $_SESSION['PastDueDays1'] . '-' . $_SESSION['PastDueDays2'] . ' ' . _('days') );
+ $pdf->addText($Left_Margin+315, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Over').' ' . $_SESSION['PastDueDays2'] . ' '. _('days'));
+ $pdf->addText($Left_Margin+442, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Total Balance') );
- $LeftOvers = $pdf->addTextWrap($Left_Margin+1, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayCurrent, 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+81, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayDue, 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+161, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayOverdue1, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+37, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayCurrent, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+130, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayDue, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+222, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayOverdue1, 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+251, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayOverdue2, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+305, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayOverdue2, 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+324, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayBalance, 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+432, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayBalance, 'right');
/*draw a line under the balance info */
@@ -377,7 +378,8 @@
if (strlen($StmtHeader['lastpaiddate'])>1 && $StmtHeader['lastpaid']!=0){
- $pdf->addText($Left_Margin+5, $Bottom_Margin+13, $FontSize, _('Last payment received').' ' . ConvertSQLDate($StmtHeader['lastpaiddate']) . ' ' . _('Amount received was').' ' . number_format($StmtHeader['lastpaid'],2));
+ $pdf->addText($Left_Margin+5, $Bottom_Margin+13, $FontSize, _('Last payment received').' ' . ConvertSQLDate($StmtHeader['lastpaiddate']) .
+ ' ' . _('Amount received was').' ' . number_format($StmtHeader['lastpaid'],2));
}
/*also show the total due in the remittance section */
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-21 13:12:52 UTC (rev 3396)
+++ trunk/doc/Change.log.html 2010-03-22 08:29:34 UTC (rev 3397)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>22/03/10 Tim: Change customer statement layout to not have overlapping text</p>
<p>21/03/10 Simon Peter Otandeka: PDFStatementPageHeader.inc - Correction for right margin variable misnamed</p>
<p>21/03/10 Pak Ricad: MRPShortages.php - Correctuion to mrp shortages report where total supply = 0</p>
<p>18/03/10 Tim: Add report of customer transactions entered on a given date</p>
Modified: trunk/includes/PDFStatementPageHeader.inc
===================================================================
--- trunk/includes/PDFStatementPageHeader.inc 2010-03-21 13:12:52 UTC (rev 3396)
+++ trunk/includes/PDFStatementPageHeader.inc 2010-03-22 08:29:34 UTC (rev 3397)
@@ -6,7 +6,7 @@
$YPos = $Page_Height - $Top_Margin;
-$pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -70,$YPos-80,0,30);
+$pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -130,$YPos-80,0,60);
// Title
$FontSize =15;
@@ -165,19 +165,19 @@
$FontSize =10;
/*Set up headings */
$pdf->addText($Left_Margin+1, $YPos,$FontSize, _('Trans Type') );
-$pdf->addText($Left_Margin+57, $YPos,$FontSize, _('Number') );
-$pdf->addText($Left_Margin+108, $YPos,$FontSize, _('Date') );
-$pdf->addText($Left_Margin+178, $YPos,$FontSize, _('Charges') );
-$pdf->addText($Left_Margin+239, $YPos,$FontSize, _('Credits') );
-$pdf->addText($Left_Margin+289, $YPos,$FontSize, _('Allocated') );
-$pdf->addText($Left_Margin+336, $YPos,$FontSize, _('Outstanding') );
+$pdf->addText($Left_Margin+100, $YPos,$FontSize, _('Number') );
+$pdf->addText($Left_Margin+210, $YPos,$FontSize, _('Date') );
+$pdf->addText($Left_Margin+300, $YPos,$FontSize, _('Charges') );
+$pdf->addText($Left_Margin+382, $YPos,$FontSize, _('Credits') );
+$pdf->addText($Left_Margin+459, $YPos,$FontSize, _('Allocated') );
+$pdf->addText($Left_Margin+536, $YPos,$FontSize, _('Outstanding') );
/*Set up remittance section headings */
$FontSize=8;
-$pdf->addText($Perforation+1, $YPos,$FontSize, _('Trans') );
-$pdf->addText($Perforation+35, $YPos,$FontSize, _('Number') );
-$pdf->addText($Perforation+80, $YPos,$FontSize, _('Outstanding') );
+$pdf->addText($Perforation+10, $YPos,$FontSize, _('Trans') );
+$pdf->addText($Perforation+55, $YPos,$FontSize, _('Number') );
+$pdf->addText($Perforation+100, $YPos,$FontSize, _('Outstanding') );
$YPos -= $line_height;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-03-22 09:08:44
|
Revision: 3398
http://web-erp.svn.sourceforge.net/web-erp/?rev=3398&view=rev
Author: tim_schofield
Date: 2010-03-22 09:08:38 +0000 (Mon, 22 Mar 2010)
Log Message:
-----------
Tim: SelectCustomer.php - Remove extra '>' character
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/doc/Change.log.html
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2010-03-22 08:29:34 UTC (rev 3397)
+++ trunk/SelectCustomer.php 2010-03-22 09:08:38 UTC (rev 3398)
@@ -527,7 +527,7 @@
} else {
echo '<tr><td class=select>' . _('Total Spend from this Customer (inc tax):') . ' </td><td class=select><b>' . number_format($row['total'], 2) . '</b></td><td class=select></td></tr>';
}
- echo '<tr><td class=select>' . _('Customer Type:') . ' </td><td class=select><b>' . $CustomerTypeName . '</b></td><td class=select></td></tr>>';
+ echo '<tr><td class=select>' . _('Customer Type:') . ' </td><td class=select><b>' . $CustomerTypeName . '</b></td><td class=select></td></tr>';
echo '</th></tr></table>';
}
// Customer Contacts
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-22 08:29:34 UTC (rev 3397)
+++ trunk/doc/Change.log.html 2010-03-22 09:08:38 UTC (rev 3398)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>22/03/10 Tim: SelectCustomer.php - Remove extra '<' character</p>
<p>22/03/10 Tim: Change customer statement layout to not have overlapping text</p>
<p>21/03/10 Simon Peter Otandeka: PDFStatementPageHeader.inc - Correction for right margin variable misnamed</p>
<p>21/03/10 Pak Ricad: MRPShortages.php - Correctuion to mrp shortages report where total supply = 0</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-03-30 07:26:11
|
Revision: 3400
http://web-erp.svn.sourceforge.net/web-erp/?rev=3400&view=rev
Author: tim_schofield
Date: 2010-03-30 07:26:05 +0000 (Tue, 30 Mar 2010)
Log Message:
-----------
Tim: PrintCustStatements.php - Use new layout when all statements printed
Modified Paths:
--------------
trunk/PrintCustStatements.php
trunk/doc/Change.log.html
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2010-03-30 06:39:55 UTC (rev 3399)
+++ trunk/PrintCustStatements.php 2010-03-30 07:26:05 UTC (rev 3400)
@@ -11,6 +11,10 @@
// If this file is called from another script, we set the required POST variables from the GET
// We call this file from SelectCustomer.php when a customer is selected and we want a statement printed
+
+if (isset($_POST['PrintPDF'])) {
+ $PaperSize='A4_Landscape';
+}
if (isset($_GET['PrintPDF'])) {
$FromCust = $_GET['FromCust'];
$ToCust = $_GET['ToCust'];
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-30 06:39:55 UTC (rev 3399)
+++ trunk/doc/Change.log.html 2010-03-30 07:26:05 UTC (rev 3400)
@@ -1,6 +1,7 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
-<p>22/03/10 Tim: SelectCustomer.php - Remove extra '<' character</p>
+<p>30/03/10 Tim: PrintCustStatements.php - Use new layout when all statements printed</p>
+<p>22/03/10 Tim: SelectCustomer.php - Remove extra '>' character</p>
<p>22/03/10 Tim: Change customer statement layout to not have overlapping text</p>
<p>21/03/10 Simon Peter Otandeka: PDFStatementPageHeader.inc - Correction for right margin variable misnamed</p>
<p>21/03/10 Pak Ricad: MRPShortages.php - Correctuion to mrp shortages report where total supply = 0</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-04-01 20:30:49
|
Revision: 3401
http://web-erp.svn.sourceforge.net/web-erp/?rev=3401&view=rev
Author: tim_schofield
Date: 2010-04-01 20:30:43 +0000 (Thu, 01 Apr 2010)
Log Message:
-----------
Harald: PDFSuppTransListing.php - Typing error in script title
Modified Paths:
--------------
trunk/PDFSuppTransListing.php
trunk/doc/Change.log.html
Modified: trunk/PDFSuppTransListing.php
===================================================================
--- trunk/PDFSuppTransListing.php 2010-03-30 07:26:05 UTC (rev 3400)
+++ trunk/PDFSuppTransListing.php 2010-04-01 20:30:43 UTC (rev 3401)
@@ -17,7 +17,7 @@
if (!isset($_POST['Date'])){
- $title = _('Suppier Transaction Listing');
+ $title = _('Supplier Transaction Listing');
include ('includes/header.inc');
echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . $title . '" alt="">' . ' '
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-30 07:26:05 UTC (rev 3400)
+++ trunk/doc/Change.log.html 2010-04-01 20:30:43 UTC (rev 3401)
@@ -1,6 +1,8 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>01/04/10 Harald: PDFSuppTransListing.php - Typing error in script title</p>
<p>30/03/10 Tim: PrintCustStatements.php - Use new layout when all statements printed</p>
+<p>22/03/10 Tim: SelectCustomer.php - Remove extra '<' character</p>
<p>22/03/10 Tim: SelectCustomer.php - Remove extra '>' character</p>
<p>22/03/10 Tim: Change customer statement layout to not have overlapping text</p>
<p>21/03/10 Simon Peter Otandeka: PDFStatementPageHeader.inc - Correction for right margin variable misnamed</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-04-04 14:55:30
|
Revision: 3403
http://web-erp.svn.sourceforge.net/web-erp/?rev=3403&view=rev
Author: tim_schofield
Date: 2010-04-04 14:55:24 +0000 (Sun, 04 Apr 2010)
Log Message:
-----------
Tim: upgrade3.11.1-3.12.sql - Enlarge fieldname column in reportfields to 60 characters
Modified Paths:
--------------
trunk/doc/Change.log.html
trunk/sql/mysql/upgrade3.11.1-3.12.sql
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-04 08:40:48 UTC (rev 3402)
+++ trunk/doc/Change.log.html 2010-04-04 14:55:24 UTC (rev 3403)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>04/04/10 Tim: upgrade3.11.1-3.12.sql - Enlarge fieldname column in reportfields to 60 characters</p>
<p>01/04/10 Harald: PDFSuppTransListing.php - Typing error in script title</p>
<p>30/03/10 Tim: PrintCustStatements.php - Use new layout when all statements printed</p>
<p>22/03/10 Tim: SelectCustomer.php - Remove extra '<' character</p>
Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-3.12.sql 2010-04-04 08:40:48 UTC (rev 3402)
+++ trunk/sql/mysql/upgrade3.11.1-3.12.sql 2010-04-04 14:55:24 UTC (rev 3403)
@@ -126,4 +126,6 @@
ADD COLUMN `inputdate` datetime NOT NULL AFTER `duedate` ;
ALTER TABLE `debtortrans`
- ADD COLUMN `inputdate` datetime NOT NULL AFTER `trandate` ;
\ No newline at end of file
+ ADD COLUMN `inputdate` datetime NOT NULL AFTER `trandate` ;
+
+AL>TER TABLE `reportfields` CHANGE COLUMN `fieldname` `fieldname` VARCHAR(60) NOT NULL DEFAULT '';
\ 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...> - 2010-04-05 15:32:08
|
Revision: 3405
http://web-erp.svn.sourceforge.net/web-erp/?rev=3405&view=rev
Author: tim_schofield
Date: 2010-04-05 15:32:01 +0000 (Mon, 05 Apr 2010)
Log Message:
-----------
Zhiguo: Japanese translation updates
Modified Paths:
--------------
trunk/doc/Change.log.html
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-04 14:58:08 UTC (rev 3404)
+++ trunk/doc/Change.log.html 2010-04-05 15:32:01 UTC (rev 3405)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>05/04/10 Zhiguo: Japanese translation updates</p>
<p>04/04/10 Tim: upgrade3.11.1-3.12.sql - Enlarge fieldname column in reportfields to 60 characters</p>
<p>01/04/10 Harald: PDFSuppTransListing.php - Typing error in script title</p>
<p>30/03/10 Tim: PrintCustStatements.php - Use new layout when all statements printed</p>
Modified: trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po 2010-04-04 14:58:08 UTC (rev 3404)
+++ trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po 2010-04-05 15:32:01 UTC (rev 3405)
@@ -8,7 +8,7 @@
"Project-Id-Version: UTF-8 Japanese 3.08\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-12-28 10:17+1200\n"
-"PO-Revision-Date: 2008-07-15 20:57+0900\n"
+"PO-Revision-Date: 2010-03-28 20:17+0800\n"
"Last-Translator: \n"
"Language-Team: Japanese <we...@ok...>\n"
"MIME-Version: 1.0\n"
@@ -18,26 +18,22 @@
"X-Poedit-Country: JAPAN\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: AccountGroups.php:9 index.php:1156
+#: AccountGroups.php:9
+#: index.php:1156
msgid "Account Groups"
msgstr "勘定グループ"
#: AccountGroups.php:19
-msgid ""
-"An error occurred in retrieving the account groups of the parent account "
-"group during the check for recursion"
-msgstr ""
-"再帰チェックの間、親勘定グループの勘定グループを取り出す際にエラーが発生しま"
-"した"
+msgid "An error occurred in retrieving the account groups of the parent account group during the check for recursion"
+msgstr "再帰チェックの間、親勘定グループの勘定グループを取り出す際にエラーが発生しました"
#: AccountGroups.php:20
-msgid ""
-"The SQL that was used to retrieve the account groups of the parent account "
-"group and that failed in the process was"
-msgstr ""
-"親勘定グループの勘定グループを取り出すのに用いられたSQLは処理に失敗した"
+msgid "The SQL that was used to retrieve the account groups of the parent account group and that failed in the process was"
+msgstr "親勘定グループの勘定グループを取り出すのに用いられたSQLは処理に失敗した"
-#: AccountGroups.php:57 AccountGroups.php:94 AccountGroups.php:177
+#: AccountGroups.php:57
+#: AccountGroups.php:94
+#: AccountGroups.php:177
#: AccountGroups.php:187
#, fuzzy
msgid "The SQL that was used to retrieve the information was"
@@ -57,8 +53,12 @@
msgid "The account group name cannot contain the character"
msgstr "勘定グループ名は文字列を含むことができません"
-#: AccountGroups.php:71 AccountSections.php:75 PaymentMethods.php:38
-#: TaxCategories.php:30 TaxProvinces.php:30 UnitsOfMeasure.php:30
+#: AccountGroups.php:71
+#: AccountSections.php:75
+#: PaymentMethods.php:38
+#: TaxCategories.php:30
+#: TaxProvinces.php:30
+#: UnitsOfMeasure.php:30
msgid "or the character"
msgstr "または文字列"
@@ -67,13 +67,8 @@
msgstr "勘定グループ名は少なくとも1文字の長さがなければなりません"
#: AccountGroups.php:84
-msgid ""
-"The parent account group selected appears to result in a recursive account "
-"structure - select an alternative parent account group or make this group a "
-"top level account group"
-msgstr ""
-"選ばれた親勘定グループは再帰的勘定構造になるように見えます - 代わりの親勘定グ"
-"ループを選ぶか、このグループをトップレベル勘定グループとしてください"
+msgid "The parent account group selected appears to result in a recursive account structure - select an alternative parent account group or make this group a top level account group"
+msgstr "選ばれた親勘定グループは再帰的勘定構造になるように見えます - 代わりの親勘定グループを選ぶか、このグループをトップレベル勘定グループとしてください"
#: AccountGroups.php:95
#, fuzzy
@@ -103,7 +98,9 @@
msgid "The SQL that was used to update the account group was"
msgstr "注文を更新に用いられたSQLは失敗した"
-#: AccountGroups.php:139 AccountSections.php:106 PaymentMethods.php:88
+#: AccountGroups.php:139
+#: AccountSections.php:106
+#: PaymentMethods.php:88
msgid "Record Updated"
msgstr "レコード更新済"
@@ -117,7 +114,9 @@
msgid "The SQL that was used to insert the account group was"
msgstr "品目を追加に用いられたSQLは失敗した"
-#: AccountGroups.php:159 AccountSections.php:118 PaymentMethods.php:110
+#: AccountGroups.php:159
+#: AccountSections.php:118
+#: PaymentMethods.php:110
msgid "Record inserted"
msgstr "レコード追加済"
@@ -127,34 +126,78 @@
msgstr "GLトランザクションを取得してエラーが発生しました"
#: AccountGroups.php:181
-msgid ""
-"Cannot delete this account group because general ledger accounts have been "
-"created using this group"
-msgstr ""
-"総勘定元帳勘定がこのグループを使ってつくられたので、この勘定グループを削除す"
-"ることができません"
+msgid "Cannot delete this account group because general ledger accounts have been created using this group"
+msgstr "総勘定元帳勘定がこのグループを使ってつくられたので、この勘定グループを削除することができません"
-#: AccountGroups.php:182 AccountGroups.php:192 AccountSections.php:139
-#: Areas.php:117 Areas.php:126 BankAccounts.php:163 CreditStatus.php:124
-#: Currencies.php:142 Currencies.php:150 Currencies.php:157
-#: CustomerBranches.php:294 CustomerBranches.php:304 CustomerBranches.php:314
-#: CustomerBranches.php:324 Customers.php:291 Customers.php:300
-#: Customers.php:308 Customers.php:316 CustomerTypes.php:151
-#: CustomerTypes.php:161 Factors.php:107 FixedAssetCategories.php:175
-#: FixedAssetItems.php:483 FixedAssetItems.php:492 FixedAssetItems.php:500
-#: FixedAssetItems.php:508 FixedAssetItems.php:516 FixedAssetItems.php:524
-#: GLAccounts.php:91 GLAccounts.php:105 Locations.php:218 Locations.php:226
-#: Locations.php:235 Locations.php:243 Locations.php:251 Locations.php:259
-#: Locations.php:267 Locations.php:275 MRPDemandTypes.php:85
-#: PaymentMethods.php:142 PaymentTerms.php:149 PaymentTerms.php:156
-#: SalesCategories.php:125 SalesCategories.php:133 SalesPeople.php:142
-#: SalesPeople.php:149 SalesTypes.php:145 SalesTypes.php:155 Shippers.php:82
-#: Shippers.php:94 StockCategories.php:153 Stocks.php:467 Stocks.php:476
-#: Stocks.php:484 Stocks.php:492 Stocks.php:500 Stocks.php:508
-#: Suppliers.php:569 Suppliers.php:578 Suppliers.php:586 TaxCategories.php:130
-#: TaxGroups.php:128 TaxGroups.php:135 TaxProvinces.php:125
-#: UnitsOfMeasure.php:140 UnitsOfMeasure.php:147 WorkCentres.php:90
-#: WorkCentres.php:96 WWW_Access.php:84
+#: AccountGroups.php:182
+#: AccountGroups.php:192
+#: AccountSections.php:139
+#: Areas.php:117
+#: Areas.php:126
+#: BankAccounts.php:163
+#: CreditStatus.php:124
+#: Currencies.php:142
+#: Currencies.php:150
+#: Currencies.php:157
+#: CustomerBranches.php:294
+#: CustomerBranches.php:304
+#: CustomerBranches.php:314
+#: CustomerBranches.php:324
+#: Customers.php:291
+#: Customers.php:300
+#: Customers.php:308
+#: Customers.php:316
+#: CustomerTypes.php:151
+#: CustomerTypes.php:161
+#: Factors.php:107
+#: FixedAssetCategories.php:175
+#: FixedAssetItems.php:483
+#: FixedAssetItems.php:492
+#: FixedAssetItems.php:500
+#: FixedAssetItems.php:508
+#: FixedAssetItems.php:516
+#: FixedAssetItems.php:524
+#: GLAccounts.php:91
+#: GLAccounts.php:105
+#: Locations.php:218
+#: Locations.php:226
+#: Locations.php:235
+#: Locations.php:243
+#: Locations.php:251
+#: Locations.php:259
+#: Locations.php:267
+#: Locations.php:275
+#: MRPDemandTypes.php:85
+#: PaymentMethods.php:142
+#: PaymentTerms.php:149
+#: PaymentTerms.php:156
+#: SalesCategories.php:125
+#: SalesCategories.php:133
+#: SalesPeople.php:142
+#: SalesPeople.php:149
+#: SalesTypes.php:145
+#: SalesTypes.php:155
+#: Shippers.php:82
+#: Shippers.php:94
+#: StockCategories.php:153
+#: Stocks.php:467
+#: Stocks.php:476
+#: Stocks.php:484
+#: Stocks.php:492
+#: Stocks.php:500
+#: Stocks.php:508
+#: Suppliers.php:569
+#: Suppliers.php:578
+#: Suppliers.php:586
+#: TaxCategories.php:130
+#: TaxGroups.php:128
+#: TaxGroups.php:135
+#: TaxProvinces.php:125
+#: UnitsOfMeasure.php:140
+#: UnitsOfMeasure.php:147
+#: WorkCentres.php:90
+#: WorkCentres.php:96
+#: WWW_Access.php:84
msgid "There are"
msgstr "ある"
@@ -168,12 +211,8 @@
msgstr "GLトランザクションを取得してエラーが発生しました"
#: AccountGroups.php:191
-msgid ""
-"Cannot delete this account group because it is a parent account group of "
-"other account group(s)"
-msgstr ""
-"それが他の勘定グループの親勘定グループであるので、この勘定グループを削除でき"
-"ません"
+msgid "Cannot delete this account group because it is a parent account group of other account group(s)"
+msgstr "それが他の勘定グループの親勘定グループであるので、この勘定グループを削除できません"
#: AccountGroups.php:192
msgid "account groups that have this group as its/there parent account group"
@@ -202,21 +241,50 @@
msgid "Could not get account groups because"
msgstr "勘定グループを得ることができなかったのは"
-#: AccountGroups.php:226 AccountSections.php:177 AddCustomerContacts.php:21
-#: AgedDebtors.php:467 AgedSuppliers.php:276 BOMListing.php:128 BOMs.php:214
-#: BOMs.php:801 DiscountCategories.php:12 DiscountCategories.php:119
-#: DiscountMatrix.php:18 Factors.php:7 FixedAssetJournal.php:335
-#: FixedAssetLocations.php:10 FixedAssetRegister.php:12
-#: FixedAssetTransfer.php:32 GLBalanceSheet.php:349 GLBudgets.php:30
-#: GLJournal.php:237 PO_AuthorisationLevels.php:12
-#: PO_SelectOSPurchOrder.php:141 PurchData.php:133 PurchData.php:218
-#: SelectCompletedOrder.php:13 SelectCustomer.php:331 SelectGLAccount.php:19
-#: SelectGLAccount.php:87 SelectOrderItems.php:607 SelectOrderItems.php:1352
-#: SelectOrderItems.php:1472 SelectProduct.php:55 SelectSalesOrder.php:159
-#: SelectSupplier.php:12 SelectSupplier.php:227 SelectWorkOrder.php:11
-#: SelectWorkOrder.php:154 Suppliers.php:306 TaxGroups.php:16 TopItems.php:57
-#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:158
-#: WorkOrderEntry.php:11 WWW_Users.php:37
+#: AccountGroups.php:226
+#: AccountSections.php:177
+#: AddCustomerContacts.php:21
+#: AgedDebtors.php:467
+#: AgedSuppliers.php:276
+#: BOMListing.php:128
+#: BOMs.php:214
+#: BOMs.php:801
+#: DiscountCategories.php:12
+#: DiscountCategories.php:119
+#: DiscountMatrix.php:18
+#: Factors.php:7
+#: FixedAssetJournal.php:335
+#: FixedAssetLocations.php:10
+#: FixedAssetRegister.php:12
+#: FixedAssetTransfer.php:32
+#: GLBalanceSheet.php:349
+#: GLBudgets.php:30
+#: GLJournal.php:237
+#: PO_AuthorisationLevels.php:12
+#: PO_SelectOSPurchOrder.php:141
+#: PurchData.php:133
+#: PurchData.php:218
+#: SelectCompletedOrder.php:13
+#: SelectCustomer.php:331
+#: SelectGLAccount.php:19
+#: SelectGLAccount.php:87
+#: SelectOrderItems.php:607
+#: SelectOrderItems.php:1352
+#: SelectOrderItems.php:1472
+#: SelectProduct.php:55
+#: SelectSalesOrder.php:159
+#: SelectSupplier.php:12
+#: SelectSupplier.php:227
+#: SelectWorkOrder.php:11
+#: SelectWorkOrder.php:154
+#: Suppliers.php:306
+#: TaxGroups.php:16
+#: TopItems.php:57
+#: WhereUsedInquiry.php:18
+#: WorkCentres.php:111
+#: WorkCentres.php:158
+#: WorkOrderEntry.php:11
+#: WWW_Users.php:37
msgid "Search"
msgstr "検索"
@@ -224,135 +292,344 @@
msgid "Group Name"
msgstr "グループ名"
-#: AccountGroups.php:231 EDIMessageFormat.php:141
+#: AccountGroups.php:231
+#: EDIMessageFormat.php:141
msgid "Section"
msgstr "セクション"
-#: AccountGroups.php:232 AccountGroups.php:389
+#: AccountGroups.php:232
+#: AccountGroups.php:389
msgid "Sequence In TB"
msgstr "試算表のシーケンス"
-#: AccountGroups.php:233 AccountGroups.php:373 GLProfit_Loss.php:8
-#: GLProfit_Loss.php:104 GLProfit_Loss.php:105 GLProfit_Loss.php:156
-#: SelectGLAccount.php:53 SelectGLAccount.php:67
+#: AccountGroups.php:233
+#: AccountGroups.php:373
+#: GLProfit_Loss.php:8
+#: GLProfit_Loss.php:104
+#: GLProfit_Loss.php:105
+#: GLProfit_Loss.php:156
+#: SelectGLAccount.php:53
+#: SelectGLAccount.php:67
msgid "Profit and Loss"
msgstr "損益計算"
-#: AccountGroups.php:234 AccountGroups.php:334
+#: AccountGroups.php:234
+#: AccountGroups.php:334
msgid "Parent Group"
msgstr "親グループ"
-#: AccountGroups.php:250 AccountGroups.php:253 AccountGroups.php:377
-#: AccountGroups.php:379 BankAccounts.php:217 BankAccounts.php:360
-#: BankAccounts.php:362 BankAccounts.php:366 BOMs.php:128 BOMs.php:712
-#: BOMs.php:714 CompanyPreferences.php:437 CompanyPreferences.php:439
-#: CompanyPreferences.php:449 CompanyPreferences.php:451
-#: CompanyPreferences.php:461 CompanyPreferences.php:463
-#: CustLoginSetup.php:574 CustLoginSetup.php:576 CustomerBranches.php:407
-#: Customers.php:563 Customers.php:804 Customers.php:811 Customers.php:814
-#: DeliveryDetails.php:967 DeliveryDetails.php:1007 DeliveryDetails.php:1010
-#: GLTransInquiry.php:72 Locations.php:342 MRPCalendar.php:218 MRP.php:543
-#: MRP.php:547 MRP.php:551 PaymentMethods.php:198 PaymentMethods.php:199
-#: PaymentMethods.php:258 PaymentMethods.php:264 PDFChequeListing.php:59
-#: PDFDeliveryDifferences.php:60 PDFDIFOT.php:63 PO_AuthorisationLevels.php:95
-#: PO_Header.php:908 PO_PDFPurchOrder.php:356 PO_PDFPurchOrder.php:359
-#: PurchData.php:177 PurchData.php:446 PurchData.php:449
-#: RecurringSalesOrders.php:473 RecurringSalesOrders.php:476
-#: SalesAnalReptCols.php:278 SalesAnalReptCols.php:383
-#: SalesAnalReptCols.php:386 SalesAnalRepts.php:404 SalesAnalRepts.php:407
-#: SalesAnalRepts.php:430 SalesAnalRepts.php:433 SalesAnalRepts.php:456
-#: SalesAnalRepts.php:459 SelectProduct.php:733 ShipmentCosting.php:612
-#: Stocks.php:837 Stocks.php:839 Stocks.php:857 Stocks.php:859
-#: SystemParameters.php:361 SystemParameters.php:437 SystemParameters.php:445
-#: SystemParameters.php:485 SystemParameters.php:558 SystemParameters.php:566
-#: SystemParameters.php:584 SystemParameters.php:591 SystemParameters.php:715
-#: SystemParameters.php:846 SystemParameters.php:848 SystemParameters.php:858
-#: SystemParameters.php:860 SystemParameters.php:914 SystemParameters.php:926
-#: SystemParameters.php:928 TaxGroups.php:291 TaxGroups.php:294
-#: TaxGroups.php:343 WWW_Users.php:592 WWW_Users.php:594
+#: AccountGroups.php:250
+#: AccountGroups.php:253
+#: AccountGroups.php:377
+#: AccountGroups.php:379
+#: BankAccounts.php:217
+#: BankAccounts.php:360
+#: BankAccounts.php:362
+#: BankAccounts.php:366
+#: BOMs.php:128
+#: BOMs.php:712
+#: BOMs.php:714
+#: CompanyPreferences.php:437
+#: CompanyPreferences.php:439
+#: CompanyPreferences.php:449
+#: CompanyPreferences.php:451
+#: CompanyPreferences.php:461
+#: CompanyPreferences.php:463
+#: CustLoginSetup.php:574
+#: CustLoginSetup.php:576
+#: CustomerBranches.php:407
+#: Customers.php:563
+#: Customers.php:804
+#: Customers.php:811
+#: Customers.php:814
+#: DeliveryDetails.php:967
+#: DeliveryDetails.php:1007
+#: DeliveryDetails.php:1010
+#: GLTransInquiry.php:72
+#: Locations.php:342
+#: MRPCalendar.php:218
+#: MRP.php:543
+#: MRP.php:547
+#: MRP.php:551
+#: PaymentMethods.php:198
+#: PaymentMethods.php:199
+#: PaymentMethods.php:258
+#: PaymentMethods.php:264
+#: PDFChequeListing.php:59
+#: PDFDeliveryDifferences.php:60
+#: PDFDIFOT.php:63
+#: PO_AuthorisationLevels.php:95
+#: PO_Header.php:908
+#: PO_PDFPurchOrder.php:356
+#: PO_PDFPurchOrder.php:359
+#: PurchData.php:177
+#: PurchData.php:446
+#: PurchData.php:449
+#: RecurringSalesOrders.php:473
+#: RecurringSalesOrders.php:476
+#: SalesAnalReptCols.php:278
+#: SalesAnalReptCols.php:383
+#: SalesAnalReptCols.php:386
+#: SalesAnalRepts.php:404
+#: SalesAnalRepts.php:407
+#: SalesAnalRepts.php:430
+#: SalesAnalRepts.php:433
+#: SalesAnalRepts.php:456
+#: SalesAnalRepts.php:459
+#: SelectProduct.php:733
+#: ShipmentCosting.php:612
+#: Stocks.php:837
+#: Stocks.php:839
+#: Stocks.php:857
+#: Stocks.php:859
+#: SystemParameters.php:361
+#: SystemParameters.php:437
+#: SystemParameters.php:445
+#: SystemParameters.php:485
+#: SystemParameters.php:558
+#: SystemParameters.php:566
+#: SystemParameters.php:584
+#: SystemParameters.php:591
+#: SystemParameters.php:715
+#: SystemParameters.php:846
+#: SystemParameters.php:848
+#: SystemParameters.php:858
+#: SystemParameters.php:860
+#: SystemParameters.php:914
+#: SystemParameters.php:926
+#: SystemParameters.php:928
+#: TaxGroups.php:291
+#: TaxGroups.php:294
+#: TaxGroups.php:343
+#: WWW_Users.php:592
+#: WWW_Users.php:594
msgid "Yes"
msgstr "Yes"
-#: AccountGroups.php:256 AccountGroups.php:382 AccountGroups.php:384
-#: BankAccounts.php:215 BankAccounts.php:360 BankAccounts.php:362
-#: BankAccounts.php:366 BOMs.php:130 BOMs.php:711 BOMs.php:715
-#: CompanyPreferences.php:436 CompanyPreferences.php:440
-#: CompanyPreferences.php:448 CompanyPreferences.php:452
-#: CompanyPreferences.php:460 CompanyPreferences.php:464
-#: CustLoginSetup.php:573 CustLoginSetup.php:577 CustomerBranches.php:407
-#: Customers.php:562 Customers.php:802 Customers.php:810 Customers.php:813
-#: DeliveryDetails.php:968 DeliveryDetails.php:1008 DeliveryDetails.php:1011
-#: GLTransInquiry.php:126 Locations.php:344 MRPCalendar.php:220 MRP.php:537
-#: MRP.php:541 MRP.php:545 MRP.php:549 PaymentMethods.php:198
-#: PaymentMethods.php:199 PaymentMethods.php:259 PaymentMethods.php:265
-#: PDFChequeListing.php:58 PDFDeliveryDifferences.php:59 PDFDIFOT.php:62
-#: PO_AuthorisationLevels.php:97 PO_Header.php:908 PO_PDFPurchOrder.php:357
-#: PO_PDFPurchOrder.php:360 PurchData.php:180 PurchData.php:447
-#: PurchData.php:450 RecurringSalesOrders.php:472 RecurringSalesOrders.php:475
-#: SalesAnalReptCols.php:276 SalesAnalReptCols.php:384
-#: SalesAnalReptCols.php:387 SalesAnalRepts.php:403 SalesAnalRepts.php:406
-#: SalesAnalRepts.php:429 SalesAnalRepts.php:432 SalesAnalRepts.php:455
-#: SalesAnalRepts.php:458 SelectProduct.php:736 ShipmentCosting.php:613
-#: Stocks.php:832 Stocks.php:834 Stocks.php:852 Stocks.php:854
-#: SystemParameters.php:362 SystemParameters.php:438 SystemParameters.php:446
-#: SystemParameters.php:486 SystemParameters.php:559 SystemParameters.php:567
-#: SystemParameters.php:585 SystemParameters.php:592 SystemParameters.php:716
-#: SystemParameters.php:845 SystemParameters.php:849 SystemParameters.php:857
-#: SystemParameters.php:861 SystemParameters.php:915 SystemParameters.php:925
-#: SystemParameters.php:929 TaxGroups.php:292 TaxGroups.php:295
-#: TaxGroups.php:345 WWW_Users.php:591 WWW_Users.php:595
-#: includes/PDFLowGPPageHeader.inc:31 includes/PDFTaxPageHeader.inc:35
+#: AccountGroups.php:256
+#: AccountGroups.php:382
+#: AccountGroups.php:384
+#: BankAccounts.php:215
+#: BankAccounts.php:360
+#: BankAccounts.php:362
+#: BankAccounts.php:366
+#: BOMs.php:130
+#: BOMs.php:711
+#: BOMs.php:715
+#: CompanyPreferences.php:436
+#: CompanyPreferences.php:440
+#: CompanyPreferences.php:448
+#: CompanyPreferences.php:452
+#: CompanyPreferences.php:460
+#: CompanyPreferences.php:464
+#: CustLoginSetup.php:573
+#: CustLoginSetup.php:577
+#: CustomerBranches.php:407
+#: Customers.php:562
+#: Customers.php:802
+#: Customers.php:810
+#: Customers.php:813
+#: DeliveryDetails.php:968
+#: DeliveryDetails.php:1008
+#: DeliveryDetails.php:1011
+#: GLTransInquiry.php:126
+#: Locations.php:344
+#: MRPCalendar.php:220
+#: MRP.php:537
+#: MRP.php:541
+#: MRP.php:545
+#: MRP.php:549
+#: PaymentMethods.php:198
+#: PaymentMethods.php:199
+#: PaymentMethods.php:259
+#: PaymentMethods.php:265
+#: PDFChequeListing.php:58
+#: PDFDeliveryDifferences.php:59
+#: PDFDIFOT.php:62
+#: PO_AuthorisationLevels.php:97
+#: PO_Header.php:908
+#: PO_PDFPurchOrder.php:357
+#: PO_PDFPurchOrder.php:360
+#: PurchData.php:180
+#: PurchData.php:447
+#: PurchData.php:450
+#: RecurringSalesOrders.php:472
+#: RecurringSalesOrders.php:475
+#: SalesAnalReptCols.php:276
+#: SalesAnalReptCols.php:384
+#: SalesAnalReptCols.php:387
+#: SalesAnalRepts.php:403
+#: SalesAnalRepts.php:406
+#: SalesAnalRepts.php:429
+#: SalesAnalRepts.php:432
+#: SalesAnalRepts.php:455
+#: SalesAnalRepts.php:458
+#: SelectProduct.php:736
+#: ShipmentCosting.php:613
+#: Stocks.php:832
+#: Stocks.php:834
+#: Stocks.php:852
+#: Stocks.php:854
+#: SystemParameters.php:362
+#: SystemParameters.php:438
+#: SystemParameters.php:446
+#: SystemParameters.php:486
+#: SystemParameters.php:559
+#: SystemParameters.php:567
+#: SystemParameters.php:585
+#: SystemParameters.php:592
+#: SystemParameters.php:716
+#: SystemParameters.php:845
+#: SystemParameters.php:849
+#: SystemParameters.php:857
+#: SystemParameters.php:861
+#: SystemParameters.php:915
+#: SystemParameters.php:925
+#: SystemParameters.php:929
+#: TaxGroups.php:292
+#: TaxGroups.php:295
+#: TaxGroups.php:345
+#: WWW_Users.php:591
+#: WWW_Users.php:595
+#: includes/PDFLowGPPageHeader.inc:31
+#: includes/PDFTaxPageHeader.inc:35
msgid "No"
msgstr "No"
-#: AccountGroups.php:265 AccountSections.php:197 AddCustomerContacts.php:126
-#: AddCustomerNotes.php:125 AddCustomerTypeNotes.php:122 Areas.php:162
-#: BankAccounts.php:226 BOMs.php:150 COGSGLPostings.php:108
-#: COGSGLPostings.php:213 CreditStatus.php:173 Currencies.php:233
-#: CustLoginSetup.php:297 CustomerBranches.php:411 Customers.php:856
-#: Customers.php:888 CustomerTypes.php:206 EDIMessageFormat.php:162
-#: FixedAssetCategories.php:235 FixedAssetLocations.php:81
-#: FreightCosts.php:242 GeocodeSetup.php:166 GLAccounts.php:318 GLTags.php:59
-#: Locations.php:351 MRPDemands.php:309 MRPDemandTypes.php:117
-#: PaymentMethods.php:200 PaymentTerms.php:204 PO_AuthorisationLevels.php:105
-#: Prices_Customer.php:201 Prices.php:179 PurchData.php:189
-#: SalesCategories.php:261 SalesGLPostings.php:133 SalesGLPostings.php:245
-#: SalesPeople.php:201 SalesTypes.php:204 SelectCustomer.php:688
-#: SelectCustomer.php:704 SelectCustomer.php:736 SelectCustomer.php:752
-#: SelectCustomer.php:783 SelectCustomer.php:799 Shippers.php:142
-#: StockCategories.php:215 SupplierContacts.php:153 TaxAuthorities.php:164
-#: TaxCategories.php:181 TaxGroups.php:179 TaxProvinces.php:176
-#: UnitsOfMeasure.php:199 WorkCentres.php:138 WWW_Access.php:124
-#: WWW_Users.php:304 includes/InputSerialItems.php:82
+#: AccountGroups.php:265
+#: AccountSections.php:197
+#: AddCustomerContacts.php:126
+#: AddCustomerNotes.php:125
+#: AddCustomerTypeNotes.php:122
+#: Areas.php:162
+#: BankAccounts.php:226
+#: BOMs.php:150
+#: COGSGLPostings.php:108
+#: COGSGLPostings.php:213
+#: CreditStatus.php:173
+#: Currencies.php:233
+#: CustLoginSetup.php:297
+#: CustomerBranches.php:411
+#: Customers.php:856
+#: Customers.php:888
+#: CustomerTypes.php:206
+#: EDIMessageFormat.php:162
+#: FixedAssetCategories.php:235
+#: FixedAssetLocations.php:81
+#: FreightCosts.php:242
+#: GeocodeSetup.php:166
+#: GLAccounts.php:318
+#: GLTags.php:59
+#: Locations.php:351
+#: MRPDemands.php:309
+#: MRPDemandTypes.php:117
+#: PaymentMethods.php:200
+#: PaymentTerms.php:204
+#: PO_AuthorisationLevels.php:105
+#: Prices_Customer.php:201
+#: Prices.php:179
+#: PurchData.php:189
+#: SalesCategories.php:261
+#: SalesGLPostings.php:133
+#: SalesGLPostings.php:245
+#: SalesPeople.php:201
+#: SalesTypes.php:204
+#: SelectCustomer.php:688
+#: SelectCustomer.php:704
+#: SelectCustomer.php:736
+#: SelectCustomer.php:752
+#: SelectCustomer.php:783
+#: SelectCustomer.php:799
+#: Shippers.php:142
+#: StockCategories.php:215
+#: SupplierContacts.php:153
+#: TaxAuthorities.php:164
+#: TaxCategories.php:181
+#: TaxGroups.php:179
+#: TaxProvinces.php:176
+#: UnitsOfMeasure.php:199
+#: WorkCentres.php:138
+#: WWW_Access.php:124
+#: WWW_Users.php:304
+#: includes/InputSerialItems.php:82
#, php-format
msgid "Edit"
msgstr "編集"
-#: AccountGroups.php:266 AccountSections.php:201 AddCustomerContacts.php:127
-#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:123 Areas.php:163
-#: BankAccounts.php:227 BOMs.php:152 COGSGLPostings.php:109
-#: COGSGLPostings.php:214 Credit_Invoice.php:372 CreditStatus.php:174
-#: Currencies.php:236 CustLoginSetup.php:298 CustomerReceipt.php:830
-#: Customers.php:889 CustomerTypes.php:207 DiscountCategories.php:201
-#: DiscountMatrix.php:173 EDIMessageFormat.php:163
-#: FixedAssetCategories.php:236 FixedAssetJournal.php:393
-#: FixedAssetLocations.php:83 FreightCosts.php:243 GeocodeSetup.php:167
-#: GLAccounts.php:319 GLJournal.php:394 Locations.php:352 MRPDemands.php:310
-#: MRPDemandTypes.php:118 PaymentMethods.php:201 Payments.php:861
-#: PaymentTerms.php:205 PO_AuthorisationLevels.php:107 PO_Items.php:961
-#: Prices_Customer.php:202 Prices.php:180 PurchData.php:190
-#: SalesAnalReptCols.php:293 SalesAnalRepts.php:303 SalesCategories.php:262
-#: SalesGLPostings.php:134 SalesGLPostings.php:246 SalesPeople.php:202
-#: SalesTypes.php:205 SelectCreditItems.php:762 SelectCustomer.php:689
-#: SelectCustomer.php:705 SelectCustomer.php:737 SelectCustomer.php:753
-#: SelectCustomer.php:784 SelectCustomer.php:800 SelectOrderItems.php:1286
-#: Shipments.php:422 Shippers.php:143 SpecialOrder.php:587
-#: StockCategories.php:216 StockCategories.php:497 SuppCreditGRNs.php:89
-#: SuppInvGLAnalysis.php:65 SuppInvGRNs.php:129 SupplierContacts.php:154
-#: SuppShiptChgs.php:79 SuppTransGLAnalysis.php:107 TaxAuthorities.php:165
-#: TaxCategories.php:182 TaxGroups.php:180 TaxProvinces.php:177
-#: UnitsOfMeasure.php:200 WorkCentres.php:139 WOSerialNos.php:296
-#: WWW_Access.php:125 WWW_Users.php:305 includes/InputSerialItemsKeyed.php:53
+#: AccountGroups.php:266
+#: AccountSections.php:201
+#: AddCustomerContacts.php:127
+#: AddCustomerNotes.php:126
+#: AddCustomerTypeNotes.php:123
+#: Areas.php:163
+#: BankAccounts.php:227
+#: BOMs.php:152
+#: COGSGLPostings.php:109
+#: COGSGLPostings.php:214
+#: Credit_Invoice.php:372
+#: CreditStatus.php:174
+#: Currencies.php:236
+#: CustLoginSetup.php:298
+#: CustomerReceipt.php:830
+#: Customers.php:889
+#: CustomerTypes.php:207
+#: DiscountCategories.php:201
+#: DiscountMatrix.php:173
+#: EDIMessageFormat.php:163
+#: FixedAssetCategories.php:236
+#: FixedAssetJournal.php:393
+#: FixedAssetLocations.php:83
+#: FreightCosts.php:243
+#: GeocodeSetup.php:167
+#: GLAccounts.php:319
+#: GLJournal.php:394
+#: Locations.php:352
+#: MRPDemands.php:310
+#: MRPDemandTypes.php:118
+#: PaymentMethods.php:201
+#: Payments.php:861
+#: PaymentTerms.php:205
+#: PO_AuthorisationLevels.php:107
+#: PO_Items.php:961
+#: Prices_Customer.php:202
+#: Prices.php:180
+#: PurchData.php:190
+#: SalesAnalReptCols.php:293
+#: SalesAnalRepts.php:303
+#: SalesCategories.php:262
+#: SalesGLPostings.php:134
+#: SalesGLPostings.php:246
+#: SalesPeople.php:202
+#: SalesTypes.php:205
+#: SelectCreditItems.php:762
+#: SelectCustomer.php:689
+#: SelectCustomer.php:705
+#: SelectCustomer.php:737
+#: SelectCustomer.php:753
+#: SelectCustomer.php:784
+#: SelectCustomer.php:800
+#: SelectOrderItems.php:1286
+#: Shipments.php:422
+#: Shippers.php:143
+#: SpecialOrder.php:587
+#: StockCategories.php:216
+#: StockCategories.php:497
+#: SuppCreditGRNs.php:89
+#: SuppInvGLAnalysis.php:65
+#: SuppInvGRNs.php:129
+#: SupplierContacts.php:154
+#: SuppShiptChgs.php:79
+#: SuppTransGLAnalysis.php:107
+#: TaxAuthorities.php:165
+#: TaxCategories.php:182
+#: TaxGroups.php:180
+#: TaxProvinces.php:177
+#: UnitsOfMeasure.php:200
+#: WorkCentres.php:139
+#: WOSerialNos.php:296
+#: WWW_Access.php:125
+#: WWW_Users.php:305
+#: includes/InputSerialItemsKeyed.php:53
#, php-format
msgid "Delete"
msgstr "削除"
@@ -368,12 +645,12 @@
#: AccountGroups.php:293
#, fuzzy
-msgid ""
-"The SQL that was used to retrieve the account group and that failed in the "
-"process was"
+msgid "The SQL that was used to retrieve the account group and that failed in the process was"
msgstr "BOMの構成部品を取り戻すのにSQLは用いられて、プロセスに失敗した"
-#: AccountGroups.php:307 GLAccounts.php:245 GLAccounts.php:298
+#: AccountGroups.php:307
+#: GLAccounts.php:245
+#: GLAccounts.php:298
#: Z_ImportGLAccountGroups.php:28
msgid "Account Group"
msgstr "勘定グループ"
@@ -383,7 +660,8 @@
msgid "Account Group Name"
msgstr "勘定グループ名"
-#: AccountGroups.php:341 AccountGroups.php:343
+#: AccountGroups.php:341
+#: AccountGroups.php:343
msgid "Top Level Group"
msgstr "トップレベルグループ"
@@ -391,24 +669,50 @@
msgid "Section In Accounts"
msgstr "勘定のセクション"
-#: AccountGroups.php:396 AccountSections.php:263 AddCustomerContacts.php:202
-#: AddCustomerNotes.php:201 AddCustomerTypeNotes.php:184 Areas.php:218
-#: BankAccounts.php:372 BOMs.php:724 COGSGLPostings.php:342
-#: CreditStatus.php:244 Currencies.php:332 CustLoginSetup.php:595
-#: DiscountMatrix.php:136 EDIMessageFormat.php:254
-#: FixedAssetCategories.php:459 FixedAssetLocations.php:127
-#: FreightCosts.php:338 GeocodeSetup.php:262 GLAccounts.php:268
-#: Locations.php:517 MRPDemands.php:425 MRPDemandTypes.php:176
-#: PaymentMethods.php:270 PaymentTerms.php:278 PO_AuthorisationLevels.php:166
-#: Prices_Customer.php:244 SalesAnalReptCols.php:465 SalesAnalRepts.php:494
-#: SalesGLPostings.php:412 SalesPeople.php:292 Shippers.php:195
-#: StockCategories.php:516 SupplierContacts.php:249 TaxAuthorities.php:302
-#: TaxCategories.php:231 TaxProvinces.php:226 UnitsOfMeasure.php:250
-#: WorkCentres.php:260 WWW_Users.php:625
+#: AccountGroups.php:396
+#: AccountSections.php:263
+#: AddCustomerContacts.php:202
+#: AddCustomerNotes.php:201
+#: AddCustomerTypeNotes.php:184
+#: Areas.php:218
+#: BankAccounts.php:372
+#: BOMs.php:724
+#: COGSGLPostings.php:342
+#: CreditStatus.php:244
+#: Currencies.php:332
+#: CustLoginSetup.php:595
+#: DiscountMatrix.php:136
+#: EDIMessageFormat.php:254
+#: FixedAssetCategories.php:459
+#: FixedAssetLocations.php:127
+#: FreightCosts.php:338
+#: GeocodeSetup.php:262
+#: GLAccounts.php:268
+#: Locations.php:517
+#: MRPDemands.php:425
+#: MRPDemandTypes.php:176
+#: PaymentMethods.php:270
+#: PaymentTerms.php:278
+#: PO_AuthorisationLevels.php:166
+#: Prices_Customer.php:244
+#: SalesAnalReptCols.php:465
+#: SalesAnalRepts.php:494
+#: SalesGLPostings.php:412
+#: SalesPeople.php:292
+#: Shippers.php:195
+#: StockCategories.php:516
+#: SupplierContacts.php:249
+#: TaxAuthorities.php:302
+#: TaxCategories.php:231
+#: TaxProvinces.php:226
+#: UnitsOfMeasure.php:250
+#: WorkCentres.php:260
+#: WWW_Users.php:625
msgid "Enter Information"
msgstr "情報入力"
-#: AccountSections.php:9 index.php:1161
+#: AccountSections.php:9
+#: index.php:1161
msgid "Account Sections"
msgstr "勘定セクション"
@@ -426,17 +730,14 @@
msgid "The account section name must contain at least one character"
msgstr "勘定セクション名は文字列を含むことができません"
-#: AccountSections.php:87 AccountSections.php:93
+#: AccountSections.php:87
+#: AccountSections.php:93
msgid "The section number must be an integer"
msgstr "セクション番号は整数でなければなりません"
#: AccountSections.php:138
-msgid ""
-"Cannot delete this account section because general ledger accounts groups "
-"have been created using this section"
-msgstr ""
-"総勘定元帳勘定グループがこのセクションを使ってつくられているので、この勘定セ"
-"クションを削除することができません"
+msgid "Cannot delete this account section because general ledger accounts groups have been created using this section"
+msgstr "総勘定元帳勘定グループがこのセクションを使ってつくられているので、この勘定セクションを削除することができません"
#: AccountSections.php:139
msgid "general ledger accounts groups that refer to this account section"
@@ -450,11 +751,14 @@
msgid "Could not get account group sections because"
msgstr "勘定グループセクションを得ることができなかった"
-#: AccountSections.php:181 AccountSections.php:239 AccountSections.php:256
+#: AccountSections.php:181
+#: AccountSections.php:239
+#: AccountSections.php:256
msgid "Section Number"
msgstr "セクション番号"
-#: AccountSections.php:182 AccountSections.php:259
+#: AccountSections.php:182
+#: AccountSections.php:259
msgid "Section Description"
msgstr "セクション内容"
@@ -470,13 +774,17 @@
msgid "Could not retrieve the requested section please try again."
msgstr "要求セクションを取り出すことができませんでした、再試行してください。"
-#: AddCustomerContacts.php:6 AddCustomerContacts.php:50 SelectCustomer.php:681
+#: AddCustomerContacts.php:6
+#: AddCustomerContacts.php:50
+#: SelectCustomer.php:681
#: SelectCustomer.php:721
#, fuzzy
msgid "Customer Contacts"
msgstr "得意先コード"
-#: AddCustomerContacts.php:20 CustEDISetup.php:11 CustLoginSetup.php:21
+#: AddCustomerContacts.php:20
+#: CustEDISetup.php:11
+#: CustLoginSetup.php:21
#: Z_CheckDebtorsControl.php:20
msgid "Back to Customers"
msgstr "得意先に戻る"
@@ -496,11 +804,20 @@
msgid "The contact's name may not be empty"
msgstr "税カテゴリ名称は空白にできない"
-#: AddCustomerContacts.php:50 AddCustomerNotes.php:49
-#: AddCustomerTypeNotes.php:49 Areas.php:74 CustomerTypes.php:68
-#: DeliveryDetails.php:673 Factors.php:47 FixedAssetItems.php:351
-#: PO_Items.php:391 SalesAnalReptCols.php:128 SalesPeople.php:92
-#: SalesTypes.php:61 Stocks.php:353 Suppliers.php:482
+#: AddCustomerContacts.php:50
+#: AddCustomerNotes.php:49
+#: AddCustomerTypeNotes.php:49
+#: Areas.php:74
+#: CustomerTypes.php:68
+#: DeliveryDetails.php:673
+#: Factors.php:47
+#: FixedAssetItems.php:351
+#: PO_Items.php:391
+#: SalesAnalReptCols.php:128
+#: SalesPeople.php:92
+#: SalesTypes.php:61
+#: Stocks.php:353
+#: Suppliers.php:482
msgid "has been updated"
msgstr "が更新された"
@@ -519,31 +836,54 @@
msgid "Contacts for Customer: <b>"
msgstr "連絡先電話番号"
-#: AddCustomerContacts.php:107 CompanyPreferences.php:227
-#: CustomerBranches.php:374 Customers.php:846 Customers.php:852
-#: Customers.php:917 SalesPeople.php:183 SelectCustomer.php:684
-#: StockDispatch.php:181 StockDispatch.php:193 SuppInvGLAnalysis.php:49
-#: SuppInvGLAnalysis.php:73 SupplierContacts.php:141 SupplierCredit.php:304
-#: SupplierInvoice.php:308 SuppTransGLAnalysis.php:91
-#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
+#: AddCustomerContacts.php:107
+#: CompanyPreferences.php:227
+#: CustomerBranches.php:374
+#: Customers.php:846
+#: Customers.php:852
+#: Customers.php:917
+#: SalesPeople.php:183
+#: SelectCustomer.php:684
+#: StockDispatch.php:181
+#: StockDispatch.php:193
+#: SuppInvGLAnalysis.php:49
+#: SuppInvGLAnalysis.php:73
+#: SupplierContacts.php:141
+#: SupplierCredit.php:304
+#: SupplierInvoice.php:308
+#: SuppTransGLAnalysis.php:91
+#: includes/InputSerialItemsFile.php:84
+#: includes/InputSerialItemsFile.php:124
#: includes/PDFTaxPageHeader.inc:37
msgid "Name"
msgstr "名称"
-#: AddCustomerContacts.php:108 AddCustomerContacts.php:184 Customers.php:847
-#: Customers.php:853 Customers.php:918 SelectCustomer.php:685
-#: WWW_Access.php:108 WWW_Access.php:168
+#: AddCustomerContacts.php:108
+#: AddCustomerContacts.php:184
+#: Customers.php:847
+#: Customers.php:853
+#: Customers.php:918
+#: SelectCustomer.php:685
+#: WWW_Access.php:108
+#: WWW_Access.php:168
msgid "Role"
msgstr "ロール"
-#: AddCustomerContacts.php:109 Customers.php:919
+#: AddCustomerContacts.php:109
+#: Customers.php:919
#, fuzzy
msgid "Phone no"
msgstr "電話番号"
-#: AddCustomerContacts.php:110 AddCustomerContacts.php:196 Customers.php:849
-#: Customers.php:855 Customers.php:920 SelectCustomer.php:687
-#: SystemParameters.php:301 WOSerialNos.php:273 WOSerialNos.php:275
+#: AddCustomerContacts.php:110
+#: AddCustomerContacts.php:196
+#: Customers.php:849
+#: Customers.php:855
+#: Customers.php:920
+#: SelectCustomer.php:687
+#: SystemParameters.php:301
+#: WOSerialNos.php:273
+#: WOSerialNos.php:275
msgid "Notes"
msgstr "注釈"
@@ -556,26 +896,36 @@
msgid "Contact Code"
msgstr "カテゴリコード"
-#: AddCustomerContacts.php:178 Factors.php:180 Factors.php:195
+#: AddCustomerContacts.php:178
+#: Factors.php:180
+#: Factors.php:195
#: SupplierContacts.php:217
msgid "Contact Name"
msgstr "連絡先名"
-#: AddCustomerContacts.php:190 PDFRemittanceAdvice.php:248 PO_Header.php:1113
-#: PO_Header.php:1188 SelectCreditItems.php:234 SelectCustomer.php:504
-#: SelectOrderItems.php:637 includes/PDFStatementPageHeader.inc:63
+#: AddCustomerContacts.php:190
+#: PDFRemittanceAdvice.php:248
+#: PO_Header.php:1113
+#: PO_Header.php:1188
+#: SelectCreditItems.php:234
+#: SelectCustomer.php:504
+#: SelectOrderItems.php:637
+#: includes/PDFStatementPageHeader.inc:63
#: includes/PDFTransPageHeader.inc:82
#: includes/PDFTransPageHeaderPortrait.inc:105
msgid "Phone"
msgstr "電話番号"
-#: AddCustomerNotes.php:6 AddCustomerNotes.php:49 SelectCustomer.php:729
+#: AddCustomerNotes.php:6
+#: AddCustomerNotes.php:49
+#: SelectCustomer.php:729
#: SelectCustomer.php:768
#, fuzzy
msgid "Customer Notes"
msgstr "得意先番号"
-#: AddCustomerNotes.php:20 AddCustomerTypeNotes.php:20
+#: AddCustomerNotes.php:20
+#: AddCustomerTypeNotes.php:20
#, fuzzy
msgid "Back to Select Customer"
msgstr "得意先に戻る"
@@ -585,12 +935,14 @@
msgid "The contact priority must be an integer."
msgstr "勘定コードは数字でなければいけない"
-#: AddCustomerNotes.php:34 AddCustomerTypeNotes.php:34
+#: AddCustomerNotes.php:34
+#: AddCustomerTypeNotes.php:34
#, fuzzy
msgid "The contact's notes must be two hundred characters or less long"
msgstr "勘定科目名は15文字以下でなければなりません"
-#: AddCustomerNotes.php:37 AddCustomerTypeNotes.php:37
+#: AddCustomerNotes.php:37
+#: AddCustomerTypeNotes.php:37
#, fuzzy
msgid "The contact's notes may not be empty"
msgstr "税カテゴリ名称は空白にできない"
@@ -610,39 +962,66 @@
msgid "Notes for Customer: <b>"
msgstr "連絡先電話番号"
-#: AddCustomerNotes.php:106 AddCustomerNotes.php:188
-#: AddCustomerTypeNotes.php:103 AddCustomerTypeNotes.php:178
-#: BankMatching.php:214 BankReconciliation.php:182 BankReconciliation.php:254
-#: CustomerAllocations.php:348 CustomerAllocations.php:374
-#: CustomerInquiry.php:190 CustomerTransInquiry.php:86
-#: GLAccountInquiry.php:157 GLTransInquiry.php:47 MRPCalendar.php:213
-#: PaymentAllocations.php:77 PDFRemittanceAdvice.php:309
-#: PrintCustTrans.php:846 PrintCustTransPortrait.php:910 ReverseGRN.php:329
-#: ShipmentCosting.php:494 ShipmentCosting.php:565 Shipments.php:463
-#: StockDispatch.php:183 StockDispatch.php:195 StockLocMovements.php:80
-#: StockMovements.php:98 StockSerialItemResearch.php:74
-#: SupplierAllocations.php:465 SupplierAllocations.php:577
-#: SupplierAllocations.php:647 SupplierInquiry.php:192
-#: SupplierTransInquiry.php:87 includes/PDFQuotationPageHeader.inc:91
-#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
+#: AddCustomerNotes.php:106
+#: AddCustomerNotes.php:188
+#: AddCustomerTypeNotes.php:103
+#: AddCustomerTypeNotes.php:178
+#: BankMatching.php:214
+#: BankReconciliation.php:182
+#: BankReconciliation.php:254
+#: CustomerAllocations.php:348
+#: CustomerAllocations.php:374
+#: CustomerInquiry.php:190
+#: CustomerTransInquiry.php:86
+#: GLAccountInquiry.php:157
+#: GLTransInquiry.php:47
+#: MRPCalendar.php:213
+#: PaymentAllocations.php:77
+#: PDFRemittanceAdvice.php:309
+#: PrintCustTrans.php:846
+#: PrintCustTransPortrait.php:910
+#: ReverseGRN.php:329
+#: ShipmentCosting.php:494
+#: ShipmentCosting.php:565
+#: Shipments.php:463
+#: StockDispatch.php:183
+#: StockDispatch.php:195
+#: StockLocMovements.php:80
+#: StockMovements.php:98
+#: StockSerialItemResearch.php:74
+#: SupplierAllocations.php:465
+#: SupplierAllocations.php:577
+#: SupplierAllocations.php:647
+#: SupplierInquiry.php:192
+#: SupplierTransInquiry.php:87
+#: includes/PDFQuotationPageHeader.inc:91
+#: includes/PDFStatementPageHeader.inc:169
+#: includes/PDFTaxPageHeader.inc:36
#: includes/PDFTransPageHeader.inc:49
#: includes/PDFTransPageHeaderPortrait.inc:58
msgid "Date"
msgstr "日付"
-#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:104 Stocks.php:841
-#: Z_Upgrade_3.10-3.11.php:61 Z_Upgrade_3.10-3.11.php:65
-#: Z_Upgrade_3.10-3.11.php:69 Z_Upgrade_3.10-3.11.php:73
+#: AddCustomerNotes.php:107
+#: AddCustomerTypeNotes.php:104
+#: Stocks.php:841
+#: Z_Upgrade_3.10-3.11.php:61
+#: Z_Upgrade_3.10-3.11.php:65
+#: Z_Upgrade_3.10-3.11.php:69
+#: Z_Upgrade_3.10-3.11.php:73
#: Z_Upgrade_3.10-3.11.php:77
msgid "Note"
msgstr "注意"
-#: AddCustomerNotes.php:108 AddCustomerNotes.php:182
+#: AddCustomerNotes.php:108
+#: AddCustomerNotes.php:182
msgid "WWW"
msgstr ""
-#: AddCustomerNotes.php:109 AddCustomerNotes.php:194
-#: AddCustomerTypeNotes.php:106 AddCustomerTypeNotes.php:181
+#: AddCustomerNotes.php:109
+#: AddCustomerNotes.php:194
+#: AddCustomerTypeNotes.php:106
+#: AddCustomerTypeNotes.php:181
#, fuzzy
msgid "Priority"
msgstr "利益"
@@ -652,7 +1031,8 @@
msgid "Review all notes for this Customer"
msgstr "得意先用特別価格"
-#: AddCustomerNotes.php:171 AddCustomerTypeNotes.php:169
+#: AddCustomerNotes.php:171
+#: AddCustomerTypeNotes.php:169
#, fuzzy
msgid "Note ID"
msgstr "注意"
@@ -662,7 +1042,8 @@
msgid "Contact Note"
msgstr "カテゴリコード"
-#: AddCustomerTypeNotes.php:6 SelectCustomer.php:776
+#: AddCustomerTypeNotes.php:6
+#: SelectCustomer.php:776
#, fuzzy
msgid "Customer Type (Group) Notes"
msgstr "得意先更新済"
@@ -672,7 +1053,8 @@
msgid "The Contact priority must be an integer."
msgstr "勘定コードは数字でなければいけない"
-#: AddCustomerTypeNotes.php:49 SelectCustomer.php:816
+#: AddCustomerTypeNotes.php:49
+#: SelectCustomer.php:816
#, fuzzy
msgid "Customer Group Notes"
msgstr "得意先更新済"
@@ -692,7 +1074,8 @@
msgid "Notes for Customer Type: <b>"
msgstr "連絡先電話番号"
-#: AddCustomerTypeNotes.php:105 AddCustomerTypeNotes.php:176
+#: AddCustomerTypeNotes.php:105
+#: AddCustomerTypeNotes.php:176
#, fuzzy
msgid "href"
msgstr "優先"
@@ -714,77 +1097,179 @@
msgid "Aged Customer Balances"
msgstr "経年得意先残高"
-#: AgedDebtors.php:267 AgedDebtors.php:365 AgedDebtors.php:436
+#: AgedDebtors.php:267
+#: AgedDebtors.php:365
+#: AgedDebtors.php:436
msgid "Aged Customer Account Analysis"
msgstr "経年得意先勘定分析"
-#: AgedDebtors.php:267 AgedDebtors.php:365 AgedDebtors.php:436
-#: AgedSuppliers.php:105 BOMExtendedQty.php:156 BOMIndented.php:149
-#: BOMIndentedReverse.php:148 BOMListing.php:48 BOMListing.php:59
-#: DebtorsAtPeriodEnd.php:58 DebtorsAtPeriodEnd.php:70 GLBalanceSheet.php:88
-#: GLBalanceSheet.php:126 GLProfit_Loss.php:156 GLTagProfit_Loss.php:167
-#: GLTrialBalance.php:140 InventoryPlanning.php:97 InventoryPlanning.php:172
-#: InventoryPlanning.php:207 InventoryPlanning.php:250
-#: InventoryPlanning.php:284 InventoryPlanningPrefSupplier.php:208
-#: InventoryPlanningPrefSupplier.php:276 InventoryPlanningPrefSupplier.php:310
-#: InventoryPlanningPrefSupplier.php:353 InventoryPlanningPrefSupplier.php:387
-#: InventoryQuantities.php:81 InventoryValuation.php:76
-#: MailInventoryValuation.php:115 MRPPlannedPurchaseOrders.php:100
-#: MRPPlannedWorkOrders.php:103 MRPReport.php:133 MRPReschedules.php:35
-#: MRPReschedules.php:47 MRPShortages.php:112 MRPShortages.php:124
-#: OutstandingGRNs.php:51 OutstandingGRNs.php:63 PDFCustomerList.php:20
-#: PDFCustomerList.php:232 PDFCustomerList.php:244 PDFLowGP.php:23
-#: PDFStockCheckComparison.php:35 PDFStockCheckComparison.php:61
-#: PDFStockCheckComparison.php:262 ReorderLevel.php:57 SelectProduct.php:48
-#: StockCheck.php:63 StockCheck.php:135 SuppPriceList.php:118
+#: AgedDebtors.php:267
+#: AgedDebtors.php:365
+#: AgedDebtors.php:436
+#: AgedSuppliers.php:105
+#: BOMExtendedQty.php:156
+#: BOMIndented.php:149
+#: BOMIndentedReverse.php:148
+#: BOMListing.php:48
+#: BOMListing.php:59
+#: DebtorsAtPeriodEnd.php:58
+#: DebtorsAtPeriodEnd.php:70
+#: GLBalanceSheet.php:88
+#: GLBalanceSheet.php:126
+#: GLProfit_Loss.php:156
+#: GLTagProfit_Loss.php:167
+#: GLTrialBalance.php:140
+#: InventoryPlanning.php:97
+#: InventoryPlanning.php:172
+#: InventoryPlanning.php:207
+#: InventoryPlanning.php:250
+#: InventoryPlanning.php:284
+#: InventoryPlanningPrefSupplier.php:208
+#: InventoryPlanningPrefSupplier.php:276
+#: InventoryPlanningPrefSupplier.php:310
+#: InventoryPlanningPrefSupplier.php:353
+#: InventoryPlanningPrefSupplier.php:387
+#: InventoryQuantities.php:81
+#: InventoryValuation.php:76
+#: MailInventoryValuation.php:115
+#: MRPPlannedPurchaseOrders.php:100
+#: MRPPlannedWorkOrders.php:103
+#: MRPReport.php:133
+#: MRPReschedules.php:35
+#: MRPReschedules.php:47
+#: MRPShortages.php:112
+#: MRPShortages.php:124
+#: OutstandingGRNs.php:51
+#: OutstandingGRNs.php:63
+#: PDFCustomerList.php:20
+#: PDFCustomerList.php:232
+#: PDFCustomerList.php:244
+#: PDFLowGP.php:23
+#: PDFStockCheckComparison.php:35
+#: PDFStockCheckComparison.php:61
+#: PDFStockCheckComparison.php:262
+#: ReorderLevel.php:57
+#: SelectProduct.php:48
+#: StockCheck.php:63
+#: StockCheck.php:135
+#: SuppPriceList.php:118
#: includes/PDFPaymentRun_PymtFooter.php:146
msgid "Problem Report"
msgstr "問題レポート"
-#: AgedDebtors.php:269 CustomerInquiry.php:87 CustomerInquiry.php:108
+#: AgedDebtors.php:269
+#: CustomerInquiry.php:87
+#: CustomerInquiry.php:108
#: DebtorsAtPeriodEnd.php:60
msgid "The customer details could not be retrieved by the SQL because"
msgstr "得意先詳細はSQLで検索ができませんでした、というのは"
-#: AgedDebtors.php:270 AgedDebtors.php:368 AgedDebtors.php:442
-#: AgedSuppliers.php:108 AgedSuppliers.php:190 BOMExtendedQty.php:159
-#: BOMExtendedQty.php:263 BOMIndented.php:152 BOMIndented.php:238
-#: BOMIndentedReverse.php:151 BOMIndentedReverse.php:235 BOMListing.php:51
-#: Credit_Invoice.php:186 DebtorsAtPeriodEnd.php:61 DebtorsAtPeriodEnd.php:73
-#: FTP_RadioBeacon.php:188 GetStockImage.php:154 GLBalanceSheet.php:91
-#: GLBalanceSheet.php:129 GLBalanceSheet.php:292 GLProfit_Loss.php:159
-#: GLProfit_Loss.php:171 GLTagProfit_Loss.php:170 GLTagProfit_Loss.php:182
-#: GLTrialBalance.php:143 GLTrialBalance.php:155 InventoryPlanning.php:100
-#: InventoryPlanning.php:175 InventoryPlanning.php:210
-#: InventoryPlanning.php:253 InventoryPlanning.php:287
-#: InventoryPlanning.php:350 InventoryPlanningPrefSupplier.php:211
-#: InventoryPlanningPrefSupplier.php:279 InventoryPlanningPrefSupplier.php:313
-#: InventoryPlanningPrefSupplier.php:356 InventoryPlanningPrefSupplier.php:390
-#: InventoryPlanningPrefSupplier.php:446 InventoryQuantities.php:84
-#: InventoryQuantities.php:95 InventoryValuation.php:79
-#: InventoryValuation.php:90 MailInventoryValuation.php:118
-#: MailInventoryValuation.php:214 MRPPlannedPurchaseOrders.php:103
-#: MRPPlannedPurchaseOrders.php:114 MRPPlannedWorkOrders.php:106
-#: MRPPlannedWorkOrders.php:117 MRPReport.php:36 MRPReport.php:47
-#: MRPReport.php:136 MRPReschedules.php:38 MRPReschedules.php:50
-#: MRPShortages.php:115 MRPShortages.php:127 OutstandingGRNs.php:54
-#: OutstandingGRNs.php:66 PDFCustomerList.php:235 PDFCustomerList.php:247
-#: PDFGrn.php:63 PDFLowGP.php:62 PDFLowGP.php:74 PDFPriceList.php:106
-#: PDFPriceList.php:189 PDFQuotation.php:235 PDFRemittanceAdvice.php:76
-#: PDFStockCheckComparison.php:39 PDFStockCheckComparison.php:65
-#: PDFStockCheckComparison.php:266 PDFTopItems.php:161 PO_PDFPurchOrder.php:27
-#: PO_PDFPurchOrder.php:135 PrintCustOrder_generic.php:182
-#: PrintCustOrder.php:198 PrintSalesOrder_generic.php:183 ReorderLevel.php:60
-#: ReorderLevel.php:149 SalesAnalysis_UserDefined.php:37
-#: SelectCreditItems.php:25 StockCheck.php:45 StockCheck.php:66
-#: StockCheck.php:95 StockCheck.php:138 StockCheck.php:149 StockCheck.php:190
-#: StockDispatch.php:89 StockDispatch.php:100 SupplierBalsAtPeriodEnd.php:57
-#: SupplierBalsAtPeriodEnd.php:68 SuppPaymentRun.php:109
-#: SuppPaymentRun.php:120 SuppPaymentRun.php:184 SuppPaymentRun.php:214
-#: SuppPriceList.php:121 Tax.php:64 Tax.php:177 Tax.php:286
-#: Z_DataExport.php:73 Z_DataExport.php:169 Z_DataExport.php:260
-#: Z_DataExport.php:309 Z_DataExport.php:348 Z_DataExport.php:384
-#: Z_DataExport.php:420 Z_DataExport.php:474 Z_poRebuildDefault.php:37
+#: AgedDebtors.php:270
+#: AgedDebtors.php:368
+#: AgedDebtors.php:442
+#: AgedSuppliers.php:108
+#: AgedSuppliers.php:190
+#: BOMExtendedQty.php:159
+#: BOMExtendedQty.php:263
+#: BOMIndented.php:152
+#: BOMIndented.php:238
+#: BOMIndentedReverse.php:151
+#: BOMIndentedReverse.php:235
+#: BOMListing.php:51
+#: Credit_Invoice.php:186
+#: DebtorsAtPeriodEnd.php:61
+#: DebtorsAtPeriodEnd.php:73
+#: FTP_RadioBeacon.php:188
+#: GetStockImage.php:154
+#: GLBalanceSheet.php:91
+#: GLBalanceSheet.php:129
+#: GLBalanceSheet.php:292
+#: GLProfit_Loss.php:159
+#: GLProfit_Loss.php:171
+#: GLTagProfit_Loss.php:170
+#: GLTagProfit_Loss.php:182
+#: GLTrialBalance.php:143
+#: GLTrialBalance.php:155
+#: InventoryPlanning.php:100
+#: InventoryPlanning.php:175
+#: InventoryPlanning.php:210
+#: InventoryPlanning.php:253
+#: InventoryPlanning.php:287
+#: InventoryPlanning.php:350
+#: InventoryPlanningPrefSupplier.php:211
+#: InventoryPlanningPrefSupplier.php:279
+#: InventoryPlanningPrefSupplier.php:313
+#: InventoryPlanningPrefSupplier.php:356
+#: InventoryPlanningPrefSupplier.php:390
+#: InventoryPlanningPrefSupplier.php:446
+#: InventoryQuantities.php:84
+#: InventoryQuantities.php:95
+#: InventoryValuation.php:79
+#: InventoryValuation.php:90
+#: MailInventoryValuation.php:118
+#: MailInventoryValuation.php:214
+#: MRPPlannedPurchaseOrders.php:103
+#: MRPPlannedPurchaseOrders.php:114
+#: MRPPlannedWorkOrders.php:106
+#: MRPPlannedWorkOrders.php:117
+#: MRPReport.php:36
+#: MRPReport.php:47
+#: MRPReport.php:136
+#: MRPReschedules.php:38
+#: MRPReschedules.php:50
+#: MRPShortages.php:115
+#: MRPShortages.php:127
+#: OutstandingGRNs.php:54
+#: OutstandingGRNs.php:66
+#: PDFCustomerList.php:235
+#: PDFCustomerList.php:247
+#: PDFGrn.php:63
+#: PDFLowGP.php:62
+#: PDFLowGP.php:74
+#: PDFPriceList.php:106
+#: PDFPriceList.php:189
+#: PDFQuotation.php:235
+#: PDFRemittanceAdvice.php:76
+#: PDFStockCheckComparison.php:39
+#: PDFStockCheckComparison.php:65
+#: PDFStockCheckComparison.php:266
+#: PDFTopItems.php:161
+#: PO_PDFPurchOrder.php:27
+#: PO_PDFPurchOrder.php:135
+#: PrintCustOrder_generic.php:182
+#: PrintCustOrder.php:198
+#: PrintSalesOrder_generic.php:183
+#: ReorderLevel.php:60
+#: ReorderLevel.php:149
+#: SalesAnalysis_UserDefined.php:37
+#: SelectCreditItems.php:25
+#: StockCheck.php:45
+#: StockCheck.php:66
+#: StockCheck.php:95
+#: StockCheck.php:138
+#: StockCheck.php:149
+#: StockCheck.php:190
+#: StockDispatch.php:89
+#: StockDispatch.php:100
+#: SupplierBalsAtPeriodEnd.php:57
+#: SupplierBalsAtPeriodEnd.php:68
+#: SuppPaymentRun.php:109
+#: SuppPaymentRun.php:120
+#: SuppPaymentRun.php:184
+#: SuppPaymentRun.php:214
+#: SuppPriceList.php:121
+#: Tax.php:64
+#: Tax.php:177
+#: Tax.php:286
+#: Z_DataExport.php:73
+#: Z_DataExport.php:169
+#: Z_DataExport.php:260
+#: Z_DataExport.php:309
+#: Z_DataExport.php:348
+#: Z_DataExport.php:384
+#: Z_DataExport.php:420
+#: Z_DataExport.php:474
+#: Z_poRebuildDefault.php:37
#: includes/PDFPaymentRun_PymtFooter.php:55
#: includes/PDFPaymentRun_PymtFooter.php:84
#: includes/PDFPaymentRun_PymtFooter.php:113
@@ -801,36 +1286,77 @@
msgid "The details of outstanding transactions for customer"
msgstr "得意先の未処理トランザクションの詳細"
-#: AgedDebtors.php:367 AgedSuppliers.php:189 GLAccountInquiry.php:149
-#: PO_Items.php:546 PO_Items.php:576 PO_Items.php:656 PO_Items.php:794
-#: SalesAnalReptCols.php:349 SpecialOrder.php:368
-#: StockLocTransferReceive.php:370 StockQuantityByDate.php:102
+#: AgedDebtors.php:367
+#: AgedSuppliers.php:189
+#: GLAccountInquiry.php:149
+#: PO_Items.php:546
+#: PO_Items.php:576
+#: PO_Items.php:656
+#: PO_Items.php:794
+#: SalesAnalReptCols.php:349
+#: SpecialOrder.php:368
+#: StockLocTransferReceive.php:370
+#: StockQuantityByDate.php:102
#: includes/SelectOrderItems_IntoCart.inc:52
msgid "could not be retrieved because"
msgstr "取り出すことができなかったのは"
-#: AgedDebtors.php:370 AgedSuppliers.php:192 Areas.php:96
-#: ConfirmDispatch_Invoice.php:154 ConfirmDispatch_Invoice.php:914
-#: ConfirmDispatch_Invoice.php:928 Credit_Invoice.php:686
-#: Credit_Invoice.php:708 CustomerReceipt.php:491 CustomerReceipt.php:632
-#: CustomerReceipt.php:660 CustomerTransInquiry.php:78 DeliveryDetails.php:397
-#: GLProfit_Loss.php:539 GLTagProfit_Loss.php:480 Payments.php:294
-#: PDFRemittanceAdvice.php:78 PurchData.php:83 PurchData.php:101
-#: PurchData.php:206 ReverseGRN.php:142 ReverseGRN.php:156 ReverseGRN.php:317
-#: SelectCreditItems.php:1393 StockCheck.php:220 StockCostUpdate.php:78
-#: StockCostUpdate.php:88 StockLocStatus.php:144 StockMovements.php:91
-#: StockQuantityByDate.php:78 StockReorderLevel.php:39 StockStatus.php:262
-#: StockTransfers.php:153 StockUsageGraph.php:53 StockUsage.php:124
-#: SupplierInquiry.php:78 SupplierInquiry.php:99 SupplierInquiry.php:129
-#: SupplierInquiry.php:174 SupplierTransInquiry.php:79 SuppPaymentRun.php:111
-#: SuppPaymentRun.php:186 SuppPaymentRun.php:216 WorkOrderCosting.php:391
-#: WorkOrderReceive.php:261 WOSerialNos.php:44 Z_ChangeBranchCode.php:108
-#: Z_ChangeCustomerCode.php:90 Z_DeleteCreditNote.php:57
-#: Z_DeleteInvoice.php:83 includes/PDFPaymentRun_PymtFooter.php:57
+#: AgedDebtors.php:370
+#: AgedSuppliers.php:192
+#: Areas.php:96
+#: ConfirmDispatch_Invoice.php:154
+#: ConfirmDispatch_Invoice.php:914
+#: ConfirmDispatch_Invoice.php:928
+#: Credit_Invoice.php:686
+#: Credit_Invoice.php:708
+#: CustomerReceipt.php:491
+#: CustomerReceipt.php:632
+#: CustomerReceipt.php:660
+#: CustomerTransInquiry.php:78
+#: DeliveryDetails.php:397
+#: GLProfit_Loss.php:539
+#: GLTagProfit_Loss.php:480
+#: Payments.php:294
+#: PDFRemittanceAdvice.php:78
+#: PurchData.php:83
+#: PurchData.php:101
+#: PurchData.php:206
+#: ReverseGRN.php:142
+#: ReverseGRN.php:156
+#: ReverseGRN.php:317
+#: SelectCreditItems.php:1393
+#: StockCheck.php:220
+#: StockCostUpdate.php:78
+#: StockCostUpdate.php:88
+#: StockLocStatus.php:144
+#: StockMovements.php:91
+#: StockQuantityByDate.php:78
+#: StockReorderLevel.php:39
+#: StockStatus.php:262
+#: StockTransfers.php:153
+#: StockUsageGraph.php:53
+#: StockUsage.php:124
+#: SupplierInquiry.php:78
+#: SupplierInquiry.php:99
+#: SupplierInquiry.php:129
+#: SupplierInquiry.php:174
+#: SupplierTransInquiry.php:79
+#: SuppPaymentRun.php:111
+#: SuppPaymentRun.php:186
+#: SuppPaymentRun.php:216
+#: WorkOrderCosting.php:391
+#: WorkOrderReceive.php:261
+#: WOSerialNos.php:44
+#: Z_ChangeBranchCode.php:108
+#: Z_ChangeCustomerCode.php:90
+#: Z_DeleteCreditNote.php:57
+#: Z_DeleteInvoice.php:83
+#: includes/PDFPaymentRun_PymtFooter.php:57
#: includes/PDFPaymentRun_PymtFooter.php:86
#: includes/PDFPaymentRun_PymtFooter.php:115
#: includes/PDFPaymentRun_PymtFooter.php:151
-#: includes/PDFPaymentRun_PymtFooter.php:182 includes/ConnectDB_mysqli.inc:55
+#: includes/PDFPaymentRun_PymtFooter.php:182
+#: includes/ConnectDB_mysqli.inc:55
#: includes/ConnectDB_mysql.inc:38
msgid "The SQL that failed was"
msgstr "失敗したSQLは"
@@ -844,15 +1370,18 @@
msgid "Aged Debtor Analysis"
msgstr "経年債務分析"
-#: AgedDebtors.php:475 DebtorsAtPeriodEnd.php:143
+#: AgedDebtors.php:475
+#: DebtorsAtPeriodEnd.php:143
msgid "From Customer Code"
msgstr "開始得意先コード"
-#: AgedDebtors.php:476 DebtorsAtPeriodEnd.php:144
+#: AgedDebtors.php:476
+#: DebtorsAtPeriodEnd.php:144
msgid "To Customer Code"
msgstr "終了得意先コード"
-#: AgedDebtors.php:478 AgedSuppliers.php:291
+#: AgedDebtors.php:478
+#: AgedSuppliers.php:291
msgid "All balances or overdues only"
msgstr "すべての残高または期限切れだけ"
@@ -860,7 +1389,8 @@
msgid "All customers with balances"
msgstr "残高があるすべての得意先"
-#: AgedDebtors.php:480 AgedSuppliers.php:294
+#: AgedDebtors.php:480
+#: AgedSuppliers.php:294
msgid "Overdue accounts only"
msgstr "期限切れアカウントだけ"
@@ -880,25 +1410,47 @@
msgid "Summary or detailed report"
msgstr "集約か詳細レポート"
-#: AgedDebtors.php:514 AgedSuppliers.php:314 InventoryValuation.php:235
+#: AgedDebtors.php:514
+#: AgedSuppliers.php:314
+#: InventoryValuation.php:235
msgid "Summary Report"
msgstr "集約レポート"
-#: AgedDebtors.php:515 AgedSuppliers.php:315 InventoryValuation.php:236
+#: AgedDebtors.php:515
+#: AgedSuppliers.php:315
+#: InventoryValuation.php:236
msgid "Detailed Report"
msgstr "詳細なレポート"
-#: AgedDebtors.php:518 AgedSuppliers.php:318 BOMExtendedQty.php:297
-#: BOMIndented.php:275 BOMIndentedReverse.php:263 BOMListing.php:140
-#: DebtorsAtPeriodEnd.php:161 InventoryPlanning.php:429
-#: InventoryPlanningPrefSupplier.php:502 InventoryQuantities.php:186
-#: InventoryValuation.php:239 MRPPlannedPurchaseOrders.php:263
-#: MRPPlannedWorkOrders.php:241 MRPReport.php:512 MRPReschedules.php:150
-#: MRPShortages.php:232 OutstandingGRNs.php:181 PDFCustomerList.php:409
-#: PDFLowGP.php:164 PDFPriceList.php:258 PDFRemittanceAdvice.php:153
-#: PDFStockCheckComparison.php:375 PrintCustTrans.php:618
-#: PrintCustTransPortrait.php:680 ReorderLevel.php:226 StockDispatch.php:293
-#: SupplierBalsAtPeriodEnd.php:148 SuppPriceList.php:231 Tax.php:348
+#: AgedDebtors.php:518
+#: AgedSuppliers.php:318
+#: BOMExtendedQty.php:297
+#: BOMIndented.php:275
+#: BOMIndentedReverse.php:263
+#: BOMListing.php:140
+#: DebtorsAtPeriodEnd.php:161
+#: InventoryPlanning.php:429
+#: InventoryPlanningPrefSupplier.php:502
+#: InventoryQuantities.php:186
+#: InventoryValuation.php:239
+#: MRPPlannedPurchaseOrders.php:263
+#: MRPPlannedWorkOrders.php:241
+#: MRPReport.php:512
+#: MRPReschedules.php:150
+#: MRPShortages.php:232
+#: OutstandingGRNs.php:181
+#: PDFCustomerList.php:409
+#: PDFLowGP.php:164
+#: PDFPriceList.php:258
+#: PDFRemittanceAdvice.php:153
+#: PDFStockCheckComparison.php:375
+#: PrintCustTrans.php:618
+#: PrintCustTransPortrait.php:680
+#: ReorderLevel.php:226
+#: StockDispatch.php:293
+#: SupplierBalsAtPeriodEnd.php:148
+#: SuppPriceList.php:231
+#: Tax.php:348
msgid "Print PDF"
msgstr "PDF印刷"
@@ -914,7 +1466,8 @@
msgid "Aged Supplier Account Analysis"
msgstr "経年仕入先勘定分析"
-#: AgedSuppliers.php:107 SupplierBalsAtPeriodEnd.php:56
+#: AgedSuppliers.php:107
+#: SupplierBalsAtPeriodEnd.php:56
msgid "The Supplier details could not be retrieved by the SQL because"
msgstr "仕入先詳細はSQLで検索できませんでした、理由は"
@@ -930,13 +1483,19 @@
msgid "Aged Supplier Analysis"
msgstr "経年仕入先分析"
-#: AgedSuppliers.php:284 OutstandingGRNs.php:176 PDFRemittanceAdvice.php:139
-#: SupplierBalsAtPeriodEnd.php:125 SuppPaymentRun.php:255
+#: AgedSuppliers.php:284
+#: OutstandingGRNs.php:176
+#: PDFRemittanceAdvice.php:139
+#: SupplierBalsAtPeriodEnd.php:125
+#: SuppPaymentRun.php:255
msgid "From Supplier Code"
msgstr "開始仕入先コード"
-#: AgedSuppliers.php:287 OutstandingGRNs.php:178 PDFRemittanceAdvice.php:141
-#: SupplierBalsAtPeriodEnd.php:127 SuppPaymentRun.php:257
+#: AgedSuppliers.php:287
+#: OutstandingGRNs.php:178
+#: PDFRemittanceAdvice.php:141
+#: SupplierBalsAtPeriodEnd.php:127
+#: SuppPaymentRun.php:257
msgid "To Supplier Code"
msgstr "終了仕入先コード"
@@ -948,7 +1507,8 @@
msgid "For suppliers trading in"
msgstr "仕入先取引通貨"
-#: AgedSuppliers.php:312 InventoryValuation.php:234
+#: AgedSuppliers.php:312
+#: InventoryValuation.php:234
msgid "Summary or Detailed Report"
msgstr "集約か詳細レポート"
@@ -994,9 +1554,7 @@
msgstr "地域は追加または更新ができませんでした理由は"
#: Areas.php:116
-msgid ""
-"Cannot delete this area because customer branches have been created using "
-"this area"
+msgid "Cannot delete this area because customer branches have been created using this area"
msgstr "この地域を使って得意先支店がつくられたので、この地域を削除できません"
#: Areas.php:117
@@ -1005,27 +1563,37 @@
#: Areas.php:125
#, fuzzy
-msgid ""
-"Cannot delete this area because sales analysis records exist that use this "
-"area"
+msgid "Cannot delete this area because sales analysis records exist that use this area"
msgstr "この地域を使う販売分析レコードが存在するので、この地域を削除できません"
#: Areas.php:126
msgid "sales analysis records referring this area code"
msgstr "この地域コードを参照している販売分析レコード"
-#: Areas.php:133 Areas.php:146 Areas.php:197 Areas.php:208
+#: Areas.php:133
+#: Areas.php:146
+#: Areas.php:197
+#: Areas.php:208
msgid "Area Code"
msgstr "地域コード"
-#: Areas.php:133 CustomerTypes.php:167 Factors.php:112
-#: FixedAssetCategories.php:192 GLAccounts.php:204 Locations.php:299
-#: SalesAnalReptCols.php:214 SalesCategories.php:137 SalesTypes.php:161
-#: StockCategories.php:170 Suppliers.php:595 Z_DeleteInvoice.php:142
+#: Areas.php:133
+#: CustomerTypes.php:167
+#: Factors.php:112
+#: FixedAssetCategories.php:192
+#: GLAccounts.php:204
+#: Locations.php:299
+#: SalesAnalReptCols.php:214
+#: SalesCategories.php:137
+#: SalesTypes.php:161
+#: StockCategories.php:170
+#: Suppliers.php:595
+#: Z_DeleteInvoice.php:142
msgid "has been deleted"
msgstr "は削除された"
-#: Areas.php:147 Areas.php:213
+#: Areas.php:147
+#: Areas.php:213
msgid "Area Name"
msgstr "地域名"
@@ -1040,23 +1608,28 @@
#: AuditTrail.php:21
#, fuzzy
msgid "Incorrect date format used, please re-enter"
-msgstr ""
-"入力日は有効でありませんでした、フォーマットで仕訳を処理日を入力して下さい"
+msgstr "入力日は有効でありませんでした、フォーマットで仕訳を処理日を入力して下さい"
-#: AuditTrail.php:34 BOMIndented.php:314 BOMIndentedReverse.php:302
+#: AuditTrail.php:34
+#: BOMIndented.php:314
+#: BOMIndentedReverse.php:302
#: MRPCalendar.php:251
#, fuzzy
msgid "From Date"
msgstr "支払元"
-#: AuditTrail.php:36 BOMIndented.php:315 BOMIndentedReverse.php:303
+#: AuditTrail.php:36
+#: BOMIndented.php:315
+#: BOMIndentedReverse.php:303
#: MRPCalendar.php:253
#, fuzzy
msgid "To Date"
msgstr "日付"
-#: AuditTrail.php:40 PO_AuthorisationLevels.php:87
-#: PO_AuthorisationLevels.php:116 PO_AuthorisationLevels.php:119
+#: AuditTrail.php:40
+#: PO_AuthorisationLevels.php:87
+#: PO_AuthorisationLevels.php:116
+#: PO_AuthorisationLevels.p...
[truncated message content] |
|
From: <tim...@us...> - 2010-04-05 19:09:56
|
Revision: 3406
http://web-erp.svn.sourceforge.net/web-erp/?rev=3406&view=rev
Author: tim_schofield
Date: 2010-04-05 19:09:50 +0000 (Mon, 05 Apr 2010)
Log Message:
-----------
Matt Taylor: Z_ImportStocks.php : Correct DB_txn functions and add validation check.
Modified Paths:
--------------
trunk/Z_ImportStocks.php
trunk/doc/Change.log.html
Modified: trunk/Z_ImportStocks.php
===================================================================
--- trunk/Z_ImportStocks.php 2010-04-05 15:32:01 UTC (rev 3405)
+++ trunk/Z_ImportStocks.php 2010-04-05 19:09:50 UTC (rev 3406)
@@ -77,7 +77,7 @@
}
//start database transaction
- DB_Txn_Begin();
+ DB_Txn_Begin($db);
//loop through file rows
$row = 1;
@@ -129,6 +129,10 @@
$InputError = 1;
prnMsg(_('The barcode must be 20 characters or less long'),'error');
}
+ if (!is_numeric($myrow[10]) OR $myrow[10]!=0 OR $myrow[10]!=1) {
+ $InputError = 1;
+ prnMsg (_('Values in the Perishable field must be either 0 (No) or 1 (Yes)') ,'error');
+ }
if (!is_numeric($myrow[11])) {
$InputError = 1;
prnMsg (_('The volume of the packaged item in cubic metres must be numeric') ,'error');
@@ -260,9 +264,9 @@
if ($InputError == 1) { //exited loop with errors so rollback
prnMsg(_('Failed on row '. $row. '. Batch import has been rolled back.'),'error');
- DB_Txn_Rollback();
+ DB_Txn_Rollback($db);
} else { //all good so commit data transaction
- DB_Txn_Commit();
+ DB_Txn_Commit($db);
prnMsg( _('Batch Import of') .' ' . $fileName . ' '. _('has been completed. All transactions committed to the database.'),'success');
}
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-05 15:32:01 UTC (rev 3405)
+++ trunk/doc/Change.log.html 2010-04-05 19:09:50 UTC (rev 3406)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>05/04/10 Matt Taylor: Z_ImportStocks.php : Correct DB_txn functions and add validation check.</p>
<p>05/04/10 Zhiguo: Japanese translation updates</p>
<p>04/04/10 Tim: upgrade3.11.1-3.12.sql - Enlarge fieldname column in reportfields to 60 characters</p>
<p>01/04/10 Harald: PDFSuppTransListing.php - Typing error in script title</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-04-05 19:32:05
|
Revision: 3407
http://web-erp.svn.sourceforge.net/web-erp/?rev=3407&view=rev
Author: tim_schofield
Date: 2010-04-05 19:31:57 +0000 (Mon, 05 Apr 2010)
Log Message:
-----------
exson qu: Chinese translation update.
Modified Paths:
--------------
trunk/doc/Change.log.html
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-05 19:09:50 UTC (rev 3406)
+++ trunk/doc/Change.log.html 2010-04-05 19:31:57 UTC (rev 3407)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>05/04/10 exson qu: Chinese translation update.</p>
<p>05/04/10 Matt Taylor: Z_ImportStocks.php : Correct DB_txn functions and add validation check.</p>
<p>05/04/10 Zhiguo: Japanese translation updates</p>
<p>04/04/10 Tim: upgrade3.11.1-3.12.sql - Enlarge fieldname column in reportfields to 60 characters</p>
Modified: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po 2010-04-05 19:09:50 UTC (rev 3406)
+++ trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po 2010-04-05 19:31:57 UTC (rev 3407)
@@ -8,35 +8,33 @@
"Project-Id-Version: WEBERP3.05 VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-12-28 10:58+1200\n"
-"PO-Revision-Date: 2009-09-23 18:23-0000\n"
-"Last-Translator: Javier De Lorenzo-Cáceres <in...@ci...>\n"
-"Language-Team: WebERP Translation Team <web-erp-translation@lists."
-"sourceforge.net>\n"
+"PO-Revision-Date: 2010-04-05 14:02+0800\n"
+"Last-Translator: 曲 <hex...@ya...>\n"
+"Language-Team: WebERP Translation Team <web...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Country: CHINA\n"
-#: AccountGroups.php:9 index.php:1156
+#: AccountGroups.php:9
+#: index.php:1156
msgid "Account Groups"
msgstr "科目组"
#: AccountGroups.php:19
#, fuzzy
-msgid ""
-"An error occurred in retrieving the account groups of the parent account "
-"group during the check for recursion"
+msgid "An error occurred in retrieving the account groups of the parent account group during the check for recursion"
msgstr "在BOM回环检查中查询BOM组件发生错误"
#: AccountGroups.php:20
#, fuzzy
-msgid ""
-"The SQL that was used to retrieve the account groups of the parent account "
-"group and that failed in the process was"
+msgid "The SQL that was used to retrieve the account groups of the parent account group and that failed in the process was"
msgstr "用于查询BOM组件失败的SQL是"
-#: AccountGroups.php:57 AccountGroups.php:94 AccountGroups.php:177
+#: AccountGroups.php:57
+#: AccountGroups.php:94
+#: AccountGroups.php:177
#: AccountGroups.php:187
#, fuzzy
msgid "The SQL that was used to retrieve the information was"
@@ -56,8 +54,12 @@
msgid "The account group name cannot contain the character"
msgstr "科目组名称不能包含这个字符"
-#: AccountGroups.php:71 AccountSections.php:75 PaymentMethods.php:38
-#: TaxCategories.php:30 TaxProvinces.php:30 UnitsOfMeasure.php:30
+#: AccountGroups.php:71
+#: AccountSections.php:75
+#: PaymentMethods.php:38
+#: TaxCategories.php:30
+#: TaxProvinces.php:30
+#: UnitsOfMeasure.php:30
msgid "or the character"
msgstr "或这个字符"
@@ -67,10 +69,7 @@
msgstr "联系人名称必须不少于 1 个字"
#: AccountGroups.php:84
-msgid ""
-"The parent account group selected appears to result in a recursive account "
-"structure - select an alternative parent account group or make this group a "
-"top level account group"
+msgid "The parent account group selected appears to result in a recursive account structure - select an alternative parent account group or make this group a top level account group"
msgstr ""
#: AccountGroups.php:95
@@ -101,7 +100,9 @@
msgid "The SQL that was used to update the account group was"
msgstr "用于更新供应商失败的 SQL 是"
-#: AccountGroups.php:139 AccountSections.php:106 PaymentMethods.php:88
+#: AccountGroups.php:139
+#: AccountSections.php:106
+#: PaymentMethods.php:88
msgid "Record Updated"
msgstr "记录已更新"
@@ -115,7 +116,9 @@
msgid "The SQL that was used to insert the account group was"
msgstr "用作插入供应商失败的 SQL 是"
-#: AccountGroups.php:159 AccountSections.php:118 PaymentMethods.php:110
+#: AccountGroups.php:159
+#: AccountSections.php:118
+#: PaymentMethods.php:110
msgid "Record inserted"
msgstr "记录已新增"
@@ -125,32 +128,78 @@
msgstr "查找货币时发生错误"
#: AccountGroups.php:181
-msgid ""
-"Cannot delete this account group because general ledger accounts have been "
-"created using this group"
+msgid "Cannot delete this account group because general ledger accounts have been created using this group"
msgstr "不能删除，已创建了属于这个科目组的会计科目"
-#: AccountGroups.php:182 AccountGroups.php:192 AccountSections.php:139
-#: Areas.php:117 Areas.php:126 BankAccounts.php:163 CreditStatus.php:124
-#: Currencies.php:142 Currencies.php:150 Currencies.php:157
-#: CustomerBranches.php:294 CustomerBranches.php:304 CustomerBranches.php:314
-#: CustomerBranches.php:324 Customers.php:291 Customers.php:300
-#: Customers.php:308 Customers.php:316 CustomerTypes.php:151
-#: CustomerTypes.php:161 Factors.php:107 FixedAssetCategories.php:175
-#: FixedAssetItems.php:483 FixedAssetItems.php:492 FixedAssetItems.php:500
-#: FixedAssetItems.php:508 FixedAssetItems.php:516 FixedAssetItems.php:524
-#: GLAccounts.php:91 GLAccounts.php:105 Locations.php:218 Locations.php:226
-#: Locations.php:235 Locations.php:243 Locations.php:251 Locations.php:259
-#: Locations.php:267 Locations.php:275 MRPDemandTypes.php:85
-#: PaymentMethods.php:142 PaymentTerms.php:149 PaymentTerms.php:156
-#: SalesCategories.php:125 SalesCategories.php:133 SalesPeople.php:142
-#: SalesPeople.php:149 SalesTypes.php:145 SalesTypes.php:155 Shippers.php:82
-#: Shippers.php:94 StockCategories.php:153 Stocks.php:467 Stocks.php:476
-#: Stocks.php:484 Stocks.php:492 Stocks.php:500 Stocks.php:508
-#: Suppliers.php:569 Suppliers.php:578 Suppliers.php:586 TaxCategories.php:130
-#: TaxGroups.php:128 TaxGroups.php:135 TaxProvinces.php:125
-#: UnitsOfMeasure.php:140 UnitsOfMeasure.php:147 WorkCentres.php:90
-#: WorkCentres.php:96 WWW_Access.php:84
+#: AccountGroups.php:182
+#: AccountGroups.php:192
+#: AccountSections.php:139
+#: Areas.php:117
+#: Areas.php:126
+#: BankAccounts.php:163
+#: CreditStatus.php:124
+#: Currencies.php:142
+#: Currencies.php:150
+#: Currencies.php:157
+#: CustomerBranches.php:294
+#: CustomerBranches.php:304
+#: CustomerBranches.php:314
+#: CustomerBranches.php:324
+#: Customers.php:291
+#: Customers.php:300
+#: Customers.php:308
+#: Customers.php:316
+#: CustomerTypes.php:151
+#: CustomerTypes.php:161
+#: Factors.php:107
+#: FixedAssetCategories.php:175
+#: FixedAssetItems.php:483
+#: FixedAssetItems.php:492
+#: FixedAssetItems.php:500
+#: FixedAssetItems.php:508
+#: FixedAssetItems.php:516
+#: FixedAssetItems.php:524
+#: GLAccounts.php:91
+#: GLAccounts.php:105
+#: Locations.php:218
+#: Locations.php:226
+#: Locations.php:235
+#: Locations.php:243
+#: Locations.php:251
+#: Locations.php:259
+#: Locations.php:267
+#: Locations.php:275
+#: MRPDemandTypes.php:85
+#: PaymentMethods.php:142
+#: PaymentTerms.php:149
+#: PaymentTerms.php:156
+#: SalesCategories.php:125
+#: SalesCategories.php:133
+#: SalesPeople.php:142
+#: SalesPeople.php:149
+#: SalesTypes.php:145
+#: SalesTypes.php:155
+#: Shippers.php:82
+#: Shippers.php:94
+#: StockCategories.php:153
+#: Stocks.php:467
+#: Stocks.php:476
+#: Stocks.php:484
+#: Stocks.php:492
+#: Stocks.php:500
+#: Stocks.php:508
+#: Suppliers.php:569
+#: Suppliers.php:578
+#: Suppliers.php:586
+#: TaxCategories.php:130
+#: TaxGroups.php:128
+#: TaxGroups.php:135
+#: TaxProvinces.php:125
+#: UnitsOfMeasure.php:140
+#: UnitsOfMeasure.php:147
+#: WorkCentres.php:90
+#: WorkCentres.php:96
+#: WWW_Access.php:84
msgid "There are"
msgstr "存在"
@@ -165,9 +214,7 @@
#: AccountGroups.php:191
#, fuzzy
-msgid ""
-"Cannot delete this account group because it is a parent account group of "
-"other account group(s)"
+msgid "Cannot delete this account group because it is a parent account group of other account group(s)"
msgstr "删除会计科目失败, 原因是：已作为税务科目"
#: AccountGroups.php:192
@@ -197,21 +244,50 @@
msgid "Could not get account groups because"
msgstr "不能取得科目组, 由于"
-#: AccountGroups.php:226 AccountSections.php:177 AddCustomerContacts.php:21
-#: AgedDebtors.php:467 AgedSuppliers.php:276 BOMListing.php:128 BOMs.php:214
-#: BOMs.php:801 DiscountCategories.php:12 DiscountCategories.php:119
-#: DiscountMatrix.php:18 Factors.php:7 FixedAssetJournal.php:335
-#: FixedAssetLocations.php:10 FixedAssetRegister.php:12
-#: FixedAssetTransfer.php:32 GLBalanceSheet.php:349 GLBudgets.php:30
-#: GLJournal.php:237 PO_AuthorisationLevels.php:12
-#: PO_SelectOSPurchOrder.php:141 PurchData.php:133 PurchData.php:218
-#: SelectCompletedOrder.php:13 SelectCustomer.php:331 SelectGLAccount.php:19
-#: SelectGLAccount.php:87 SelectOrderItems.php:607 SelectOrderItems.php:1352
-#: SelectOrderItems.php:1472 SelectProduct.php:55 SelectSalesOrder.php:159
-#: SelectSupplier.php:12 SelectSupplier.php:227 SelectWorkOrder.php:11
-#: SelectWorkOrder.php:154 Suppliers.php:306 TaxGroups.php:16 TopItems.php:57
-#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:158
-#: WorkOrderEntry.php:11 WWW_Users.php:37
+#: AccountGroups.php:226
+#: AccountSections.php:177
+#: AddCustomerContacts.php:21
+#: AgedDebtors.php:467
+#: AgedSuppliers.php:276
+#: BOMListing.php:128
+#: BOMs.php:214
+#: BOMs.php:801
+#: DiscountCategories.php:12
+#: DiscountCategories.php:119
+#: DiscountMatrix.php:18
+#: Factors.php:7
+#: FixedAssetJournal.php:335
+#: FixedAssetLocations.php:10
+#: FixedAssetRegister.php:12
+#: FixedAssetTransfer.php:32
+#: GLBalanceSheet.php:349
+#: GLBudgets.php:30
+#: GLJournal.php:237
+#: PO_AuthorisationLevels.php:12
+#: PO_SelectOSPurchOrder.php:141
+#: PurchData.php:133
+#: PurchData.php:218
+#: SelectCompletedOrder.php:13
+#: SelectCustomer.php:331
+#: SelectGLAccount.php:19
+#: SelectGLAccount.php:87
+#: SelectOrderItems.php:607
+#: SelectOrderItems.php:1352
+#: SelectOrderItems.php:1472
+#: SelectProduct.php:55
+#: SelectSalesOrder.php:159
+#: SelectSupplier.php:12
+#: SelectSupplier.php:227
+#: SelectWorkOrder.php:11
+#: SelectWorkOrder.php:154
+#: Suppliers.php:306
+#: TaxGroups.php:16
+#: TopItems.php:57
+#: WhereUsedInquiry.php:18
+#: WorkCentres.php:111
+#: WorkCentres.php:158
+#: WorkOrderEntry.php:11
+#: WWW_Users.php:37
msgid "Search"
msgstr "查找"
@@ -219,136 +295,345 @@
msgid "Group Name"
msgstr "科目组名称"
-#: AccountGroups.php:231 EDIMessageFormat.php:141
+#: AccountGroups.php:231
+#: EDIMessageFormat.php:141
msgid "Section"
msgstr "会计要素"
-#: AccountGroups.php:232 AccountGroups.php:389
+#: AccountGroups.php:232
+#: AccountGroups.php:389
msgid "Sequence In TB"
msgstr "试算表行次"
-#: AccountGroups.php:233 AccountGroups.php:373 GLProfit_Loss.php:8
-#: GLProfit_Loss.php:104 GLProfit_Loss.php:105 GLProfit_Loss.php:156
-#: SelectGLAccount.php:53 SelectGLAccount.php:67
+#: AccountGroups.php:233
+#: AccountGroups.php:373
+#: GLProfit_Loss.php:8
+#: GLProfit_Loss.php:104
+#: GLProfit_Loss.php:105
+#: GLProfit_Loss.php:156
+#: SelectGLAccount.php:53
+#: SelectGLAccount.php:67
msgid "Profit and Loss"
msgstr "损益类"
-#: AccountGroups.php:234 AccountGroups.php:334
+#: AccountGroups.php:234
+#: AccountGroups.php:334
#, fuzzy
msgid "Parent Group"
msgstr "片断组"
-#: AccountGroups.php:250 AccountGroups.php:253 AccountGroups.php:377
-#: AccountGroups.php:379 BankAccounts.php:217 BankAccounts.php:360
-#: BankAccounts.php:362 BankAccounts.php:366 BOMs.php:128 BOMs.php:712
-#: BOMs.php:714 CompanyPreferences.php:437 CompanyPreferences.php:439
-#: CompanyPreferences.php:449 CompanyPreferences.php:451
-#: CompanyPreferences.php:461 CompanyPreferences.php:463
-#: CustLoginSetup.php:574 CustLoginSetup.php:576 CustomerBranches.php:407
-#: Customers.php:563 Customers.php:804 Customers.php:811 Customers.php:814
-#: DeliveryDetails.php:967 DeliveryDetails.php:1007 DeliveryDetails.php:1010
-#: GLTransInquiry.php:72 Locations.php:342 MRPCalendar.php:218 MRP.php:543
-#: MRP.php:547 MRP.php:551 PaymentMethods.php:198 PaymentMethods.php:199
-#: PaymentMethods.php:258 PaymentMethods.php:264 PDFChequeListing.php:59
-#: PDFDeliveryDifferences.php:60 PDFDIFOT.php:63 PO_AuthorisationLevels.php:95
-#: PO_Header.php:908 PO_PDFPurchOrder.php:356 PO_PDFPurchOrder.php:359
-#: PurchData.php:177 PurchData.php:446 PurchData.php:449
-#: RecurringSalesOrders.php:473 RecurringSalesOrders.php:476
-#: SalesAnalReptCols.php:278 SalesAnalReptCols.php:383
-#: SalesAnalReptCols.php:386 SalesAnalRepts.php:404 SalesAnalRepts.php:407
-#: SalesAnalRepts.php:430 SalesAnalRepts.php:433 SalesAnalRepts.php:456
-#: SalesAnalRepts.php:459 SelectProduct.php:733 ShipmentCosting.php:612
-#: Stocks.php:837 Stocks.php:839 Stocks.php:857 Stocks.php:859
-#: SystemParameters.php:361 SystemParameters.php:437 SystemParameters.php:445
-#: SystemParameters.php:485 SystemParameters.php:558 SystemParameters.php:566
-#: SystemParameters.php:584 SystemParameters.php:591 SystemParameters.php:715
-#: SystemParameters.php:846 SystemParameters.php:848 SystemParameters.php:858
-#: SystemParameters.php:860 SystemParameters.php:914 SystemParameters.php:926
-#: SystemParameters.php:928 TaxGroups.php:291 TaxGroups.php:294
-#: TaxGroups.php:343 WWW_Users.php:592 WWW_Users.php:594
+#: AccountGroups.php:250
+#: AccountGroups.php:253
+#: AccountGroups.php:377
+#: AccountGroups.php:379
+#: BankAccounts.php:217
+#: BankAccounts.php:360
+#: BankAccounts.php:362
+#: BankAccounts.php:366
+#: BOMs.php:128
+#: BOMs.php:712
+#: BOMs.php:714
+#: CompanyPreferences.php:437
+#: CompanyPreferences.php:439
+#: CompanyPreferences.php:449
+#: CompanyPreferences.php:451
+#: CompanyPreferences.php:461
+#: CompanyPreferences.php:463
+#: CustLoginSetup.php:574
+#: CustLoginSetup.php:576
+#: CustomerBranches.php:407
+#: Customers.php:563
+#: Customers.php:804
+#: Customers.php:811
+#: Customers.php:814
+#: DeliveryDetails.php:967
+#: DeliveryDetails.php:1007
+#: DeliveryDetails.php:1010
+#: GLTransInquiry.php:72
+#: Locations.php:342
+#: MRPCalendar.php:218
+#: MRP.php:543
+#: MRP.php:547
+#: MRP.php:551
+#: PaymentMethods.php:198
+#: PaymentMethods.php:199
+#: PaymentMethods.php:258
+#: PaymentMethods.php:264
+#: PDFChequeListing.php:59
+#: PDFDeliveryDifferences.php:60
+#: PDFDIFOT.php:63
+#: PO_AuthorisationLevels.php:95
+#: PO_Header.php:908
+#: PO_PDFPurchOrder.php:356
+#: PO_PDFPurchOrder.php:359
+#: PurchData.php:177
+#: PurchData.php:446
+#: PurchData.php:449
+#: RecurringSalesOrders.php:473
+#: RecurringSalesOrders.php:476
+#: SalesAnalReptCols.php:278
+#: SalesAnalReptCols.php:383
+#: SalesAnalReptCols.php:386
+#: SalesAnalRepts.php:404
+#: SalesAnalRepts.php:407
+#: SalesAnalRepts.php:430
+#: SalesAnalRepts.php:433
+#: SalesAnalRepts.php:456
+#: SalesAnalRepts.php:459
+#: SelectProduct.php:733
+#: ShipmentCosting.php:612
+#: Stocks.php:837
+#: Stocks.php:839
+#: Stocks.php:857
+#: Stocks.php:859
+#: SystemParameters.php:361
+#: SystemParameters.php:437
+#: SystemParameters.php:445
+#: SystemParameters.php:485
+#: SystemParameters.php:558
+#: SystemParameters.php:566
+#: SystemParameters.php:584
+#: SystemParameters.php:591
+#: SystemParameters.php:715
+#: SystemParameters.php:846
+#: SystemParameters.php:848
+#: SystemParameters.php:858
+#: SystemParameters.php:860
+#: SystemParameters.php:914
+#: SystemParameters.php:926
+#: SystemParameters.php:928
+#: TaxGroups.php:291
+#: TaxGroups.php:294
+#: TaxGroups.php:343
+#: WWW_Users.php:592
+#: WWW_Users.php:594
msgid "Yes"
msgstr "是"
-#: AccountGroups.php:256 AccountGroups.php:382 AccountGroups.php:384
-#: BankAccounts.php:215 BankAccounts.php:360 BankAccounts.php:362
-#: BankAccounts.php:366 BOMs.php:130 BOMs.php:711 BOMs.php:715
-#: CompanyPreferences.php:436 CompanyPreferences.php:440
-#: CompanyPreferences.php:448 CompanyPreferences.php:452
-#: CompanyPreferences.php:460 CompanyPreferences.php:464
-#: CustLoginSetup.php:573 CustLoginSetup.php:577 CustomerBranches.php:407
-#: Customers.php:562 Customers.php:802 Customers.php:810 Customers.php:813
-#: DeliveryDetails.php:968 DeliveryDetails.php:1008 DeliveryDetails.php:1011
-#: GLTransInquiry.php:126 Locations.php:344 MRPCalendar.php:220 MRP.php:537
-#: MRP.php:541 MRP.php:545 MRP.php:549 PaymentMethods.php:198
-#: PaymentMethods.php:199 PaymentMethods.php:259 PaymentMethods.php:265
-#: PDFChequeListing.php:58 PDFDeliveryDifferences.php:59 PDFDIFOT.php:62
-#: PO_AuthorisationLevels.php:97 PO_Header.php:908 PO_PDFPurchOrder.php:357
-#: PO_PDFPurchOrder.php:360 PurchData.php:180 PurchData.php:447
-#: PurchData.php:450 RecurringSalesOrders.php:472 RecurringSalesOrders.php:475
-#: SalesAnalReptCols.php:276 SalesAnalReptCols.php:384
-#: SalesAnalReptCols.php:387 SalesAnalRepts.php:403 SalesAnalRepts.php:406
-#: SalesAnalRepts.php:429 SalesAnalRepts.php:432 SalesAnalRepts.php:455
-#: SalesAnalRepts.php:458 SelectProduct.php:736 ShipmentCosting.php:613
-#: Stocks.php:832 Stocks.php:834 Stocks.php:852 Stocks.php:854
-#: SystemParameters.php:362 SystemParameters.php:438 SystemParameters.php:446
-#: SystemParameters.php:486 SystemParameters.php:559 SystemParameters.php:567
-#: SystemParameters.php:585 SystemParameters.php:592 SystemParameters.php:716
-#: SystemParameters.php:845 SystemParameters.php:849 SystemParameters.php:857
-#: SystemParameters.php:861 SystemParameters.php:915 SystemParameters.php:925
-#: SystemParameters.php:929 TaxGroups.php:292 TaxGroups.php:295
-#: TaxGroups.php:345 WWW_Users.php:591 WWW_Users.php:595
-#: includes/PDFLowGPPageHeader.inc:31 includes/PDFTaxPageHeader.inc:35
+#: AccountGroups.php:256
+#: AccountGroups.php:382
+#: AccountGroups.php:384
+#: BankAccounts.php:215
+#: BankAccounts.php:360
+#: BankAccounts.php:362
+#: BankAccounts.php:366
+#: BOMs.php:130
+#: BOMs.php:711
+#: BOMs.php:715
+#: CompanyPreferences.php:436
+#: CompanyPreferences.php:440
+#: CompanyPreferences.php:448
+#: CompanyPreferences.php:452
+#: CompanyPreferences.php:460
+#: CompanyPreferences.php:464
+#: CustLoginSetup.php:573
+#: CustLoginSetup.php:577
+#: CustomerBranches.php:407
+#: Customers.php:562
+#: Customers.php:802
+#: Customers.php:810
+#: Customers.php:813
+#: DeliveryDetails.php:968
+#: DeliveryDetails.php:1008
+#: DeliveryDetails.php:1011
+#: GLTransInquiry.php:126
+#: Locations.php:344
+#: MRPCalendar.php:220
+#: MRP.php:537
+#: MRP.php:541
+#: MRP.php:545
+#: MRP.php:549
+#: PaymentMethods.php:198
+#: PaymentMethods.php:199
+#: PaymentMethods.php:259
+#: PaymentMethods.php:265
+#: PDFChequeListing.php:58
+#: PDFDeliveryDifferences.php:59
+#: PDFDIFOT.php:62
+#: PO_AuthorisationLevels.php:97
+#: PO_Header.php:908
+#: PO_PDFPurchOrder.php:357
+#: PO_PDFPurchOrder.php:360
+#: PurchData.php:180
+#: PurchData.php:447
+#: PurchData.php:450
+#: RecurringSalesOrders.php:472
+#: RecurringSalesOrders.php:475
+#: SalesAnalReptCols.php:276
+#: SalesAnalReptCols.php:384
+#: SalesAnalReptCols.php:387
+#: SalesAnalRepts.php:403
+#: SalesAnalRepts.php:406
+#: SalesAnalRepts.php:429
+#: SalesAnalRepts.php:432
+#: SalesAnalRepts.php:455
+#: SalesAnalRepts.php:458
+#: SelectProduct.php:736
+#: ShipmentCosting.php:613
+#: Stocks.php:832
+#: Stocks.php:834
+#: Stocks.php:852
+#: Stocks.php:854
+#: SystemParameters.php:362
+#: SystemParameters.php:438
+#: SystemParameters.php:446
+#: SystemParameters.php:486
+#: SystemParameters.php:559
+#: SystemParameters.php:567
+#: SystemParameters.php:585
+#: SystemParameters.php:592
+#: SystemParameters.php:716
+#: SystemParameters.php:845
+#: SystemParameters.php:849
+#: SystemParameters.php:857
+#: SystemParameters.php:861
+#: SystemParameters.php:915
+#: SystemParameters.php:925
+#: SystemParameters.php:929
+#: TaxGroups.php:292
+#: TaxGroups.php:295
+#: TaxGroups.php:345
+#: WWW_Users.php:591
+#: WWW_Users.php:595
+#: includes/PDFLowGPPageHeader.inc:31
+#: includes/PDFTaxPageHeader.inc:35
msgid "No"
msgstr "否"
-#: AccountGroups.php:265 AccountSections.php:197 AddCustomerContacts.php:126
-#: AddCustomerNotes.php:125 AddCustomerTypeNotes.php:122 Areas.php:162
-#: BankAccounts.php:226 BOMs.php:150 COGSGLPostings.php:108
-#: COGSGLPostings.php:213 CreditStatus.php:173 Currencies.php:233
-#: CustLoginSetup.php:297 CustomerBranches.php:411 Customers.php:856
-#: Customers.php:888 CustomerTypes.php:206 EDIMessageFormat.php:162
-#: FixedAssetCategories.php:235 FixedAssetLocations.php:81
-#: FreightCosts.php:242 GeocodeSetup.php:166 GLAccounts.php:318 GLTags.php:59
-#: Locations.php:351 MRPDemands.php:309 MRPDemandTypes.php:117
-#: PaymentMethods.php:200 PaymentTerms.php:204 PO_AuthorisationLevels.php:105
-#: Prices_Customer.php:201 Prices.php:179 PurchData.php:189
-#: SalesCategories.php:261 SalesGLPostings.php:133 SalesGLPostings.php:245
-#: SalesPeople.php:201 SalesTypes.php:204 SelectCustomer.php:688
-#: SelectCustomer.php:704 SelectCustomer.php:736 SelectCustomer.php:752
-#: SelectCustomer.php:783 SelectCustomer.php:799 Shippers.php:142
-#: StockCategories.php:215 SupplierContacts.php:153 TaxAuthorities.php:164
-#: TaxCategories.php:181 TaxGroups.php:179 TaxProvinces.php:176
-#: UnitsOfMeasure.php:199 WorkCentres.php:138 WWW_Access.php:124
-#: WWW_Users.php:304 includes/InputSerialItems.php:82
+#: AccountGroups.php:265
+#: AccountSections.php:197
+#: AddCustomerContacts.php:126
+#: AddCustomerNotes.php:125
+#: AddCustomerTypeNotes.php:122
+#: Areas.php:162
+#: BankAccounts.php:226
+#: BOMs.php:150
+#: COGSGLPostings.php:108
+#: COGSGLPostings.php:213
+#: CreditStatus.php:173
+#: Currencies.php:233
+#: CustLoginSetup.php:297
+#: CustomerBranches.php:411
+#: Customers.php:856
+#: Customers.php:888
+#: CustomerTypes.php:206
+#: EDIMessageFormat.php:162
+#: FixedAssetCategories.php:235
+#: FixedAssetLocations.php:81
+#: FreightCosts.php:242
+#: GeocodeSetup.php:166
+#: GLAccounts.php:318
+#: GLTags.php:59
+#: Locations.php:351
+#: MRPDemands.php:309
+#: MRPDemandTypes.php:117
+#: PaymentMethods.php:200
+#: PaymentTerms.php:204
+#: PO_AuthorisationLevels.php:105
+#: Prices_Customer.php:201
+#: Prices.php:179
+#: PurchData.php:189
+#: SalesCategories.php:261
+#: SalesGLPostings.php:133
+#: SalesGLPostings.php:245
+#: SalesPeople.php:201
+#: SalesTypes.php:204
+#: SelectCustomer.php:688
+#: SelectCustomer.php:704
+#: SelectCustomer.php:736
+#: SelectCustomer.php:752
+#: SelectCustomer.php:783
+#: SelectCustomer.php:799
+#: Shippers.php:142
+#: StockCategories.php:215
+#: SupplierContacts.php:153
+#: TaxAuthorities.php:164
+#: TaxCategories.php:181
+#: TaxGroups.php:179
+#: TaxProvinces.php:176
+#: UnitsOfMeasure.php:199
+#: WorkCentres.php:138
+#: WWW_Access.php:124
+#: WWW_Users.php:304
+#: includes/InputSerialItems.php:82
#, php-format
msgid "Edit"
msgstr "编辑"
-#: AccountGroups.php:266 AccountSections.php:201 AddCustomerContacts.php:127
-#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:123 Areas.php:163
-#: BankAccounts.php:227 BOMs.php:152 COGSGLPostings.php:109
-#: COGSGLPostings.php:214 Credit_Invoice.php:372 CreditStatus.php:174
-#: Currencies.php:236 CustLoginSetup.php:298 CustomerReceipt.php:830
-#: Customers.php:889 CustomerTypes.php:207 DiscountCategories.php:201
-#: DiscountMatrix.php:173 EDIMessageFormat.php:163
-#: FixedAssetCategories.php:236 FixedAssetJournal.php:393
-#: FixedAssetLocations.php:83 FreightCosts.php:243 GeocodeSetup.php:167
-#: GLAccounts.php:319 GLJournal.php:394 Locations.php:352 MRPDemands.php:310
-#: MRPDemandTypes.php:118 PaymentMethods.php:201 Payments.php:861
-#: PaymentTerms.php:205 PO_AuthorisationLevels.php:107 PO_Items.php:961
-#: Prices_Customer.php:202 Prices.php:180 PurchData.php:190
-#: SalesAnalReptCols.php:293 SalesAnalRepts.php:303 SalesCategories.php:262
-#: SalesGLPostings.php:134 SalesGLPostings.php:246 SalesPeople.php:202
-#: SalesTypes.php:205 SelectCreditItems.php:762 SelectCustomer.php:689
-#: SelectCustomer.php:705 SelectCustomer.php:737 SelectCustomer.php:753
-#: SelectCustomer.php:784 SelectCustomer.php:800 SelectOrderItems.php:1286
-#: Shipments.php:422 Shippers.php:143 SpecialOrder.php:587
-#: StockCategories.php:216 StockCategories.php:497 SuppCreditGRNs.php:89
-#: SuppInvGLAnalysis.php:65 SuppInvGRNs.php:129 SupplierContacts.php:154
-#: SuppShiptChgs.php:79 SuppTransGLAnalysis.php:107 TaxAuthorities.php:165
-#: TaxCategories.php:182 TaxGroups.php:180 TaxProvinces.php:177
-#: UnitsOfMeasure.php:200 WorkCentres.php:139 WOSerialNos.php:296
-#: WWW_Access.php:125 WWW_Users.php:305 includes/InputSerialItemsKeyed.php:53
+#: AccountGroups.php:266
+#: AccountSections.php:201
+#: AddCustomerContacts.php:127
+#: AddCustomerNotes.php:126
+#: AddCustomerTypeNotes.php:123
+#: Areas.php:163
+#: BankAccounts.php:227
+#: BOMs.php:152
+#: COGSGLPostings.php:109
+#: COGSGLPostings.php:214
+#: Credit_Invoice.php:372
+#: CreditStatus.php:174
+#: Currencies.php:236
+#: CustLoginSetup.php:298
+#: CustomerReceipt.php:830
+#: Customers.php:889
+#: CustomerTypes.php:207
+#: DiscountCategories.php:201
+#: DiscountMatrix.php:173
+#: EDIMessageFormat.php:163
+#: FixedAssetCategories.php:236
+#: FixedAssetJournal.php:393
+#: FixedAssetLocations.php:83
+#: FreightCosts.php:243
+#: GeocodeSetup.php:167
+#: GLAccounts.php:319
+#: GLJournal.php:394
+#: Locations.php:352
+#: MRPDemands.php:310
+#: MRPDemandTypes.php:118
+#: PaymentMethods.php:201
+#: Payments.php:861
+#: PaymentTerms.php:205
+#: PO_AuthorisationLevels.php:107
+#: PO_Items.php:961
+#: Prices_Customer.php:202
+#: Prices.php:180
+#: PurchData.php:190
+#: SalesAnalReptCols.php:293
+#: SalesAnalRepts.php:303
+#: SalesCategories.php:262
+#: SalesGLPostings.php:134
+#: SalesGLPostings.php:246
+#: SalesPeople.php:202
+#: SalesTypes.php:205
+#: SelectCreditItems.php:762
+#: SelectCustomer.php:689
+#: SelectCustomer.php:705
+#: SelectCustomer.php:737
+#: SelectCustomer.php:753
+#: SelectCustomer.php:784
+#: SelectCustomer.php:800
+#: SelectOrderItems.php:1286
+#: Shipments.php:422
+#: Shippers.php:143
+#: SpecialOrder.php:587
+#: StockCategories.php:216
+#: StockCategories.php:497
+#: SuppCreditGRNs.php:89
+#: SuppInvGLAnalysis.php:65
+#: SuppInvGRNs.php:129
+#: SupplierContacts.php:154
+#: SuppShiptChgs.php:79
+#: SuppTransGLAnalysis.php:107
+#: TaxAuthorities.php:165
+#: TaxCategories.php:182
+#: TaxGroups.php:180
+#: TaxProvinces.php:177
+#: UnitsOfMeasure.php:200
+#: WorkCentres.php:139
+#: WOSerialNos.php:296
+#: WWW_Access.php:125
+#: WWW_Users.php:305
+#: includes/InputSerialItemsKeyed.php:53
#, php-format
msgid "Delete"
msgstr "删除"
@@ -364,12 +649,12 @@
#: AccountGroups.php:293
#, fuzzy
-msgid ""
-"The SQL that was used to retrieve the account group and that failed in the "
-"process was"
+msgid "The SQL that was used to retrieve the account group and that failed in the process was"
msgstr "用于查询BOM组件失败的SQL是"
-#: AccountGroups.php:307 GLAccounts.php:245 GLAccounts.php:298
+#: AccountGroups.php:307
+#: GLAccounts.php:245
+#: GLAccounts.php:298
#: Z_ImportGLAccountGroups.php:28
msgid "Account Group"
msgstr "科目组"
@@ -379,7 +664,8 @@
msgid "Account Group Name"
msgstr "科目组名称"
-#: AccountGroups.php:341 AccountGroups.php:343
+#: AccountGroups.php:341
+#: AccountGroups.php:343
msgid "Top Level Group"
msgstr ""
@@ -387,24 +673,50 @@
msgid "Section In Accounts"
msgstr "会计要素"
-#: AccountGroups.php:396 AccountSections.php:263 AddCustomerContacts.php:202
-#: AddCustomerNotes.php:201 AddCustomerTypeNotes.php:184 Areas.php:218
-#: BankAccounts.php:372 BOMs.php:724 COGSGLPostings.php:342
-#: CreditStatus.php:244 Currencies.php:332 CustLoginSetup.php:595
-#: DiscountMatrix.php:136 EDIMessageFormat.php:254
-#: FixedAssetCategories.php:459 FixedAssetLocations.php:127
-#: FreightCosts.php:338 GeocodeSetup.php:262 GLAccounts.php:268
-#: Locations.php:517 MRPDemands.php:425 MRPDemandTypes.php:176
-#: PaymentMethods.php:270 PaymentTerms.php:278 PO_AuthorisationLevels.php:166
-#: Prices_Customer.php:244 SalesAnalReptCols.php:465 SalesAnalRepts.php:494
-#: SalesGLPostings.php:412 SalesPeople.php:292 Shippers.php:195
-#: StockCategories.php:516 SupplierContacts.php:249 TaxAuthorities.php:302
-#: TaxCategories.php:231 TaxProvinces.php:226 UnitsOfMeasure.php:250
-#: WorkCentres.php:260 WWW_Users.php:625
+#: AccountGroups.php:396
+#: AccountSections.php:263
+#: AddCustomerContacts.php:202
+#: AddCustomerNotes.php:201
+#: AddCustomerTypeNotes.php:184
+#: Areas.php:218
+#: BankAccounts.php:372
+#: BOMs.php:724
+#: COGSGLPostings.php:342
+#: CreditStatus.php:244
+#: Currencies.php:332
+#: CustLoginSetup.php:595
+#: DiscountMatrix.php:136
+#: EDIMessageFormat.php:254
+#: FixedAssetCategories.php:459
+#: FixedAssetLocations.php:127
+#: FreightCosts.php:338
+#: GeocodeSetup.php:262
+#: GLAccounts.php:268
+#: Locations.php:517
+#: MRPDemands.php:425
+#: MRPDemandTypes.php:176
+#: PaymentMethods.php:270
+#: PaymentTerms.php:278
+#: PO_AuthorisationLevels.php:166
+#: Prices_Customer.php:244
+#: SalesAnalReptCols.php:465
+#: SalesAnalRepts.php:494
+#: SalesGLPostings.php:412
+#: SalesPeople.php:292
+#: Shippers.php:195
+#: StockCategories.php:516
+#: SupplierContacts.php:249
+#: TaxAuthorities.php:302
+#: TaxCategories.php:231
+#: TaxProvinces.php:226
+#: UnitsOfMeasure.php:250
+#: WorkCentres.php:260
+#: WWW_Users.php:625
msgid "Enter Information"
msgstr "保存"
-#: AccountSections.php:9 index.php:1161
+#: AccountSections.php:9
+#: index.php:1161
msgid "Account Sections"
msgstr "会计要素"
@@ -422,14 +734,13 @@
msgid "The account section name must contain at least one character"
msgstr "会计要素不能包含这个字符"
-#: AccountSections.php:87 AccountSections.php:93
+#: AccountSections.php:87
+#: AccountSections.php:93
msgid "The section number must be an integer"
msgstr "会计要素编号必须是整数"
#: AccountSections.php:138
-msgid ""
-"Cannot delete this account section because general ledger accounts groups "
-"have been created using this section"
+msgid "Cannot delete this account section because general ledger accounts groups have been created using this section"
msgstr "此会计要素已被科目组使用，不能删除"
#: AccountSections.php:139
@@ -444,11 +755,14 @@
msgid "Could not get account group sections because"
msgstr "找不到会计要素，原因是："
-#: AccountSections.php:181 AccountSections.php:239 AccountSections.php:256
+#: AccountSections.php:181
+#: AccountSections.php:239
+#: AccountSections.php:256
msgid "Section Number"
msgstr "会计要素编号"
-#: AccountSections.php:182 AccountSections.php:259
+#: AccountSections.php:182
+#: AccountSections.php:259
msgid "Section Description"
msgstr "会计要素名称"
@@ -464,13 +778,17 @@
msgid "Could not retrieve the requested section please try again."
msgstr "找不到会计要素, 请重试"
-#: AddCustomerContacts.php:6 AddCustomerContacts.php:50 SelectCustomer.php:681
+#: AddCustomerContacts.php:6
+#: AddCustomerContacts.php:50
+#: SelectCustomer.php:681
#: SelectCustomer.php:721
#, fuzzy
msgid "Customer Contacts"
msgstr "客户报价单"
-#: AddCustomerContacts.php:20 CustEDISetup.php:11 CustLoginSetup.php:21
+#: AddCustomerContacts.php:20
+#: CustEDISetup.php:11
+#: CustLoginSetup.php:21
#: Z_CheckDebtorsControl.php:20
msgid "Back to Customers"
msgstr "返回客户"
@@ -490,11 +808,20 @@
msgid "The contact's name may not be empty"
msgstr "税类名称不能留空"
-#: AddCustomerContacts.php:50 AddCustomerNotes.php:49
-#: AddCustomerTypeNotes.php:49 Areas.php:74 CustomerTypes.php:68
-#: DeliveryDetails.php:673 Factors.php:47 FixedAssetItems.php:351
-#: PO_Items.php:391 SalesAnalReptCols.php:128 SalesPeople.php:92
-#: SalesTypes.php:61 Stocks.php:353 Suppliers.php:482
+#: AddCustomerContacts.php:50
+#: AddCustomerNotes.php:49
+#: AddCustomerTypeNotes.php:49
+#: Areas.php:74
+#: CustomerTypes.php:68
+#: DeliveryDetails.php:673
+#: Factors.php:47
+#: FixedAssetItems.php:351
+#: PO_Items.php:391
+#: SalesAnalReptCols.php:128
+#: SalesPeople.php:92
+#: SalesTypes.php:61
+#: Stocks.php:353
+#: Suppliers.php:482
msgid "has been updated"
msgstr "已更新"
@@ -513,31 +840,54 @@
msgid "Contacts for Customer: <b>"
msgstr "和于客户"
-#: AddCustomerContacts.php:107 CompanyPreferences.php:227
-#: CustomerBranches.php:374 Customers.php:846 Customers.php:852
-#: Customers.php:917 SalesPeople.php:183 SelectCustomer.php:684
-#: StockDispatch.php:181 StockDispatch.php:193 SuppInvGLAnalysis.php:49
-#: SuppInvGLAnalysis.php:73 SupplierContacts.php:141 SupplierCredit.php:304
-#: SupplierInvoice.php:308 SuppTransGLAnalysis.php:91
-#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
+#: AddCustomerContacts.php:107
+#: CompanyPreferences.php:227
+#: CustomerBranches.php:374
+#: Customers.php:846
+#: Customers.php:852
+#: Customers.php:917
+#: SalesPeople.php:183
+#: SelectCustomer.php:684
+#: StockDispatch.php:181
+#: StockDispatch.php:193
+#: SuppInvGLAnalysis.php:49
+#: SuppInvGLAnalysis.php:73
+#: SupplierContacts.php:141
+#: SupplierCredit.php:304
+#: SupplierInvoice.php:308
+#: SuppTransGLAnalysis.php:91
+#: includes/InputSerialItemsFile.php:84
+#: includes/InputSerialItemsFile.php:124
#: includes/PDFTaxPageHeader.inc:37
msgid "Name"
msgstr "名称"
-#: AddCustomerContacts.php:108 AddCustomerContacts.php:184 Customers.php:847
-#: Customers.php:853 Customers.php:918 SelectCustomer.php:685
-#: WWW_Access.php:108 WWW_Access.php:168
+#: AddCustomerContacts.php:108
+#: AddCustomerContacts.php:184
+#: Customers.php:847
+#: Customers.php:853
+#: Customers.php:918
+#: SelectCustomer.php:685
+#: WWW_Access.php:108
+#: WWW_Access.php:168
msgid "Role"
msgstr "职位"
-#: AddCustomerContacts.php:109 Customers.php:919
+#: AddCustomerContacts.php:109
+#: Customers.php:919
#, fuzzy
msgid "Phone no"
msgstr "电话"
-#: AddCustomerContacts.php:110 AddCustomerContacts.php:196 Customers.php:849
-#: Customers.php:855 Customers.php:920 SelectCustomer.php:687
-#: SystemParameters.php:301 WOSerialNos.php:273 WOSerialNos.php:275
+#: AddCustomerContacts.php:110
+#: AddCustomerContacts.php:196
+#: Customers.php:849
+#: Customers.php:855
+#: Customers.php:920
+#: SelectCustomer.php:687
+#: SystemParameters.php:301
+#: WOSerialNos.php:273
+#: WOSerialNos.php:275
msgid "Notes"
msgstr "备注"
@@ -550,26 +900,36 @@
msgid "Contact Code"
msgstr "物料组编号"
-#: AddCustomerContacts.php:178 Factors.php:180 Factors.php:195
+#: AddCustomerContacts.php:178
+#: Factors.php:180
+#: Factors.php:195
#: SupplierContacts.php:217
msgid "Contact Name"
msgstr "联系人名称"
-#: AddCustomerContacts.php:190 PDFRemittanceAdvice.php:248 PO_Header.php:1113
-#: PO_Header.php:1188 SelectCreditItems.php:234 SelectCustomer.php:504
-#: SelectOrderItems.php:637 includes/PDFStatementPageHeader.inc:63
+#: AddCustomerContacts.php:190
+#: PDFRemittanceAdvice.php:248
+#: PO_Header.php:1113
+#: PO_Header.php:1188
+#: SelectCreditItems.php:234
+#: SelectCustomer.php:504
+#: SelectOrderItems.php:637
+#: includes/PDFStatementPageHeader.inc:63
#: includes/PDFTransPageHeader.inc:82
#: includes/PDFTransPageHeaderPortrait.inc:105
msgid "Phone"
msgstr "电话"
-#: AddCustomerNotes.php:6 AddCustomerNotes.php:49 SelectCustomer.php:729
+#: AddCustomerNotes.php:6
+#: AddCustomerNotes.php:49
+#: SelectCustomer.php:729
#: SelectCustomer.php:768
#, fuzzy
msgid "Customer Notes"
msgstr "客户编号"
-#: AddCustomerNotes.php:20 AddCustomerTypeNotes.php:20
+#: AddCustomerNotes.php:20
+#: AddCustomerTypeNotes.php:20
#, fuzzy
msgid "Back to Select Customer"
msgstr "返回客户"
@@ -579,12 +939,14 @@
msgid "The contact priority must be an integer."
msgstr "科目编号必须是整数"
-#: AddCustomerNotes.php:34 AddCustomerTypeNotes.php:34
+#: AddCustomerNotes.php:34
+#: AddCustomerTypeNotes.php:34
#, fuzzy
msgid "The contact's notes must be two hundred characters or less long"
msgstr "科目名称必须不多于50个字符"
-#: AddCustomerNotes.php:37 AddCustomerTypeNotes.php:37
+#: AddCustomerNotes.php:37
+#: AddCustomerTypeNotes.php:37
#, fuzzy
msgid "The contact's notes may not be empty"
msgstr "税类名称不能留空"
@@ -604,39 +966,66 @@
msgid "Notes for Customer: <b>"
msgstr "和于客户"
-#: AddCustomerNotes.php:106 AddCustomerNotes.php:188
-#: AddCustomerTypeNotes.php:103 AddCustomerTypeNotes.php:178
-#: BankMatching.php:214 BankReconciliation.php:182 BankReconciliation.php:254
-#: CustomerAllocations.php:348 CustomerAllocations.php:374
-#: CustomerInquiry.php:190 CustomerTransInquiry.php:86
-#: GLAccountInquiry.php:157 GLTransInquiry.php:47 MRPCalendar.php:213
-#: PaymentAllocations.php:77 PDFRemittanceAdvice.php:309
-#: PrintCustTrans.php:846 PrintCustTransPortrait.php:910 ReverseGRN.php:329
-#: ShipmentCosting.php:494 ShipmentCosting.php:565 Shipments.php:463
-#: StockDispatch.php:183 StockDispatch.php:195 StockLocMovements.php:80
-#: StockMovements.php:98 StockSerialItemResearch.php:74
-#: SupplierAllocations.php:465 SupplierAllocations.php:577
-#: SupplierAllocations.php:647 SupplierInquiry.php:192
-#: SupplierTransInquiry.php:87 includes/PDFQuotationPageHeader.inc:91
-#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
+#: AddCustomerNotes.php:106
+#: AddCustomerNotes.php:188
+#: AddCustomerTypeNotes.php:103
+#: AddCustomerTypeNotes.php:178
+#: BankMatching.php:214
+#: BankReconciliation.php:182
+#: BankReconciliation.php:254
+#: CustomerAllocations.php:348
+#: CustomerAllocations.php:374
+#: CustomerInquiry.php:190
+#: CustomerTransInquiry.php:86
+#: GLAccountInquiry.php:157
+#: GLTransInquiry.php:47
+#: MRPCalendar.php:213
+#: PaymentAllocations.php:77
+#: PDFRemittanceAdvice.php:309
+#: PrintCustTrans.php:846
+#: PrintCustTransPortrait.php:910
+#: ReverseGRN.php:329
+#: ShipmentCosting.php:494
+#: ShipmentCosting.php:565
+#: Shipments.php:463
+#: StockDispatch.php:183
+#: StockDispatch.php:195
+#: StockLocMovements.php:80
+#: StockMovements.php:98
+#: StockSerialItemResearch.php:74
+#: SupplierAllocations.php:465
+#: SupplierAllocations.php:577
+#: SupplierAllocations.php:647
+#: SupplierInquiry.php:192
+#: SupplierTransInquiry.php:87
+#: includes/PDFQuotationPageHeader.inc:91
+#: includes/PDFStatementPageHeader.inc:169
+#: includes/PDFTaxPageHeader.inc:36
#: includes/PDFTransPageHeader.inc:49
#: includes/PDFTransPageHeaderPortrait.inc:58
msgid "Date"
msgstr "日期"
-#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:104 Stocks.php:841
-#: Z_Upgrade_3.10-3.11.php:61 Z_Upgrade_3.10-3.11.php:65
-#: Z_Upgrade_3.10-3.11.php:69 Z_Upgrade_3.10-3.11.php:73
+#: AddCustomerNotes.php:107
+#: AddCustomerTypeNotes.php:104
+#: Stocks.php:841
+#: Z_Upgrade_3.10-3.11.php:61
+#: Z_Upgrade_3.10-3.11.php:65
+#: Z_Upgrade_3.10-3.11.php:69
+#: Z_Upgrade_3.10-3.11.php:73
#: Z_Upgrade_3.10-3.11.php:77
msgid "Note"
msgstr "备注"
-#: AddCustomerNotes.php:108 AddCustomerNotes.php:182
+#: AddCustomerNotes.php:108
+#: AddCustomerNotes.php:182
msgid "WWW"
msgstr ""
-#: AddCustomerNotes.php:109 AddCustomerNotes.php:194
-#: AddCustomerTypeNotes.php:106 AddCustomerTypeNotes.php:181
+#: AddCustomerNotes.php:109
+#: AddCustomerNotes.php:194
+#: AddCustomerTypeNotes.php:106
+#: AddCustomerTypeNotes.php:181
#, fuzzy
msgid "Priority"
msgstr "利润"
@@ -646,7 +1035,8 @@
msgid "Review all notes for this Customer"
msgstr "张此客户分公司/客户的销售订单"
-#: AddCustomerNotes.php:171 AddCustomerTypeNotes.php:169
+#: AddCustomerNotes.php:171
+#: AddCustomerTypeNotes.php:169
#, fuzzy
msgid "Note ID"
msgstr "备注"
@@ -656,7 +1046,8 @@
msgid "Contact Note"
msgstr "物料组编号"
-#: AddCustomerTypeNotes.php:6 SelectCustomer.php:776
+#: AddCustomerTypeNotes.php:6
+#: SelectCustomer.php:776
#, fuzzy
msgid "Customer Type (Group) Notes"
msgstr "客户已更新"
@@ -666,7 +1057,8 @@
msgid "The Contact priority must be an integer."
msgstr "科目编号必须是整数"
-#: AddCustomerTypeNotes.php:49 SelectCustomer.php:816
+#: AddCustomerTypeNotes.php:49
+#: SelectCustomer.php:816
#, fuzzy
msgid "Customer Group Notes"
msgstr "客户已更新"
@@ -686,7 +1078,8 @@
msgid "Notes for Customer Type: <b>"
msgstr "和于客户"
-#: AddCustomerTypeNotes.php:105 AddCustomerTypeNotes.php:176
+#: AddCustomerTypeNotes.php:105
+#: AddCustomerTypeNotes.php:176
#, fuzzy
msgid "href"
msgstr "首选"
@@ -709,77 +1102,179 @@
msgid "Aged Customer Balances"
msgstr "欠款余额"
-#: AgedDebtors.php:267 AgedDebtors.php:365 AgedDebtors.php:436
+#: AgedDebtors.php:267
+#: AgedDebtors.php:365
+#: AgedDebtors.php:436
msgid "Aged Customer Account Analysis"
msgstr "客户欠款分析"
-#: AgedDebtors.php:267 AgedDebtors.php:365 AgedDebtors.php:436
-#: AgedSuppliers.php:105 BOMExtendedQty.php:156 BOMIndented.php:149
-#: BOMIndentedReverse.php:148 BOMListing.php:48 BOMListing.php:59
-#: DebtorsAtPeriodEnd.php:58 DebtorsAtPeriodEnd.php:70 GLBalanceSheet.php:88
-#: GLBalanceSheet.php:126 GLProfit_Loss.php:156 GLTagProfit_Loss.php:167
-#: GLTrialBalance.php:140 InventoryPlanning.php:97 InventoryPlanning.php:172
-#: InventoryPlanning.php:207 InventoryPlanning.php:250
-#: InventoryPlanning.php:284 InventoryPlanningPrefSupplier.php:208
-#: InventoryPlanningPrefSupplier.php:276 InventoryPlanningPrefSupplier.php:310
-#: InventoryPlanningPrefSupplier.php:353 InventoryPlanningPrefSupplier.php:387
-#: InventoryQuantities.php:81 InventoryValuation.php:76
-#: MailInventoryValuation.php:115 MRPPlannedPurchaseOrders.php:100
-#: MRPPlannedWorkOrders.php:103 MRPReport.php:133 MRPReschedules.php:35
-#: MRPReschedules.php:47 MRPShortages.php:112 MRPShortages.php:124
-#: OutstandingGRNs.php:51 OutstandingGRNs.php:63 PDFCustomerList.php:20
-#: PDFCustomerList.php:232 PDFCustomerList.php:244 PDFLowGP.php:23
-#: PDFStockCheckComparison.php:35 PDFStockCheckComparison.php:61
-#: PDFStockCheckComparison.php:262 ReorderLevel.php:57 SelectProduct.php:48
-#: StockCheck.php:63 StockCheck.php:135 SuppPriceList.php:118
+#: AgedDebtors.php:267
+#: AgedDebtors.php:365
+#: AgedDebtors.php:436
+#: AgedSuppliers.php:105
+#: BOMExtendedQty.php:156
+#: BOMIndented.php:149
+#: BOMIndentedReverse.php:148
+#: BOMListing.php:48
+#: BOMListing.php:59
+#: DebtorsAtPeriodEnd.php:58
+#: DebtorsAtPeriodEnd.php:70
+#: GLBalanceSheet.php:88
+#: GLBalanceSheet.php:126
+#: GLProfit_Loss.php:156
+#: GLTagProfit_Loss.php:167
+#: GLTrialBalance.php:140
+#: InventoryPlanning.php:97
+#: InventoryPlanning.php:172
+#: InventoryPlanning.php:207
+#: InventoryPlanning.php:250
+#: InventoryPlanning.php:284
+#: InventoryPlanningPrefSupplier.php:208
+#: InventoryPlanningPrefSupplier.php:276
+#: InventoryPlanningPrefSupplier.php:310
+#: InventoryPlanningPrefSupplier.php:353
+#: InventoryPlanningPrefSupplier.php:387
+#: InventoryQuantities.php:81
+#: InventoryValuation.php:76
+#: MailInventoryValuation.php:115
+#: MRPPlannedPurchaseOrders.php:100
+#: MRPPlannedWorkOrders.php:103
+#: MRPReport.php:133
+#: MRPReschedules.php:35
+#: MRPReschedules.php:47
+#: MRPShortages.php:112
+#: MRPShortages.php:124
+#: OutstandingGRNs.php:51
+#: OutstandingGRNs.php:63
+#: PDFCustomerList.php:20
+#: PDFCustomerList.php:232
+#: PDFCustomerList.php:244
+#: PDFLowGP.php:23
+#: PDFStockCheckComparison.php:35
+#: PDFStockCheckComparison.php:61
+#: PDFStockCheckComparison.php:262
+#: ReorderLevel.php:57
+#: SelectProduct.php:48
+#: StockCheck.php:63
+#: StockCheck.php:135
+#: SuppPriceList.php:118
#: includes/PDFPaymentRun_PymtFooter.php:146
msgid "Problem Report"
msgstr "问题报告"
-#: AgedDebtors.php:269 CustomerInquiry.php:87 CustomerInquiry.php:108
+#: AgedDebtors.php:269
+#: CustomerInquiry.php:87
+#: CustomerInquiry.php:108
#: DebtorsAtPeriodEnd.php:60
msgid "The customer details could not be retrieved by the SQL because"
msgstr "客户明细资料无法从SQL取得, 因为"
-#: AgedDebtors.php:270 AgedDebtors.php:368 AgedDebtors.php:442
-#: AgedSuppliers.php:108 AgedSuppliers.php:190 BOMExtendedQty.php:159
-#: BOMExtendedQty.php:263 BOMIndented.php:152 BOMIndented.php:238
-#: BOMIndentedReverse.php:151 BOMIndentedReverse.php:235 BOMListing.php:51
-#: Credit_Invoice.php:186 DebtorsAtPeriodEnd.php:61 DebtorsAtPeriodEnd.php:73
-#: FTP_RadioBeacon.php:188 GetStockImage.php:154 GLBalanceSheet.php:91
-#: GLBalanceSheet.php:129 GLBalanceSheet.php:292 GLProfit_Loss.php:159
-#: GLProfit_Loss.php:171 GLTagProfit_Loss.php:170 GLTagProfit_Loss.php:182
-#: GLTrialBalance.php:143 GLTrialBalance.php:155 InventoryPlanning.php:100
-#: InventoryPlanning.php:175 InventoryPlanning.php:210
-#: InventoryPlanning.php:253 InventoryPlanning.php:287
-#: InventoryPlanning.php:350 InventoryPlanningPrefSupplier.php:211
-#: InventoryPlanningPrefSupplier.php:279 InventoryPlanningPrefSupplier.php:313
-#: InventoryPlanningPrefSupplier.php:356 InventoryPlanningPrefSupplier.php:390
-#: InventoryPlanningPrefSupplier.php:446 InventoryQuantities.php:84
-#: InventoryQuantities.php:95 InventoryValuation.php:79
-#: InventoryValuation.php:90 MailInventoryValuation.php:118
-#: MailInventoryValuation.php:214 MRPPlannedPurchaseOrders.php:103
-#: MRPPlannedPurchaseOrders.php:114 MRPPlannedWorkOrders.php:106
-#: MRPPlannedWorkOrders.php:117 MRPReport.php:36 MRPReport.php:47
-#: MRPReport.php:136 MRPReschedules.php:38 MRPReschedules.php:50
-#: MRPShortages.php:115 MRPShortages.php:127 OutstandingGRNs.php:54
-#: OutstandingGRNs.php:66 PDFCustomerList.php:235 PDFCustomerList.php:247
-#: PDFGrn.php:63 PDFLowGP.php:62 PDFLowGP.php:74 PDFPriceList.php:106
-#: PDFPriceList.php:189 PDFQuotation.php:235 PDFRemittanceAdvice.php:76
-#: PDFStockCheckComparison.php:39 PDFStockCheckComparison.php:65
-#: PDFStockCheckComparison.php:266 PDFTopItems.php:161 PO_PDFPurchOrder.php:27
-#: PO_PDFPurchOrder.php:135 PrintCustOrder_generic.php:182
-#: PrintCustOrder.php:198 PrintSalesOrder_generic.php:183 ReorderLevel.php:60
-#: ReorderLevel.php:149 SalesAnalysis_UserDefined.php:37
-#: SelectCreditItems.php:25 StockCheck.php:45 StockCheck.php:66
-#: StockCheck.php:95 StockCheck.php:138 StockCheck.php:149 StockCheck.php:190
-#: StockDispatch.php:89 StockDispatch.php:100 SupplierBalsAtPeriodEnd.php:57
-#: SupplierBalsAtPeriodEnd.php:68 SuppPaymentRun.php:109
-#: SuppPaymentRun.php:120 SuppPaymentRun.php:184 SuppPaymentRun.php:214
-#: SuppPriceList.php:121 Tax.php:64 Tax.php:177 Tax.php:286
-#: Z_DataExport.php:73 Z_DataExport.php:169 Z_DataExport.php:260
-#: Z_DataExport.php:309 Z_DataExport.php:348 Z_DataExport.php:384
-#: Z_DataExport.php:420 Z_DataExport.php:474 Z_poRebuildDefault.php:37
+#: AgedDebtors.php:270
+#: AgedDebtors.php:368
+#: AgedDebtors.php:442
+#: AgedSuppliers.php:108
+#: AgedSuppliers.php:190
+#: BOMExtendedQty.php:159
+#: BOMExtendedQty.php:263
+#: BOMIndented.php:152
+#: BOMIndented.php:238
+#: BOMIndentedReverse.php:151
+#: BOMIndentedReverse.php:235
+#: BOMListing.php:51
+#: Credit_Invoice.php:186
+#: DebtorsAtPeriodEnd.php:61
+#: DebtorsAtPeriodEnd.php:73
+#: FTP_RadioBeacon.php:188
+#: GetStockImage.php:154
+#: GLBalanceSheet.php:91
+#: GLBalanceSheet.php:129
+#: GLBalanceSheet.php:292
+#: GLProfit_Loss.php:159
+#: GLProfit_Loss.php:171
+#: GLTagProfit_Loss.php:170
+#: GLTagProfit_Loss.php:182
+#: GLTrialBalance.php:143
+#: GLTrialBalance.php:155
+#: InventoryPlanning.php:100
+#: InventoryPlanning.php:175
+#: InventoryPlanning.php:210
+#: InventoryPlanning.php:253
+#: InventoryPlanning.php:287
+#: InventoryPlanning.php:350
+#: InventoryPlanningPrefSupplier.php:211
+#: InventoryPlanningPrefSupplier.php:279
+#: InventoryPlanningPrefSupplier.php:313
+#: InventoryPlanningPrefSupplier.php:356
+#: InventoryPlanningPrefSupplier.php:390
+#: InventoryPlanningPrefSupplier.php:446
+#: InventoryQuantities.php:84
+#: InventoryQuantities.php:95
+#: InventoryValuation.php:79
+#: InventoryValuation.php:90
+#: MailInventoryValuation.php:118
+#: MailInventoryValuation.php:214
+#: MRPPlannedPurchaseOrders.php:103
+#: MRPPlannedPurchaseOrders.php:114
+#: MRPPlannedWorkOrders.php:106
+#: MRPPlannedWorkOrders.php:117
+#: MRPReport.php:36
+#: MRPReport.php:47
+#: MRPReport.php:136
+#: MRPReschedules.php:38
+#: MRPReschedules.php:50
+#: MRPShortages.php:115
+#: MRPShortages.php:127
+#: OutstandingGRNs.php:54
+#: OutstandingGRNs.php:66
+#: PDFCustomerList.php:235
+#: PDFCustomerList.php:247
+#: PDFGrn.php:63
+#: PDFLowGP.php:62
+#: PDFLowGP.php:74
+#: PDFPriceList.php:106
+#: PDFPriceList.php:189
+#: PDFQuotation.php:235
+#: PDFRemittanceAdvice.php:76
+#: PDFStockCheckComparison.php:39
+#: PDFStockCheckComparison.php:65
+#: PDFStockCheckComparison.php:266
+#: PDFTopItems.php:161
+#: PO_PDFPurchOrder.php:27
+#: PO_PDFPurchOrder.php:135
+#: PrintCustOrder_generic.php:182
+#: PrintCustOrder.php:198
+#: PrintSalesOrder_generic.php:183
+#: ReorderLevel.php:60
+#: ReorderLevel.php:149
+#: SalesAnalysis_UserDefined.php:37
+#: SelectCreditItems.php:25
+#: StockCheck.php:45
+#: StockCheck.php:66
+#: StockCheck.php:95
+#: StockCheck.php:138
+#: StockCheck.php:149
+#: StockCheck.php:190
+#: StockDispatch.php:89
+#: StockDispatch.php:100
+#: SupplierBalsAtPeriodEnd.php:57
+#: SupplierBalsAtPeriodEnd.php:68
+#: SuppPaymentRun.php:109
+#: SuppPaymentRun.php:120
+#: SuppPaymentRun.php:184
+#: SuppPaymentRun.php:214
+#: SuppPriceList.php:121
+#: Tax.php:64
+#: Tax.php:177
+#: Tax.php:286
+#: Z_DataExport.php:73
+#: Z_DataExport.php:169
+#: Z_DataExport.php:260
+#: Z_DataExport.php:309
+#: Z_DataExport.php:348
+#: Z_DataExport.php:384
+#: Z_DataExport.php:420
+#: Z_DataExport.php:474
+#: Z_poRebuildDefault.php:37
#: includes/PDFPaymentRun_PymtFooter.php:55
#: includes/PDFPaymentRun_PymtFooter.php:84
#: includes/PDFPaymentRun_PymtFooter.php:113
@@ -796,36 +1291,77 @@
msgid "The details of outstanding transactions for customer"
msgstr "该用户未清算的交易明细"
-#: AgedDebtors.php:367 AgedSuppliers.php:189 GLAccountInquiry.php:149
-#: PO_Items.php:546 PO_Items.php:576 PO_Items.php:656 PO_Items.php:794
-#: SalesAnalReptCols.php:349 SpecialOrder.php:368
-#: StockLocTransferReceive.php:370 StockQuantityByDate.php:102
+#: AgedDebtors.php:367
+#: AgedSuppliers.php:189
+#: GLAccountInquiry.php:149
+#: PO_Items.php:546
+#: PO_Items.php:576
+#: PO_Items.php:656
+#: PO_Items.php:794
+#: SalesAnalReptCols.php:349
+#: SpecialOrder.php:368
+#: StockLocTransferReceive.php:370
+#: StockQuantityByDate.php:102
#: includes/SelectOrderItems_IntoCart.inc:52
msgid "could not be retrieved because"
msgstr "不能取得, 因为"
-#: AgedDebtors.php:370 AgedSuppliers.php:192 Areas.php:96
-#: ConfirmDispatch_Invoice.php:154 ConfirmDispatch_Invoice.php:914
-#: ConfirmDispatch_Invoice.php:928 Credit_Invoice.php:686
-#: Credit_Invoice.php:708 CustomerReceipt.php:491 CustomerReceipt.php:632
-#: CustomerReceipt.php:660 CustomerTransInquiry.php:78 DeliveryDetails.php:397
-#: GLProfit_Loss.php:539 GLTagProfit_Loss.php:480 Payments.php:294
-#: PDFRemittanceAdvice.php:78 PurchData.php:83 PurchData.php:101
-#: PurchData.php:206 ReverseGRN.php:142 ReverseGRN.php:156 ReverseGRN.php:317
-#: SelectCreditItems.php:1393 StockCheck.php:220 StockCostUpdate.php:78
-#: StockCostUpdate.php:88 StockLocStatus.php:144 StockMovements.php:91
-#: StockQuantityByDate.php:78 StockReorderLevel.php:39 StockStatus.php:262
-#: StockTransfers.php:153 StockUsageGraph.php:53 StockUsage.php:124
-#: SupplierInquiry.php:78 SupplierInquiry.php:99 SupplierInquiry.php:129
-#: SupplierInquiry.php:174 SupplierTransInquiry.php:79 SuppPaymentRun.php:111
-#: SuppPaymentRun.php:186 SuppPaymentRun.php:216 WorkOrderCosting.php:391
-#: WorkOrderReceive.php:261 WOSerialNos.php:44 Z_ChangeBranchCode.php:108
-#: Z_ChangeCustomerCode.php:90 Z_DeleteCreditNote.php:57
-#: Z_DeleteInvoice.php:83 includes/PDFPaymentRun_PymtFooter.php:57
+#: AgedDebtors.php:370
+#: AgedSuppliers.php:192
+#: Areas.php:96
+#: ConfirmDispatch_Invoice.php:154
+#: ConfirmDispatch_Invoice.php:914
+#: ConfirmDispatch_Invoice.php:928
+#: Credit_Invoice.php:686
+#: Credit_Invoice.php:708
+#: CustomerReceipt.php:491
+#: CustomerReceipt.php:632
+#: CustomerReceipt.php:660
+#: CustomerTransInquiry.php:78
+#: DeliveryDetails.php:397
+#: GLProfit_Loss.php:539
+#: GLTagProfit_Loss.php:480
+#: Payments.php:294
+#: PDFRemittanceAdvice.php:78
+#: PurchData.php:83
+#: PurchData.php:101
+#: PurchData.php:206
+#: ReverseGRN.php:142
+#: ReverseGRN.php:156
+#: ReverseGRN.php:317
+#: SelectCreditItems.php:1393
+#: StockCheck.php:220
+#: StockCostUpdate.php:78
+#: StockCostUpdate.php:88
+#: StockLocStatus.php:144
+#: StockMovements.php:91
+#: StockQuantityByDate.php:78
+#: StockReorderLevel.php:39
+#: StockStatus.php:262
+#: StockTransfers.php:153
+#: StockUsageGraph.php:53
+#: StockUsage.php:124
+#: SupplierInquiry.php:78
+#: SupplierInquiry.php:99
+#: SupplierInquiry.php:129
+#: SupplierInquiry.php:174
+#: SupplierTransInquiry.php:79
+#: SuppPaymentRun.php:111
+#: SuppPaymentRun.php:186
+#: SuppPaymentRun.php:216
+#: WorkOrderCosting.php:391
+#: WorkOrderReceive.php:261
+#: WOSerialNos.php:44
+#: Z_ChangeBranchCode.php:108
+#: Z_ChangeCustomerCode.php:90
+#: Z_DeleteCreditNote.php:57
+#: Z_DeleteInvoice.php:83
+#: includes/PDFPaymentRun_PymtFooter.php:57
#: includes/PDFPaymentRun_PymtFooter.php:86
#: includes/PDFPaymentRun_PymtFooter.php:115
#: includes/PDFPaymentRun_PymtFooter.php:151
-#: includes/PDFPaymentRun_PymtFooter.php:182 includes/ConnectDB_mysqli.inc:55
+#: includes/PDFPaymentRun_PymtFooter.php:182
+#: includes/ConnectDB_mysqli.inc:55
#: includes/ConnectDB_mysql.inc:38
msgid "The SQL that failed was"
msgstr "运行失败的 SQL 是"
@@ -839,15 +1375,18 @@
msgid "Aged Debtor Analysis"
msgstr "应收账款账龄分析表"
-#: AgedDebtors.php:475 DebtorsAtPeriodEnd.php:143
+#: AgedDebtors.php:475
+#: DebtorsAtPeriodEnd.php:143
msgid "From Customer Code"
msgstr "由客户编号"
-#: AgedDebtors.php:476 DebtorsAtPeriodEnd.php:144
+#: AgedDebtors.php:476
+#: DebtorsAtPeriodEnd.php:144
msgid "To Customer Code"
msgstr "到客户编号"
-#: AgedDebtors.php:478 AgedSuppliers.php:291
+#: AgedDebtors.php:478
+#: AgedSuppliers.php:291
msgid "All balances or overdues only"
msgstr "全部余额或只包含过期未付的"
@@ -855,7 +1394,8 @@
msgid "All customers with balances"
msgstr "所有有余额的客户"
-#: AgedDebtors.php:480 AgedSuppliers.php:294
+#: AgedDebtors.php:480
+#: AgedSuppliers.php:294
msgid "Overdue accounts only"
msgstr "只显示过期未付的"
@@ -875,25 +1415,47 @@
msgid "Summary or detailed report"
msgstr "汇总或明细"
-#: AgedDebtors.php:514 AgedSuppliers.php:314 InventoryValuation.php:235
+#: AgedDebtors.php:514
+#: AgedSuppliers.php:314
+#: InventoryValuation.php:235
msgid "Summary Report"
msgstr "汇总报表"
-#: AgedDebtors.php:515 AgedSuppliers.php:315 InventoryValuation.php:236
+#: AgedDebtors.php:515
+#: AgedSuppliers.php:315
+#: InventoryValuation.php:236
msgid "Detailed Report"
msgstr "明细报表"
-#: AgedDebtors.php:518 AgedSuppliers.php:318 BOMExtendedQty.php:297
-#: BOMIndented.php:275 BOMIndentedReverse.php:263 BOMListing.php:140
-#: DebtorsAtPeriodEnd.php:161 InventoryPlanning.php:429
-#: InventoryPlanningPrefSupplier.php:502 InventoryQuantities.php:186
-#: InventoryValuation.php:239 MRPPlannedPurchaseOrders.php:263
-#: MRPPlannedWorkOrders.php:241 MRPReport.php:512 MRPReschedules.php:150
-#: MRPShortages.php:232 OutstandingGRNs.php:181 PDFCustomerList.php:409
-#: PDFLowGP.php:164 PDFPriceList.php:258 PDFRemittanceAdvice.php:153
-#: PDFStockCheckComparison.php:375 PrintCustTrans.php:618
-#: PrintCustTransPortrait.php:680 ReorderLevel.php:226 StockDispatch.php:293
-#: SupplierBalsAtPeriodEnd.php:148 SuppPriceList.php:231 Tax.php:348
+#: AgedDebtors.php:518
+#: AgedSuppliers.php:318
+#: BOMExtendedQty.php:297
+#: BOMIndented.php:275
+#: BOMIndentedReverse.php:263
+#: BOMListing.php:140
+#: DebtorsAtPeriodEnd.php:161
+#: InventoryPlanning.php:429
+#: InventoryPlanningPrefSupplier.php:502
+#: InventoryQuantities.php:186
+#: InventoryValuation.php:239
+#: MRPPlannedPurchaseOrders.php:263
+#: MRPPlannedWorkOrders.php:241
+#: MRPReport.php:512
+#: MRPReschedules.php:150
+#: MRPShortages.php:232
+#: OutstandingGRNs.php:181
+#: PDFCustomerList.php:409
+#: PDFLowGP.php:164
+#: PDFPriceList.php:258
+#: PDFRemittanceAdvice.php:153
+#: PDFStockCheckComparison.php:375
+#: PrintCustTrans.php:618
+#: PrintCustTransPortrait.php:680
+#: ReorderLevel.php:226
+#: StockDispatch.php:293
+#: SupplierBalsAtPeriodEnd.php:148
+#: SuppPriceList.php:231
+#: Tax.php:348
msgid "Print PDF"
msgstr "打印到PDF"
@@ -909,7 +1471,8 @@
msgid "Aged Supplier Account Analysis"
msgstr "应付账款账龄分析"
-#: AgedSuppliers.php:107 SupplierBalsAtPeriodEnd.php:56
+#: AgedSuppliers.php:107
+#: SupplierBalsAtPeriodEnd.php:56
msgid "The Supplier details could not be retrieved by the SQL because"
msgstr "供应商明细资料未能由SQL取得, 因为"
@@ -925,13 +1488,19 @@
msgid "Aged Supplier Analysis"
msgstr "应付账款帐龄分析"
-#: AgedSuppliers.php:284 OutstandingGRNs.php:176 PDFRemittanceAdvice.php:139
-#: SupplierBalsAtPeriodEnd.php:125 SuppPaymentRun.php:255
+#: AgedSuppliers.php:284
+#: OutstandingGRNs.php:176
+#: PDFRemittanceAdvice.php:139
+#: SupplierBalsAtPeriodEnd.php:125
+#: SuppPaymentRun.php:255
msgid "From Supplier Code"
msgstr "从供应商编号"
-#: AgedSuppliers.php:287 OutstandingGRNs.php:178 PDFRemittanceAdvice.php:141
-#: SupplierBalsAtPeriodEnd.php:127 SuppPaymentRun.php:257
+#: AgedSuppliers.php:287
+#: OutstandingGRNs.php:178
+#: PDFRemittanceAdvice.php:141
+#: SupplierBalsAtPeriodEnd.php:127
+#: SuppPaymentRun.php:257
msgid "To Supplier Code"
msgstr "到供应商编号"
@@ -943,7 +1512,8 @@
msgid "For suppliers trading in"
msgstr "供应商货币"
-#: AgedSuppliers.php:312 InventoryValuation.php:234
+#: AgedSuppliers.php:312
+#: InventoryValuation.php:234
msgid "Summary or Detailed Report"
msgstr "汇总或明细表"
@@ -989,9 +1559,7 @@
msgstr "区域编号不能新增或更新, 因为"
#: Areas.php:116
-msgid ""
-"Cannot delete this area because customer branches have been created using "
-"this area"
+msgid "Cannot delete this area because customer branches have been created using this area"
msgstr "不能删除此销售区域因为已有客户分公司在这区域"
#: Areas.php:117
@@ -1000,27 +1568,37 @@
#: Areas.php:125
#, fuzzy
-msgid ""
-"Cannot delete this area because sales analysis records exist that use this "
-"area"
+msgid "Cannot delete this area because sales analysis records exist that use this area"
msgstr "不能删除这个区域因为此区域已用于现有的销售分析记录"
#: Areas.php:126
msgid "sales analysis records referring this area code"
msgstr "条此区域的销售分析记录"
-#: Areas.php:133 Areas.php:146 Areas.php:197 Areas.php:208
+#: Areas.php:133
+#: Areas.php:146
+#: Areas.php:197
+#: Areas.php:208
msgid "Area Code"
msgstr "区域编号"
-#: Areas.php:133 CustomerTypes.php:167 Factors.php:112
-#: FixedAssetCategories.php:192 GLAccounts.php:204 Locations.php:299
-#: SalesAnalReptCols.php:214 SalesCategories.php:137 SalesTypes.php:161
-#: StockCategories.php:170 Suppliers.php:595 Z_DeleteInvoice.php:142
+#: Areas.php:133
+#: CustomerTypes.php:167
+#: Factors.php:112
+#: FixedAssetCategories.php:192
+#: GLAccounts.php:204
+#: Locations.php:299
+#: SalesAnalReptCols.php:214
+#: SalesCategories.php:137
+#: SalesTypes.php:161
+#: StockCategories.php:170
+#: Suppliers.php:595
+#: Z_DeleteInvoice.php:142
msgid "has been deleted"
msgstr "已删除"
-#: Areas.php:147 Areas.php:213
+#: Areas.php:147
+#: Areas.php:213
msgid "Area Name"
msgstr "区域名称"
@@ -1037,20 +1615,26 @@
msgid "Incorrect date format used, please re-enter"
msgstr "输入的日期无效, 请输入有效日期格式"
-#: AuditTrail.php:34 BOMIndented.php:314 BOMIndentedReverse.php:302
+#: AuditTrail.php:34
+#: BOMIndented.php:314
+#: BOMIndentedReverse.php:302
#: MRPCalendar.php:251
#, fuzzy
msgid "From Date"
msgstr "账号"
-#: AuditTrail.php:36 BOMIndented.php:315 BOMIndentedReverse.php:303
+#: AuditTrail.php:36
+#: BOMIndented.php:315
+#: BOMIndentedReverse.php:303
#: MRPCalendar.php:253
#, fuzzy
msgid "To Date"
msgstr "日期"
-#: AuditTrail.php:40 PO_AuthorisationLevels.php:87
-#: PO_AuthorisationLevels.php:116 PO_AuthorisationLevels.php:119
+#: AuditTrail.php:40
+#: PO_AuthorisationLevels.php:87
+#: PO_AuthorisationLevels.php:116
+#: PO_AuthorisationLevels.php:119
#: UserSettings.php:114
msgid "User ID"
msgstr "用户 ID"
@@ -1060,7 +1644,8 @@
msgid "Table "
msgstr "启用"
-#: AuditTrail.php:64 PO_SelectPurchOrder.php:370
+#: AuditTrail.php:64
+#: PO_SelectPurchOrder.php:370
msgid "View"
msgstr "查看"
@@ -1069,23 +1654,41 @@
msgid "Date/Time"
msgstr "日期"
-#: AuditTrail.php:142 includes/header.inc:42
+#: AuditTrail.php:142
+#: includes/header.inc:42
#, fuzzy
msgid "User"
msgstr "用户 ID"
-#: AuditTrail.php:143 BankReconciliation.php:183 BankReconciliation.php:255
-#: CustomerAllocations.php:372 CustomerInquiry.php:188
-#: CustomerTransInquiry.php:19 CustomerTransInquiry.php:84
-#: CustWhereAlloc.php:14 CustWhereAlloc.php:81 FixedAssetCategories.php:212
-#: GLAccountInquiry.php:155 GLJournal.php:250 MRPReschedules.php:188
-#: SelectCustomer.php:503 ShipmentCosting.php:492 ShipmentCosting.php:563
-#: StockCategories.php:190 StockLocMovements.php:78 StockMovements.php:9...
[truncated message content] |
|
From: <tim...@us...> - 2010-04-07 10:06:49
|
Revision: 3409
http://web-erp.svn.sourceforge.net/web-erp/?rev=3409&view=rev
Author: tim_schofield
Date: 2010-04-07 10:06:43 +0000 (Wed, 07 Apr 2010)
Log Message:
-----------
Tim: SystemParameters.php and Currencies.php - Correct so that currency updates are only done when Automatic is chosen.
Modified Paths:
--------------
trunk/Currencies.php
trunk/SystemParameters.php
trunk/doc/Change.log.html
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2010-04-07 10:06:04 UTC (rev 3408)
+++ trunk/Currencies.php 2010-04-07 10:06:43 UTC (rev 3409)
@@ -10,9 +10,9 @@
include('includes/SQL_CommonFunctions.inc');
if (isset($_GET['SelectedCurrency'])){
- $SelectedCurrency = $_GET['SelectedCurrency'];
+ $SelectedCurrency = $_GET['SelectedCurrency'];
} elseif (isset($_POST['SelectedCurrency'])){
- $SelectedCurrency = $_POST['SelectedCurrency'];
+ $SelectedCurrency = $_POST['SelectedCurrency'];
}
$ForceConfigReload = true;
@@ -28,13 +28,13 @@
if (isset($_POST['submit'])) {
- //initialise no input errors assumed initially before we test
- $InputError = 0;
+ //initialise no input errors assumed initially before we test
+ $InputError = 0;
- /* actions to take once the user has clicked the submit button
- ie the page has called itself with some user input */
+ /* actions to take once the user has clicked the submit button
+ ie the page has called itself with some user input */
- //first off validate inputs are sensible
+ //first off validate inputs are sensible
$i=1;
$sql="SELECT count(currabrev)
@@ -48,63 +48,63 @@
$Errors[$i] = 'Abbreviation';
$i++;
}
- if (strlen($_POST['Abbreviation']) > 3) {
- $InputError = 1;
- prnMsg(_('The currency abbreviation must be 3 characters or less long and for automated currency updates to work correctly be one of the ISO4217 currency codes'),'error');
+ if (strlen($_POST['Abbreviation']) > 3) {
+ $InputError = 1;
+ prnMsg(_('The currency abbreviation must be 3 characters or less long and for automated currency updates to work correctly be one of the ISO4217 currency codes'),'error');
$Errors[$i] = 'Abbreviation';
$i++;
- }
+ }
if (!is_numeric($_POST['ExchangeRate'])){
- $InputError = 1;
- prnMsg(_('The exchange rate must be numeric'),'error');
+ $InputError = 1;
+ prnMsg(_('The exchange rate must be numeric'),'error');
$Errors[$i] = 'ExchangeRate';
$i++;
- }
- if (strlen($_POST['CurrencyName']) > 20) {
- $InputError = 1;
- prnMsg(_('The currency name must be 20 characters or less long'),'error');
+ }
+ if (strlen($_POST['CurrencyName']) > 20) {
+ $InputError = 1;
+ prnMsg(_('The currency name must be 20 characters or less long'),'error');
$Errors[$i] = 'CurrencyName';
$i++;
- }
- if (strlen($_POST['Country']) > 50) {
- $InputError = 1;
- prnMsg(_('The currency country must be 50 characters or less long'),'error');
+ }
+ if (strlen($_POST['Country']) > 50) {
+ $InputError = 1;
+ prnMsg(_('The currency country must be 50 characters or less long'),'error');
$Errors[$i] = 'Country';
$i++;
- }
- if (strlen($_POST['HundredsName']) > 15) {
- $InputError = 1;
- prnMsg(_('The hundredths name must be 15 characters or less long'),'error');
+ }
+ if (strlen($_POST['HundredsName']) > 15) {
+ $InputError = 1;
+ prnMsg(_('The hundredths name must be 15 characters or less long'),'error');
$Errors[$i] = 'HundredsName';
$i++;
- }
- if (($FunctionalCurrency != '') and (isset($SelectedCurrency) and $SelectedCurrency==$FunctionalCurrency)){
- $InputError = 1;
- prnMsg(_('The functional currency cannot be modified or deleted'),'error');
- }
- if (strstr($_POST['Abbreviation'],"'") OR strstr($_POST['Abbreviation'],'+') OR strstr($_POST['Abbreviation'],"\"") OR strstr($_POST['Abbreviation'],'&') OR strstr($_POST['Abbreviation'],' ') OR strstr($_POST['Abbreviation'],"\\") OR strstr($_POST['Abbreviation'],'.') OR strstr($_POST['Abbreviation'],'"')) {
+ }
+ if (($FunctionalCurrency != '') and (isset($SelectedCurrency) and $SelectedCurrency==$FunctionalCurrency)){
$InputError = 1;
+ prnMsg(_('The functional currency cannot be modified or deleted'),'error');
+ }
+ if (strstr($_POST['Abbreviation'],"'") OR strstr($_POST['Abbreviation'],'+') OR strstr($_POST['Abbreviation'],"\"") OR strstr($_POST['Abbreviation'],'&') OR strstr($_POST['Abbreviation'],' ') OR strstr($_POST['Abbreviation'],"\\") OR strstr($_POST['Abbreviation'],'.') OR strstr($_POST['Abbreviation'],'"')) {
+ $InputError = 1;
prnMsg( _('The currency code cannot contain any of the following characters') . " . - ' & + \" " . _('or a space'),'error');
$Errors[$i] = 'Abbreviation';
$i++;
}
- if (isset($SelectedCurrency) AND $InputError !=1) {
+ if (isset($SelectedCurrency) AND $InputError !=1) {
- /*SelectedCurrency could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
- $sql = "UPDATE currencies SET
+ /*SelectedCurrency could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
+ $sql = "UPDATE currencies SET
currency='" . $_POST['CurrencyName'] . "',
country='". $_POST['Country']. "',
hundredsname='" . $_POST['HundredsName'] . "',
rate=" .$_POST['ExchangeRate'] . "
WHERE currabrev = '" . $SelectedCurrency . "'";
- $msg = _('The currency definition record has been updated');
- } else if ($InputError !=1) {
+ $msg = _('The currency definition record has been updated');
+ } else if ($InputError !=1) {
- /*Selected currencies is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new payment terms form */
- $sql = "INSERT INTO currencies (currency,
- currabrev,
+ /*Selected currencies is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new payment terms form */
+ $sql = "INSERT INTO currencies (currency,
+ currabrev,
country,
hundredsname,
rate)
@@ -114,58 +114,58 @@
'" . $_POST['HundredsName'] . "',
" . $_POST['ExchangeRate'] . ")";
- $msg = _('The currency definition record has been added');
- }
- //run the SQL from either of the above possibilites
- $result = DB_query($sql,$db);
- if ($InputError!=1){
- prnMsg( $msg,'success');
- }
- unset($SelectedCurrency);
- unset($_POST['CurrencyName']);
- unset($_POST['Country']);
- unset($_POST['HundredsName']);
- unset($_POST['ExchangeRate']);
- unset($_POST['Abbreviation']);
+ $msg = _('The currency definition record has been added');
+ }
+ //run the SQL from either of the above possibilites
+ $result = DB_query($sql,$db);
+ if ($InputError!=1){
+ prnMsg( $msg,'success');
+ }
+ unset($SelectedCurrency);
+ unset($_POST['CurrencyName']);
+ unset($_POST['Country']);
+ unset($_POST['HundredsName']);
+ unset($_POST['ExchangeRate']);
+ unset($_POST['Abbreviation']);
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
// PREVENT DELETES IF DEPENDENT RECORDS IN DebtorsMaster
- $sql= "SELECT COUNT(*) FROM debtorsmaster WHERE debtorsmaster.currcode = '" . $SelectedCurrency . "'";
- $result = DB_query($sql,$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0] > 0)
- {
- prnMsg(_('Cannot delete this currency because customer accounts have been created referring to this currency') .
- '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('customer accounts that refer to this currency'),'warn');
- } else {
- $sql= "SELECT COUNT(*) FROM suppliers WHERE suppliers.currcode = '$SelectedCurrency'";
- $result = DB_query($sql,$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0] > 0)
- {
- prnMsg(_('Cannot delete this currency because supplier accounts have been created referring to this currency')
- . '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('supplier accounts that refer to this currency'),'warn');
- } else {
- $sql= "SELECT COUNT(*) FROM banktrans WHERE banktrans.currcode = '" . $SelectedCurrency . "'";
- $result = DB_query($sql,$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0] > 0){
- prnMsg(_('Cannot delete this currency because there are bank transactions that use this currency') .
- '<br>' . ' ' . _('There are') . ' ' . $myrow[0] . ' ' . _('bank transactions that refer to this currency'),'warn');
- } elseif ($FunctionalCurrency==$SelectedCurrency){
- prnMsg(_('Cannot delete this currency because it is the functional currency of the company'),'warn');
- } else {
- //only delete if used in neither customer or supplier, comp prefs, bank trans accounts
- $sql="DELETE FROM currencies WHERE currabrev='" . $SelectedCurrency . "'";
- $result = DB_query($sql,$db);
- prnMsg(_('The currency definition record has been deleted'),'success');
- }
- }
- }
- //end if currency used in customer or supplier accounts
+ $sql= "SELECT COUNT(*) FROM debtorsmaster WHERE debtorsmaster.currcode = '" . $SelectedCurrency . "'";
+ $result = DB_query($sql,$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0] > 0)
+ {
+ prnMsg(_('Cannot delete this currency because customer accounts have been created referring to this currency') .
+ '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('customer accounts that refer to this currency'),'warn');
+ } else {
+ $sql= "SELECT COUNT(*) FROM suppliers WHERE suppliers.currcode = '$SelectedCurrency'";
+ $result = DB_query($sql,$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0] > 0)
+ {
+ prnMsg(_('Cannot delete this currency because supplier accounts have been created referring to this currency')
+ . '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('supplier accounts that refer to this currency'),'warn');
+ } else {
+ $sql= "SELECT COUNT(*) FROM banktrans WHERE banktrans.currcode = '" . $SelectedCurrency . "'";
+ $result = DB_query($sql,$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0] > 0){
+ prnMsg(_('Cannot delete this currency because there are bank transactions that use this currency') .
+ '<br>' . ' ' . _('There are') . ' ' . $myrow[0] . ' ' . _('bank transactions that refer to this currency'),'warn');
+ } elseif ($FunctionalCurrency==$SelectedCurrency){
+ prnMsg(_('Cannot delete this currency because it is the functional currency of the company'),'warn');
+ } else {
+ //only delete if used in neither customer or supplier, comp prefs, bank trans accounts
+ $sql="DELETE FROM currencies WHERE currabrev='" . $SelectedCurrency . "'";
+ $result = DB_query($sql,$db);
+ prnMsg(_('The currency definition record has been deleted'),'success');
+ }
+ }
+ }
+ //end if currency used in customer or supplier accounts
}
if (!isset($SelectedCurrency)) {
@@ -175,46 +175,48 @@
links to delete or edit each. These will call the same page again and allow update/input
or deletion of the records*/
- $sql = 'SELECT currency, currabrev, country, hundredsname, rate FROM currencies';
- $result = DB_query($sql, $db);
+ $sql = 'SELECT currency, currabrev, country, hundredsname, rate FROM currencies';
+ $result = DB_query($sql, $db);
- echo '<table border=1>';
- echo '<tr><td></td>
- <th>' . _('ISO4217 Code') . '</th>
- <th>' . _('Currency Name') . '</th>
+ echo '<table border=1>';
+ echo '<tr><td></td>
+ <th>' . _('ISO4217 Code') . '</th>
+ <th>' . _('Currency Name') . '</th>
<th>' . _('Country') . '</th>
<th>' . _('Hundredths Name') . '</th>
<th>' . _('Exchange Rate') . '</th>
<th>' . _('Ex Rate - ECB') .'</th>
</tr>';
- $k=0; //row colour counter
- /*Get published currency rates from Eurpoean Central Bank */
- $CurrencyRatesArray = GetECBCurrencyRates();
+ $k=0; //row colour counter
+ /*Get published currency rates from Eurpoean Central Bank */
+ if ($_SESSION['UpdateCurrencyRatesDaily'] != '0') {
+ $CurrencyRatesArray = GetECBCurrencyRates();
+ }
- while ($myrow = DB_fetch_row($result)) {
- if ($myrow[1]==$FunctionalCurrency){
- echo '<tr bgcolor=#FFbbbb>';
- } elseif ($k==1){
- echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
- echo '<tr class="OddTableRows">';;
- $k++;
- }
- // Lets show the country flag
- $ImageFile = 'flags/' . strtoupper($myrow[1]) . '.gif';
+ while ($myrow = DB_fetch_row($result)) {
+ if ($myrow[1]==$FunctionalCurrency){
+ echo '<tr bgcolor=#FFbbbb>';
+ } elseif ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';;
+ $k++;
+ }
+ // Lets show the country flag
+ $ImageFile = 'flags/' . strtoupper($myrow[1]) . '.gif';
if(!file_exists($ImageFile)){
$ImageFile = 'flags/blank.gif';
}
- if ($myrow[1]!=$FunctionalCurrency){
- printf("<td><img src=\"%s\"></td>
- <td>%s</td>
- <td>%s</td>
+ if ($myrow[1]!=$FunctionalCurrency){
+ printf("<td><img src=\"%s\"></td>
<td>%s</td>
<td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
<td class=number>%s</td>
<td class=number>%s</td>
<td><a href=\"%s&SelectedCurrency=%s\">%s</a></td>
@@ -236,12 +238,12 @@
_('Delete'),
$rootpath,
SID . '&CurrencyToShow=' . $myrow[1]);
- } else {
- printf("<td><img src=\"%s\"></td>
- <td>%s</td>
- <td>%s</td>
+ } else {
+ printf("<td><img src=\"%s\"></td>
<td>%s</td>
<td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
<td class=number>%s</td>
<td colspan=4>%s</td>
</tr>",
@@ -252,27 +254,27 @@
$myrow[3],
1,
_('Functional Currency'));
- }
+ }
- } //END WHILE LIST LOOP
- echo '</table><br>';
+ } //END WHILE LIST LOOP
+ echo '</table><br>';
} //end of ifs and buts!
if (isset($SelectedCurrency)) {
- echo '<div class="centre"><a href=' .$_SERVER['PHP_SELF'] . '?' . SID. '>'._('Show all currency definitions').'</a></div>';
+ echo '<div class="centre"><a href=' .$_SERVER['PHP_SELF'] . '?' . SID. '>'._('Show all currency definitions').'</a></div>';
}
echo '<br>';
if (!isset($_GET['delete'])) {
- echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+ echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
- if (isset($SelectedCurrency) AND $SelectedCurrency!='') {
- //editing an existing payment terms
+ if (isset($SelectedCurrency) AND $SelectedCurrency!='') {
+ //editing an existing payment terms
- $sql = "SELECT currency,
+ $sql = "SELECT currency,
currabrev,
country,
hundredsname,
@@ -280,58 +282,58 @@
FROM currencies
WHERE currabrev='" . $SelectedCurrency . "'";
- $ErrMsg = _('An error occurred in retrieving the currency information');;
+ $ErrMsg = _('An error occurred in retrieving the currency information');;
$result = DB_query($sql, $db, $ErrMsg);
- $myrow = DB_fetch_array($result);
+ $myrow = DB_fetch_array($result);
- $_POST['Abbreviation'] = $myrow['currabrev'];
- $_POST['CurrencyName'] = $myrow['currency'];
- $_POST['Country'] = $myrow['country'];
- $_POST['HundredsName'] = $myrow['hundredsname'];
- $_POST['ExchangeRate'] = $myrow['rate'];
+ $_POST['Abbreviation'] = $myrow['currabrev'];
+ $_POST['CurrencyName'] = $myrow['currency'];
+ $_POST['Country'] = $myrow['country'];
+ $_POST['HundredsName'] = $myrow['hundredsname'];
+ $_POST['ExchangeRate'] = $myrow['rate'];
- echo '<input type="hidden" name="SelectedCurrency" VALUE="' . $SelectedCurrency . '">';
- echo '<input type="hidden" name="Abbreviation" VALUE="' . $_POST['Abbreviation'] . '">';
- echo '<table><tr>
+ echo '<input type="hidden" name="SelectedCurrency" VALUE="' . $SelectedCurrency . '">';
+ echo '<input type="hidden" name="Abbreviation" VALUE="' . $_POST['Abbreviation'] . '">';
+ echo '<table><tr>
<td>' . _('ISO 4217 Currency Code').':</td>
<td>';
- echo $_POST['Abbreviation'] . '</td></tr>';
+ echo $_POST['Abbreviation'] . '</td></tr>';
- } else { //end of if $SelectedCurrency only do the else when a new record is being entered
+ } else { //end of if $SelectedCurrency only do the else when a new record is being entered
if (!isset($_POST['Abbreviation'])) {$_POST['Abbreviation']='';}
- echo '<table><tr>
+ echo '<table><tr>
<td>' ._('Currency Abbreviation') . ':</td>
<td><input ' . (in_array('Abbreviation',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Abbreviation" value="' . $_POST['Abbreviation'] . '" size=4 maxlength=3></td></tr>';
- }
+ }
- echo '<tr><td>'._('Currency Name').':</td>';
- echo '<td>';
+ echo '<tr><td>'._('Currency Name').':</td>';
+ echo '<td>';
if (!isset($_POST['CurrencyName'])) {$_POST['CurrencyName']='';}
- echo '<input ' . (in_array('CurrencyName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="CurrencyName" size=20 maxlength=20 VALUE="' . $_POST['CurrencyName'] . '">';
- echo '</td></tr>';
- echo '<tr><td>'._('Country').':</td>';
- echo '<td>';
+ echo '<input ' . (in_array('CurrencyName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="CurrencyName" size=20 maxlength=20 VALUE="' . $_POST['CurrencyName'] . '">';
+ echo '</td></tr>';
+ echo '<tr><td>'._('Country').':</td>';
+ echo '<td>';
if (!isset($_POST['Country'])) {$_POST['Country']='';}
- echo '<input ' . (in_array('Country',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Country" size=30 maxlength=50 VALUE="' . $_POST['Country'] . '">';
- echo '</td></tr>';
- echo '<tr><td>'._('Hundredths Name').':</td>';
- echo '<td>';
+ echo '<input ' . (in_array('Country',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Country" size=30 maxlength=50 VALUE="' . $_POST['Country'] . '">';
+ echo '</td></tr>';
+ echo '<tr><td>'._('Hundredths Name').':</td>';
+ echo '<td>';
if (!isset($_POST['HundredsName'])) {$_POST['HundredsName']='';}
- echo '<input ' . (in_array('HundredsName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="HundredsName" size=10 maxlength=15 VALUE="'. $_POST['HundredsName'].'">';
- echo '</td></tr>';
- echo '<tr><td>'._('Exchange Rate').':</td>';
- echo '<td>';
+ echo '<input ' . (in_array('HundredsName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="HundredsName" size=10 maxlength=15 VALUE="'. $_POST['HundredsName'].'">';
+ echo '</td></tr>';
+ echo '<tr><td>'._('Exchange Rate').':</td>';
+ echo '<td>';
if (!isset($_POST['ExchangeRate'])) {$_POST['ExchangeRate']='';}
- echo '<input ' . (in_array('ExchangeRate',$Errors) ? 'class="inputerror"' : '' ) .' type="text" class=number name="ExchangeRate" size=10 maxlength=9 VALUE='. $_POST['ExchangeRate'].'>';
- echo '</td></tr>';
- echo '</table>';
+ echo '<input ' . (in_array('ExchangeRate',$Errors) ? 'class="inputerror"' : '' ) .' type="text" class=number name="ExchangeRate" size=10 maxlength=9 VALUE='. $_POST['ExchangeRate'].'>';
+ echo '</td></tr>';
+ echo '</table>';
- echo '<div class="centre"><input type="Submit" name="submit" value='._('Enter Information').'></div>';
+ echo '<div class="centre"><input type="Submit" name="submit" value='._('Enter Information').'></div>';
- echo '</form>';
+ echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2010-04-07 10:06:04 UTC (rev 3408)
+++ trunk/SystemParameters.php 2010-04-07 10:06:43 UTC (rev 3409)
@@ -250,11 +250,7 @@
$sql[] = "UPDATE config SET confvalue='" . $_POST['X_LogPath'] . "' WHERE confname='LogPath'";
}
if ($_SESSION['UpdateCurrencyRatesDaily'] != $_POST['X_UpdateCurrencyRatesDaily']){
- if ($_POST['X_UpdateCurrencyRatesDaily']=='Auto'){
- $sql[] = "UPDATE config SET confvalue='" . Date('Y-m-d',mktime(0,0,0,Date('m'),Date('d')-1,Date('Y'))) . "' WHERE confname='UpdateCurrencyRatesDaily'";
- } else {
- $sql[] = "UPDATE config SET confvalue='0' WHERE confname='UpdateCurrencyRatesDaily'";
- }
+ $sql[] = "UPDATE config SET confvalue='".$_POST['X_UpdateCurrencyRatesDaily']."' WHERE confname='UpdateCurrencyRatesDaily'";
}
if ($_SESSION['FactoryManagerEmail'] != $_POST['X_FactoryManagerEmail']){
$sql[] = "UPDATE config SET confvalue='" . $_POST['X_FactoryManagerEmail'] . "' WHERE confname='FactoryManagerEmail'";
@@ -389,7 +385,7 @@
//UpdateCurrencyRatesDaily
echo '<tr><td>' . _('Auto Update Exchange Rates Daily') . ':</td>
<td><select Name="X_UpdateCurrencyRatesDaily">
- <option '.($_SESSION['UpdateCurrencyRatesDaily']!='0'?'selected ':'').'value="Auto">'._('Automatic').'
+ <option '.($_SESSION['UpdateCurrencyRatesDaily']!='0'?'selected ':'').'value="1">'._('Automatic').'
<option '.($_SESSION['UpdateCurrencyRatesDaily']=='0'?'selected ':'').'value="0">'._('Manual').'
</select></td>
<td>' . _('Automatic updates to exchange rates will retrieve the latest daily rates from the European Central Bank once per day - when the first user logs in for the day. Manual will never update the rates automatically - exchange rates will need to be maintained manually') . '</td>
@@ -632,8 +628,8 @@
<td>' . _('Picture files of items can be uploaded to the server. The system will check that files uploaded are less than this size (in KB) before they will be allowed to be uploaded. Large pictures will make the system slow and will be difficult to view in the stock maintenance screen.') .'</td>
</tr>';
//NumberOfMonthMustBeShown
-$sql = 'SELECT confvalue
- FROM `config`
+$sql = 'SELECT confvalue
+ FROM `config`
WHERE confname ="numberOfMonthMustBeShown"';
$ErrMsg = _('Could not load the Number Of Month Must be Shown');
@@ -642,7 +638,7 @@
$_SESSION['NumberOfMonthMustBeShown'] = $row['confvalue'];
echo '<tr><td>' . _('Number Of Month Must Be Shown') . ':</td>
- <td><input type="text" class="number" name="X_NumberOfMonthMustBeShown" size=4 maxlength=3 value="' . $_SESSION['NumberOfMonthMustBeShown'] . '"></td>
+ <td><input type="text" class="number" name="X_NumberOfMonthMustBeShown" size=4 maxlength=3 value="' . $_SESSION['NumberOfMonthMustBeShown'] . '"></td>
<td>' . _('Number of month must be shown on report can be changed with this parameters ex: in CustomerInquiry.php ') .'</td>
</tr>';
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-07 10:06:04 UTC (rev 3408)
+++ trunk/doc/Change.log.html 2010-04-07 10:06:43 UTC (rev 3409)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>07/04/10 Tim: SystemParameters.php and Currencies.php - Correct so that currency updates are only done when Automatic is chosen.</p>
<p>05/04/10 exson qu: Chinese translation update.</p>
<p>05/04/10 Matt Taylor: Z_ImportStocks.php : Correct DB_txn functions and add validation check.</p>
<p>05/04/10 Zhiguo: Japanese translation updates</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-04-07 11:35:33
|
Revision: 3410
http://web-erp.svn.sourceforge.net/web-erp/?rev=3410&view=rev
Author: tim_schofield
Date: 2010-04-07 11:35:27 +0000 (Wed, 07 Apr 2010)
Log Message:
-----------
Tim: PO_Items.php - Remove the Back To Purchase Order Header link if the order is already posted.
Modified Paths:
--------------
trunk/PO_Items.php
trunk/doc/Change.log.html
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2010-04-07 10:06:43 UTC (rev 3409)
+++ trunk/PO_Items.php 2010-04-07 11:35:27 UTC (rev 3410)
@@ -28,7 +28,9 @@
$Maximum_Number_Of_Parts_To_Show=50;
-echo '<a href="'.$rootpath.'/PO_Header.php?' . SID . "identifier=".$identifier. '">' ._('Back To Purchase Order Header') . '</a><br>';
+if (!isset($_POST['Commit'])) {
+ echo '<a href="'.$rootpath.'/PO_Header.php?' . SID . "identifier=".$identifier. '">' ._('Back To Purchase Order Header') . '</a><br>';
+}
// add new request here 08-09-26
if (isset($_POST['StockID2']) && $_GET['Edit']=='') {
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-07 10:06:43 UTC (rev 3409)
+++ trunk/doc/Change.log.html 2010-04-07 11:35:27 UTC (rev 3410)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>07/04/10 Tim: PO_Items.php - Remove the Back To Purchase Order Header link if the order is already posted.</p>
<p>07/04/10 Tim: SystemParameters.php and Currencies.php - Correct so that currency updates are only done when Automatic is chosen.</p>
<p>05/04/10 exson qu: Chinese translation update.</p>
<p>05/04/10 Matt Taylor: Z_ImportStocks.php : Correct DB_txn functions and add validation check.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-04-07 12:43:06
|
Revision: 3411
http://web-erp.svn.sourceforge.net/web-erp/?rev=3411&view=rev
Author: tim_schofield
Date: 2010-04-07 12:43:00 +0000 (Wed, 07 Apr 2010)
Log Message:
-----------
Tim: SelectOrderItems.php - Improve layout and correct for paging of items.
Modified Paths:
--------------
trunk/SelectOrderItems.php
trunk/doc/Change.log.html
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2010-04-07 11:35:27 UTC (rev 3410)
+++ trunk/SelectOrderItems.php 2010-04-07 12:43:00 UTC (rev 3411)
@@ -19,7 +19,7 @@
include('includes/SQL_CommonFunctions.inc');
if (isset($_POST['QuickEntry'])){
- unset($_POST['PartSearch']);
+ unset($_POST['PartSearch']);
}
if (isset($_POST['order_items'])){
@@ -314,8 +314,11 @@
custbranch.phoneno,
custbranch.faxno,
custbranch.branchcode,
- custbranch.debtorno
+ custbranch.debtorno,
+ debtorsmaster.name
FROM custbranch
+ LEFT JOIN debtorsmaster
+ ON custbranch.debtorno=debtorsmaster.debtorno
WHERE custbranch.brname " . LIKE . " '$SearchString'";
if ($_SESSION['SalesmanLogin']!=''){
@@ -333,8 +336,11 @@
custbranch.phoneno,
custbranch.faxno,
custbranch.branchcode,
- custbranch.debtorno
+ custbranch.debtorno,
+ debtorsmaster.name
FROM custbranch
+ LEFT JOIN debtorsmaster
+ ON custbranch.debtorno=debtorsmaster.debtorno
WHERE custbranch.debtorno " . LIKE . " '%" . $_POST['CustCode'] . "%' OR custbranch.branchcode " . LIKE . " '%" . $_POST['CustCode'] . "%'";
if ($_SESSION['SalesmanLogin']!=''){
@@ -348,8 +354,11 @@
custbranch.phoneno,
custbranch.faxno,
custbranch.branchcode,
- custbranch.debtorno
+ custbranch.debtorno,
+ debtorsmaster.name
FROM custbranch
+ LEFT JOIN debtorsmaster
+ ON custbranch.debtorno=debtorsmaster.debtorno
WHERE custbranch.phoneno " . LIKE . " '%" . $_POST['CustPhone'] . "%'";
if ($_SESSION['SalesmanLogin']!=''){
@@ -365,7 +374,7 @@
if (DB_num_rows($result_CustSelect)==1){
$myrow=DB_fetch_array($result_CustSelect);
- $_POST['Select'] = $myrow['debtorno'] . ' - ' . $myrow['branchcode'];
+ $_POST['Select'] = $myrow['debtorno'] . ' - ' . $myrow['branchname'];
} elseif (DB_num_rows($result_CustSelect)==0){
prnMsg(_('No Customer Branch records contain the search criteria') . ' - ' . _('please try again') . ' - ' . _('Note a Customer Branch Name may be different to the Customer Name'),'info');
}
@@ -437,14 +446,14 @@
custbranch.defaultlocation,
custbranch.defaultshipvia,
custbranch.deliverblind,
- custbranch.specialinstructions,
- custbranch.estdeliverydays,
- locations.locationname,
+ custbranch.specialinstructions,
+ custbranch.estdeliverydays,
+ locations.locationname,
custbranch.salesman
FROM custbranch
INNER JOIN locations
ON custbranch.defaultlocation=locations.loccode
- WHERE custbranch.branchcode='" . $_SESSION['Items'.$identifier]->Branch . "'
+ WHERE custbranch.brname='" . $_SESSION['Items'.$identifier]->Branch . "'
AND custbranch.debtorno = '" . $_POST['Select'] . "'";
$ErrMsg = _('The customer branch record of the customer selected') . ': ' . $_POST['Select'] . ' ' . _('cannot be retrieved because');
@@ -603,7 +612,7 @@
?>
<form action="<?php echo $_SERVER['PHP_SELF'] . '?' .SID .'identifier='.$identifier;?>" name="SelectCustomer" method=post>
<b><?php echo '<p>' . $msg; ?></p>
- <table cellpadding=3 colspan=4>
+ <table cellpadding=3 colspan=4 class=selection>
<tr>
<td><h5><?php echo _('Part of the Customer Branch Name'); ?>:</h5></td>
<td><input tabindex=1 type="Text" name="CustKeywords" size=20 maxlength=25></td>
@@ -621,10 +630,10 @@
if (isset($result_CustSelect)) {
- echo '<table cellpadding=2 colspan=7 border=2>';
+ echo '<table cellpadding=2 colspan=7>';
$TableHeader = '<br><tr>
- <th>' . _('Code') . '</th>
+ <th>' . _('Customer') . '</th>
<th>' . _('Branch') . '</th>
<th>' . _('Contact') . '</th>
<th>' . _('Phone') . '</th>
@@ -644,20 +653,18 @@
echo '<tr class="OddTableRows">';
$k=1;
}
-
- printf('<td><input tabindex='.number_format($j+5).' type=submit name="Select" value="%s - %s"</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- </tr>',
- $myrow['debtorno'],
- $myrow['branchcode'],
- $myrow['brname'],
- $myrow['contactname'],
- $myrow['phoneno'],
- $myrow['faxno']);
-
+ if ($LastCustomer != $myrow['name']) {
+ echo '<td>'.$myrow['name'].'</td>';
+ } else {
+ echo '<td></td>';
+ }
+ echo '<td><input tabindex='.number_format($j+5).' type=submit name="Select" value="'.$myrow['debtorno'].' - '.$myrow['brname'].'"</td>
+ <td>'.$myrow['brname'].'</td>
+ <td>'.$myrow['contactname'].'</td>
+ <td>'.$myrow['phoneno'].'</td>
+ <td>.'.$myrow['faxno'].'</td>
+ </tr>';
+ $LastCustomer=$myrow['name'];
$j++;
//end of page full new headings if
}
@@ -752,7 +759,7 @@
//insert wildcard characters in spaces
$_POST['Keywords'] = strtoupper($_POST['Keywords']);
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
-
+
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
@@ -843,7 +850,7 @@
if (!isset($Offset) or $Offset<0) {
$Offset=0;
}
- $SQL = $SQL . ' LIMIT ' . $_SESSION['DisplayRecordsMax'].' OFFSET '.number_format($_SESSION['DisplayRecordsMax']*$Offset);
+ $SQL = $SQL . ' LIMIT ' . $_SESSION['DefaultDisplayRecordsMax'].' OFFSET '.number_format($_SESSION['DefaultDisplayRecordsMax']*$Offset);
$ErrMsg = _('There is a problem selecting the part records to display because');
$DbgMsg = _('The SQL used to get the part selection was');
@@ -890,13 +897,13 @@
OR isset($_POST['QuickEntry'])
OR isset($_POST['Recalculate'])){
- /* get the item details from the database and hold them in the cart object */
+ /* get the item details from the database and hold them in the cart object */
- /*Discount can only be set later on -- after quick entry -- so default discount to 0 in the first place */
- $Discount = 0;
+ /*Discount can only be set later on -- after quick entry -- so default discount to 0 in the first place */
+ $Discount = 0;
- $i=1;
- while ($i<=$_SESSION['QuickEntries'] and isset($_POST['part_' . $i]) and $_POST['part_' . $i]!='') {
+ $i=1;
+ while ($i<=$_SESSION['QuickEntries'] and isset($_POST['part_' . $i]) and $_POST['part_' . $i]!='') {
$QuickEntryCode = 'part_' . $i;
$QuickEntryQty = 'qty_' . $i;
$QuickEntryPOLine = 'poline_' . $i;
@@ -923,7 +930,7 @@
if (!isset($NewItem)){
unset($NewItem);
- break; /* break out of the loop if nothing in the quick entry fields*/
+ break; /* break out of the loop if nothing in the quick entry fields*/
}
if(!Is_Date($NewItemDue)) {
@@ -972,8 +979,8 @@
include('includes/SelectOrderItems_IntoCart.inc');
}
}
- }
- unset($NewItem);
+ }
+ unset($NewItem);
} /* end of if quick entry */
@@ -1055,7 +1062,7 @@
if (isset($_POST['DeliveryDetails'])){
echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/DeliveryDetails.php?' . SID .'identifier='.$identifier . '">';
prnMsg(_('You should automatically be forwarded to the entry of the delivery details page') . '. ' . _('if this does not happen') . ' (' . _('if the browser does not support META Refresh') . ') ' .
- '<a href="' . $rootpath . '/DeliveryDetails.php?' . SID .'identifier='.$identifier . '">' . _('click here') . '</a> ' . _('to continue'), 'info');
+ '<a href="' . $rootpath . '/DeliveryDetails.php?' . SID .'identifier='.$identifier . '">' . _('click here') . '</a> ' . _('to continue'), 'info');
exit;
}
@@ -1099,7 +1106,7 @@
$NewItemDue = date($_SESSION['DefaultDateFormat']);
$NewPOLine = 0;
- include('includes/SelectOrderItems_IntoCart.inc');
+ include('includes/SelectOrderItems_IntoCart.inc');
}
} /* end of if its a new item */
@@ -1195,7 +1202,7 @@
/* This is where the order as selected should be displayed reflecting any deletions or insertions*/
echo '<br>
- <table width="90%" cellpadding="2" colspan="7" border="1">
+ <table width="90%" cellpadding="2" colspan="7">
<tr bgcolor=#800000>';
if($_SESSION['Items'.$identifier]->DefaultPOLine == 1){
echo '<th>' . _('PO Line') . '</th>';
@@ -1300,20 +1307,20 @@
} else {
$ColSpanNumber = 5;
}
- echo '<tr><td></td><td><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
+ echo '<tr class="EvenTableRows"><td></td><td><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
<td colspan="' . $ColSpanNumber . '" class=number>' . $DisplayTotal . '</td></tr></table>';
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
echo '<table border=1><tr><td>' . _('Total Weight') . ':</td>
- <td>' . $DisplayWeight . '</td>
- <td>' . _('Total Volume') . ':</td>
- <td>' . $DisplayVolume . '</td>
- </tr></table>';
+ <td>' . $DisplayWeight . '</td>
+ <td>' . _('Total Volume') . ':</td>
+ <td>' . $DisplayVolume . '</td>
+ </tr></table>';
echo '<br><div class="centre"><input type=submit name="Recalculate" Value="' . _('Re-Calculate') . '">
- <input type=submit name="DeliveryDetails" value="' . _('Enter Delivery Details and Confirm Order') . '"></div><hr>';
+ <input type=submit name="DeliveryDetails" value="' . _('Enter Delivery Details and Confirm Order') . '"></div><hr>';
} # end of if lines
/* Now show the stock item selection search stuff below */
@@ -1329,12 +1336,12 @@
$SQL="SELECT stockmaster.units, stockmaster.description, stockmaster.stockid, salesorderdetails.stkcode, SUM(qtyinvoiced) Sales FROM `salesorderdetails`, `stockmaster`
WHERE ActualDispatchDate >= '" . FormatDateForSQL($SixMonthsAgo) . "'
- AND salesorderdetails.stkcode = stockmaster.stockid
- GROUP BY stkcode
- ORDER BY sales DESC
- LIMIT " . $_SESSION['FrequentlyOrderedItems'];
- $result2 = DB_query($SQL,$db);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ';
+ AND salesorderdetails.stkcode = stockmaster.stockid
+ GROUP BY stkcode
+ ORDER BY sales DESC
+ LIMIT " . $_SESSION['FrequentlyOrderedItems'];
+ $result2 = DB_query($SQL,$db);
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ';
echo _('Frequently Ordered Items') . '<br>';
echo '<div class="page_help_text">' . _('Frequently Ordered Items') . _(', shows the most frequently ordered items in the last 6 months. You can choose from this list, or search further for other items') . '.</div><br>';
echo '<table class="table1">';
@@ -1365,9 +1372,9 @@
// Find the quantity on outstanding sales orders
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
FROM salesorderdetails,
- salesorders
+ salesorders
WHERE salesorders.orderno = salesorderdetails.orderno AND
- salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "' AND
+ salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "' AND
salesorderdetails.completed=0 AND
salesorders.quotation=0 AND
salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
@@ -1404,7 +1411,7 @@
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
$WoResult = db_query($sql,$db,$ErrMsg);
-$WoRow = db_fetch_row($WoResult);
+ $WoRow = db_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
@@ -1454,10 +1461,10 @@
echo '</table>';
} //end of if Frequently Ordered Items > 0
echo '<p><div class="centre"><b><p>' . $msg . '</b></p>';
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ';
- echo _('Search for Order Items') . '</p>';
- echo '<div class="page_help_text">' . _('Search for Order Items') . _(', Searches the database for items, you can narrow the results by selecting a stock category, or just enter a partial item description or partial item code') . '.</div><br>';
- echo '<table class="table2"><tr><td><b>' . _('Select a Stock Category') . ': </b><select tabindex=1 name="StockCat">';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ';
+ echo _('Search for Order Items') . '</p>';
+ echo '<div class="page_help_text">' . _('Search for Order Items') . _(', Searches the database for items, you can narrow the results by selecting a stock category, or just enter a partial item description or partial item code') . '.</div><br>';
+ echo '<table class="selection"><tr><td><b>' . _('Select a Stock Category') . ': </b><select tabindex=1 name="StockCat">';
if (!isset($_POST['StockCat'])){
echo "<option selected value='All'>" . _('All');
@@ -1518,13 +1525,13 @@
echo '<td style="text-align:center" colspan=6><input type="hidden" name="order_items" value=1><input tabindex='.number_format($j+8).' type="submit" value="'._('Add to Sales Order').'"></td>';
echo '<td colspan=><input type="hidden" name="nextlist" value='.number_format($Offset+1).'><input tabindex='.number_format($j+9).' type="submit" name="Next" value="'._('Next').'"></td></tr>';
$TableHeader = '<tr><th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Units') . '</th>
- <th>' . _('On Hand') . '</th>
- <th>' . _('On Demand') . '</th>
- <th>' . _('On Order') . '</th>
- <th>' . _('Available') . '</th>
- <th>' . _('Quantity') . '</th></tr>';
+ <th>' . _('Description') . '</th>
+ <th>' . _('Units') . '</th>
+ <th>' . _('On Hand') . '</th>
+ <th>' . _('On Demand') . '</th>
+ <th>' . _('On Order') . '</th>
+ <th>' . _('Available') . '</th>
+ <th>' . _('Quantity') . '</th></tr>';
echo $TableHeader;
$k=0; //row colour counter
@@ -1556,16 +1563,16 @@
// Find the quantity on outstanding sales orders
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
- FROM salesorderdetails,
- salesorders
- WHERE salesorders.orderno = salesorderdetails.orderno AND
- salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "' AND
- salesorderdetails.completed=0 AND
+ FROM salesorderdetails,
+ salesorders
+ WHERE salesorders.orderno = salesorderdetails.orderno AND
+ salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "' AND
+ salesorderdetails.completed=0 AND
salesorders.quotation=0 AND
- salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
+ salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The demand for this product from') . ' ' . $_SESSION['Items'.$identifier]->Location . ' ' .
- _('cannot be retrieved because');
+ _('cannot be retrieved because');
$DemandResult = DB_query($sql,$db,$ErrMsg);
$DemandRow = DB_fetch_row($DemandResult);
@@ -1577,9 +1584,9 @@
// Find the quantity on purchase orders
$sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS dem
- FROM purchorderdetails
- WHERE purchorderdetails.completed=0 AND
- purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
+ FROM purchorderdetails
+ WHERE purchorderdetails.completed=0 AND
+ purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
$PurchResult = db_query($sql,$db,$ErrMsg);
@@ -1593,8 +1600,8 @@
// Find the quantity on works orders
$sql = "SELECT SUM(woitems.qtyreqd - woitems.qtyrecd) AS dedm
- FROM woitems
- WHERE stockid='" . $myrow['stockid'] ."'";
+ FROM woitems
+ WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
$WoResult = db_query($sql,$db,$ErrMsg);
@@ -1656,7 +1663,7 @@
/*FORM VARIABLES TO POST TO THE ORDER WITH PART CODE AND QUANTITY */
// echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" name="quickentry" method=post>';
echo '<div class="page_help_text"><b>' . _('Use this screen for the '). _('Quick Entry')._(' of products to be ordered') . '</b></div><br>
- <table border=1>
+ <table border=1>
<tr>';
/*do not display colum unless customer requires po line number by sales order line*/
if($_SESSION['Items'.$identifier]->DefaultPOLine ==1){
@@ -1665,13 +1672,13 @@
echo '<th>' . _('Part Code') . '</th>
<th>' . _('Quantity') . '</th>
<th>' . _('Due Date') . '</th>
- </tr>';
+ </tr>';
$DefaultDeliveryDate = DateAdd(Date($_SESSION['DefaultDateFormat']),'d',$_SESSION['Items'.$identifier]->DeliveryDays);
- for ($i=1;$i<=$_SESSION['QuickEntries'];$i++){
+ for ($i=1;$i<=$_SESSION['QuickEntries'];$i++){
- echo '<tr class="OddTableRow">';
- /* Do not display colum unless customer requires po line number by sales order line*/
- if($_SESSION['Items'.$identifier]->DefaultPOLine > 0){
+ echo '<tr class="OddTableRow">';
+ /* Do not display colum unless customer requires po line number by sales order line*/
+ if($_SESSION['Items'.$identifier]->DefaultPOLine > 0){
echo '<td><input type="text" name="poline_' . $i . '" size=21 maxlength=20></td>';
}
echo '<td><input type="text" name="part_' . $i . '" size=21 maxlength=20></td>
@@ -1680,12 +1687,12 @@
alt="'.$_SESSION['DefaultDateFormat'].'" value="' . $DefaultDeliveryDate . '"></td></tr>';
}
- echo '</table><br><div class="centre"><input type="submit" name="QuickEntry" value="' . _('Quick Entry') . '">
- <input type="submit" name="PartSearch" value="' . _('Search Parts') . '"></div>';
+ echo '</table><br><div class="centre"><input type="submit" name="QuickEntry" value="' . _('Quick Entry') . '">
+ <input type="submit" name="PartSearch" value="' . _('Search Parts') . '"></div>';
}
if ($_SESSION['Items'.$identifier]->ItemsOrdered >=1){
- echo '<br><div class="centre"><input type=submit name="CancelOrder" value="' . _('Cancel Whole Order') . '" onclick="return confirm(\'' . _('Are you sure you wish to cancel this entire order?') . '\');"></div>';
+ echo '<br><div class="centre"><input type=submit name="CancelOrder" value="' . _('Cancel Whole Order') . '" onclick="return confirm(\'' . _('Are you sure you wish to cancel this entire order?') . '\');"></div>';
}
}#end of else not selecting a customer
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-07 11:35:27 UTC (rev 3410)
+++ trunk/doc/Change.log.html 2010-04-07 12:43:00 UTC (rev 3411)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>07/04/10 Tim: SelectOrderItems.php - Improve layout and correct for paging of items.</p>
<p>07/04/10 Tim: PO_Items.php - Remove the Back To Purchase Order Header link if the order is already posted.</p>
<p>07/04/10 Tim: SystemParameters.php and Currencies.php - Correct so that currency updates are only done when Automatic is chosen.</p>
<p>05/04/10 exson qu: Chinese translation update.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-04-07 19:34:49
|
Revision: 3414
http://web-erp.svn.sourceforge.net/web-erp/?rev=3414&view=rev
Author: tim_schofield
Date: 2010-04-07 19:34:30 +0000 (Wed, 07 Apr 2010)
Log Message:
-----------
SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout.
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/SelectOrderItems.php
trunk/doc/Change.log.html
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2010-04-07 19:31:29 UTC (rev 3413)
+++ trunk/DeliveryDetails.php 2010-04-07 19:34:30 UTC (rev 3414)
@@ -127,7 +127,7 @@
$_POST['ShipVia'] = $BestShipper;
} else {
prnMsg(_($_POST['FreightCost']),'warn');
- }
+ }
}
$sql = 'SELECT custbranch.brname,
custbranch.braddress1,
@@ -324,9 +324,9 @@
$ConfDate = FormatDateforSQL($_SESSION['Items'.$identifier]->ConfirmedDate);
$Result = DB_Txn_Begin($db);
-
+
$OrderNo = GetNextTransNo(30, $db);
-
+
$HeaderSQL = 'INSERT INTO salesorders (
orderno,
debtorno,
@@ -382,7 +382,7 @@
$ErrMsg = _('The order cannot be added because');
$InsertQryResult = DB_query($HeaderSQL,$db,$ErrMsg);
-
+
$StartOf_LineItemsSQL = 'INSERT INTO salesorderdetails (
orderlineno,
orderno,
@@ -410,22 +410,22 @@
)';
$ErrMsg = _('Unable to add the sales order line');
$Ins_LineItemResult = DB_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg,true);
-
- /*Now check to see if the item is manufactured
- * and AutoCreateWOs is on
+
+ /*Now check to see if the item is manufactured
+ * and AutoCreateWOs is on
* and it is a real order (not just a quotation)*/
-
- if ($StockItem->MBflag=='M'
- AND $_SESSION['AutoCreateWOs']==1
- AND $_SESSION['Items'.$identifier]->Quotation!=1){ //oh yeah its all on!
-
+
+ if ($StockItem->MBflag=='M'
+ AND $_SESSION['AutoCreateWOs']==1
+ AND $_SESSION['Items'.$identifier]->Quotation!=1){ //oh yeah its all on!
+
echo '<br>';
-
+
//now get the data required to test to see if we need to make a new WO
$QOHResult = DB_query("SELECT SUM(quantity) FROM locstock WHERE stockid='" . $StockItem->StockID . "'",$db);
$QOHRow = DB_fetch_row($QOHResult);
$QOH = $QOHRow[0];
-
+
$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
FROM salesorderdetails
WHERE salesorderdetails.stkcode = '" . $StockItem->StockID . "'
@@ -433,7 +433,7 @@
$DemandResult = DB_query($SQL,$db);
$DemandRow = DB_fetch_row($DemandResult);
$QuantityDemand = $DemandRow[0];
-
+
$SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
FROM salesorderdetails,
bom,
@@ -447,7 +447,7 @@
$AssemblyDemandResult = DB_query($SQL,$db);
$AssemblyDemandRow = DB_fetch_row($AssemblyDemandResult);
$QuantityAssemblyDemand = $AssemblyDemandRow[0];
-
+
$SQL = "SELECT SUM(purchorderdetails.quantityord - purchorderdetails.quantityrecd) as qtyonorder
FROM purchorderdetails,
purchorders
@@ -457,7 +457,7 @@
$PurchOrdersResult = DB_query($SQL,$db);
$PurchOrdersRow = DB_fetch_row($PurchOrdersResult);
$QuantityPurchOrders = $PurchOrdersRow[0];
-
+
$SQL = "SELECT SUM(woitems.qtyreqd - woitems.qtyrecd) as qtyonorder
FROM woitems INNER JOIN workorders
ON woitems.wo=workorders.wo
@@ -470,7 +470,7 @@
//Now we have the data - do we need to make any more?
$ShortfallQuantity = $QOH-$QuantityDemand-$QuantityAssemblyDemand+$QuantityPurchOrders+$QuantityWorkOrders;
-
+
if ($ShortfallQuantity < 0) { //then we need to make a work order
//How many should the work order be for??
if ($ShortfallQuantity + $StockItem->EOQ < 0){
@@ -478,7 +478,7 @@
} else {
$WOQuantity = $StockItem->EOQ;
}
-
+
$WONo = GetNextTransNo(40,$db);
$ErrMsg = _('Unable to insert a new work order for the sales order item');
$InsWOResult = DB_query("INSERT INTO workorders (wo,
@@ -504,7 +504,7 @@
} else {
$Cost = $CostRow[0];
}
-
+
// insert parent item info
$sql = "INSERT INTO woitems (wo,
stockid,
@@ -520,16 +520,16 @@
//Recursively insert real component requirements - see includes/SQL_CommonFunctions.in for function WoRealRequirements
WoRealRequirements($db, $WONo, $_SESSION['DefaultFactoryLocation'], $StockItem->StockID);
- $FactoryManagerEmail = _('A new work order has been created for') .
+ $FactoryManagerEmail = _('A new work order has been created for') .
":\n" . $StockItem->StockID . ' - ' . $StockItem->Descr . ' x ' . $WOQuantity . ' ' . $StockItem->UOM .
"\n" . _('These are for') . ' ' . $_SESSION['Items'.$identifier]->CustomerName . ' ' . _('there order ref') . ': ' . $_SESSION['Items'.$identifier]->CustRef . ' ' ._('our order number') . ': ' . $OrderNo;
-
+
if ($StockItem->Serialised AND $StockItem->NextSerialNo>0){
//then we must create the serial numbers for the new WO also
$FactoryManagerEmail .= "\n" . _('The following serial numbers have been reserved for this work order') . ':';
-
+
for ($i=0;$i<$WOQuantity;$i++){
-
+
$result = DB_query("SELECT serialno FROM stockserialitems
WHERE serialno='" . ($StockItem->NextSerialNo + $i) . "'
AND stockid='" . $StockItem->StockID ."'",$db);
@@ -540,14 +540,14 @@
$sql = 'INSERT INTO woserialnos (wo,
stockid,
serialno)
- VALUES (' . $WONo . ",
+ VALUES (' . $WONo . ",
'" . $StockItem->StockID . "',
" . ($StockItem->NextSerialNo + $i) . ')';
$ErrMsg = _('The serial number for the work order item could not be added');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
$FactoryManagerEmail .= "\n" . ($StockItem->NextSerialNo + $i);
}
- } //end loop around creation of woserialnos
+ } //end loop around creation of woserialnos
$NewNextSerialNo = ($StockItem->NextSerialNo + $WOQuantity +1);
$ErrMsg = _('Could not update the new next serial number for the item');
$UpdateNextSerialNoResult = DB_query('UPDATE stockmaster SET nextserialno=' . $NewNextSerialNo . " WHERE stockid='" . $StockItem->StockID . "'",$db,$ErrMsg,$DbgMsg,true);
@@ -555,12 +555,12 @@
$EmailSubject = _('New Work Order Number') . ' ' . $WONo . ' ' . _('for') . ' ' . $StockItem->StockID . ' x ' . $WOQuantity;
//Send email to the Factory Manager
- mail($_SESSION['FactoryManagerEmail'],$EmailSubject,$FactoryManagerEmail);
+ mail($_SESSION['FactoryManagerEmail'],$EmailSubject,$FactoryManagerEmail);
} //end if with this sales order there is a shortfall of stock - need to create the WO
}//end if auto create WOs in on
} /* end inserted line items into sales order details */
- $result = DB_Txn_Commit($db);
+ $result = DB_Txn_Commit($db);
echo '<br>';
if ($_SESSION['Items'.$identifier]->Quotation==1){
prnMsg(_('Quotation Number') . ' ' . $OrderNo . ' ' . _('has been entered'),'success');
@@ -702,7 +702,7 @@
echo _('Order Summary');
}
echo '</b></div>
- <table cellpading=2 colspan=7 border=1>
+ <table cellpading=2 colspan=7>
<Tr>
<th>'. _('Item Code') .'</th>
<th>'. _('Item Description') .'</th>
@@ -750,14 +750,14 @@
}
$DisplayTotal = number_format($_SESSION['Items'.$identifier]->total,2);
- echo '<tr>
+ echo '<tr class="EvenTableRows">
<td colspan=6 class=number><b>'. _('TOTAL Excl Tax/Freight') .'</b></td>
<td class=number>'.$DisplayTotal.'</td>
</tr></table>';
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
- echo '<table border=1><tr>
+ echo '<br><table class=selection><tr>
<td>'. _('Total Weight') .':</td>
<td>'.$DisplayWeight.'</td>
<td>'. _('Total Volume') .':</td>
@@ -809,7 +809,7 @@
}
$DisplayTotal = number_format($_SESSION['Items'.$identifier]->total,2);
- echo '<table><tr>
+ echo '<table class=selection><tr>
<td>'. _('Total Weight') .':</td>
<td>'.$DisplayWeight .'</td>
<td>'. _('Total Volume') .':</td>
@@ -818,7 +818,7 @@
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
- echo '<table border=1><tr>
+ echo '<table class=selection><tr>
<td>'. _('Total Weight') .':</td>
<td>'. $DisplayWeight .'</td>
<td>'. _('Total Volume') .':</td>
@@ -827,7 +827,7 @@
}
-echo '<br><table><tr>
+echo '<br><table class=selection><tr>
<td>'. _('Deliver To') .':</td>
<td><input type=text size=42 maxlength=40 name="DeliverTo" value="' . $_SESSION['Items'.$identifier]->DeliverTo . '"></td>
</tr>';
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2010-04-07 19:31:29 UTC (rev 3413)
+++ trunk/SelectOrderItems.php 2010-04-07 19:34:30 UTC (rev 3414)
@@ -386,8 +386,15 @@
// record returned from a search so parse the $Select string into customer code and branch code */
if (isset($_POST['Select']) AND $_POST['Select']!='') {
- $_SESSION['Items'.$identifier]->Branch = substr($_POST['Select'],strpos($_POST['Select'],' - ')+3);
+ $branchsql='SELECT branchcode
+ FROM custbranch
+ WHERE brname="'.substr($_POST['Select'],strpos($_POST['Select'],' - ')+3).'"
+ AND debtorno="'.substr($_POST['Select'],0,strpos($_POST['Select'],' - ')).'"';
+ $branchresult=DB_query($branchsql, $db);
+ $branchrow=DB_fetch_row($branchresult);
+ $_SESSION['Items'.$identifier]->Branch = $branchrow[0];
+
$_POST['Select'] = substr($_POST['Select'],0,strpos($_POST['Select'],' - '));
// Now check to ensure this account is not on hold */
@@ -453,7 +460,7 @@
FROM custbranch
INNER JOIN locations
ON custbranch.defaultlocation=locations.loccode
- WHERE custbranch.brname='" . $_SESSION['Items'.$identifier]->Branch . "'
+ WHERE custbranch.branchcode='" . $_SESSION['Items'.$identifier]->Branch . "'
AND custbranch.debtorno = '" . $_POST['Select'] . "'";
$ErrMsg = _('The customer branch record of the customer selected') . ': ' . $_POST['Select'] . ' ' . _('cannot be retrieved because');
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-07 19:31:29 UTC (rev 3413)
+++ trunk/doc/Change.log.html 2010-04-07 19:34:30 UTC (rev 3414)
@@ -1,5 +1,7 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>07/04/10 Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout.</p>
+<p>07/04/10 Tim: Improvements to the silverwolf theme.</p>
<p>07/04/10 Tim: SelectOrderItems.php - Improve layout and correct for paging of items.</p>
<p>07/04/10 Tim: PO_Items.php - Remove the Back To Purchase Order Header link if the order is already posted.</p>
<p>07/04/10 Tim: SystemParameters.php and Currencies.php - Correct so that currency updates are only done when Automatic is chosen.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-04-08 08:26:30
|
Revision: 3416
http://web-erp.svn.sourceforge.net/web-erp/?rev=3416&view=rev
Author: tim_schofield
Date: 2010-04-08 08:26:24 +0000 (Thu, 08 Apr 2010)
Log Message:
-----------
Tim: SuppTransGLAnalysis.php - Correct typo in sql statement.
Modified Paths:
--------------
trunk/SuppTransGLAnalysis.php
trunk/doc/Change.log.html
Modified: trunk/SuppTransGLAnalysis.php
===================================================================
--- trunk/SuppTransGLAnalysis.php 2010-04-08 08:25:57 UTC (rev 3415)
+++ trunk/SuppTransGLAnalysis.php 2010-04-08 08:26:24 UTC (rev 3416)
@@ -47,7 +47,7 @@
prnMsg( _('The amount entered is not numeric') . '. ' . _('This line cannot be added to the transaction'),'error');
$InputError = True;
} elseif ($_POST['JobRef'] != ''){
- $sql = "SELECT contractref FROM contracts WHERE contactref='" . $_POST['JobRef'] . "'";
+ $sql = "SELECT contractref FROM contracts WHERE contractref='" . $_POST['JobRef'] . "'";
$result = DB_query($sql, $db);
if (DB_num_rows($result) == 0){
prnMsg( _('The contract reference entered is not a valid contract, this line cannot be added to the transaction'),'error');
@@ -78,7 +78,7 @@
/*Show all the selected GLCodes so far from the SESSION['SuppInv']->GLCodes array */
if ($_SESSION['SuppTrans']->InvoiceOrCredit == 'Invoice'){
- echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('General Ledger') . '" alt="">' . ' '
+ echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('General Ledger') . '" alt="">' . ' '
. _('General Ledger Analysis of Invoice From') . ' ' . $_SESSION['SuppTrans']->SupplierName;
} else {
echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('General Ledger') . '" alt="">' . ' '
@@ -174,10 +174,10 @@
echo '<tr>
<td>' . _('Contract Ref') . ":</td>
<td><input type='Text' name='JobRef' size=21 maxlength=20 VALUE=" . $_POST['JobRef'] . ">";
-
+
/* Once the contract stuff is written then it would be appropriate to have:
<a TARGET='_blank' href='$rootpath/ContractsList.php?" . SID . "'>" . _('View Open Contracts/Jobs') . '</a> */
-
+
echo ' </td>
</tr>';
if (!isset($_POST['Narrative'])) {
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-08 08:25:57 UTC (rev 3415)
+++ trunk/doc/Change.log.html 2010-04-08 08:26:24 UTC (rev 3416)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>08/04/10 Tim: SuppTransGLAnalysis.php - Correct typo in sql statement.</p>
<p>07/04/10 Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout.</p>
<p>07/04/10 Tim: Improvements to the silverwolf theme.</p>
<p>07/04/10 Tim: SelectOrderItems.php - Improve layout and correct for paging of items.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-04-14 15:21:17
|
Revision: 3417
http://web-erp.svn.sourceforge.net/web-erp/?rev=3417&view=rev
Author: tim_schofield
Date: 2010-04-14 15:21:11 +0000 (Wed, 14 Apr 2010)
Log Message:
-----------
Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout.
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/SelectOrderItems.php
trunk/css/silverwolf/default.css
trunk/doc/Change.log.html
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2010-04-08 08:26:24 UTC (rev 3416)
+++ trunk/DeliveryDetails.php 2010-04-14 15:21:11 UTC (rev 3417)
@@ -573,19 +573,19 @@
if ($_POST['Quotation']==0) { /*then its not a quotation its a real order */
- echo '<div style="text-align:center"><p><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="">' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?' . SID .'identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Preprinted stationery') . ')' .'</a>';
- echo '<p><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="">' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?' . SID .'identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a>';
+ echo '<br><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td><td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?' . SID .'identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Preprinted stationery') . ')' .'</a></td></tr>';
+ echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td><td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?' . SID .'identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td></tr>';
- echo '<p><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt="">' . ' ' . '<a href="' . $rootpath . '/ConfirmDispatch_Invoice.php?' . SID .'identifier='.$identifier . '&OrderNumber=' . $OrderNo .'">'. _('Confirm Dispatch and Produce Invoice') .'</a>';
+ echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt=""></td><td>' . ' ' . '<a href="' . $rootpath . '/ConfirmDispatch_Invoice.php?' . SID .'identifier='.$identifier . '&OrderNumber=' . $OrderNo .'">'. _('Confirm Dispatch and Produce Invoice') .'</a></td></tr>';
//Add option to Print Sales Orders or Proforma invoice
- echo '<p><img src="'.$rootpath.'/css/'.$theme.'/images/pdf.png" title="' . _('Sales Order') . '" alt="">' . ' ' . '<a href="' . $rootpath . '/PrintSalesOrder_generic.php?' . SID .'identifier='.$identifier . '&TransNo=' . $OrderNo .'">'. _('Print Sales Order / Pro-forma Invoice') .'</a></div>';
+ echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/pdf.png" title="' . _('Sales Order') . '" alt=""></td><td>' . ' ' . '<a href="' . $rootpath . '/PrintSalesOrder_generic.php?' . SID .'identifier='.$identifier . '&TransNo=' . $OrderNo .'">'. _('Print Sales Order / Pro-forma Invoice') .'</a></td></tr></table>';
} else {
/*link to print the quotation */
- echo '<p><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt="">' . ' ' . '<a href="' . $rootpath . '/PDFQuotation.php?' . SID .'identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation') .'</a>';
+ echo '<br><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt=""></td><td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotation.php?' . SID .'identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation') .'</a></td></tr></table>';
}
- echo '<div class="centre"><p><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt="">' . ' ' . '<a href="'. $rootpath .'/SelectOrderItems.php?' . SID .'identifier='.$identifier . '&NewOrder=Yes">'. _('Add Sales Order') .'</a></div>';
+ echo '<br><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt=""></td><td>' . ' ' . '<a href="'. $rootpath .'/SelectOrderItems.php?' . SID .'identifier='.$identifier . '&NewOrder=Yes">'. _('Add Another Sales Order') .'</a></td></tr></table>';
} else {
/*its a customer logon so thank them */
prnMsg(_('Thank you for your business'),'success');
@@ -672,10 +672,10 @@
prnMsg(_('Order Number') .' ' . $_SESSION['ExistingOrder'] . ' ' . _('has been updated'),'success');
- echo '<br><a href="' . $rootpath . '/PrintCustOrder.php?' . SID.'identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'] . '">'. _('Print packing slip - pre-printed stationery') .'</a>';
- echo '<p><a href="' . $rootpath .'/ConfirmDispatch_Invoice.php?' . SID.'identifier='.$identifier . '&OrderNumber=' . $_SESSION['ExistingOrder'] . '">'. _('Confirm Order Delivery Quantities and Produce Invoice') .'</a>';
- echo '<br><a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?' . SID.'identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'] . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a>';
- echo '<p><a href="' . $rootpath .'/SelectSalesOrder.php?' . SID.'identifier='.$identifier . '">'. _('Select A Different Order') .'</a>';
+ echo '<br><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td><td><a href="' . $rootpath . '/PrintCustOrder.php?' . SID.'identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'] . '">'. _('Print packing slip - pre-printed stationery') .'</a></td></tr>';
+ echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td><td><a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?' . SID.'identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'] . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td></tr>';
+ echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt=""></td><td><a href="' . $rootpath .'/ConfirmDispatch_Invoice.php?' . SID.'identifier='.$identifier . '&OrderNumber=' . $_SESSION['ExistingOrder'] . '">'. _('Confirm Order Delivery Quantities and Produce Invoice') .'</a></td></tr>';
+ echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt=""></td><td><a href="' . $rootpath .'/SelectSalesOrder.php?' . SID.'identifier='.$identifier . '">'. _('Select A Different Order') .'</a></td></tr></table>';
include('includes/footer.inc');
exit;
}
@@ -757,7 +757,7 @@
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
- echo '<br><table class=selection><tr>
+ echo '<br><table><tr class="EvenTableRows">
<td>'. _('Total Weight') .':</td>
<td>'.$DisplayWeight.'</td>
<td>'. _('Total Volume') .':</td>
@@ -1015,7 +1015,7 @@
echo '</table>';
-echo '<br><div class="centre"><input type=submit name="BackToLineDetails" value="' . _('Modify Order Lines') . '">';
+echo '<br><div class="centre"><input type=submit name="BackToLineDetails" value="' . _('Modify Order Lines') . '"><br>';
if ($_SESSION['ExistingOrder']==0){
echo '<br><br><input type=submit name="ProcessOrder" value="' . _('Place Order') . '">';
@@ -1026,4 +1026,4 @@
echo '</div></form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2010-04-08 08:26:24 UTC (rev 3416)
+++ trunk/SelectOrderItems.php 2010-04-14 15:21:11 UTC (rev 3417)
@@ -374,7 +374,7 @@
if (DB_num_rows($result_CustSelect)==1){
$myrow=DB_fetch_array($result_CustSelect);
- $_POST['Select'] = $myrow['debtorno'] . ' - ' . $myrow['branchname'];
+ $_POST['Select'] = $myrow['debtorno'] . ' - ' . $myrow['branchcode'];
} elseif (DB_num_rows($result_CustSelect)==0){
prnMsg(_('No Customer Branch records contain the search criteria') . ' - ' . _('please try again') . ' - ' . _('Note a Customer Branch Name may be different to the Customer Name'),'info');
}
@@ -386,15 +386,8 @@
// record returned from a search so parse the $Select string into customer code and branch code */
if (isset($_POST['Select']) AND $_POST['Select']!='') {
- $branchsql='SELECT branchcode
- FROM custbranch
- WHERE brname="'.substr($_POST['Select'],strpos($_POST['Select'],' - ')+3).'"
- AND debtorno="'.substr($_POST['Select'],0,strpos($_POST['Select'],' - ')).'"';
+ $_SESSION['Items'.$identifier]->Branch = substr($_POST['Select'],strpos($_POST['Select'],' - ')+3);
- $branchresult=DB_query($branchsql, $db);
- $branchrow=DB_fetch_row($branchresult);
- $_SESSION['Items'.$identifier]->Branch = $branchrow[0];
-
$_POST['Select'] = substr($_POST['Select'],0,strpos($_POST['Select'],' - '));
// Now check to ensure this account is not on hold */
@@ -562,6 +555,7 @@
// the order process will ask for branch details later anyway
$sql = "SELECT custbranch.brname,
+ custbranch.branchcode,
custbranch.braddress1,
custbranch.braddress2,
custbranch.braddress3,
@@ -660,17 +654,18 @@
echo '<tr class="OddTableRows">';
$k=1;
}
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID .'identifier='.$identifier . '"& name="SelectParts" method=post>';
if ($LastCustomer != $myrow['name']) {
echo '<td>'.$myrow['name'].'</td>';
} else {
echo '<td></td>';
}
- echo '<td><input tabindex='.number_format($j+5).' type=submit name="Select" value="'.$myrow['debtorno'].' - '.$myrow['brname'].'"</td>
- <td>'.$myrow['brname'].'</td>
+ echo '<td><input tabindex='.number_format($j+5).' type=submit name="Submit" value="'.$myrow['brname'].'"</td>
+ <input type=hidden name="Select" value="'.$myrow['debtorno'].' - '.$myrow['branchcode'].'">
<td>'.$myrow['contactname'].'</td>
<td>'.$myrow['phoneno'].'</td>
<td>.'.$myrow['faxno'].'</td>
- </tr>';
+ </tr></form>';
$LastCustomer=$myrow['name'];
$j++;
//end of page full new headings if
@@ -1319,7 +1314,7 @@
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
- echo '<table border=1><tr><td>' . _('Total Weight') . ':</td>
+ echo '<table><tr class="EvenTableRows"><td>' . _('Total Weight') . ':</td>
<td>' . $DisplayWeight . '</td>
<td>' . _('Total Volume') . ':</td>
<td>' . $DisplayVolume . '</td>
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2010-04-08 08:26:24 UTC (rev 3416)
+++ trunk/css/silverwolf/default.css 2010-04-14 15:21:11 UTC (rev 3417)
@@ -41,7 +41,7 @@
/*links before selection */
a {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
font-weight: normal;
text-decoration: none;
color: #00f;
@@ -61,7 +61,7 @@
th {
font-weight: normal;
background-color: #cccce5;
- font-size: 12px;
+ font-size: 10px;
color: #300;
text-align: center;
vertical-align: center;
@@ -76,7 +76,7 @@
/*table detail items default format */
td {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
text-align: left;
}
@@ -171,9 +171,24 @@
margin: 0 auto;
}
+textarea {
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 10px;
+ background-color: #e3e1e1;
+ border-width:1px;
+ border-bottom-color: gray;
+ border-bottom-style: solid;
+ border-top-color: gray;
+ border-top-style: solid;
+ border-left-color: gray;
+ border-left-style: solid;
+ border-right-color: gray;
+ border-right-style: solid;
+}
+
input {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
background-color: #e3e1e1;
border-width:1px;
border-bottom-color: gray;
@@ -186,6 +201,21 @@
border-right-style: solid;
}
+input:hover {
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 10px;
+ background-color: #e3e5f5;
+ border-width:1px;
+ border-bottom-color: gray;
+ border-bottom-style: solid;
+ border-top-color: gray;
+ border-top-style: solid;
+ border-left-color: gray;
+ border-left-style: solid;
+ border-right-color: gray;
+ border-right-style: solid;
+}
+
input.number {
text-align: right;
}
@@ -196,7 +226,7 @@
select {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
}
font.good {
@@ -330,7 +360,7 @@
width: 100%;
margin: 0px;
padding: 0px;
- font-size: 12px;
+ font-size: 10px;
}
/* Main page heading with quick menu within */
@@ -356,7 +386,7 @@
.quick_menu_left {
background: none;
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
font-weight: bold;
border: none;
white-space: nowrap;
@@ -427,12 +457,12 @@
}
.system_menu_tabs a {
- font-size: 12px;
+ font-size: 10px;
color: black;
}
.system_menu_tabs a:hover {
- font-size: 12px;
+ font-size: 10px;
color: black;
}
@@ -503,7 +533,7 @@
span.main_menu_nolink {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
font-weight: bold;
color: #777;
text-decoration: none;
@@ -545,7 +575,7 @@
.menu_group_headers_text {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
font-weight: bold;
color: black;
}
@@ -572,7 +602,7 @@
padding-top: 2px;
padding-bottom: 2px;
font-weight: bold;
- font-size: 12px;
+ font-size: 10px;
color: black;
background-color: #cccce5;
width: 33%;
@@ -631,7 +661,7 @@
span.menu_group_nolink {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
font-weight: normal;
color: #777;
text-decoration: none;
@@ -727,7 +757,7 @@
.label {
font-weight:bold;
font-style:normal;
- font-size:12px;
+ font-size:10px;
color:black;
background-color:#ccc;
}
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-08 08:26:24 UTC (rev 3416)
+++ trunk/doc/Change.log.html 2010-04-14 15:21:11 UTC (rev 3417)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>14/04/10 Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout and design of sales order entry</p>
<p>08/04/10 Tim: SuppTransGLAnalysis.php - Correct typo in sql statement.</p>
<p>07/04/10 Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout.</p>
<p>07/04/10 Tim: Improvements to the silverwolf theme.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-04-14 23:12:18
|
Revision: 3418
http://web-erp.svn.sourceforge.net/web-erp/?rev=3418&view=rev
Author: tim_schofield
Date: 2010-04-14 23:12:11 +0000 (Wed, 14 Apr 2010)
Log Message:
-----------
Tim: SystemParameters.php - Add in picking note parameter
Modified Paths:
--------------
trunk/SystemParameters.php
trunk/doc/Change.log.html
trunk/sql/mysql/upgrade3.11.1-3.12.sql
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2010-04-14 15:21:11 UTC (rev 3417)
+++ trunk/SystemParameters.php 2010-04-14 23:12:11 UTC (rev 3418)
@@ -219,6 +219,9 @@
if ($_SESSION['AllowOrderLineItemNarrative'] != $_POST['X_AllowOrderLineItemNarrative'] ) {
$sql[] = "UPDATE config SET confvalue = '". $_POST['X_AllowOrderLineItemNarrative']."' WHERE confname = 'AllowOrderLineItemNarrative'";
}
+ if ($_SESSION['RequirePickingNote'] != $_POST['X_RequirePickingNote'] ) {
+ $sql[] = "UPDATE config SET confvalue = '". $_POST['X_RequirePickingNote']."' WHERE confname = 'RequirePickingNote'";
+ }
if ($_SESSION['geocode_integration'] != $_POST['X_geocode_integration'] ) {
$sql[] = "UPDATE config SET confvalue = '". $_POST['X_geocode_integration']."' WHERE confname = 'geocode_integration'";
}
@@ -382,6 +385,16 @@
</select></td>
<td>' . _('Select whether or not to allow entry of narrative on order line items. This narrative will appear on invoices and packing slips. Useful mainly for service businesses.') . '</td>
</tr>';
+
+//'RequirePickingNote'
+echo '<tr><td>' . _('A picking note must be produced before an order can be delivered') . ':</td>
+ <td><select Name="X_RequirePickingNote">
+ <option '.($_SESSION['RequirePickingNote']=='1'?'selected ':'').'value="1">'._('Yes').'
+ <option '.($_SESSION['RequirePickingNote']=='0'?'selected ':'').'value="0">'._('No').'
+ </select></td>
+ <td>' . _('Select whether or not a picking note must be produced before an order can be delivered to a customer.') . '</td>
+ </tr>';
+
//UpdateCurrencyRatesDaily
echo '<tr><td>' . _('Auto Update Exchange Rates Daily') . ':</td>
<td><select Name="X_UpdateCurrencyRatesDaily">
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-14 15:21:11 UTC (rev 3417)
+++ trunk/doc/Change.log.html 2010-04-14 23:12:11 UTC (rev 3418)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>15/04/10 Tim: SystemParameters.php - Add in picking note parameter</p>
<p>14/04/10 Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout and design of sales order entry</p>
<p>08/04/10 Tim: SuppTransGLAnalysis.php - Correct typo in sql statement.</p>
<p>07/04/10 Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout.</p>
Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-3.12.sql 2010-04-14 15:21:11 UTC (rev 3417)
+++ trunk/sql/mysql/upgrade3.11.1-3.12.sql 2010-04-14 23:12:11 UTC (rev 3418)
@@ -128,4 +128,6 @@
ALTER TABLE `debtortrans`
ADD COLUMN `inputdate` datetime NOT NULL AFTER `trandate` ;
-ALTER TABLE `reportfields` CHANGE COLUMN `fieldname` `fieldname` VARCHAR(60) NOT NULL DEFAULT '';
\ No newline at end of file
+ALTER TABLE `reportfields` CHANGE COLUMN `fieldname` `fieldname` VARCHAR(60) NOT NULL DEFAULT '';
+
+INSERT INTO `config` (`confname`, `confvalue`) VALUES ('RequirePickingNote',0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-04-15 10:50:47
|
Revision: 3419
http://web-erp.svn.sourceforge.net/web-erp/?rev=3419&view=rev
Author: tim_schofield
Date: 2010-04-15 10:50:41 +0000 (Thu, 15 Apr 2010)
Log Message:
-----------
Tim: GLJournal.php - Fix to show the footer on completion of the journal.</
Modified Paths:
--------------
trunk/GLJournal.php
trunk/doc/Change.log.html
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2010-04-14 23:12:11 UTC (rev 3418)
+++ trunk/GLJournal.php 2010-04-15 10:50:41 UTC (rev 3419)
@@ -122,6 +122,7 @@
echo "<br><a href='" . $_SERVER['PHP_SELF'] . '?' . SID . "&NewJournal=Yes'>"._('Enter Another General Ledger Journal').'</a>';
/*And post the journal too */
include ('includes/GLPostings.inc');
+ include ('includes/footer.inc');
exit;
} elseif (isset($_GET['Delete'])){
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-14 23:12:11 UTC (rev 3418)
+++ trunk/doc/Change.log.html 2010-04-15 10:50:41 UTC (rev 3419)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>15/04/10 Tim: GLJournal.php - Fix to show the footer on completion of the journal.</p>
<p>15/04/10 Tim: SystemParameters.php - Add in picking note parameter</p>
<p>14/04/10 Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout and design of sales order entry</p>
<p>08/04/10 Tim: SuppTransGLAnalysis.php - Correct typo in sql statement.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-04-15 10:55:52
|
Revision: 3420
http://web-erp.svn.sourceforge.net/web-erp/?rev=3420&view=rev
Author: tim_schofield
Date: 2010-04-15 10:55:46 +0000 (Thu, 15 Apr 2010)
Log Message:
-----------
Ricard: WWW_Users.php - Correctly show the last visited date.
Modified Paths:
--------------
trunk/WWW_Users.php
trunk/doc/Change.log.html
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2010-04-15 10:50:41 UTC (rev 3419)
+++ trunk/WWW_Users.php 2010-04-15 10:55:46 UTC (rev 3420)
@@ -11,17 +11,17 @@
}
include('includes/session.inc');
-$ModuleList = array(_('Orders'),
- _('Receivables'),
- _('Payables'),
- _('Purchasing'),
- _('Inventory'),
- _('Manufacturing'),
- _('General Ledger'),
- _('Asset Manager'),
- _('Petty Cash'),
+$ModuleList = array(_('Orders'),
+ _('Receivables'),
+ _('Payables'),
+ _('Purchasing'),
+ _('Inventory'),
+ _('Manufacturing'),
+ _('General Ledger'),
+ _('Asset Manager'),
+ _('Petty Cash'),
_('Setup'));
-
+
$PDFLanguages = array(_('Latin Western Languages'),
_('Eastern European Russian Japanese'),
_('Chinese'),
@@ -38,8 +38,8 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' . _('Search') . '" alt="">' . ' ' . $title.'<br>';
// Make an array of the security roles
-$sql = 'SELECT secroleid,
- secrolename
+$sql = 'SELECT secroleid,
+ secrolename
FROM securityroles ORDER BY secroleid';
$Sec_Result = DB_query($sql, $db);
$SecurityRoles = array();
@@ -240,7 +240,7 @@
/* If its the first time the page has been displayed with no parameters then none of the above are true and the list of Users will be displayed with links to delete or edit each. These will call the same page again and allow update/input or deletion of the records*/
- $sql = 'SELECT
+ $sql = 'SELECT
userid,
realname,
phone,
@@ -281,11 +281,11 @@
echo '<tr class="OddTableRows">';
$k=1;
}
-
- if ($myrow[6]=='') {
+
+ if ($myrow[7]=='') {
$LastVisitDate = Date('Y-m-d');
} else {
- $LastVisitDate = ConvertSQLDate($myrow[6]);
+ $LastVisitDate = ConvertSQLDate($myrow[7]);
}
/*The SecurityHeadings array is defined in config.php */
@@ -351,7 +351,7 @@
blocked,
theme,
language,
- pdflanguage
+ pdflanguage
FROM www_users
WHERE userid='" . $SelectedUser . "'";
@@ -373,7 +373,7 @@
$_POST['UserLanguage'] = $myrow['language'];
$_POST['Blocked'] = $myrow['blocked'];
$_POST['PDFLanguage'] = $myrow['pdflanguage'];
-
+
echo "<input type='hidden' name='SelectedUser' value='" . $SelectedUser . "'>";
echo "<input type='hidden' name='UserID' value='" . $_POST['UserID'] . "'>";
echo "<input type='hidden' name='ModulesAllowed' value='" . $_POST['ModulesAllowed'] . "'>";
@@ -475,7 +475,7 @@
echo '<option value="">' . _('Not a salesperson only login') . '</option>';
}
while ($myrow=DB_fetch_array($result)){
-
+
if (isset($_POST['Salesman']) and $myrow['salesmancode'] == $_POST['Salesman']){
echo '<option selected value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
} else {
@@ -573,7 +573,7 @@
} elseif (!isset($_POST['UserLanguage']) and $LanguageEntry == $DefaultLanguage) {
echo "<option selected value='$LanguageEntry'>$LanguageEntry";
} else {
- echo "<option value='$LanguageEntry'>$LanguageEntry";
+ echo "<option value='$LanguageEntry'>$LanguageEntry";
}
}
}
@@ -601,7 +601,7 @@
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){
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-15 10:50:41 UTC (rev 3419)
+++ trunk/doc/Change.log.html 2010-04-15 10:55:46 UTC (rev 3420)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>15/04/10 Ricard: WWW_Users.php - Correctly show the last visited date.</p>
<p>15/04/10 Tim: GLJournal.php - Fix to show the footer on completion of the journal.</p>
<p>15/04/10 Tim: SystemParameters.php - Add in picking note parameter</p>
<p>14/04/10 Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout and design of sales order entry</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2010-04-15 20:20:21
|
Revision: 3421
http://web-erp.svn.sourceforge.net/web-erp/?rev=3421&view=rev
Author: tim_schofield
Date: 2010-04-15 20:20:15 +0000 (Thu, 15 Apr 2010)
Log Message:
-----------
Kalmer Piiskop: MiscFunctions.js - Update IsDAte() function for all date formats.
Modified Paths:
--------------
trunk/doc/Change.log.html
trunk/javascripts/MiscFunctions.js
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-15 10:55:46 UTC (rev 3420)
+++ trunk/doc/Change.log.html 2010-04-15 20:20:15 UTC (rev 3421)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>15/04/10 Kalmer Piiskop: MiscFunctions.js - Update IsDAte() function for all date formats.</p>
<p>15/04/10 Ricard: WWW_Users.php - Correctly show the last visited date.</p>
<p>15/04/10 Tim: GLJournal.php - Fix to show the footer on completion of the journal.</p>
<p>15/04/10 Tim: SystemParameters.php - Add in picking note parameter</p>
Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js 2010-04-15 10:55:46 UTC (rev 3420)
+++ trunk/javascripts/MiscFunctions.js 2010-04-15 20:20:15 UTC (rev 3421)
@@ -28,12 +28,18 @@
alert("Please enter the date in the format "+dF);
return false;
}
-if (dF=="d/m/Y"){
-d=mA[1];
-m=mA[3];
+if ((dF == "d/m/Y") || (dF == "d.m.Y")){
+d = mA[1];
+m = mA[3];
+y = mA[5];
+}else if (dF == "m/d/Y"){
+d = mA[3];
+m = mA[1];
+y = mA[5];
}else{
-d=mA[3];
-m=mA[1];
+d = mA[5];
+m = mA[3];
+y = mA[1];
}
y=mA[5];
if (m<1 || m>12){
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