Menu
▾
▴
web-erp-svn
|
From: <tim...@us...> - 2012-08-30 18:26:53
|
Revision: 5615
http://web-erp.svn.sourceforge.net/web-erp/?rev=5615&view=rev
Author: tim_schofield
Date: 2012-08-30 18:26:44 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
Thomas Timothy Lie: Fix more typos in gettext strings
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/BOMIndentedReverse.php
trunk/ConfirmDispatch_Invoice.php
trunk/CounterSales.php
trunk/FixedAssetLocations.php
trunk/GLProfit_Loss.php
trunk/Labels.php
trunk/MRP.php
trunk/MRPCalendar.php
trunk/PurchData.php
trunk/SMTPServer.php
trunk/SalesInquiry.php
trunk/WOSerialNos.php
trunk/api/api_xml-rpc.php
trunk/reportwriter/languages/en_US/reports.php
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/BOMExtendedQty.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -27,7 +27,7 @@
part char(20),
extendedqpa double,
sortpart text) DEFAULT CHARSET=utf8";
- $ErrMsg = _('The SQL to to create passbom failed with the message');
+ $ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = "CREATE TEMPORARY TABLE tempbom (
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/BOMIndentedReverse.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -23,7 +23,7 @@
part char(20),
sortpart text) DEFAULT CHARSET=utf8";
- $ErrMsg = _('The SQL to to create passbom failed with the message');
+ $ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = "CREATE TEMPORARY TABLE tempbom (
@@ -48,7 +48,7 @@
CONCAT(bom.component,bom.parent) AS sortpart
FROM bom
WHERE bom.component ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -75,7 +75,7 @@
bom.quantity
FROM bom
WHERE bom.component ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -106,7 +106,7 @@
bom.quantity
FROM bom,passbom
WHERE bom.component = passbom.part
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -126,7 +126,7 @@
CONCAT(passbom2.sortpart,bom.parent) AS sortpart
FROM bom,passbom2
WHERE bom.component = passbom2.part
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
$result = DB_query("SELECT COUNT(*) FROM bom,passbom WHERE bom.component = passbom.part",$db);
@@ -172,8 +172,8 @@
ORDER BY sortpart";
$result = DB_query($sql,$db);
- $ListCount = DB_num_rows($result);
-
+ $ListCount = DB_num_rows($result);
+
While ($myrow = DB_fetch_array($result,$db)){
$YPos -=$line_height;
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/ConfirmDispatch_Invoice.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -830,7 +830,7 @@
} else {
$AssetNumber = intval(mb_substr($OrderLine->StockID,6,mb_strlen($OrderLine->StockID)-$HyphenOccursAt-1));
}
- prnMsg (_('The asset number beind disposed of is:') . ' ' . $AssetNumber, 'info');
+ prnMsg (_('The asset number being disposed of is:') . ' ' . $AssetNumber, 'info');
} else {
$IsAsset = false;
$AssetNumber = 0;
@@ -1440,7 +1440,7 @@
'" . $_SESSION['Items'.$identifier]->DebtorNo . " - " . $OrderLine->StockID . ' ' . _('disposal') . "',
'" . -$DisposalRow['cost'] . "')";
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The reversal of asset cost on dispoal GL posting could not be inserted because');
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The reversal of asset cost on disposal GL posting could not be inserted because');
$DbgMsg = _('The following SQL to insert the GLTrans record was used');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
}
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/CounterSales.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -996,13 +996,13 @@
/* Now Get the area where the sale is to from the branches table */
- $SQL = "SELECT area,
+ $SQL = "SELECT area,
defaultshipvia
FROM custbranch
WHERE custbranch.debtorno ='". $_SESSION['Items'.$identifier]->DebtorNo . "'
AND custbranch.branchcode = '" . $_SESSION['Items'.$identifier]->Branch . "'";
- $ErrMsg = _('We were unable to load the area where the sale is to from the custbranch table');
+ $ErrMsg = _('We were unable to load the area from the custbranch table where the sale is to ');
$Result = DB_query($SQL,$db, $ErrMsg);
$myrow = DB_fetch_row($Result);
$Area = $myrow[0];
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/FixedAssetLocations.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -28,7 +28,7 @@
}
}
if (isset($_GET['SelectedLocation'])) {
- $sql="SELECT * FROM fixedassetlocations
+ $sql="SELECT * FROM fixedassetlocations
WHERE locationid='".$_GET['SelectedLocation']."'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -50,11 +50,11 @@
$InputError=1;
}
if ($InputError==0) {
- $sql="UPDATE fixedassetlocations
+ $sql="UPDATE fixedassetlocations
SET locationdescription='" . $_POST['LocationDescription'] . "',
parentlocationid='" . $_POST['ParentLocationID'] . "'
WHERE locationid ='" . $_POST['LocationID'] . "'";
-
+
$result=DB_query($sql,$db);
echo '<meta http-equiv="Refresh" content="0; url="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'">';
}
@@ -74,7 +74,7 @@
$result = DB_query($sql,$db);
$myrow=DB_fetch_row($result);
if ($myrow[0]>0) {
- prnMsg(_('You have assets in this location location so it cannot be removed'), 'warn');
+ prnMsg(_('You have assets in this location so it cannot be removed'), 'warn');
$InputError=1;
}
if ($InputError==0) {
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/GLProfit_Loss.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -12,8 +12,8 @@
$_POST['SelectADifferentPeriod']='Select A Different Period';
}
-if ((!isset($_POST['FromPeriod'])
- AND !isset($_POST['ToPeriod']))
+if ((!isset($_POST['FromPeriod'])
+ AND !isset($_POST['ToPeriod']))
OR isset($_POST['SelectADifferentPeriod'])){
include('includes/header.inc');
@@ -21,12 +21,12 @@
echo '<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Profit and Loss Report') . '
</p>';
- echo '<div class="page_help_text">' . _('Profit and loss statement (P&L), also called an Income Statment, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') .
+ echo '<div class="page_help_text">' . _('Profit and loss statement (P&L), also called an Income Statement, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') .
'<br />'
. _('The purpose of the income statement is to show whether the company made or lost money during the period being reported.') . '<br />'
. _('The P&L represents a period of time. This contrasts with the Balance Sheet, which represents a single moment in time.') . '<br />'
. _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.') . '</div>';
-
+
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -46,9 +46,9 @@
<tr><td>' . _('Select Period From') . ':</td>
<td><select name="FromPeriod">';
- $sql = "SELECT periodno,
- lastdate_in_period
- FROM periods
+ $sql = "SELECT periodno,
+ lastdate_in_period
+ FROM periods
ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
@@ -594,7 +594,7 @@
accountgroups.sequenceintb,
accountgroups.groupname,
chartdetails.accountcode";
-
+
$AccountsResult = DB_query($SQL,$db,_('No general ledger accounts were returned by the SQL because'),_('The SQL that failed was'));
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('General Ledger Profit Loss Inquiry') . '" alt="" />' . ' ' . _('Statement of Profit and Loss for the') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' and including ' . $PeriodToDate . '</p>';
@@ -814,7 +814,7 @@
locale_number_format($TotalIncome - $SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($TotalBudgetIncome - $SectionPrdBudget,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($TotalLYIncome - $SectionPrdLY,$_SESSION['CompanyRecord']['decimalplaces']));
-
+
if ($TotalIncome !=0){
$PrdGPPercent = 100*($TotalIncome - $SectionPrdActual)/$TotalIncome;
} else {
Modified: trunk/Labels.php
===================================================================
--- trunk/Labels.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/Labels.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -42,7 +42,7 @@
WHERE labelfieldid='" . $_POST['LabelFieldID' . $i] . "'",
$db);
} else {
- prnMsg (_('Entries for Vertical Position, Horizonal Position, and Font Size must be integers.'),'error');
+ prnMsg (_('Entries for Vertical Position, Horizontal Position, and Font Size must be integers.'),'error');
}
}
}
@@ -433,7 +433,7 @@
FROM labelfields
WHERE labelid = '" . $SelectedLabelID . "'
ORDER BY vpos DESC";
- $ErrMsg = _('Could note get the label fields because');
+ $ErrMsg = _('Could not get the label fields because');
$result = DB_query($SQL,$db,$ErrMsg);
$i=0;
echo '<table class="selection">
@@ -443,7 +443,7 @@
<tr>
<th>' . _('Field') . '</th>
<th>' . _('Vertical') . '<br />' . _('Position') . '<br />(VPos)</th>
- <th>' . _('Horizonal') . '<br />' . _('Position') . '<br />(HPos)</th>
+ <th>' . _('Horizontal') . '<br />' . _('Position') . '<br />(HPos)</th>
<th>' . _('Font Size') . '</th>
<th>' . _('Bar-code') . '</th>
</tr>';
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/MRP.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -24,7 +24,7 @@
$sql = "CREATE TEMPORARY TABLE passbom (part char(20),
sortpart text) DEFAULT CHARSET=utf8";
- $ErrMsg = _('The SQL to to create passbom failed with the message');
+ $ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = "CREATE TEMPORARY TABLE tempbom (parent char(20),
Modified: trunk/MRPCalendar.php
===================================================================
--- trunk/MRPCalendar.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/MRPCalendar.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -83,15 +83,15 @@
manufacturingflag smallint(6) NOT NULL default '1',
INDEX (daynumber),
PRIMARY KEY (calendardate)) DEFAULT CHARSET=utf8";
- $ErrMsg = _('The SQL to to create passbom failed with the message');
+ $ErrMsg = _('The SQL to create passbom failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$i = 0;
/* $DaysTextArray used so can get text of day based on the value get from DayOfWeekFromSQLDate of
- the calendar date. See if that text is in the ExcludeDays array note no gettext here hard coded english days from $_POST*/
+ the calendar date. See if that text is in the ExcludeDays array note no gettext here hard coded english days from $_POST*/
$DaysTextArray = array('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday');
-
+
$ExcludeDays = array($_POST['Sunday'],$_POST['Monday'],$_POST['Tuesday'],$_POST['Wednesday'],
$_POST['Thursday'],$_POST['Friday'],$_POST['Saturday']);
@@ -122,7 +122,7 @@
// manufacturing day that precedes it. That way can read the table by the non-manufacturing day,
// subtract the leadtime from the daynumber, and find the valid manufacturing day with that daynumber.
$DayNumber = 1;
- $sql = "SELECT * FROM mrpcalendar
+ $sql = "SELECT * FROM mrpcalendar
ORDER BY calendardate";
$result = DB_query($sql,$db,$ErrMsg);
while ($myrow = DB_fetch_array($result)) {
@@ -306,7 +306,7 @@
if (!isset($_POST['ChangeDate'])) {
$_POST['ChangeDate']=date($_SESSION['DefaultDateFormat']);
}
-
+
echo '<br />
<table class="selection">
<tr>
Modified: trunk/PurchData.php
===================================================================
--- trunk/PurchData.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/PurchData.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -8,15 +8,15 @@
include ('includes/header.inc');
if (isset($_GET['SupplierID'])) {
- $SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
+ $SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
} elseif (isset($_POST['SupplierID'])) {
- $SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
+ $SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
}
if (isset($_GET['StockID'])) {
- $StockID = trim(mb_strtoupper($_GET['StockID']));
+ $StockID = trim(mb_strtoupper($_GET['StockID']));
} elseif (isset($_POST['StockID'])) {
- $StockID = trim(mb_strtoupper($_POST['StockID']));
+ $StockID = trim(mb_strtoupper($_POST['StockID']));
}
if (isset($_POST['StockUOM'])) {
@@ -28,12 +28,13 @@
echo '<a href="' . $rootpath . '/SelectProduct.php">' . _('Back to Items') . '</a><br />';
if (isset($_POST['SupplierDescription'])) {
- $_POST['SupplierDescription'] = trim($_POST['SupplierDescription']);
+ $_POST['SupplierDescription'] = trim($_POST['SupplierDescription']);
}
if ((isset($_POST['AddRecord']) OR isset($_POST['UpdateRecord'])) AND isset($SupplierID)) { /*Validate Inputs */
$InputError = 0; /*Start assuming the best */
- if ($StockID == '' OR !isset($StockID)) {
+
+if ($StockID == '' OR !isset($StockID)) {
$InputError = 1;
prnMsg(_('There is no stock item set up enter the stock code or select a stock item using the search page'), 'error');
}
@@ -41,8 +42,7 @@
$InputError = 1;
unset($_POST['Price']);
prnMsg(_('The price entered was not numeric and a number is expected. No changes have been made to the database'), 'error');
- }
- if ($_POST['Price'] == 0) {
+ }elseif ($_POST['Price'] == 0) {
prnMsg(_('The price entered is zero') . ' ' . _('Is this intentional?'), 'warn');
}
if (!is_numeric(filter_number_format($_POST['LeadTime']))) {
@@ -60,252 +60,227 @@
unset($_POST['ConversionFactor']);
prnMsg(_('The conversion factor entered was not numeric') . ' (' . _('a number is expected') . '). ' . _('The conversion factor is the number which the price must be divided by to get the unit price in our unit of measure') . '. <br />' . _('E.g.') . ' ' . _('The supplier sells an item by the tonne and we hold stock by the kg') . '. ' . _('The suppliers price must be divided by 1000 to get to our cost per kg') . '. ' . _('The conversion factor to enter is 1000') . '. <br /><br />' . _('No changes will be made to the database'), 'error');
}
- if ($InputError == 0 AND isset($_POST['AddRecord'])) {
- $sql = "INSERT INTO purchdata (supplierno,
- stockid,
- price,
- effectivefrom,
- suppliersuom,
- conversionfactor,
- supplierdescription,
- suppliers_partno,
- leadtime,
- minorderqty,
- preferred)
- VALUES ('" . $SupplierID . "',
- '" . $StockID . "',
- '" . filter_number_format($_POST['Price']) . "',
- '" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
- '" . $_POST['SuppliersUOM'] . "',
- '" . $_POST['ConversionFactor'] . "',
- '" . $_POST['SupplierDescription'] . "',
- '" . $_POST['SupplierCode'] . "',
- '" . $_POST['LeadTime'] . "',
- '" . $_POST['MinOrderQty'] . "',
- '" . $_POST['Preferred'] . "'
- )";
- $ErrMsg = _('The supplier purchasing details could not be added to the database because');
- $DbgMsg = _('The SQL that failed was');
- $AddResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
- prnMsg(_('This supplier purchasing data has been added to the database'), 'success');
-
- /* If the new purchdata is the preferred one, the old ones from the same suppliers shouldn't be preferred.
- Are kept only for historic information only */
- if ($_POST['Preferred'] == 1){
- $sql = "UPDATE purchdata SET preferred='0'
- WHERE purchdata.stockid='".$StockID."'
- AND purchdata.supplierno='".$SupplierID."'
- AND purchdata.effectivefrom < '" . FormatDateForSQL($_POST['EffectiveFrom']) . "'";
- $ErrMsg = _('The preferred supplier details could not be update because');
- $DbgMsg = _('The SQL that failed was');
- $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
- prnMsg(_('Supplier preferred flag has been updated'), 'success');
- }
- }
- if ($InputError == 0 AND isset($_POST['UpdateRecord'])) {
- $sql = "UPDATE purchdata SET price='" . filter_number_format($_POST['Price']) . "',
- effectivefrom='" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
- suppliersuom='" . $_POST['SuppliersUOM'] . "',
- conversionfactor='" . $_POST['ConversionFactor'] . "',
- supplierdescription='" . $_POST['SupplierDescription'] . "',
- suppliers_partno='" . $_POST['SupplierCode'] . "',
- leadtime='" . $_POST['LeadTime'] . "',
- minorderqty='" . $_POST['MinOrderQty'] . "',
- preferred='" . $_POST['Preferred'] . "'
+ if ($InputError == 0 AND isset($_POST['AddRecord'])) {
+ $sql = "INSERT INTO purchdata (supplierno,
+ stockid,
+ price,
+ effectivefrom,
+ suppliersuom,
+ conversionfactor,
+ supplierdescription,
+ suppliers_partno,
+ leadtime,
+ minorderqty,
+ preferred)
+ VALUES ('" . $SupplierID . "',
+ '" . $StockID . "',
+ '" . filter_number_format($_POST['Price']) . "',
+ '" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
+ '" . $_POST['SuppliersUOM'] . "',
+ '" . filter_number_format($_POST['ConversionFactor']) . "',
+ '" . $_POST['SupplierDescription'] . "',
+ '" . $_POST['SupplierCode'] . "',
+ '" . filter_number_format($_POST['LeadTime']) . "', '" . filter_number_format($_POST['MinOrderQty']) . "',
+ '" . $_POST['Preferred'] . "')";
+ $ErrMsg = _('The supplier purchasing details could not be added to the database because');
+ $DbgMsg = _('The SQL that failed was');
+ $AddResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ prnMsg(_('This supplier purchasing data has been added to the database'), 'success');
+ }
+ if ($InputError == 0 AND isset($_POST['UpdateRecord'])) {
+ $sql = "UPDATE purchdata SET price='" . filter_number_format($_POST['Price']) . "',
+ effectivefrom='" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
+ suppliersuom='" . $_POST['SuppliersUOM'] . "',
+ conversionfactor='" . filter_number_format($_POST['ConversionFactor']) . "',
+ supplierdescription='" . $_POST['SupplierDescription'] . "',
+ suppliers_partno='" . $_POST['SupplierCode'] . "',
+ leadtime='" . filter_number_format($_POST['LeadTime']) . "',
+ minorderqty='" . filter_number_format($_POST['MinOrderQty']) . "',
+ preferred='" . $_POST['Preferred'] . "'
WHERE purchdata.stockid='".$StockID."'
- AND purchdata.supplierno='".$SupplierID."'
- AND purchdata.effectivefrom='" . $_POST['WasEffectiveFrom'] . "'";
- $ErrMsg = _('The supplier purchasing details could not be update because');
- $DbgMsg = _('The SQL that failed was');
- $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
- prnMsg(_('Supplier purchasing data has been updated'), 'success');
- }
- if ($InputError == 0 AND (isset($_POST['UpdateRecord']) OR isset($_POST['AddRecord']))) {
- /*update or insert took place and need to clear the form */
- unset($SupplierID);
- unset($_POST['Price']);
- unset($CurrCode);
- unset($_POST['SuppliersUOM']);
- unset($_POST['EffectiveFrom']);
- unset($_POST['ConversionFactor']);
- unset($_POST['SupplierDescription']);
- unset($_POST['LeadTime']);
- unset($_POST['Preferred']);
- unset($_POST['SupplierCode']);
- unset($_POST['MinOrderQty']);
- unset($SuppName);
- }
+ AND purchdata.supplierno='".$SupplierID."'
+ AND purchdata.effectivefrom='" . $_POST['WasEffectiveFrom'] . "'";
+ $ErrMsg = _('The supplier purchasing details could not be updated because');
+ $DbgMsg = _('The SQL that failed was'
+);
+ $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ prnMsg(_('Supplier purchasing data has been updated'), 'success');
+ }
+ if ($InputError == 0 AND (isset($_POST['UpdateRecord']) OR isset($_POST['AddRecord']))) {
+ /*update or insert took place and need to clear the form */
+ unset($SupplierID);
+ unset($_POST['Price']);
+ unset($CurrCode);
+ unset($_POST['SuppliersUOM']);
+ unset($_POST['EffectiveFrom']);
+ unset($_POST['ConversionFactor']
+);
+ unset($_POST['SupplierDescription']);
+ unset($_POST['LeadTime']);
+ unset($_POST['Preferred']);
+ unset($_POST['SupplierCode']);
+ unset($_POST['MinOrderQty']);
+ unset($SuppName);
+ }
}
if (isset($_GET['Delete'])) {
- $sql = "DELETE FROM purchdata
- WHERE purchdata.supplierno='".$SupplierID."'
- AND purchdata.stockid='".$StockID."'
- AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
- $ErrMsg = _('The supplier purchasing details could not be deleted because');
- $DelResult = DB_query($sql, $db, $ErrMsg);
- prnMsg(_('This purchasing data record has been successfully deleted'), 'success');
- unset($SupplierID);
+ $sql = "DELETE FROM purchdata
+ WHERE purchdata.supplierno='".$SupplierID."'
+ AND purchdata.stockid='".$StockID."'
+ AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
+ $ErrMsg = _('The supplier purchasing details could not be deleted because');
+ $DelResult = DB_query($sql, $db, $ErrMsg);
+ prnMsg(_('This purchasing data record has been successfully deleted'), 'success');
+ unset($SupplierID);
}
if (!isset($_GET['Edit'])) {
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . ' ' . _('For Stock Code') . ' - ' . $StockID . '</p><br />';
- $sql = "SELECT purchdata.supplierno,
- suppliers.suppname,
- purchdata.price,
- suppliers.currcode,
- purchdata.effectivefrom,
- purchdata.suppliersuom,
- purchdata.supplierdescription,
- purchdata.leadtime,
- purchdata.suppliers_partno,
- purchdata.minorderqty,
- purchdata.preferred,
- purchdata.conversionfactor,
- currencies.decimalplaces AS currdecimalplaces
- FROM purchdata
- INNER JOIN suppliers
- ON purchdata.supplierno=suppliers.supplierid
- INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE purchdata.stockid = '" . $StockID . "'
- ORDER BY purchdata.effectivefrom DESC, supplierno";
- $ErrMsg = _('The supplier purchasing details for the selected part could not be retrieved because');
- $PurchDataResult = DB_query($sql, $db, $ErrMsg);
- if (DB_num_rows($PurchDataResult) == 0 and $StockID != '') {
+ $sql = "SELECT purchdata.supplierno,
+ suppliers.suppname,
+ purchdata.price,
+ suppliers.currcode,
+ purchdata.effectivefrom,
+ purchdata.suppliersuom,
+ purchdata.supplierdescription,
+ purchdata.leadtime,
+ purchdata.suppliers_partno,
+ purchdata.minorderqty,
+ purchdata.preferred,
+ purchdata.conversionfactor,
+ currencies.decimalplaces AS currdecimalplaces
+ FROM purchdata INNER JOIN suppliers
+ ON purchdata.supplierno=suppliers.supplierid
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE purchdata.stockid = '" . $StockID . "'
+ ORDER BY purchdata.effectivefrom DESC";
+ $ErrMsg = _('The supplier purchasing details for the selected part could not be retrieved because');
+ $PurchDataResult = DB_query($sql, $db, $ErrMsg);
+ if (DB_num_rows($PurchDataResult) == 0 and $StockID != '') {
prnMsg(_('There is no purchasing data set up for the part selected'), 'info');
- $sql="SELECT stockmaster.decimalplaces
- FROM stockmaster
- WHERE stockmaster.stockid = '" . $StockID . "'";
- $DecimalPlacesResult=DB_query($sql, $db);
- $DecimalPlacesRow=DB_fetch_array($DecimalPlacesResult);
- $StockDecimalPlaces=$DecimalPlacesRow['decimalplaces'];
$NoPurchasingData=1;
- } else if ($StockID != '') {
- echo '<table cellpadding="2" class="selection">';
- $TableHeader = '<tr>
- <th>' . _('Supplier') . '</th>
- <th>' . _('Price') . '</th>
- <th>' . _('Currency') . '</th>
- <th>' . _('Effective From') . '</th>
- <th>' . _('Supplier Unit') . '</th>
- <th>' . _('Conversion Factor') . '</th>
- <th>' . _('Price Our Units') . '</th>
- <th>' . _('Min Order Qty') . '</th>
- <th>' . _('Lead Time') . '</th>
- <th>' . _('Preferred') . '</th>
- </tr>';
- echo $TableHeader;
- $CountPreferreds = 0;
- $k = 0; //row colour counter
- while ($myrow = DB_fetch_array($PurchDataResult)) {
- if ($myrow['preferred'] == 1) {
- echo '<tr class="EvenTableRows">';
- } elseif ($k == 1) {
- echo '<tr class="EvenTableRows">';
- $k = 0;
- } else {
- echo '<tr class="OddTableRows">';
- $k++;
- }
- if ($myrow['preferred'] == 1) {
- $DisplayPreferred = _('Yes');
- $CountPreferreds++;
- } else {
- $DisplayPreferred = _('No');
- }
- printf('<td>%s</td>
+ } else if ($StockID != '') {
+ echo '<table cellpadding="2" class="selection">';
+ $TableHeader = '<tr><th>' . _('Supplier') . '</th>
+ <th>' . _('Price') . '</th>
+ <th>' . _('Supplier Unit') . '</th>
+ <th>' . _('Conversion Factor') . '</th>
+ <th>' . _('Cost Per Our Unit') . '</th>
+ <th>' . _('Currency') . '</th>
+ <th>' . _('Effective From') . '</th>
+ <th>' . _('Min Order Qty') . '</th>
+ <th>' . _('Lead Time') . '</th>
+ <th>' . _('Preferred') . '</th>
+ </tr>';
+ echo $TableHeader;
+ $CountPreferreds = 0;
+ $k = 0; //row colour counter
+ while ($myrow = DB_fetch_array($PurchDataResult)) {
+ if ($myrow['preferred'] == 1) {
+ echo '<tr class="EvenTableRows">';
+ } elseif ($k == 1) {
+ echo '<tr class="EvenTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+ if ($myrow['preferred'] == 1) {
+ $DisplayPreferred = _('Yes');
+ $CountPreferreds++;
+
+ } else {
+ $DisplayPreferred = _('No');
+ }
+ $UPriceDecimalPlaces = max($myrow['currdecimalplaces'],$_Session['StandardCostDecimalPlaces']);
+ printf('<td>%s</td>
<td class="number">%s</td>
<td>%s</td>
- <td>%s</td>
- <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s ' . _('days') . '</td>
<td>%s</td>
- <td><a href="%s?StockID=%s&SupplierID=%s&Edit=1&EffectiveFrom=%s">' . _('Edit') . '</a></td>
- <td><a href="%s?StockID=%s&SupplierID=%s&Copy=1&EffectiveFrom=%s">' . _('Copy') . '</a></td>
- <td><a href="%s?StockID=%s&SupplierID=%s&Delete=1&EffectiveFrom=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this suppliers price?') . '\');">' . _('Delete') . '</a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s ' . _('days') . '</td>
+ <td>%s</td>
+ <td><a href="%s?StockID=%s&SupplierID=%s&Edit=1&EffectiveFrom=%s">' . _('Edit') . '</a></td>
+ <td><a href="%s?StockID=%s&SupplierID=%s&Delete=1&EffectiveFrom=%s" onclick=\'return confirm("' . _('Are you sure you wish to delete this suppliers price?') . '");\'>' . _('Delete') . '</a></td>
</tr>',
$myrow['suppname'],
- locale_number_format($myrow['price'], $myrow['currdecimalplaces']),
- $myrow['currcode'],
- ConvertSQLDate($myrow['effectivefrom']),
+ locale_number_format($myrow['price'],$UPriceDecimalPlaces),
$myrow['suppliersuom'],
locale_number_format($myrow['conversionfactor'],'Variable'),
- locale_number_format($myrow['price']/$myrow['conversionfactor'],$myrow['currdecimalplaces']),
+ locale_number_format($myrow['price']/$myrow['conversionfactor'],$UPriceDecimalPlaces),
+ $myrow['currcode'],
+ ConvertSQLDate($myrow['effectivefrom']),
locale_number_format($myrow['minorderqty'],'Variable'),
locale_number_format($myrow['leadtime'],'Variable'),
$DisplayPreferred,
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'),
+ htmlspecialchars($_SERVER['PHP_SELF']),
$StockID,
$myrow['supplierno'],
$myrow['effectivefrom'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'),
+ htmlspecialchars($_SERVER['PHP_SELF']),
$StockID,
$myrow['supplierno'],
- $myrow['effectivefrom'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'),
- $StockID,
- $myrow['supplierno'],
$myrow['effectivefrom']);
- } //end of while loop
- echo '</table><br />';
- if ($CountPreferreds > 1) {
- prnMsg(_('There are now') . ' ' . $CountPreferreds . ' ' . _('preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should edit the supplier purchasing data to make only one supplier the preferred supplier'), 'warn');
- } elseif ($CountPreferreds == 0) {
- prnMsg(_('There are NO preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should make one supplier only the preferred supplier'), 'warn');
- }
- } // end of there are purchsing data rows to show
- echo '<br />';
+ } //end of while loop
+ echo '</table><br/>';
+ if ($CountPreferreds > 1) {
+ prnMsg(_('There are now') . ' ' . $CountPreferreds . ' ' . _('preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should edit the supplier purchasing data to make only one supplier the preferred supplier'), 'warn');
+ } elseif ($CountPreferreds == 0) {
+ prnMsg(_('There are NO preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should make one supplier only the preferred supplier'), 'warn');
+ }
+ } // end of there are purchsing data rows to show
+ echo '<br/>';
} /* Only show the existing purchasing data records if one is not being edited */
-if (isset($SupplierID) AND $SupplierID != '' AND !isset($_POST['SearchSupplier'])) { /*NOT EDITING AN EXISTING BUT SUPPLIER selected OR ENTERED*/
- $sql = "SELECT suppliers.suppname,
+if (isset($SupplierID) AND $SupplierID != '' AND !isset($_POST['SearchSupplier'])) { /*NOT EDITING AN
+ EXISTING BUT SUPPLIER selected OR ENTERED*/
+ $sql = "SELECT suppliers.suppname,
suppliers.currcode,
currencies.decimalplaces AS currdecimalplaces
- FROM suppliers
- INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE supplierid='".$SupplierID."'";
- $ErrMsg = _('The supplier details for the selected supplier could not be retrieved because');
- $DbgMsg = _('The SQL that failed was');
- $SuppSelResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
- if (DB_num_rows($SuppSelResult) == 1) {
- $myrow = DB_fetch_array($SuppSelResult);
- $SuppName = $myrow['suppname'];
- $CurrCode = $myrow['currcode'];
- $CurrDecimalPlaces = $myrow['currdecimalplaces'];
- } else {
- prnMsg(_('The supplier code') . ' ' . $SupplierID . ' ' . _('is not an existing supplier in the database') . '. ' . _('You must enter an alternative supplier code or select a supplier using the search facility below'), 'error');
- unset($SupplierID);
- }
+ FROM suppliers
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE supplierid='".$SupplierID."'";
+ $ErrMsg = _('The supplier details for the selected supplier could not be retrieved because');
+ $DbgMsg = _('The SQL that failed was');
+ $SuppSelResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ if (DB_num_rows($SuppSelResult) == 1) {
+ $myrow = DB_fetch_array($SuppSelResult);
+ $SuppName = $myrow['suppname'];
+ $CurrCode = $myrow['currcode'];
+ $CurrDecimalPlaces = $myrow['currdecimalplaces'];
+ } else {
+ prnMsg(_('The supplier code') . ' ' . $SupplierID . ' ' . _('is not an existing supplier in the database') . '. ' . _('You must enter an alternative supplier code or select a supplier using the search facility below'), 'error');
+ unset($SupplierID);
+ }
} else {
- if ($NoPurchasingData=0) {
+ if ($NoPurchasingData==0) {
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . ' ' . _('For Stock Code') . ' - ' . $StockID . '</p><br />';
}
- if (!isset($_POST['SearchSupplier'])) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
- echo '<div>';
+ if (!isset($_POST['SearchSupplier'])) {
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">
+ <table cellpadding="3" colspan="4" class="selection">
+ <tr>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
- echo '<table cellpadding="3" class="selection">
- <tr>';
- echo '<td>' . _('Text in the Supplier') . ' <b>' . _('NAME') . '</b>:</td>';
- echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>';
- echo '<td><b>' . _('OR') . '</b></td>';
- echo '<td>' . _('Text in Supplier') . ' <b>' . _('CODE') . '</b>:</td>';
- echo '<td><input type="text" name="SupplierCode" size="10" maxlength="10" /></td>';
- echo '</tr></table><br />';
- echo '<div class="centre">
+ echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
+ echo '<td>' . _('Text in the Supplier') . ' <b>' . _('NAME') . '</b>:</td>';
+ echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>';
+ echo '<td><b>' . _('OR') . '</b></td>';
+ echo '<td>' . _('Text in Supplier') . ' <b>' . _('CODE') . '</b>:</td>';
+ echo '<td><input type="text" name="SupplierCode" size="20" maxlength="50" /></td>';
+ echo '</tr></table><br />';
+ echo '<div class="centre">
<input type="submit" name="SearchSupplier" value="' . _('Find Suppliers Now') . '" />
</div>
- </div>
</form>';
- include ('includes/footer.inc');
- exit;
- };
+ include ('includes/footer.inc');
+ exit;
+ };
}
if (isset($_GET['Edit'])) {
@@ -313,15 +288,15 @@
}
if (isset($_POST['SearchSupplier'])) {
- if (isset($_POST['Keywords']) AND isset($_POST['SupplierCode'])) {
- prnMsg( _('Supplier Name keywords have been used in preference to the Supplier Code extract entered') . '.', 'info' );
- echo '<br />';
- }
- if ($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') {
- $_POST['Keywords'] = ' ';
- }
- if (mb_strlen($_POST['Keywords']) > 0) {
- //insert wildcard characters in spaces
+ if (isset($_POST['Keywords']) AND isset($_POST['SupplierCode'])) {
+ prnMsg( _('Supplier Name keywords have been used in preference to the Supplier Code extract entered') . '.', 'info' );
+ echo '<br />';
+ }
+ if ($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') {
+ $_POST['Keywords'] = ' ';
+ }
+ if (mb_strlen($_POST['Keywords']) > 0) {
+ //insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
$SQL = "SELECT suppliers.supplierid,
@@ -330,65 +305,63 @@
suppliers.address1,
suppliers.address2,
suppliers.address3
- FROM suppliers
- WHERE suppliers.suppname " . LIKE . " '".$SearchString."'";
+ FROM suppliers
+ WHERE suppliers.suppname " . LIKE . " '".$SearchString."'";
- } elseif (mb_strlen($_POST['SupplierCode']) > 0) {
- $SQL = "SELECT suppliers.supplierid,
+ } elseif (mb_strlen($_POST['SupplierCode']) > 0) {
+ $SQL = "SELECT suppliers.supplierid,
suppliers.suppname,
suppliers.currcode,
suppliers.address1,
suppliers.address2,
suppliers.address3
- FROM suppliers
- WHERE suppliers.supplierid " . LIKE . " '%" . $_POST['SupplierCode'] . "%'";
+ FROM suppliers
+ WHERE suppliers.supplierid " . LIKE . " '%" . $_POST['SupplierCode'] . "%'";
- } //one of keywords or SupplierCode was more than a zero length string
- $ErrMsg = _('The suppliers matching the criteria entered could not be retrieved because');
- $DbgMsg = _('The SQL to retrieve supplier details that failed was');
- $SuppliersResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
+ } //one of keywords or SupplierCode was more than a zero length string
+ $ErrMsg = _('The suppliers matching the criteria entered could not be retrieved because');
+ $DbgMsg = _('The SQL to retrieve supplier details that failed was');
+ $SuppliersResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
} //end of if search
-if (isset($StockID)) {
- $result = DB_query("SELECT stockmaster.description,
+if (isset($SuppliersResult)) {
+ if (isset($StockID)) {
+ $result = DB_query("SELECT stockmaster.description,
stockmaster.units,
stockmaster.mbflag
FROM stockmaster
WHERE stockmaster.stockid='".$StockID."'", $db);
- $myrow = DB_fetch_array($result);
- $StockUOM = $myrow['units'];
- if (DB_num_rows($result) == 1) {
- if ($myrow['mbflag'] == 'D' OR $myrow['mbflag'] == 'A' OR $myrow['mbflag'] == 'K') {
- prnMsg($StockID . ' - ' . $myrow['description'] . '<br /> ' . _('The item selected is a dummy part or an assembly or kit set part') . ' - ' . _('it is not purchased') . '. ' . _('Entry of purchasing information is therefore inappropriate'), 'warn');
- include ('includes/footer.inc');
- exit;
- } else {
- // echo '<br /><font color="blue" size="3"><b>' . $StockID . ' - ' . $myrow[0] . ' </b> (' . _('In Units of') . ' ' . $myrow[1] . ' )</font>';
- }
- } else {
- prnMsg(_('Stock Item') . ' - ' . $StockID . ' ' . _('is not defined in the database'), 'warn');
- }
-} else {
- $StockID = '';
- $StockUOM = 'each';
-}
-
-if (isset($SuppliersResult)) {
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
- echo '<div>';
+ $myrow = DB_fetch_row($result);
+ $StockUOM = $myrow[1];
+ if (DB_num_rows($result) == 1) {
+ if ($myrow[2] == 'D' OR $myrow[2] == 'A' OR $myrow[2] == 'K') {
+ prnMsg($StockID . ' - ' . $myrow[0] . '<p> ' . _('The item selected is a dummy part or an assembly or kit set part') . ' - ' . _('it is not purchased') . '. ' . _('Entry of purchasing information is therefore inappropriate'), 'warn');
+ include ('includes/footer.inc');
+ exit;
+ } else {
+ // echo '<br /><b>' . $StockID . ' - ' . $myrow[0] . ' </b> (' . _('In Units of') . ' ' . $myrow[1] . ' )';
+ }
+ } else {
+ prnMsg(_('Stock Item') . ' - ' . $StockID . ' ' . _('is not defined in the database'), 'warn');
+ }
+ } else {
+ $StockID = '';
+ $StockUOM = 'each';
+ }
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">
+ <table cellpadding="2" colspan="7" class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table cellpadding="2" class="selection">';
- $TableHeader = '<tr>
+ $TableHeader = '<tr>
<th>' . _('Code') . '</th>
- <th>' . _('Supplier Name') . '</th>
+ <th>' . _('Supplier Name') . '</th>
<th>' . _('Currency') . '</th>
<th>' . _('Address 1') . '</th>
<th>' . _('Address 2') . '</th>
<th>' . _('Address 3') . '</th>
</tr>';
- echo $TableHeader;
+ echo $TableHeader;
$k = 0;
- while ($myrow = DB_fetch_array($SuppliersResult)) {
+ while ($myrow = DB_fetch_array($SuppliersResult)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
$k=0;
@@ -396,34 +369,34 @@
echo '<tr class="OddTableRows">';
$k++;
}
- printf('<td><input type="submit" name="SupplierID" value="%s" /></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s',
- $myrow['supplierid'],
- $myrow['suppname'],
- $myrow['currcode'],
- $myrow['address1'],
- $myrow['address2'],
- $myrow['address3']);
+ printf('<td><input type="submit" name="SupplierID" value="%s" /></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ </tr>',
+ $myrow['supplierid'],
+ $myrow['suppname'],
+ $myrow['currcode'],
+ $myrow['address1'],
+ $myrow['address2'],
+ $myrow['address3']);
- echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
- echo '<input type="hidden" name="StockUOM" value="' . $StockUOM . '" /></td></tr>';
+ echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
+ echo '<input type="hidden" name="StockUOM" value="' . $StockUOM . '" />';
- }
- //end of while loop
- echo '</table><br/>';
- echo '</div>
- </form>';
+ }
+ //end of while loop
+ echo '</table><br/></form>';
}
//end if results to show
/*Show the input form for new supplier purchasing details */
if (!isset($SuppliersResult)) {
- if (isset($_GET['Edit']) or isset($_GET['Copy'])) {
- $sql = "SELECT purchdata.supplierno,
+ if (isset($_GET['Edit'])) {
+
+ $sql = "SELECT purchdata.supplierno,
suppliers.suppname,
purchdata.price,
purchdata.effectivefrom,
@@ -447,134 +420,127 @@
AND purchdata.stockid='".$StockID."'
AND purchdata.effectivefrom='" . $_GET['EffectiveFrom'] . "'";
- $ErrMsg = _('The supplier purchasing details for the selected supplier and item could not be retrieved because');
- $EditResult = DB_query($sql, $db, $ErrMsg);
- $myrow = DB_fetch_array($EditResult);
- $SuppName = $myrow['suppname'];
- if (isset($_GET['Edit'])) {
- $_POST['EffectiveFrom'] = ConvertSQLDate($myrow['effectivefrom']);
- $_POST['Price'] = $myrow['price'];
- } else {
- $_POST['EffectiveFrom'] = Date($_SESSION['DefaultDateFormat']);
- $_POST['Price'] = 0;
- }
- $CurrCode = $myrow['currcode'];
- $CurrDecimalPlaces = $myrow['currdecimalplaces'];
- $_POST['SuppliersUOM'] = $myrow['suppliersuom'];
- $_POST['SupplierDescription'] = $myrow['supplierdescription'];
- $_POST['LeadTime'] = locale_number_format($myrow['leadtime'],'Variable');
+ $ErrMsg = _('The supplier purchasing details for the selected supplier and item could not be retrieved because');
+ $EditResult = DB_query($sql, $db, $ErrMsg);
+ $myrow = DB_fetch_array($EditResult);
+ $SuppName = $myrow['suppname'];
+ $UPriceDecimalPlaces = max($myrow['currdecimalplaces'],$_Session['StandardCostDecimalPlaces']);
+ $_POST['Price'] = locale_number_format(round($myrow['price'],$UPriceDecimalPlaces),$UPriceDecimalPlaces);
+ $_POST['EffectiveFrom'] = ConvertSQLDate($myrow['effectivefrom']);
+ $CurrCode = $myrow['currcode'];
+ $CurrDecimalPlaces = $myrow['currdecimalplaces'];
+ $_POST['SuppliersUOM'] = $myrow['suppliersuom'];
+ $_POST['SupplierDescription'] = $myrow['supplierdescription'];
+ $_POST['LeadTime'] = locale_number_format($myrow['leadtime'],'Variable');
- $_POST['ConversionFactor'] = locale_number_format($myrow['conversionfactor'],'Variable');
- $_POST['Preferred'] = $myrow['preferred'];
- $_POST['MinOrderQty'] = locale_number_format($myrow['minorderqty'],'Variable');
- $_POST['SupplierCode'] = $myrow['suppliers_partno'];
+ $_POST['ConversionFactor'] = locale_number_format($myrow['conversionfactor'],'Variable');
+ $_POST['Preferred'] = $myrow['preferred'];
+ $_POST['MinOrderQty'] = locale_number_format($myrow['minorderqty'],'Variable');
+ $_POST['SupplierCode'] = $myrow['suppliers_partno'];
$StockUOM=$myrow['units'];
- }
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
- echo '<div>';
+ }
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">
+ <table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table class="selection">
- <tr>
- <th colspan="3"><h3>' . _('Data for Purchasing') . ' ' . $StockID . ' ' . _('from') . ' '. $SupplierID . '</h3></th>
- </tr>';
- if (!isset($SupplierID)) {
- $SupplierID = '';
- }
+ if (!isset($SupplierID)) {
+ $SupplierID = '';
+ }
if (isset($_GET['Edit'])) {
- echo '<tr><td>' . _('Supplier Name') . ':</td>
- <td><input type="hidden" name="SupplierID" value="' . $SupplierID . '" />' . $SupplierID . ' - ' . $SuppName . '<input type="hidden" name="WasEffectiveFrom" value="' . $myrow['effectivefrom'] . '" /></td>
- </tr>';
- } else {
- echo '<tr>
- <td>' . _('Supplier Name') . ':
- <input type="hidden" name="SupplierID" maxlength="10" size="11" value="' . $SupplierID . '" />
- </td>';
- if (!isset($SuppName) OR $SuppName == "") {
- echo '<td>(' . _('A search facility is available below if necessary') . ')';
- } else {
+ echo '<tr><td>' . _('Supplier Name') . ':</td>
+ <td><input type="hidden" name="SupplierID" value="' . $SupplierID . '" />' . $SupplierID . ' - ' . $SuppName . '<input type="hidden" name="WasEffectiveFrom" value="' . $myrow['effectivefrom'] . '" /></td>
+ </tr>';
+ } else {
+ echo '<tr>
+ <td>' . _('Supplier Name') . ':</td>
+ <input type="hidden" name="SupplierID" maxlength="10" size="11" value="' . $SupplierID . '" />';
+ if ($SupplierID!='') {
echo '<td>'.$SuppName;
}
- echo '</td></tr>';
- }
- echo '<tr><td><input type="hidden" name="StockID" maxlength="10" size="11" value="' . $StockID . '" /></td></tr>';
- if (!isset($CurrCode)) {
- $CurrCode = '';
- }
- if (!isset($_POST['Price'])) {
- $_POST['Price'] = 0;
- }
- if (!isset($_POST['EffectiveFrom'])) {
- $_POST['EffectiveFrom'] = Date($_SESSION['DefaultDateFormat']);
- }
- if (!isset($_POST['SuppliersUOM'])) {
- $_POST['SuppliersUOM'] = '';
- }
- if (!isset($_POST['SupplierDescription'])) {
- $_POST['SupplierDescription'] = '';
- }
+ if (!isset($SuppName) OR $SuppName = "") {
+ echo '(' . _('A search facility is available below if necessary') . ')';
+ } else {
+ echo '<td>'.$SuppName;
+ }
+ echo '</td></tr>';
+ }
+ echo '<td><input type="hidden" name="StockID" maxlength="10" size="11" value="' . $StockID . '" />';
+ if (!isset($CurrCode)) {
+ $CurrCode = '';
+ }
+ if (!isset($_POST['Price'])) {
+ $_POST['Price'] = 0;
+ }
+ if (!isset($_POST['EffectiveFrom'])) {
+ $_POST['EffectiveFrom'] = Date($_SESSION['DefaultDateFormat']);
+ }
+ if (!isset($_POST['SuppliersUOM'])) {
+ $_POST['SuppliersUOM'] = '';
+ }
+ if (!isset($_POST['SupplierDescription'])) {
+ $_POST['SupplierDescription'] = '';
+ }
if (!isset($_POST['SupplierCode'])) {
- $_POST['SupplierCode'] = '';
- }
+ $_POST['SupplierCode'] = '';
+ }
if (!isset($_POST['MinOrderQty'])) {
- $_POST['MinOrderQty'] = '1';
- }
- echo '<tr><td>' . _('Currency') . ':</td>
- <td><input type="hidden" name="CurrCode" value="' . $CurrCode . '" />' . $CurrCode . '</td></tr>';
- echo '<tr><td>' . _('Price') . ' (' . _('in Supplier Currency') . '):</td>
+ $_POST['MinOrderQty'] = '1';
+ }
+ echo '<tr><td>' . _('Currency') . ':</td>
+ <td><input type="hidden" name="CurrCode" . value="' . $CurrCode . '" />' . $CurrCode . '</td></tr>';
+ echo '<tr><td>' . _('Price') . ' (' . _('in Supplier Currency') . '):</td>
<td><input type="text" class="number" name="Price" maxlength="12" size="12" value="' . $_POST['Price'] . '" /></td></tr>';
- echo '<tr><td>' . _('Date Updated') . ':</td>
+ echo '<tr><td>' . _('Date Updated') . ':</td>
<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom" maxlength="10" size="11" value="' . $_POST['EffectiveFrom'] . '" /></td></tr>';
- echo '<tr><td>' . _('Our Unit of Measure') . ':</td>';
+ echo '<tr><td>' . _('Our Unit of Measure') . ':</td>';
if (isset($SupplierID)) {
echo '<td>' . $StockUOM . '</td></tr>';
}
- echo '<tr><td>' . _('Suppliers Unit of Measure') . ':</td>';
- echo '<td><input type="text" name="SuppliersUOM" size="20" maxlength="20" value ="' . $_POST['SuppliersUOM'] . '"/>';
- echo '</td></tr>';
- if (!isset($_POST['ConversionFactor'])
+ echo '<tr><td>' . _('Suppliers Unit of Measure') . ':</td>';
+ echo '<td><input type="text" name="SuppliersUOM" size="20" maxlength="20" value ="' . $_POST['SuppliersUOM'] . '"/>';
+ echo '</td></tr>';
+ if (!isset($_POST['ConversionFactor'])
OR $_POST['ConversionFactor'] == '') {
- $_POST['ConversionFactor'] = 1;
- }
- echo '<tr><td>' . _('Conversion Factor (to our UOM)') . ':</td>
+ $_POST['ConversionFactor'] = 1;
+ }
+ echo '<tr><td>' . _('Conversion Factor (to our UOM)') . ':</td>
<td><input type="text" class="number" name="ConversionFactor" maxlength="12" size="12" value="' . $_POST['ConversionFactor'] . '" /></td></tr>';
- echo '<tr><td>' . _('Supplier Stock Code') . ':</td>
+ echo '<tr><td>' . _('Supplier Stock Code') . ':</td>
<td><input type="text" name="SupplierCode" maxlength="50" size="20" value="' . $_POST['SupplierCode'] . '" /></td></tr>';
- echo '<tr><td>' . _('MinOrderQty') . ':</td>
+ echo '<tr><td>' . _('MinOrderQty') . ':</td>
<td><input type="text" class="number" name="MinOrderQty" maxlength="15" size="15" value="' . $_POST['MinOrderQty'] . '" /></td></tr>';
- echo '<tr><td>' . _('Supplier Stock Description') . ':</td>
- <td><input type="text" name="SupplierDescription" maxlength="50" size="50" value="' . $_POST['SupplierDescription'] . '" /></td></tr>';
- if (!isset($_POST['LeadTime']) OR $_POST['LeadTime'] == "") {
- $_POST['LeadTime'] = 1;
- }
- echo '<tr><td>' . _('Lead Time') . ' (' . _('in days from date of order') . '):</td>
+ echo '<tr><td>' . _('Supplier Stock Description') . ':</td>
+ <td><input type="text" name="SupplierDescription" maxlength="50" size="51" value="' . $_POST['SupplierDescription'] . '" /></td></tr>';
+ if (!isset($_POST['LeadTime']) OR $_POST['LeadTime'] == "") {
+ $_POST['LeadTime'] = 1;
+ }
+ echo '<tr><td>' . _('Lead Time') . ' (' . _('in days from date of order') . '):</td>
<td><input type="text" class="number" name="LeadTime" maxlength="4" size="5" value="' . $_POST['LeadTime'] . '" /></td></tr>';
- echo '<tr><td>' . _('Preferred Supplier') . ':</td>
+ echo '<tr><td>' . _('Preferred Supplier') . ':</td>
<td><select name="Preferred">';
- if ($_POST['Preferred'] == 1) {
- echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
- echo '<option value="0">' . _('No') . '</option>';
- } else {
- echo '<option value="1">' . _('Yes') . '</option>';
- echo '<option selected="selected" value="0">' . _('No') . '</option>';
- }
- echo '</select></td></tr></table><br /><div class="centre">';
- if (isset($_GET['Edit'])) {
- echo '<input type="submit" name="UpdateRecord" value="' . _('Update') . '" />';
- } else {
- echo '<input type="submit" name="AddRecord" value="' . _('Add') . '" />';
- }
- echo '</div>';
- echo '<div class="centre">';
- if (isset($StockLocation) and isset($StockID) AND mb_strlen($StockID) != 0) {
- echo '<br /><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
- echo '<br /><a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Show Stock Movements') . '</a>';
- echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Search Outstanding Sales Orders') . '</a>';
- echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
- }
- echo '</div>';
- echo '</div>
- </form>';
+ if ($_POST['Preferred'] == 1) {
+ echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
+ echo '<option value="0">' . _('No') . '</option>';
+ } else {
+ echo '<option value="1">' . _('Yes') . '</option>';
+ echo '<option selected="selected" value="0">' . _('No') . '</option>';
+ }
+ echo '</select></td></tr></table><br /><div class="centre">';
+ if (isset($_GET['Edit'])) {
+ echo '<input type="submit" name="UpdateRecord" value="' . _('Update') . '" />';
+ } else {
+ echo '<input type="submit" name="AddRecord" value="' . _('Add') . '" />';
+ }
+ echo '</div>';
+ echo '<div class="centre">';
+ if (isset($StockLocation) and isset($StockID) AND mb_strlen($StockID) != 0) {
+ echo '<br /><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Show Stock Movements') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Search Outstanding Sales Orders') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
+ }
+ echo '</form></div>';
}
+
include ('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/SMTPServer.php
===================================================================
--- trunk/SMTPServer.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/SMTPServer.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -18,7 +18,7 @@
username='".$_POST['UserName']."',
password='".$_POST['Password']."',
auth='".$_POST['Auth']."'";
- $ErrMsg = _('The email setting information is failed to update');
+ $ErrMsg = _('The email setting information failed to update');
$DbgMsg = _('The SQL failed to update is ');
$result1=DB_query($sql, $db, $ErrMsg, $DbgMsg);
unset($_POST['MailServerSetting']);
@@ -32,7 +32,7 @@
heloaddress,
username,
password,
- auth)
+ auth)
VALUES (
'".$_POST['Host']."',
'".$_POST['Port']."',
@@ -40,7 +40,7 @@
'".$_POST['UserName']."',
'".$_POST['Password']."',
'".$_POST['Auth']."')";
- $ErrMsg = _('The email settings are failed to be inserted');
+ $ErrMsg = _('The email settings failed to be inserted');
$DbgMsg = _('The SQL failed to insert the email information is');
$result2 = DB_query($sql,$db);
DB_free_result($result2);
@@ -61,13 +61,13 @@
auth
FROM emailsettings";
$ErrMsg = _('The email settings information cannot be retrieved');
- $DbgMsg = _('The SQL that faild was');
+ $DbgMsg = _('The SQL that failed was');
$result=DB_query($sql, $db,$ErrMsg,$DbgMsg);
if(DB_num_rows($result)!=0){
$MailServerSetting = 1;
$myrow=DB_fetch_array($result);
- }else{
+ }else{
DB_free_result($result);
$MailServerSetting = 0;
$myrow['host']='';
@@ -77,8 +77,8 @@
$myrow['password']='';
$myrow['timeout']=5;
}
-
-
+
+
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/SalesInquiry.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -131,7 +131,7 @@
} else {
$WhereDebtorNo = ' ';
}
-
+
$WhereDebtorName = ' ';
if (mb_strlen($DebtorName) > 0 AND $DebtorNameOp == 'LIKE') {
$DebtorName = $DebtorName . '%';
@@ -209,8 +209,8 @@
LEFT JOIN stockmaster ON salesorderdetails.stkcode = stockmaster.stockid
WHERE salesorders.orddate >='" . $FromDate . "'
AND salesorders.orddate <='" . $ToDate . "'
- AND salesorders.quotation = '" . $_POST['OrderType'] . "'" .
- $WherePart .
+ AND salesorders.quotation = '" . $_POST['OrderType'] . "'" .
+ $WherePart .
$WhereOrderNo .
$WhereDebtorNo .
$WhereDebtorName .
@@ -485,7 +485,7 @@
$WhereSalesman .
$WhereCategory .
"GROUP BY " . $_POST['SummaryType'] .
- ",areas.areadescription
+ ",areas.areadescription
ORDER BY " . $orderby;
}
} else {
@@ -1196,7 +1196,7 @@
echo '<tr><td> </td></tr>
<tr><td> </td></tr>
<tr><td> </td></tr>';
-
+
echo '<tr><td> </td></tr>';
echo '<tr><td>' . _('Summary Type') . ':</td>
<td><select name="SummaryType">
@@ -1241,7 +1241,7 @@
$ToDate = FormatDateForSQL($_POST['ToDate']);
$sql = "CREATE TEMPORARY TABLE tempstockmoves LIKE stockmoves";
- $ErrMsg = _('The SQL to to the create temp stock moves table failed with the message');
+ $ErrMsg = _('The SQL to the create temp stock moves table failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
$sql = "INSERT tempstockmoves
@@ -1258,7 +1258,7 @@
AND SUBSTR(tempstockmoves.reference,10,10) = stockmoves.transno
AND tempstockmoves.stockid = stockmoves.stockid
AND stockmoves.type ='10'";
- $ErrMsg = _('The SQL to to update tempstockmoves failed with the message');
+ $ErrMsg = _('The SQL to update tempstockmoves failed with the message');
$result = DB_query($sql,$db,$ErrMsg);
Modified: trunk/WOSerialNos.php
===================================================================
--- trunk/WOSerialNos.php 2012-08-30 03:08:53 UTC (rev 5614)
+++ trunk/WOSerialNos.php 2012-08-30 18:26:44 UTC (rev 5615)
@@ -53,9 +53,9 @@
} else {
DB_Txn_Begin($db);
/*Process the additional controlled items into woserialnos and update the quantity on the work order order in woitems*/
-
+
$InputError =...
[truncated message content] |
|
From: <dai...@us...> - 2012-09-01 00:18:10
|
Revision: 5616
http://web-erp.svn.sourceforge.net/web-erp/?rev=5616&view=rev
Author: daintree
Date: 2012-09-01 00:18:04 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
accounts groups change option when deleting an existing account group that is used by several accounts
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/GLAccounts.php
trunk/doc/Change.log
trunk/includes/footer.inc
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-08-30 18:26:44 UTC (rev 5615)
+++ trunk/AccountGroups.php 2012-09-01 00:18:04 UTC (rev 5616)
@@ -40,6 +40,15 @@
$Errors = array();
+if (isset($_POST['MoveGroup'])) {
+ $sql="UPDATE chartmaster SET group_='" . $_POST['DestinyAccountGroup'] . "' WHERE group_='" . $_POST['OriginalAccountGroup'] . "'";
+ $ErrMsg = _('An error occurred in moving the account group');
+ $DbgMsg = _('The SQL that was used to moving the account group was');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
+ echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
+ prnMsg( _('All accounts in the account group:') . ' ' . $_POST['OriginalAccountGroup'] . ' ' . _('have been changed to the account group:') . ' ' . $_POST['DestinyAccountGroup'],'success');
+}
+
if (isset($_POST['submit'])) {
//initialise no input errors assumed initially before we test
@@ -180,7 +189,31 @@
if ($myrow['groups']>0) {
prnMsg( _('Cannot delete this account group because general ledger accounts have been created using this group'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group');
+ echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection">';
+ echo '<input type="hidden" name="OriginalAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
+ echo '<tr>
+ <td>' . _('Parent Group') . ':' . '</td>
+ <td><select tabindex="2" ' . (in_array('ParentGroupName',$Errors) ? 'class="selecterror"' : '' ) . ' name="DestinyAccountGroup">';
+ $sql = "SELECT groupname FROM accountgroups";
+ $GroupResult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
+ while ($GroupRow = DB_fetch_array($GroupResult) ) {
+
+ if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$RroupRow['groupname']) {
+ echo '<option selected="selected" value="'.htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8'). '</option>';
+ } else {
+ echo '<option value="'.htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
+ }
+ }
+ echo '</select>';
+ echo '</td></tr>';
+ echo '<tr>
+ <td colspan="2"><div class="centre"><input tabindex="6" type="submit" name="MoveGroup" value="' . _('Move Group') . '" /></div></td>
+ </tr>';
+
} else {
$sql = "SELECT COUNT(groupname) groupnames FROM accountgroups WHERE parentgroupname = '" . $_GET['SelectedAccountGroup'] . "'";
$ErrMsg = _('An error occurred in retrieving the parent group information');
@@ -190,6 +223,7 @@
if ($myrow['groupnames']>0) {
prnMsg( _('Cannot delete this account group because it is a parent account group of other account group(s)'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow['groupnames'] . ' ' . _('account groups that have this group as its/there parent account group');
+
} else {
$sql="DELETE FROM accountgroups WHERE groupname='" . $_GET['SelectedAccountGroup'] . "'";
$ErrMsg = _('An error occurred in deleting the account group');
@@ -321,8 +355,8 @@
<td>' . $_POST['GroupName'] . '</td>
</tr>';
- } else { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
-
+ } elseif (!isset($_POST['MoveGroup'])) { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
+
if (!isset($_POST['SelectedAccountGroup'])){
$_POST['SelectedAccountGroup']='';
}
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2012-08-30 18:26:44 UTC (rev 5615)
+++ trunk/GLAccounts.php 2012-09-01 00:18:04 UTC (rev 5616)
@@ -238,10 +238,12 @@
if (!isset($_POST['AccountName'])) {$_POST['AccountName']='';}
echo '<tr><td>' . _('Account Name') . ':</td><td><input type="text" size="51" maxlength="50" name="AccountName" value="' . $_POST['AccountName'] . '" /></td></tr>';
- $sql = 'SELECT groupname FROM accountgroups ORDER BY sequenceintb';
+ "$sql = 'SELECT groupname FROM accountgroups ORDER BY sequenceintb";
$result = DB_query($sql, $db);
- echo '<tr><td>' . _('Account Group') . ':</td><td><select name="Group">';
+ echo '<tr>
+ <td>' . _('Account Group') . ':</td>
+ <td><select name="Group">';
while ($myrow = DB_fetch_array($result)){
if (isset($_POST['Group']) and $myrow[0]==$_POST['Group']){
@@ -251,7 +253,9 @@
}
echo $myrow[0] . '">' . $myrow[0] . '</option>';
}
- echo '</select></td></tr></table>';
+ echo '</select></td>
+ </tr>
+ </table>';
if (!isset($_GET['SelectedAccount']) or $_GET['SelectedAccount']=='') {
echo '<script type="text/javascript">defaultControl(document.GLAccounts.AccountCode);</script>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-08-30 18:26:44 UTC (rev 5615)
+++ trunk/doc/Change.log 2012-09-01 00:18:04 UTC (rev 5616)
@@ -1,4 +1,5 @@
webERP Change Log
+1/9/12 Carlos Rubio: AccountGroups.php now has option to move to alternative accountgroups
30/8/2012 Exson: fixed sql problem reported bymodpr0be
24/8/12 Serge Gélinas: Added new fr_CA.utf8 French Quebec translation
21/8/12 Phil: Stock.php could not change an item to an assembly if there were any old completed or deleted/rejected purchase orders for the item.
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2012-08-30 18:26:44 UTC (rev 5615)
+++ trunk/includes/footer.inc 2012-09-01 00:18:04 UTC (rev 5616)
@@ -2,32 +2,28 @@
/* $Id$*/
-echo '</div>'; // BodyWrapDiv ===HJ===
-echo '</div>'; // BodyDiv ===HJ===
+echo '</div>'; // BodyWrapDiv
+echo '</div>'; // BodyDiv
-echo '<div id="FooterDiv">'; //===HJ===
-echo '<div id="FooterWrapDiv">'; //===HJ===
+echo '<div id="FooterDiv">';
+echo '<div id="FooterWrapDiv">';
-echo '<div id="FooterLogoDiv">'; //===HJ===
+echo '<div id="FooterLogoDiv">';
echo '<img src="'. $rootpath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © weberp.org - ' . date('Y') . '" /></td>';
echo '</div>';
-echo '<div id="FooterVersionDiv">'; //===HJ===
- echo 'webERP ' ._('version') .' ' . $_SESSION['VersionNumber'];
+echo '<div id="FooterVersionDiv">';
+ echo 'webERP ' ._('version') .' ' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © 2004 - ' . Date('Y'). ' <a href="http://www.weberp.org/weberp/doc/Manual/ManualContributors.html">weberp.org</a>';
echo '</div>';
-echo '<div id="FooterTimeDiv">'; //===HJ===
+echo '<div id="FooterTimeDiv">';
echo DisplayDateTime();
echo '</div>';
-// if(http_file_exists('http://sflogo.sourceforge.net/sflogo.php')) {
-// echo '<tr><td class="footer"><a href="https://sourceforge.net/projects/web-erp"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=391629&type=12" width="120" height="30" border="0" alt="Get webERP web-based ERP Accounting at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></td></tr>';
-// }
+echo '</div>'; // FooterWrapDiv
+echo '</div>'; // FooterDiv
-echo '</div>'; // FooterWrapDiv ===HJ===
-echo '</div>'; // FooterDiv ===HJ===
-
echo '</body>';
echo '</html>';
-?>
+?>
\ 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: <dai...@us...> - 2012-09-01 00:18:11
|
Revision: 5616
http://web-erp.svn.sourceforge.net/web-erp/?rev=5616&view=rev
Author: daintree
Date: 2012-09-01 00:18:04 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
accounts groups change option when deleting an existing account group that is used by several accounts
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/GLAccounts.php
trunk/doc/Change.log
trunk/includes/footer.inc
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-08-30 18:26:44 UTC (rev 5615)
+++ trunk/AccountGroups.php 2012-09-01 00:18:04 UTC (rev 5616)
@@ -40,6 +40,15 @@
$Errors = array();
+if (isset($_POST['MoveGroup'])) {
+ $sql="UPDATE chartmaster SET group_='" . $_POST['DestinyAccountGroup'] . "' WHERE group_='" . $_POST['OriginalAccountGroup'] . "'";
+ $ErrMsg = _('An error occurred in moving the account group');
+ $DbgMsg = _('The SQL that was used to moving the account group was');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
+ echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
+ prnMsg( _('All accounts in the account group:') . ' ' . $_POST['OriginalAccountGroup'] . ' ' . _('have been changed to the account group:') . ' ' . $_POST['DestinyAccountGroup'],'success');
+}
+
if (isset($_POST['submit'])) {
//initialise no input errors assumed initially before we test
@@ -180,7 +189,31 @@
if ($myrow['groups']>0) {
prnMsg( _('Cannot delete this account group because general ledger accounts have been created using this group'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group');
+ echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class="selection">';
+ echo '<input type="hidden" name="OriginalAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
+ echo '<tr>
+ <td>' . _('Parent Group') . ':' . '</td>
+ <td><select tabindex="2" ' . (in_array('ParentGroupName',$Errors) ? 'class="selecterror"' : '' ) . ' name="DestinyAccountGroup">';
+ $sql = "SELECT groupname FROM accountgroups";
+ $GroupResult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
+ while ($GroupRow = DB_fetch_array($GroupResult) ) {
+
+ if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$RroupRow['groupname']) {
+ echo '<option selected="selected" value="'.htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8'). '</option>';
+ } else {
+ echo '<option value="'.htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
+ }
+ }
+ echo '</select>';
+ echo '</td></tr>';
+ echo '<tr>
+ <td colspan="2"><div class="centre"><input tabindex="6" type="submit" name="MoveGroup" value="' . _('Move Group') . '" /></div></td>
+ </tr>';
+
} else {
$sql = "SELECT COUNT(groupname) groupnames FROM accountgroups WHERE parentgroupname = '" . $_GET['SelectedAccountGroup'] . "'";
$ErrMsg = _('An error occurred in retrieving the parent group information');
@@ -190,6 +223,7 @@
if ($myrow['groupnames']>0) {
prnMsg( _('Cannot delete this account group because it is a parent account group of other account group(s)'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow['groupnames'] . ' ' . _('account groups that have this group as its/there parent account group');
+
} else {
$sql="DELETE FROM accountgroups WHERE groupname='" . $_GET['SelectedAccountGroup'] . "'";
$ErrMsg = _('An error occurred in deleting the account group');
@@ -321,8 +355,8 @@
<td>' . $_POST['GroupName'] . '</td>
</tr>';
- } else { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
-
+ } elseif (!isset($_POST['MoveGroup'])) { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
+
if (!isset($_POST['SelectedAccountGroup'])){
$_POST['SelectedAccountGroup']='';
}
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2012-08-30 18:26:44 UTC (rev 5615)
+++ trunk/GLAccounts.php 2012-09-01 00:18:04 UTC (rev 5616)
@@ -238,10 +238,12 @@
if (!isset($_POST['AccountName'])) {$_POST['AccountName']='';}
echo '<tr><td>' . _('Account Name') . ':</td><td><input type="text" size="51" maxlength="50" name="AccountName" value="' . $_POST['AccountName'] . '" /></td></tr>';
- $sql = 'SELECT groupname FROM accountgroups ORDER BY sequenceintb';
+ "$sql = 'SELECT groupname FROM accountgroups ORDER BY sequenceintb";
$result = DB_query($sql, $db);
- echo '<tr><td>' . _('Account Group') . ':</td><td><select name="Group">';
+ echo '<tr>
+ <td>' . _('Account Group') . ':</td>
+ <td><select name="Group">';
while ($myrow = DB_fetch_array($result)){
if (isset($_POST['Group']) and $myrow[0]==$_POST['Group']){
@@ -251,7 +253,9 @@
}
echo $myrow[0] . '">' . $myrow[0] . '</option>';
}
- echo '</select></td></tr></table>';
+ echo '</select></td>
+ </tr>
+ </table>';
if (!isset($_GET['SelectedAccount']) or $_GET['SelectedAccount']=='') {
echo '<script type="text/javascript">defaultControl(document.GLAccounts.AccountCode);</script>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-08-30 18:26:44 UTC (rev 5615)
+++ trunk/doc/Change.log 2012-09-01 00:18:04 UTC (rev 5616)
@@ -1,4 +1,5 @@
webERP Change Log
+1/9/12 Carlos Rubio: AccountGroups.php now has option to move to alternative accountgroups
30/8/2012 Exson: fixed sql problem reported bymodpr0be
24/8/12 Serge Gélinas: Added new fr_CA.utf8 French Quebec translation
21/8/12 Phil: Stock.php could not change an item to an assembly if there were any old completed or deleted/rejected purchase orders for the item.
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2012-08-30 18:26:44 UTC (rev 5615)
+++ trunk/includes/footer.inc 2012-09-01 00:18:04 UTC (rev 5616)
@@ -2,32 +2,28 @@
/* $Id$*/
-echo '</div>'; // BodyWrapDiv ===HJ===
-echo '</div>'; // BodyDiv ===HJ===
+echo '</div>'; // BodyWrapDiv
+echo '</div>'; // BodyDiv
-echo '<div id="FooterDiv">'; //===HJ===
-echo '<div id="FooterWrapDiv">'; //===HJ===
+echo '<div id="FooterDiv">';
+echo '<div id="FooterWrapDiv">';
-echo '<div id="FooterLogoDiv">'; //===HJ===
+echo '<div id="FooterLogoDiv">';
echo '<img src="'. $rootpath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © weberp.org - ' . date('Y') . '" /></td>';
echo '</div>';
-echo '<div id="FooterVersionDiv">'; //===HJ===
- echo 'webERP ' ._('version') .' ' . $_SESSION['VersionNumber'];
+echo '<div id="FooterVersionDiv">';
+ echo 'webERP ' ._('version') .' ' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © 2004 - ' . Date('Y'). ' <a href="http://www.weberp.org/weberp/doc/Manual/ManualContributors.html">weberp.org</a>';
echo '</div>';
-echo '<div id="FooterTimeDiv">'; //===HJ===
+echo '<div id="FooterTimeDiv">';
echo DisplayDateTime();
echo '</div>';
-// if(http_file_exists('http://sflogo.sourceforge.net/sflogo.php')) {
-// echo '<tr><td class="footer"><a href="https://sourceforge.net/projects/web-erp"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=391629&type=12" width="120" height="30" border="0" alt="Get webERP web-based ERP Accounting at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></td></tr>';
-// }
+echo '</div>'; // FooterWrapDiv
+echo '</div>'; // FooterDiv
-echo '</div>'; // FooterWrapDiv ===HJ===
-echo '</div>'; // FooterDiv ===HJ===
-
echo '</body>';
echo '</html>';
-?>
+?>
\ 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: <dai...@us...> - 2012-09-01 02:14:16
|
Revision: 5617
http://web-erp.svn.sourceforge.net/web-erp/?rev=5617&view=rev
Author: daintree
Date: 2012-09-01 02:14:10 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
fix typo
Modified Paths:
--------------
trunk/GLAccounts.php
trunk/includes/footer.inc
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2012-09-01 00:18:04 UTC (rev 5616)
+++ trunk/GLAccounts.php 2012-09-01 02:14:10 UTC (rev 5617)
@@ -68,9 +68,9 @@
// PREVENT DELETES IF DEPENDENT RECORDS IN 'ChartDetails'
- $sql= "SELECT COUNT(*)
- FROM chartdetails
- WHERE chartdetails.accountcode ='" . $SelectedAccount . "'
+ $sql= "SELECT COUNT(*)
+ FROM chartdetails
+ WHERE chartdetails.accountcode ='" . $SelectedAccount . "'
AND chartdetails.actual <>0";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -81,8 +81,8 @@
} else {
// PREVENT DELETES IF DEPENDENT RECORDS IN 'GLTrans'
- $sql= "SELECT COUNT(*)
- FROM gltrans
+ $sql= "SELECT COUNT(*)
+ FROM gltrans
WHERE gltrans.account ='" . $SelectedAccount . "'";
$ErrMsg = _('Could not test for existing transactions because');
@@ -146,8 +146,8 @@
prnMsg( _('Cannot delete this account because it is used by one of the sales GL posting interface records'),'warn');
} else {
//PREVENT DELETES IF COGS POSTINGS USE THE GL ACCOUNT
- $sql= "SELECT COUNT(*)
- FROM cogsglpostings
+ $sql= "SELECT COUNT(*)
+ FROM cogsglpostings
WHERE glcode='" . $SelectedAccount ."'";
$ErrMsg = _('Could not test for existing cost of sales interface codes because');
@@ -238,7 +238,7 @@
if (!isset($_POST['AccountName'])) {$_POST['AccountName']='';}
echo '<tr><td>' . _('Account Name') . ':</td><td><input type="text" size="51" maxlength="50" name="AccountName" value="' . $_POST['AccountName'] . '" /></td></tr>';
- "$sql = 'SELECT groupname FROM accountgroups ORDER BY sequenceintb";
+ $sql = "SELECT groupname FROM accountgroups ORDER BY sequenceintb";
$result = DB_query($sql, $db);
echo '<tr>
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2012-09-01 00:18:04 UTC (rev 5616)
+++ trunk/includes/footer.inc 2012-09-01 02:14:10 UTC (rev 5617)
@@ -2,26 +2,26 @@
/* $Id$*/
-echo '</div>'; // BodyWrapDiv
-echo '</div>'; // BodyDiv
+echo '</div>'; // BodyWrapDiv
+echo '</div>'; // BodyDiv
-echo '<div id="FooterDiv">';
-echo '<div id="FooterWrapDiv">';
+echo '<div id="FooterDiv">';
+echo '<div id="FooterWrapDiv">';
-echo '<div id="FooterLogoDiv">';
+echo '<div id="FooterLogoDiv">';
echo '<img src="'. $rootpath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © weberp.org - ' . date('Y') . '" /></td>';
echo '</div>';
-echo '<div id="FooterVersionDiv">';
- echo 'webERP ' ._('version') .' ' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © 2004 - ' . Date('Y'). ' <a href="http://www.weberp.org/weberp/doc/Manual/ManualContributors.html">weberp.org</a>';
+echo '<div id="FooterVersionDiv">';
+ echo 'webERP ' ._('version') .' ' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © 2004 - ' . Date('Y'). ' <a target="_blank" href="http://www.weberp.org/weberp/doc/Manual/ManualContributors.html">weberp.org</a>';
echo '</div>';
-echo '<div id="FooterTimeDiv">';
+echo '<div id="FooterTimeDiv">';
echo DisplayDateTime();
echo '</div>';
-echo '</div>'; // FooterWrapDiv
-echo '</div>'; // FooterDiv
+echo '</div>'; // FooterWrapDiv
+echo '</div>'; // FooterDiv
echo '</body>';
echo '</html>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-01 02:14:16
|
Revision: 5617
http://web-erp.svn.sourceforge.net/web-erp/?rev=5617&view=rev
Author: daintree
Date: 2012-09-01 02:14:10 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
fix typo
Modified Paths:
--------------
trunk/GLAccounts.php
trunk/includes/footer.inc
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2012-09-01 00:18:04 UTC (rev 5616)
+++ trunk/GLAccounts.php 2012-09-01 02:14:10 UTC (rev 5617)
@@ -68,9 +68,9 @@
// PREVENT DELETES IF DEPENDENT RECORDS IN 'ChartDetails'
- $sql= "SELECT COUNT(*)
- FROM chartdetails
- WHERE chartdetails.accountcode ='" . $SelectedAccount . "'
+ $sql= "SELECT COUNT(*)
+ FROM chartdetails
+ WHERE chartdetails.accountcode ='" . $SelectedAccount . "'
AND chartdetails.actual <>0";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
@@ -81,8 +81,8 @@
} else {
// PREVENT DELETES IF DEPENDENT RECORDS IN 'GLTrans'
- $sql= "SELECT COUNT(*)
- FROM gltrans
+ $sql= "SELECT COUNT(*)
+ FROM gltrans
WHERE gltrans.account ='" . $SelectedAccount . "'";
$ErrMsg = _('Could not test for existing transactions because');
@@ -146,8 +146,8 @@
prnMsg( _('Cannot delete this account because it is used by one of the sales GL posting interface records'),'warn');
} else {
//PREVENT DELETES IF COGS POSTINGS USE THE GL ACCOUNT
- $sql= "SELECT COUNT(*)
- FROM cogsglpostings
+ $sql= "SELECT COUNT(*)
+ FROM cogsglpostings
WHERE glcode='" . $SelectedAccount ."'";
$ErrMsg = _('Could not test for existing cost of sales interface codes because');
@@ -238,7 +238,7 @@
if (!isset($_POST['AccountName'])) {$_POST['AccountName']='';}
echo '<tr><td>' . _('Account Name') . ':</td><td><input type="text" size="51" maxlength="50" name="AccountName" value="' . $_POST['AccountName'] . '" /></td></tr>';
- "$sql = 'SELECT groupname FROM accountgroups ORDER BY sequenceintb";
+ $sql = "SELECT groupname FROM accountgroups ORDER BY sequenceintb";
$result = DB_query($sql, $db);
echo '<tr>
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2012-09-01 00:18:04 UTC (rev 5616)
+++ trunk/includes/footer.inc 2012-09-01 02:14:10 UTC (rev 5617)
@@ -2,26 +2,26 @@
/* $Id$*/
-echo '</div>'; // BodyWrapDiv
-echo '</div>'; // BodyDiv
+echo '</div>'; // BodyWrapDiv
+echo '</div>'; // BodyDiv
-echo '<div id="FooterDiv">';
-echo '<div id="FooterWrapDiv">';
+echo '<div id="FooterDiv">';
+echo '<div id="FooterWrapDiv">';
-echo '<div id="FooterLogoDiv">';
+echo '<div id="FooterLogoDiv">';
echo '<img src="'. $rootpath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © weberp.org - ' . date('Y') . '" /></td>';
echo '</div>';
-echo '<div id="FooterVersionDiv">';
- echo 'webERP ' ._('version') .' ' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © 2004 - ' . Date('Y'). ' <a href="http://www.weberp.org/weberp/doc/Manual/ManualContributors.html">weberp.org</a>';
+echo '<div id="FooterVersionDiv">';
+ echo 'webERP ' ._('version') .' ' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © 2004 - ' . Date('Y'). ' <a target="_blank" href="http://www.weberp.org/weberp/doc/Manual/ManualContributors.html">weberp.org</a>';
echo '</div>';
-echo '<div id="FooterTimeDiv">';
+echo '<div id="FooterTimeDiv">';
echo DisplayDateTime();
echo '</div>';
-echo '</div>'; // FooterWrapDiv
-echo '</div>'; // FooterDiv
+echo '</div>'; // FooterWrapDiv
+echo '</div>'; // FooterDiv
echo '</body>';
echo '</html>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-03 10:35:01
|
Revision: 5620
http://web-erp.svn.sourceforge.net/web-erp/?rev=5620&view=rev
Author: daintree
Date: 2012-09-03 10:34:54 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
typos per Thomas Lie
Modified Paths:
--------------
trunk/ContractBOM.php
trunk/CustomerReceipt.php
trunk/PO_Items.php
trunk/Z_ChangeStockCode.php
trunk/api/api_xml-rpc.php
trunk/includes/PDFSuppTransListingPageHeader.inc
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-09-01 05:19:56 UTC (rev 5619)
+++ trunk/ContractBOM.php 2012-09-03 10:34:54 UTC (rev 5620)
@@ -156,7 +156,7 @@
if($_SESSION['Contract'.$identifier]->Status!=2){
$_SESSION['Contract'.$identifier]->Remove_ContractComponent($_GET['Delete']);
} else {
- prnMsg( _('The contract BOM cannot be alterned because the customer has already placed the order'),'warn');
+ prnMsg( _('The contract BOM cannot be altered because the customer has already placed the order'),'warn');
}
}
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2012-09-01 05:19:56 UTC (rev 5619)
+++ trunk/CustomerReceipt.php 2012-09-03 10:34:54 UTC (rev 5620)
@@ -22,7 +22,7 @@
$Cancel=1;
}
-if (isset($_GET['Type']) and $_GET['Type']=='GL') {
+if (isset($_GET['Type']) AND $_GET['Type']=='GL') {
$_POST['GLEntry']=1;
}
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2012-09-01 05:19:56 UTC (rev 5619)
+++ trunk/PO_Items.php 2012-09-03 10:34:54 UTC (rev 5620)
@@ -704,7 +704,7 @@
}
echo '<td>' . $POLine->StockID . '</td>
- <td><input type="text" name="ItemDescription' . $POLine->LineNo.'" size="80" value="' .$POLine->ItemDescription .'" /></td>
+ <td><input type="text" name="ItemDescription' . $POLine->LineNo.'" size="30" value="' .$POLine->ItemDescription .'" /></td>
<td class="number">' . locale_number_format($POLine->Quantity,$POLine->DecimalPlaces) . '</td>
<td>' . $POLine->Units . '</td>
<td class="number">' . $DisplayPrice . '</td>
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2012-09-01 05:19:56 UTC (rev 5619)
+++ trunk/Z_ChangeStockCode.php 2012-09-03 10:34:54 UTC (rev 5620)
@@ -228,7 +228,7 @@
echo '<br />' . _('Changing the contract BOM table records');
$sql = "UPDATE contractbom SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to contract BOM records failed');
+ $ErrMsg = _('The SQL to update the contract BOM records failed');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-09-01 05:19:56 UTC (rev 5619)
+++ trunk/api/api_xml-rpc.php 2012-09-03 10:34:54 UTC (rev 5620)
@@ -2954,12 +2954,12 @@
return $rtn;
}
- $Description = _('Returns the webERP reports_dir for the company selected');
+ $Description = _('Returns the webERP reports directory for the company selected');
$Parameter[0]['name'] = _('User name');
$Parameter[0]['description'] = _('A valid weberp username. This user should have security access to this data.');
$Parameter[1]['name'] = _('User password');
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
- $ReturnValue[0] = _('If successful this function returns a string containing the path to the company reporte_dir') . ' ' . _('Otherwise an array of error codes is returned. ');
+ $ReturnValue[0] = _('If successful this function returns a string containing the path to the company reports directory') . ' ' . _('Otherwise an array of error codes is returned. ');
$GetReportsDirectory_sig = array(array($xmlrpcStruct),
array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
Modified: trunk/includes/PDFSuppTransListingPageHeader.inc
===================================================================
--- trunk/includes/PDFSuppTransListingPageHeader.inc 2012-09-01 05:19:56 UTC (rev 5619)
+++ trunk/includes/PDFSuppTransListingPageHeader.inc 2012-09-03 10:34:54 UTC (rev 5620)
@@ -12,13 +12,13 @@
Switch ($_POST['TransType']) {
case 20:
- $TransType=_('Suppier Invoices');
+ $TransType=_('Supplier Invoices');
break;
case 21:
- $TransType=_('Suppier Credit Notes');
+ $TransType=_('Supplier Credit Notes');
break;
case 22:
- $TransType=_('Suppier Payments');
+ $TransType=_('Supplier Payments');
}
$XPos = $Left_Margin;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-03 10:35:04
|
Revision: 5620
http://web-erp.svn.sourceforge.net/web-erp/?rev=5620&view=rev
Author: daintree
Date: 2012-09-03 10:34:54 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
typos per Thomas Lie
Modified Paths:
--------------
trunk/ContractBOM.php
trunk/CustomerReceipt.php
trunk/PO_Items.php
trunk/Z_ChangeStockCode.php
trunk/api/api_xml-rpc.php
trunk/includes/PDFSuppTransListingPageHeader.inc
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-09-01 05:19:56 UTC (rev 5619)
+++ trunk/ContractBOM.php 2012-09-03 10:34:54 UTC (rev 5620)
@@ -156,7 +156,7 @@
if($_SESSION['Contract'.$identifier]->Status!=2){
$_SESSION['Contract'.$identifier]->Remove_ContractComponent($_GET['Delete']);
} else {
- prnMsg( _('The contract BOM cannot be alterned because the customer has already placed the order'),'warn');
+ prnMsg( _('The contract BOM cannot be altered because the customer has already placed the order'),'warn');
}
}
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2012-09-01 05:19:56 UTC (rev 5619)
+++ trunk/CustomerReceipt.php 2012-09-03 10:34:54 UTC (rev 5620)
@@ -22,7 +22,7 @@
$Cancel=1;
}
-if (isset($_GET['Type']) and $_GET['Type']=='GL') {
+if (isset($_GET['Type']) AND $_GET['Type']=='GL') {
$_POST['GLEntry']=1;
}
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2012-09-01 05:19:56 UTC (rev 5619)
+++ trunk/PO_Items.php 2012-09-03 10:34:54 UTC (rev 5620)
@@ -704,7 +704,7 @@
}
echo '<td>' . $POLine->StockID . '</td>
- <td><input type="text" name="ItemDescription' . $POLine->LineNo.'" size="80" value="' .$POLine->ItemDescription .'" /></td>
+ <td><input type="text" name="ItemDescription' . $POLine->LineNo.'" size="30" value="' .$POLine->ItemDescription .'" /></td>
<td class="number">' . locale_number_format($POLine->Quantity,$POLine->DecimalPlaces) . '</td>
<td>' . $POLine->Units . '</td>
<td class="number">' . $DisplayPrice . '</td>
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2012-09-01 05:19:56 UTC (rev 5619)
+++ trunk/Z_ChangeStockCode.php 2012-09-03 10:34:54 UTC (rev 5620)
@@ -228,7 +228,7 @@
echo '<br />' . _('Changing the contract BOM table records');
$sql = "UPDATE contractbom SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to contract BOM records failed');
+ $ErrMsg = _('The SQL to update the contract BOM records failed');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-09-01 05:19:56 UTC (rev 5619)
+++ trunk/api/api_xml-rpc.php 2012-09-03 10:34:54 UTC (rev 5620)
@@ -2954,12 +2954,12 @@
return $rtn;
}
- $Description = _('Returns the webERP reports_dir for the company selected');
+ $Description = _('Returns the webERP reports directory for the company selected');
$Parameter[0]['name'] = _('User name');
$Parameter[0]['description'] = _('A valid weberp username. This user should have security access to this data.');
$Parameter[1]['name'] = _('User password');
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
- $ReturnValue[0] = _('If successful this function returns a string containing the path to the company reporte_dir') . ' ' . _('Otherwise an array of error codes is returned. ');
+ $ReturnValue[0] = _('If successful this function returns a string containing the path to the company reports directory') . ' ' . _('Otherwise an array of error codes is returned. ');
$GetReportsDirectory_sig = array(array($xmlrpcStruct),
array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
Modified: trunk/includes/PDFSuppTransListingPageHeader.inc
===================================================================
--- trunk/includes/PDFSuppTransListingPageHeader.inc 2012-09-01 05:19:56 UTC (rev 5619)
+++ trunk/includes/PDFSuppTransListingPageHeader.inc 2012-09-03 10:34:54 UTC (rev 5620)
@@ -12,13 +12,13 @@
Switch ($_POST['TransType']) {
case 20:
- $TransType=_('Suppier Invoices');
+ $TransType=_('Supplier Invoices');
break;
case 21:
- $TransType=_('Suppier Credit Notes');
+ $TransType=_('Supplier Credit Notes');
break;
case 22:
- $TransType=_('Suppier Payments');
+ $TransType=_('Supplier Payments');
}
$XPos = $Left_Margin;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-06 09:37:07
|
Revision: 5626
http://web-erp.svn.sourceforge.net/web-erp/?rev=5626&view=rev
Author: daintree
Date: 2012-09-06 09:36:49 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
Thomas Timothy Lie: updated Indonesian translation
Modified Paths:
--------------
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-09-06 01:51:57 UTC (rev 5625)
+++ trunk/doc/Change.log 2012-09-06 09:36:49 UTC (rev 5626)
@@ -1,4 +1,5 @@
webERP Change Log
+6/9/12 Thomas Timothy Lie and baliboss.com Team: updated Indonesian translation
1/9/12 Carlos Rubio: AccountGroups.php now has option to move to alternative accountgroups
30/8/2012 Exson: fixed sql problem reported bymodpr0be
24/8/12 Serge Gélinas: Added new fr_CA.utf8 French Quebec translation
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2012-09-06 01:51:57 UTC (rev 5625)
+++ trunk/doc/Manual/ManualContributors.html 2012-09-06 09:36:49 UTC (rev 5626)
@@ -169,6 +169,8 @@
<br />
Serge Gélinas - French Quebec<br />
<br />
+ Thomas Timothy Lie and baliboss.com Team - Indonesian<br />
+ <br />
Thiago Mansinho de Lima - Portuguese Brazilian<br />
<br />
Roberto del Pino - Spanish<br />
Modified: trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po 2012-09-06 01:51:57 UTC (rev 5625)
+++ trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po 2012-09-06 09:36:49 UTC (rev 5626)
@@ -1,47 +1,42 @@
# Indonesian translations for PACKAGE package.
-# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2009-2012 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# Thomas Timothy Lie <tho...@gm...>, 2009.
+# Thomas Timothy Lie <op...@ba...>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: weberp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-24 09:40+1200\n"
-"PO-Revision-Date: 2011-02-05 16:44+0000\n"
-"Last-Translator: Tim Schofield <Unknown>\n"
+"POT-Creation-Date: 2012-08-31 16:00+0700\n"
+"PO-Revision-Date: 2012-09-06 15:23+0700\n"
+"Last-Translator: Thomas Timothy Lie <op...@ba...>\n"
"Language-Team: www.baliboss.com <op...@ba...>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-31 06:29+0000\n"
"X-Generator: Launchpad (build 12696)\n"
"X-Poedit-Country: INDONESIA\n"
-"Language: \n"
"X-Poedit-Language: Indonesian\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
-#: AccountGroups.php:7 includes/MainMenuLinksArray.php:375
+#: AccountGroups.php:7
+#: includes/MainMenuLinksArray.php:375
msgid "Account Groups"
-msgstr "Grup Rekening"
+msgstr "Grup Akun"
#: AccountGroups.php:17
-msgid ""
-"An error occurred in retrieving the account groups of the parent account "
-"group during the check for recursion"
-msgstr ""
-"Kesalahan terjadi saat mengambil grup rekening induk selama pemeriksaan "
-"untuk pengulangan (recursion)"
+msgid "An error occurred in retrieving the account groups of the parent account group during the check for recursion"
+msgstr "Kesalahan terjadi saat mengambil grup akun induk selama pemeriksaan untuk pengulangan (recursion)"
#: AccountGroups.php:18
-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 yang digunakan untuk mengambil grup rekening induk dan yang gagal dalam "
-"proses adalah"
+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 yang digunakan untuk mengambil grup akun induk dan yang gagal dalam proses adalah"
-#: AccountGroups.php:58 AccountGroups.php:95 AccountGroups.php:176
+#: AccountGroups.php:58
+#: AccountGroups.php:95
+#: AccountGroups.php:176
#: AccountGroups.php:186
msgid "The SQL that was used to retrieve the information was"
msgstr "SQL yang digunakan untuk mengambil informasi adalah"
@@ -52,77 +47,70 @@
#: AccountGroups.php:66
msgid "The account group name already exists in the database"
-msgstr "Nama rekening grup tersebut sudah ada di database"
+msgstr "Nama grup akun tersebut sudah ada di database"
#: AccountGroups.php:72
msgid "The account group name cannot contain the character"
-msgstr "Nama rekening grup tidak dapat berisi karakter"
+msgstr "Nama grup akun tidak boleh berisi karakter"
-#: AccountGroups.php:72 Departments.php:30 TaxCategories.php:31
+#: AccountGroups.php:72
+#: Departments.php:30
+#: TaxCategories.php:31
msgid "or the character"
msgstr "atau karakter"
#: AccountGroups.php:78
msgid "The account group name must be at least one character long"
-msgstr "Nama grup rekening minimum 1 karakter"
+msgstr "Nama grup akun minimum 1 karakter"
#: AccountGroups.php:85
-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 ""
-"Grup rekening induk yang dipilih nampaknya mengakibatkan struktur rekening "
-"berulang (recursive) - pilih grup rekening induk yang lain atau jadikan grup "
-"ini grup rekening tingkat utama (top level)"
+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 "Grup akun induk yang dipilih nampaknya mengakibatkan struktur akun berulang (recursive) - pilih grup akun induk yang lain atau jadikan grup ini grup akun tingkat utama (top level)"
#: AccountGroups.php:96
msgid "Could not check whether the group is recursive because"
-msgstr ""
-"Tidak dapat memeriksa apakah grupnya bersifat berulang (recursive) karena"
+msgstr "Tidak dapat memeriksa apakah grupnya bersifat berulang (recursive) karena"
#: AccountGroups.php:104
-msgid ""
-"Since this account group is a child group, the sequence in the trial "
-"balance, the section in the accounts and whether or not the account group "
-"appears in the balance sheet or profit and loss account are all properties "
-"inherited from the parent account group. Any changes made to these fields "
-"will have no effect."
-msgstr ""
+msgid "Since this account group is a child group, the sequence in the trial balance, the section in the accounts and whether or not the account group appears in the balance sheet or profit and loss account are all properties inherited from the parent account group. Any changes made to these fields will have no effect."
+msgstr "Karena grup akun ini grup anak, urutan di neraca percobaan, tipe akun dan apakah atau tidak grup akun muncul di neraca atau akun laba rugi adalah semua ciri diperoleh dari grup akun induk. Perubahan apapun yg dibuat terhadap kolom-kolom ini tidak akan berpengaruh."
#: AccountGroups.php:109
msgid "The section in accounts must be an integer"
-msgstr "Kelompok rekening harus bilangan bulat"
+msgstr "Tipe akun harus bilangan bulat"
#: AccountGroups.php:115
msgid "The sequence in the trial balance must be an integer"
-msgstr "Urutan dari neraca saldo harus bilangan bulat"
+msgstr "Urutan di neraca percobaan harus bilangan bulat"
#: AccountGroups.php:121
msgid "The sequence in the TB must be numeric and less than"
-msgstr "Urutan dari neraca saldo harus berupa angka dan kurang dari"
+msgstr "Urutan di neraca percobaan harus berupa angka dan kurang dari"
#: AccountGroups.php:137
msgid "An error occurred in updating the account group"
-msgstr "Kesalahan terjadi saat memperbarui grup rekening"
+msgstr "Kesalahan terjadi saat memperbarui grup akun"
#: AccountGroups.php:138
msgid "The SQL that was used to update the account group was"
-msgstr "SQL yang digunakan untuk memperbaharui grup rekening adalah"
+msgstr "SQL yang digunakan untuk memperbaharui grup akun adalah"
-#: AccountGroups.php:140 AccountSections.php:98 PaymentMethods.php:83
+#: AccountGroups.php:140
+#: AccountSections.php:98
+#: PaymentMethods.php:83
msgid "Record Updated"
-msgstr "Data telah diperbaharui"
+msgstr "Data telah Diperbaharui"
#: AccountGroups.php:156
msgid "An error occurred in inserting the account group"
-msgstr "Kesalahan terjadi saat memasukkan grup rekening"
+msgstr "Kesalahan terjadi saat memasukkan grup akun"
#: AccountGroups.php:157
msgid "The SQL that was used to insert the account group was"
-msgstr "SQL yang digunakan untuk memasukkan grup rekening adalah"
+msgstr "SQL yang digunakan untuk memasukkan grup akun adalah"
-#: AccountGroups.php:158 AccountSections.php:108
+#: AccountGroups.php:158
+#: AccountSections.php:108
msgid "Record inserted"
msgstr "Data telah dimasukkan"
@@ -131,63 +119,102 @@
msgstr "Kesalahan terjadi saat mengambil informasi grup dari tabel chartmaster"
#: AccountGroups.php:180
-msgid ""
-"Cannot delete this account group because general ledger accounts have been "
-"created using this group"
-msgstr ""
-"Tidak dapat menghapus grup rekening ini karena rekening buku besar telah "
-"dibuat menggunakan grup ini"
+msgid "Cannot delete this account group because general ledger accounts have been created using this group"
+msgstr "Tidak dapat menghapus grup akun ini karena akun buku besar telah dibuat menggunakan grup ini"
-#: AccountGroups.php:181 AccountGroups.php:191 AccountSections.php:130
-#: Areas.php:114 Areas.php:123 BankAccounts.php:158 CreditStatus.php:125
-#: Currencies.php:166 Currencies.php:174 Currencies.php:182
-#: CustomerBranches.php:286 CustomerBranches.php:296 CustomerBranches.php:306
-#: CustomerBranches.php:316 Customers.php:289 Customers.php:298
-#: Customers.php:306 Customers.php:314 CustomerTypes.php:147
-#: CustomerTypes.php:157 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:134 GLAccounts.php:80 GLAccounts.php:96
-#: Locations.php:237 Locations.php:245 Locations.php:256 Locations.php:265
-#: Locations.php:274 Locations.php:283 Locations.php:292 Locations.php:301
-#: Locations.php:309 MRPDemandTypes.php:87 PaymentMethods.php:142
-#: PaymentTerms.php:146 PaymentTerms.php:153 PcExpenses.php:158
-#: SalesCategories.php:125 SalesCategories.php:132 SalesPeople.php:150
-#: SalesPeople.php:157 SalesPeople.php:163 SalesTypes.php:140
-#: SalesTypes.php:150 Shippers.php:81 Shippers.php:93 StockCategories.php:187
-#: Stocks.php:653 Stocks.php:662 Stocks.php:670 Stocks.php:678 Stocks.php:686
-#: Stocks.php:694 Suppliers.php:612 Suppliers.php:621 Suppliers.php:629
-#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:132
-#: TaxGroups.php:140 TaxProvinces.php:129 UnitsOfMeasure.php:135
-#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:83
+#: AccountGroups.php:181
+#: AccountGroups.php:191
+#: AccountSections.php:130
+#: Areas.php:114
+#: Areas.php:123
+#: BankAccounts.php:158
+#: CreditStatus.php:125
+#: Currencies.php:166
+#: Currencies.php:174
+#: Currencies.php:182
+#: CustomerBranches.php:286
+#: CustomerBranches.php:296
+#: CustomerBranches.php:306
+#: CustomerBranches.php:316
+#: CustomerTypes.php:147
+#: CustomerTypes.php:157
+#: Customers.php:289
+#: Customers.php:298
+#: Customers.php:306
+#: Customers.php:314
+#: Departments.php:141
+#: Factors.php:134
+#: FixedAssetCategories.php:134
+#: GLAccounts.php:80
+#: GLAccounts.php:96
+#: Locations.php:237
+#: Locations.php:245
+#: Locations.php:256
+#: Locations.php:265
+#: Locations.php:274
+#: Locations.php:283
+#: Locations.php:292
+#: Locations.php:301
+#: Locations.php:309
+#: MRPDemandTypes.php:87
+#: PaymentMethods.php:142
+#: PaymentTerms.php:146
+#: PaymentTerms.php:153
+#: PcExpenses.php:158
+#: SalesCategories.php:125
+#: SalesCategories.php:132
+#: SalesPeople.php:150
+#: SalesPeople.php:157
+#: SalesPeople.php:163
+#: SalesTypes.php:140
+#: SalesTypes.php:150
+#: Shippers.php:81
+#: Shippers.php:93
+#: StockCategories.php:187
+#: Stocks.php:653
+#: Stocks.php:662
+#: Stocks.php:670
+#: Stocks.php:678
+#: Stocks.php:686
+#: Stocks.php:694
+#: SupplierTypes.php:145
+#: Suppliers.php:612
+#: Suppliers.php:621
+#: Suppliers.php:629
+#: TaxCategories.php:131
+#: TaxGroups.php:132
+#: TaxGroups.php:140
+#: TaxProvinces.php:129
+#: UnitsOfMeasure.php:135
+#: WWW_Access.php:83
+#: WorkCentres.php:89
+#: WorkCentres.php:95
msgid "There are"
msgstr "Ada"
#: AccountGroups.php:181
msgid "general ledger accounts that refer to this account group"
-msgstr "rekening buku besar yang mereferensi pada grup rekening ini"
+msgstr "akun buku besar yang mereferensi pada grup akun ini"
#: AccountGroups.php:185
msgid "An error occurred in retrieving the parent group information"
msgstr "Kesalahan terjadi saat mengambil informasi grup induk"
#: AccountGroups.php:190
-msgid ""
-"Cannot delete this account group because it is a parent account group of "
-"other account group(s)"
-msgstr ""
-"Tidak dapat menghapus grup rekening ini karena digunakan sebagai induk dari "
-"grup rekening yang lain"
+msgid "Cannot delete this account group because it is a parent account group of other account group(s)"
+msgstr "Tidak dapat menghapus grup akun ini karena digunakan sebagai induk dari grup akun yang lain"
#: AccountGroups.php:191
msgid "account groups that have this group as its/there parent account group"
-msgstr "grup rekening yang mempunyai grup ini sebagai grup rekening induk nya"
+msgstr "grup akun yang mempunyai grup ini sebagai grup akun induk nya"
#: AccountGroups.php:194
msgid "An error occurred in deleting the account group"
-msgstr "Kesalahan terjadi saat menghapus grup rekening"
+msgstr "Kesalahan terjadi saat menghapus grup akun"
#: AccountGroups.php:195
msgid "The SQL that was used to delete the account group was"
-msgstr "SQL yang digunakan untuk menghapus grup rekening adalah"
+msgstr "SQL yang digunakan untuk menghapus grup akun adalah"
#: AccountGroups.php:197
msgid "group has been deleted"
@@ -195,55 +222,133 @@
#: AccountGroups.php:222
msgid "The sql that was used to retrieve the account group information was "
-msgstr "SQL yang digunakan untuk mengambil informasi grup rekening adalah "
+msgstr "SQL yang digunakan untuk mengambil informasi grup akun adalah "
#: AccountGroups.php:223
msgid "Could not get account groups because"
-msgstr "Tidak dapat mengambil grup rekening karena"
+msgstr "Tidak dapat mengambil grup akun karena"
-#: AccountGroups.php:225 AccountSections.php:169 AddCustomerContacts.php:25
-#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
-#: AddCustomerTypeNotes.php:94 AgedDebtors.php:444 AgedSuppliers.php:276
-#: Areas.php:143 AuditTrail.php:11 BankReconciliation.php:14
-#: BOMExtendedQty.php:250 BOMIndented.php:246 BOMIndentedReverse.php:235
-#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:858
-#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2037
-#: CounterSales.php:2163 Credit_Invoice.php:255 CreditStatus.php:21
-#: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:11
-#: DebtorsAtPeriodEnd.php:125 DiscountCategories.php:10
-#: DiscountCategories.php:134 DiscountMatrix.php:16 EDIMessageFormat.php:105
-#: FixedAssetLocations.php:9 FixedAssetRegister.php:13
-#: FixedAssetRegister.php:249 FixedAssetTransfer.php:32 FormDesigner.php:129
-#: GLBalanceSheet.php:378 GLBudgets.php:29 GLJournal.php:247
-#: InternalStockRequest.php:281 InventoryPlanning.php:374
-#: InventoryPlanningPrefSupplier.php:467 MRPReport.php:516 NoSalesItems.php:93
-#: OutstandingGRNs.php:163 PcAssignCashToTab.php:56 PcAssignCashToTab.php:130
-#: PcAssignCashToTab.php:146 PcAssignCashToTab.php:190 PDFPickingList.php:28
-#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
-#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:140
-#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:30
-#: PurchData.php:152 PurchData.php:286 PurchData.php:312
-#: RecurringSalesOrders.php:309 SalesAnalReptCols.php:51 SalesAnalRepts.php:11
-#: SalesCategories.php:11 SalesGLPostings.php:17 SalesGraph.php:35
-#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:46
-#: SelectCompletedOrder.php:11 SelectContract.php:65 SelectCreditItems.php:216
-#: SelectCreditItems.php:287 SelectCustomer.php:263 SelectGLAccount.php:17
-#: SelectGLAccount.php:87 SelectOrderItems.php:586 SelectOrderItems.php:1498
-#: SelectOrderItems.php:1620 SelectProduct.php:505 SelectSalesOrder.php:534
-#: SelectSupplier.php:9 SelectSupplier.php:199 SelectWorkOrder.php:9
-#: SelectWorkOrder.php:152 ShipmentCosting.php:11 Shipments.php:17
-#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
-#: StockLocMovements.php:14 StockLocStatus.php:28
-#: StockSerialItemResearch.php:30 SupplierPriceList.php:15
-#: SupplierPriceList.php:214 SupplierPriceList.php:384
-#: SupplierPriceList.php:388 SupplierPriceList.php:439
-#: SupplierPriceList.php:489 Suppliers.php:302 SupplierTenderCreate.php:522
-#: SupplierTenderCreate.php:628 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TaxGroups.php:15
-#: TaxProvinces.php:11 TopItems.php:114 WhereUsedInquiry.php:18
-#: WorkCentres.php:111 WorkCentres.php:162 WorkOrderCosting.php:13
-#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:17
-#: WorkOrderStatus.php:42 WWW_Access.php:11 WWW_Users.php:33
+#: AccountGroups.php:225
+#: AccountSections.php:169
+#: AddCustomerContacts.php:25
+#: AddCustomerContacts.php:27
+#: AddCustomerNotes.php:101
+#: AddCustomerTypeNotes.php:94
+#: AgedDebtors.php:444
+#: AgedSuppliers.php:276
+#: Areas.php:143
+#: AuditTrail.php:11
+#: BOMExtendedQty.php:250
+#: BOMIndented.php:246
+#: BOMIndentedReverse.php:235
+#: BOMInquiry.php:187
+#: BOMListing.php:109
+#: BOMs.php:231
+#: BOMs.php:858
+#: BankReconciliation.php:14
+#: COGSGLPostings.php:18
+#: CompanyPreferences.php:153
+#: CounterSales.php:2037
+#: CounterSales.php:2163
+#: CreditStatus.php:21
+#: Credit_Invoice.php:256
+#: Currencies.php:28
+#: CustEDISetup.php:17
+#: DailyBankTransactions.php:11
+#: DebtorsAtPeriodEnd.php:125
+#: DiscountCategories.php:10
+#: DiscountCategories.php:134
+#: DiscountMatrix.php:16
+#: EDIMessageFormat.php:105
+#: FixedAssetLocations.php:9
+#: FixedAssetRegister.php:13
+#: FixedAssetRegister.php:249
+#: FixedAssetTransfer.php:32
+#: FormDesigner.php:129
+#: GLBalanceSheet.php:378
+#: GLBudgets.php:29
+#: GLJournal.php:247
+#: InternalStockRequest.php:281
+#: InventoryPlanning.php:376
+#: InventoryPlanningPrefSupplier.php:469
+#: MRPReport.php:516
+#: NoSalesItems.php:93
+#: OutstandingGRNs.php:163
+#: PDFPickingList.php:28
+#: PDFStockLocTransfer.php:16
+#: POReport.php:60
+#: POReport.php:64
+#: POReport.php:68
+#: PO_AuthorisationLevels.php:10
+#: PO_SelectOSPurchOrder.php:140
+#: PcAssignCashToTab.php:56
+#: PcAssignCashToTab.php:130
+#: PcAssignCashToTab.php:146
+#: PcAssignCashToTab.php:190
+#: Prices.php:30
+#: PricesBasedOnMarkUp.php:8
+#: Prices_Customer.php:35
+#: PurchData.php:152
+#: PurchData.php:286
+#: PurchData.php:312
+#: RecurringSalesOrders.php:309
+#: SalesAnalReptCols.php:51
+#: SalesAnalRepts.php:11
+#: SalesCategories.php:11
+#: SalesGLPostings.php:17
+#: SalesGraph.php:35
+#: SalesPeople.php:20
+#: SalesTypes.php:20
+#: SelectAsset.php:46
+#: SelectCompletedOrder.php:11
+#: SelectContract.php:65
+#: SelectCreditItems.php:216
+#: SelectCreditItems.php:287
+#: SelectCustomer.php:263
+#: SelectGLAccount.php:17
+#: SelectGLAccount.php:87
+#: SelectOrderItems.php:586
+#: SelectOrderItems.php:1498
+#: SelectOrderItems.php:1621
+#: SelectProduct.php:505
+#: SelectSalesOrder.php:534
+#: SelectSupplier.php:9
+#: SelectSupplier.php:199
+#: SelectWorkOrder.php:9
+#: SelectWorkOrder.php:152
+#: ShipmentCosting.php:11
+#: Shipments.php:17
+#: Shippers.php:123
+#: Shippers.php:160
+#: Shipt_Select.php:8
+#: StockLocMovements.php:14
+#: StockLocStatus.php:28
+#: StockSerialItemResearch.php:30
+#: SupplierPriceList.php:15
+#: SupplierPriceList.php:214
+#: SupplierPriceList.php:384
+#: SupplierPriceList.php:388
+#: SupplierPriceList.php:439
+#: SupplierPriceList.php:489
+#: SupplierTenderCreate.php:522
+#: SupplierTenderCreate.php:628
+#: SupplierTenders.php:322
+#: SupplierTenders.php:388
+#: SupplierTransInquiry.php:10
+#: Suppliers.php:302
+#: TaxGroups.php:15
+#: TaxProvinces.php:11
+#: TopItems.php:114
+#: WWW_Access.php:11
+#: WWW_Users.php:33
+#: WhereUsedInquiry.php:18
+#: WorkCentres.php:111
+#: WorkCentres.php:162
+#: WorkOrderCosting.php:13
+#: WorkOrderEntry.php:11
+#: WorkOrderIssue.php:22
+#: WorkOrderReceive.php:17
+#: WorkOrderStatus.php:42
#: Z_BottomUpCosts.php:57
msgid "Search"
msgstr "Cari"
@@ -252,283 +357,559 @@
msgid "Group Name"
msgstr "Nama Grup"
-#: AccountGroups.php:230 EDIMessageFormat.php:129 EDIMessageFormat.php:208
+#: AccountGroups.php:230
+#: EDIMessageFormat.php:129
+#: EDIMessageFormat.php:208
msgid "Section"
-msgstr "Kelompok"
+msgstr "Tipe"
-#: AccountGroups.php:231 AccountGroups.php:410
+#: AccountGroups.php:231
+#: AccountGroups.php:410
msgid "Sequence In TB"
-msgstr "Urutan di Neraca Saldo"
+msgstr "Urutan di Neraca Percobaan"
-#: AccountGroups.php:232 AccountGroups.php:393 GLProfit_Loss.php:6
-#: GLProfit_Loss.php:126 GLProfit_Loss.php:127 GLProfit_Loss.php:178
-#: SelectGLAccount.php:40 SelectGLAccount.php:54 SelectGLAccount.php:68
+#: AccountGroups.php:232
+#: AccountGroups.php:393
+#: GLProfit_Loss.php:6
+#: GLProfit_Loss.php:126
+#: GLProfit_Loss.php:127
+#: GLProfit_Loss.php:178
+#: SelectGLAccount.php:40
+#: SelectGLAccount.php:54
+#: SelectGLAccount.php:68
msgid "Profit and Loss"
msgstr "Laba/Rugi"
-#: AccountGroups.php:233 AccountGroups.php:354
+#: AccountGroups.php:233
+#: AccountGroups.php:354
msgid "Parent Group"
msgstr "Grup Induk"
-#: AccountGroups.php:249 AccountGroups.php:252 AccountGroups.php:397
-#: AccountGroups.php:399 BOMs.php:124 BOMs.php:772 BOMs.php:774
-#: CompanyPreferences.php:477 CompanyPreferences.php:479
-#: CompanyPreferences.php:492 CompanyPreferences.php:494
-#: CompanyPreferences.php:507 CompanyPreferences.php:509
-#: ContractCosting.php:198 CustomerBranches.php:411 Customers.php:594
-#: Customers.php:947 Customers.php:956 Customers.php:959
-#: DeliveryDetails.php:1082 DeliveryDetails.php:1125 DeliveryDetails.php:1128
-#: GLTransInquiry.php:69 Labels.php:491 Labels.php:493 Labels.php:518
-#: MRPCalendar.php:224 MRP.php:529 MRP.php:533 MRP.php:537 MRP.php:541
-#: PaymentMethods.php:204 PaymentMethods.php:205 PaymentMethods.php:206
-#: PaymentMethods.php:207 PaymentMethods.php:273 PaymentMethods.php:280
-#: PaymentMethods.php:287 PaymentMethods.php:294 PcAuthorizeExpenses.php:243
-#: PDFChequeListing.php:63 PDFDeliveryDifferences.php:76 PDFDIFOT.php:76
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:792 PO_PDFPurchOrder.php:392 PO_PDFPurchOrder.php:395
-#: PurchData.php:212 PurchData.php:554 PurchData.php:557
-#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
-#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
-#: SalesAnalReptCols.php:422 SalesAnalRepts.php:417 SalesAnalRepts.php:420
-#: SalesAnalRepts.php:445 SalesAnalRepts.php:448 SalesAnalRepts.php:473
-#: SalesAnalRepts.php:476 SalesPeople.php:219 SalesPeople.php:356
-#: SalesPeople.php:358 SelectProduct.php:385 ShipmentCosting.php:667
-#: Stocks.php:1051 Stocks.php:1053 Stocks.php:1076 Stocks.php:1078
-#: SuppContractChgs.php:90 SystemParameters.php:401 SystemParameters.php:424
-#: SystemParameters.php:440 SystemParameters.php:503 SystemParameters.php:511
-#: SystemParameters.php:551 SystemParameters.php:631 SystemParameters.php:640
-#: SystemParameters.php:648 SystemParameters.php:666 SystemParameters.php:673
-#: SystemParameters.php:717 SystemParameters.php:813 SystemParameters.php:948
-#: SystemParameters.php:950 SystemParameters.php:960 SystemParameters.php:962
-#: SystemParameters.php:1016 SystemParameters.php:1028
-#: SystemParameters.php:1030 TaxGroups.php:311 TaxGroups.php:314
-#: TaxGroups.php:371 WWW_Users.php:484 WWW_Users.php:486 WWW_Users.php:657
+#: AccountGroups.php:249
+#: AccountGroups.php:252
+#: AccountGroups.php:397
+#: AccountGroups.php:399
+#: BOMs.php:124
+#: BOMs.php:772
+#: BOMs.php:774
+#: CompanyPreferences.php:477
+#: CompanyPreferences.php:479
+#: CompanyPreferences.php:492
+#: CompanyPreferences.php:494
+#: CompanyPreferences.php:507
+#: CompanyPreferences.php:509
+#: ContractCosting.php:198
+#: CustomerBranches.php:411
+#: Customers.php:594
+#: Customers.php:947
+#: Customers.php:956
+#: Customers.php:959
+#: DeliveryDetails.php:1087
+#: GLTransInquiry.php:69
+#: Labels.php:491
+#: Labels.php:493
+#: Labels.php:518
+#: MRP.php:529
+#: MRP.php:533
+#: MRP.php:537
+#: MRP.php:541
+#: MRPCalendar.php:224
+#: PDFChequeListing.php:63
+#: PDFDIFOT.php:76
+#: PDFDeliveryDifferences.php:76
+#: PO_AuthorisationLevels.php:134
+#: PO_AuthorisationLevels.php:139
+#: PO_Header.php:792
+#: PO_PDFPurchOrder.php:392
+#: PO_PDFPurchOrder.php:395
+#: PaymentMethods.php:204
+#: PaymentMethods.php:205
+#: PaymentMethods.php:206
+#: PaymentMethods.php:207
+#: PaymentMethods.php:273
+#: PaymentMethods.php:280
+#: PaymentMethods.php:287
+#: PaymentMethods.php:294
+#: PcAuthorizeExpenses.php:243
+#: PurchData.php:212
+#: PurchData.php:554
+#: PurchData.php:557
+#: RecurringSalesOrders.php:482
+#: RecurringSalesOrders.php:485
+#: SalesAnalReptCols.php:284
+#: SalesAnalReptCols.php:419
+#: SalesAnalReptCols.php:422
+#: SalesAnalRepts.php:417
+#: SalesAnalRepts.php:420
+#: SalesAnalRepts.php:445
+#: SalesAnalRepts.php:448
+#: SalesAnalRepts.php:473
+#: SalesAnalRepts.php:476
+#: SalesPeople.php:219
+#: SalesPeople.php:356
+#: SalesPeople.php:358
+#: SelectProduct.php:385
+#: ShipmentCosting.php:667
+#: Stocks.php:1051
+#: Stocks.php:1053
+#: Stocks.php:1076
+#: Stocks.php:1078
+#: SuppContractChgs.php:90
+#: SystemParameters.php:401
+#: SystemParameters.php:424
+#: SystemParameters.php:440
+#: SystemParameters.php:503
+#: SystemParameters.php:511
+#: SystemParameters.php:551
+#: SystemParameters.php:631
+#: SystemParameters.php:640
+#: SystemParameters.php:648
+#: SystemParameters.php:666
+#: SystemParameters.php:673
+#: SystemParameters.php:717
+#: SystemParameters.php:813
+#: SystemParameters.php:948
+#: SystemParameters.php:950
+#: SystemParameters.php:960
+#: SystemParameters.php:962
+#: SystemParameters.php:1016
+#: SystemParameters.php:1028
+#: SystemParameters.php:1030
+#: TaxGroups.php:311
+#: TaxGroups.php:314
+#: TaxGroups.php:371
+#: WWW_Users.php:484
+#: WWW_Users.php:486
+#: WWW_Users.php:657
#: WWW_Users.php:659
+#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "Ya"
-#: AccountGroups.php:255 AccountGroups.php:402 AccountGroups.php:404
-#: BankAccounts.php:209 BankAccounts.php:378 BankAccounts.php:380
-#: BankAccounts.php:384 BankAccounts.php:392 BOMs.php:126 BOMs.php:771
-#: BOMs.php:775 CompanyPreferences.php:476 CompanyPreferences.php:480
-#: CompanyPreferences.php:491 CompanyPreferences.php:495
-#: CompanyPreferences.php:506 CompanyPreferences.php:510
-#: ContractCosting.php:196 CustomerBranches.php:411 Customers.php:593
-#: Customers.php:942 Customers.php:955 Customers.php:958
-#: DeliveryDetails.php:1083 DeliveryDetails.php:1126 DeliveryDetails.php:1129
-#: GLTransInquiry.php:86 Labels.php:490 Labels.php:494 Labels.php:519
-#: MRPCalendar.php:226 MRP.php:527 MRP.php:531 MRP.php:535 MRP.php:539
-#: NoSalesItems.php:153 PaymentMethods.php:204 PaymentMethods.php:205
-#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:274
-#: PaymentMethods.php:281 PaymentMethods.php:288 PaymentMethods.php:295
-#: PcAuthorizeExpenses.php:241 PDFChequeListing.php:62
-#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75
-#: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
-#: PO_Header.php:791 PO_PDFPurchOrder.php:393 PO_PDFPurchOrder.php:396
-#: PurchData.php:215 PurchData.php:555 PurchData.php:558
-#: RecurringSalesOrders.php:481 RecurringSalesOrders.php:484
-#: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
-#: SalesAnalReptCols.php:423 SalesAnalRepts.php:416 SalesAnalRepts.php:419
-#: SalesAnalRepts.php:444 SalesAnalRepts.php:447 SalesAnalRepts.php:472
-#: SalesAnalRepts.php:475 SalesPeople.php:221 SalesPeople.php:361
-#: SalesPeople.php:363 SelectProduct.php:387 ShipmentCosting.php:668
-#: Stocks.php:1046 Stocks.php:1048 Stocks.php:1071 Stocks.php:1073
-#: SuppContractChgs.php:92 SystemParameters.php:402 SystemParameters.php:425
-#: SystemParameters.php:441 SystemParameters.php:504 SystemParameters.php:512
-#: SystemParameters.php:552 SystemParameters.php:632 SystemParameters.php:641
-#: SystemParameters.php:649 SystemParameters.php:667 SystemParameters.php:674
-#: SystemParameters.php:718 SystemParameters.php:814 SystemParameters.php:947
-#: SystemParameters.php:951 SystemParameters.php:959 SystemParameters.php:963
-#: SystemParameters.php:1017 SystemParameters.php:1027
-#: SystemParameters.php:1031 TaxGroups.php:312 TaxGroups.php:315
-#: TaxGroups.php:373 WWW_Users.php:483 WWW_Users.php:487 WWW_Users.php:656
-#: WWW_Users.php:660 includes/PDFLowGPPageHeader.inc:44
+#: AccountGroups.php:255
+#: AccountGroups.php:402
+#: AccountGroups.php:404
+#: BOMs.php:126
+#: BOMs.php:771
+#: BOMs.php:775
+#: BankAccounts.php:209
+#: BankAccounts.php:378
+#: BankAccounts.php:380
+#: BankAccounts.php:384
+#: BankAccounts.php:392
+#: CompanyPreferences.php:476
+#: CompanyPreferences.php:480
+#: CompanyPreferences.php:491
+#: CompanyPreferences.php:495
+#: CompanyPreferences.php:506
+#: CompanyPreferences.php:510
+#: ContractCosting.php:196
+#: CustomerBranches.php:411
+#: Customers.php:593
+#: Customers.php:942
+#: Customers.php:955
+#: Customers.php:958
+#: DeliveryDetails.php:1088
+#: GLTransInquiry.php:86
+#: Labels.php:490
+#: Labels.php:494
+#: Labels.php:519
+#: MRP.php:527
+#: MRP.php:531
+#: MRP.php:535
+#: MRP.php:539
+#: MRPCalendar.php:226
+#: NoSalesItems.php:153
+#: PDFChequeListing.php:62
+#: PDFDIFOT.php:75
+#: PDFDeliveryDifferences.php:75
+#: PO_AuthorisationLevels.php:136
+#: PO_AuthorisationLevels.php:141
+#: PO_Header.php:791
+#: PO_PDFPurchOrder.php:393
+#: PO_PDFPurchOrder.php:396
+#: PaymentMethods.php:204
+#: PaymentMethods.php:205
+#: PaymentMethods.php:206
+#: PaymentMethods.php:207
+#: PaymentMethods.php:274
+#: PaymentMethods.php:281
+#: PaymentMethods.php:288
+#: PaymentMethods.php:295
+#: PcAuthorizeExpenses.php:241
+#: PurchData.php:215
+#: PurchData.php:555
+#: PurchData.php:558
+#: RecurringSalesOrders.php:481
+#: RecurringSalesOrders.php:484
+#: SalesAnalReptCols.php:282
+#: SalesAnalReptCols.php:420
+#: SalesAnalReptCols.php:423
+#: SalesAnalRepts.php:416
+#: SalesAnalRepts.php:419
+#: SalesAnalRepts.php:444
+#: SalesAnalRepts.php:447
+#: SalesAnalRepts.php:472
+#: SalesAnalRepts.php:475
+#: SalesPeople.php:221
+#: SalesPeople.php:361
+#: SalesPeople.php:363
+#: SelectProduct.php:387
+#: ShipmentCosting.php:668
+#: Stocks.php:1046
+#: Stocks.php:1048
+#: Stocks.php:1071
+#: Stocks.php:1073
+#: SuppContractChgs.php:92
+#: SystemParameters.php:402
+#: SystemParameters.php:425
+#: SystemParameters.php:441
+#: SystemParameters.php:504
+#: SystemParameters.php:512
+#: SystemParameters.php:552
+#: SystemParameters.php:632
+#: SystemParameters.php:641
+#: SystemParameters.php:649
+#: SystemParameters.php:667
+#: SystemParameters.php:674
+#: SystemParameters.php:718
+#: SystemParameters.php:814
+#: SystemParameters.php:947
+#: SystemParameters.php:951
+#: SystemParameters.php:959
+#: SystemParameters.php:963
+#: SystemParameters.php:1017
+#: SystemParameters.php:1027
+#: SystemParameters.php:1031
+#: TaxGroups.php:312
+#: TaxGroups.php:315
+#: TaxGroups.php:373
+#: WWW_Users.php:483
+#: WWW_Users.php:487
+#: WWW_Users.php:656
+#: WWW_Users.php:660
+#: includes/PDFLowGPPageHeader.inc:44
#: includes/PDFTaxPageHeader.inc:35
+#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "No"
-#: AccountGroups.php:264 AccountSections.php:189 AddCustomerContacts.php:148
-#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:163
-#: BankAccounts.php:222 BOMs.php:151 COGSGLPostings.php:108
-#: COGSGLPostings.php:206 CreditStatus.php:175 Currencies.php:272
-#: CustomerBranches.php:415 Customers.php:1033 Customers.php:1067
-#: CustomerTypes.php:206 Departments.php:186 EDIMessageFormat.php:150
-#: Factors.php:334 FixedAssetCategories.php:187 FixedAssetLocations.php:107
-#: FreightCosts.php:242 GeocodeSetup.php:173 GLAccounts.php:312 GLTags.php:93
-#: InternalStockRequest.php:263 Labels.php:223 Labels.php:248
-#: Locations.php:391 MRPDemands.php:309 MRPDemandTypes.php:120
-#: PaymentMethods.php:208 PaymentTerms.php:205 PcAssignCashToTab.php:273
-#: PcClaimExpensesFromTab.php:265 PcExpenses.php:223 PcTabs.php:233
-#: PcTypeTabs.php:174 PO_AuthorisationLevels.php:151 Prices_Customer.php:278
-#: Prices.php:249 PurchData.php:227 SalesCategories.php:256
-#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:232
-#: SalesTypes.php:206 SecurityTokens.php:130 SelectCustomer.php:615
-#: SelectCustomer.php:633 SelectCustomer.php:656 SelectCustomer.php:673
-#: SelectCustomer.php:696 SelectCustomer.php:713 Shippers.php:144
-#: StockCategories.php:263 SupplierContacts.php:163
-#: SupplierTenderCreate.php:145 SupplierTypes.php:189
-#: SuppTransGLAnalysis.php:120 TaxAuthorities.php:174 TaxCategories.php:182
-#: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185
-#: WorkCentres.php:141 WWW_Access.php:123 WWW_Users.php:325
-#: includes/InputSerialItems.php:90 includes/OutputSerialItems.php:20
+#: AccountGroups.php:264
+#: AccountSections.php:189
+#: AddCustomerContacts.php:148
+#: AddCustomerNotes.php:137
+#: AddCustomerTypeNotes.php:131
+#: Areas.php:163
+#: BOMs.php:151
+#: BankAccounts.php:222
+#: COGSGLPostings.php:108
+#: COGSGLPostings.php:206
+#: CreditStatus.php:175
+#: Currencies.php:272
+#: CustomerBranches.php:415
+#: CustomerTypes.php:206
+#: Customers.php:1033
+#: Customers.php:1067
+#: Departments.php:186
+#: EDIMessageFormat.php:150
+#: Factors.php:334
+#: FixedAssetCategories.php:187
+#: FixedAssetLocations.php:107
+#: FreightCosts.php:242
+#: GLAccounts.php:312
+#: GLTags.php:93
+#: GeocodeSetup.php:173
+#: InternalStockRequest.php:263
+#: Labels.php:223
+#: Labels.php:248
+#: Locations.php:391
+#: MRPDemandTypes.php:120
+#: MRPDemands.php:309
+#: PO_AuthorisationLevels.php:151
+#: PaymentMethods.php:208
+#: PaymentTerms.php:205
+#: PcAssignCashToTab.php:273
+#: PcClaimExpensesFromTab.php:265
+#: PcExpenses.php:223
+#: PcTabs.php:233
+#: PcTypeTabs.php:174
+#: Prices.php:249
+#: Prices_Customer.php:278
+#: PurchData.php:227
+#: SalesCategories.php:256
+#: SalesGLPostings.php:132
+#: SalesGLPostings.php:245
+#: SalesPeople.php:232
+#: SalesTypes.php:206
+#: SecurityTokens.php:130
+#: SelectCustomer.php:615
+#: SelectCustomer.php:633
+#: SelectCustomer.php:656
+#: SelectCustomer.php:673
+#: SelectCustomer.php:696
+#: SelectCustomer.php:713
+#: Shippers.php:144
+#: StockCategories.php:263
+#: SuppTransGLAnalysis.php:120
+#: SupplierContacts.php:163
+#: SupplierTenderCreate.php:145
+#: SupplierTypes.php:189
+#: TaxAuthorities.php:174
+#: TaxCategories.php:182
+#: TaxGroups.php:188
+#: TaxProvinces.php:180
+#: UnitsOfMeasure.php:185
+#: WWW_Access.php:123
+#: WWW_Users.php:325
+#: WorkCentres.php:141
+#: includes/InputSerialItems.php:90
+#: includes/OutputSerialItems.php:20
+#: reportwriter/languages/en_US/reports.php:143
#, php-format
msgid "Edit"
msgstr "Edit"
#: AccountGroups.php:265
-#, fuzzy
msgid "Are you sure you wish to delete this account group?"
-msgstr "Apakah Anda yakin ingin menghapus cabang ini?"
+msgstr "Apakah Anda yakin ingin menghapus grup akun ini?"
-#: AccountGroups.php:265 AccountSections.php:193 AddCustomerContacts.php:149
-#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:164
-#: BankAccounts.php:223 BOMs.php:153 COGSGLPostings.php:109
-#: COGSGLPostings.php:207 ContractBOM.php:267 ContractOtherReqts.php:120
-#: CounterSales.php:830 Credit_Invoice.php:401 CreditStatus.php:176
-#: Currencies.php:275 CustomerReceipt.php:925 Customers.php:1068
-#: CustomerTypes.php:207 Departments.php:187 DiscountCategories.php:223
-#: DiscountMatrix.php:183 EDIMessageFormat.php:151
-#: FixedAssetCategories.php:188 FreightCosts.php:243 GeocodeSetup.php:174
-#: GLAccounts.php:313 GLJournal.php:426 GLTags.php:94
-#: InternalStockRequest.php:264 Labels.php:224 Labels.php:249 Labels.php:497
-#: Locations.php:392 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:209 Payments.php:1083 PaymentTerms.php:206
-#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:266 PcExpenses.php:224
-#: PcExpensesTypeTab.php:187 PcTabs.php:234 PcTypeTabs.php:175
-#: PO_AuthorisationLevels.php:153 PO_Items.php:712 Prices_Customer.php:279
-#: Prices.php:250 PurchData.php:229 SalesAnalReptCols.php:299
-#: SalesAnalRepts.php:304 SalesCategories.php:257 SalesGLPostings.php:133
-#: SalesGLPostings.php:246 SalesPeople.php:233 SalesTypes.php:207
-#: SecurityTokens.php:131 SelectCreditItems.php:767 SelectCustomer.php:616
-#: SelectCustomer.php:634 SelectCustomer.php:657 SelectCustomer.php:674
-#: SelectCustomer.php:697 SelectCustomer.php:714 SelectOrderItems.php:1417
-#: Shipments.php:440 Shippers.php:145 SpecialOrder.php:667
-#: StockCategories.php:264 StockCategories.php:586 StockLocTransfer.php:332
-#: SuppContractChgs.php:99 SuppCreditGRNs.php:112 SuppFixedAssetChgs.php:87
-#: SuppInvGRNs.php:147 SupplierContacts.php:164 SupplierTenderCreate.php:401
-#: SupplierTenderCreate.php:429 SupplierTypes.php:191 SuppShiptChgs.php:90
-#: SuppTransGLAnalysis.php:121 TaxAuthorities.php:175 TaxCategories.php:183
-#: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186
-#: WorkCentres.php:142 WOSerialNos.php:321 WWW_Access.php:124
-#: WWW_Users.php:326 includes/InputSerialItemsKeyed.php:58
+#: AccountGroups.php:265
+#: AccountSections.php:193
+#: AddCustomerContacts.php:149
+#: AddCustomerNotes.php:138
+#: AddCustomerTypeNotes.php:132
+#: Areas.php:164
+#: BOMs.php:153
+#: BankAccounts.php:223
+#: COGSGLPostings.php:109
+#: COGSGLPostings.php:207
+#: ContractBOM.php:267
+#: ContractOtherReqts.php:120
+#: CounterSales.php:830
+#: CreditStatus.php:176
+#: Credit_Invoice.php:394
+#: Currencies.php:275
+#: CustomerReceipt.php:925
+#: CustomerTypes.php:207
+#: Customers.php:1068
+#: Departments.php:187
+#: DiscountCategories.php:223
+#: DiscountMatrix.php:183
+#: EDIMessageFormat.php:151
+#: FixedAssetCategories.php:188
+#: FreightCosts.php:243
+#: GLAccounts.php:313
+#: GLJournal.php:426
+#: GLTags.php:94
+#: GeocodeSetup.php:174
+#: InternalStockRequest.php:264
+#: Labels.php:224
+#: Labels.php:249
+#: Labels.php:497
+#: Locations.php:392
+#: MRPDemandTypes.php:121
+#: MRPDemands.php:310
+#: PO_AuthorisationLevels.php:153
+#: PO_Items.php:712
+#: PaymentMethods.php:209
+#: PaymentTerms.php:206
+#: Payments.php:1083
+#: PcAssignCashToTab.php:277
+#: PcClaimExpensesFromTab.php:266
+#: PcExpenses.php:224
+#: PcExpensesTypeTab.php:187
+#: PcTabs.php:234
+#: PcTypeTabs.php:175
+#: Prices.php:250
+#: Prices_Customer.php:279
+#: PurchData.php:229
+#: SalesAnalReptCols.php:299
+#: SalesAnalRepts.php:304
+#: SalesCategories.php:257
+#: SalesGLPostings.php:133
+#: SalesGLPostings.php:246
+#: SalesPeople.php:233
+#: SalesTypes.php:207
+#: SecurityTokens.php:131
+#: SelectCreditItems.php:767
+#: SelectCustomer.php:616
+#: SelectCustomer.php:634
+#: SelectCustomer.php:657
+#: SelectCustomer.php:674
+#: SelectCustomer.php:697
+#: SelectCustomer.php:714
+#: SelectOrderItems.php:1417
+#: Shipments.php:440
+#: Shippers.php:145
+#: SpecialOrder.php:667
+#: StockCategories.php:264
+#: StockCategories.php:586
+#: StockLocTransfer.php:332
+#: SuppContractChgs.php:99
+#: SuppCreditGRNs.php:112
+#: SuppFixedAssetChgs.php:87
+#: SuppInvGRNs.php:147
+#: SuppShiptChgs.php:90
+#: SuppTransGLAnalysis.php:121
+#: SupplierContacts.php:164
+#: SupplierTenderCreate.php:401
+#: SupplierTenderCreate.php:429
+#: SupplierTypes.php:191
+#: TaxAuthorities.php:175
+#: TaxCategories.php:183
+#: TaxGroups.php:189
+#: TaxProvinces.php:181
+#: UnitsOfMeasure.php:186
+#: WOSerialNos.php:321
+#: WWW_Access.php:124
+#: WWW_Users.php:326
+#: WorkCentres.php:142
+#: includes/InputSerialItemsKeyed.php:58
#: includes/OutputSerialItems.php:99
+#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "Hapus"
#: AccountGroups.php:273
msgid "Review Account Groups"
-msgstr "Tinjau Semua Grup Rekening"
+msgstr "Tinjau Semua Grup Akun"
#: AccountGroups.php:293
msgid "An error occurred in retrieving the account group information"
-msgstr "Kesalahan terjadi saat mengambil informasi grup rekening"
+msgstr "Kesalahan terjadi saat mengambil informasi grup akun"
#: AccountGroups.php:294
-msgid ""
-"The SQL that was used to retrieve the account group and that failed in the "
-"process was"
-msgstr ""
-"SQL yang digunakan untuk mengambil grup rekening dan yang gagal dalam proses "
-"adalah"
+msgid "The SQL that was used to retrieve the account group and that failed in the process was"
+msgstr "SQL yang digunakan untuk mengambil grup akun dan yang gagal dalam proses adalah"
#: AccountGroups.php:297
msgid "The account group name does not exist in the database"
msgstr "Nama grup akun tidak ada dalam database"
#: AccountGroups.php:311
-#, fuzzy
msgid "Edit Account Group Details"
-msgstr "Account Rincian Grup"
+msgstr "Edit Rincian Grup Akun"
-#: AccountGroups.php:319 GLAccounts.php:244 GLAccounts.php:292
+#: AccountGroups.php:319
+#: GLAccounts.php:244
+#: GLAccounts.php:292
#: Z_ImportGLAccountGroups.php:26
msgid "Account Group"
-msgstr "Grup Rekening"
+msgstr "Grup Akun"
#: AccountGroups.php:343
-#, fuzzy
msgid "New Account Group Details"
-msgstr "Account Rincian Grup"
+msgstr "Rincian Grup Akun Baru"
#: AccountGroups.php:349
msgid "Account Group Name"
-msgstr "Nama Grup Rekening"
+msgstr "Nama Grup Akun"
-#: AccountGroups.php:360 AccountGroups.php:362
+#: AccountGroups.php:360
+#: AccountGroups.php:362
msgid "Top Level Group"
msgstr "Grup Tingkat Utama (Top Level)"
#: AccountGroups.php:377
msgid "Section In Accounts"
-msgstr "Kelompok Rekening"
+msgstr "Tipe Akun"
-#: AccountGroups.php:415 AccountSections.php:259 AddCustomerContacts.php:260
-#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:228
-#: BankAccounts.php:398 BOMs.php:785 COGSGLPostings.php:355
-#: CreditStatus.php:259 Currencies.php:402 CustLoginSetup.php:273
-#: Departments.php:255 DiscountMatrix.php:142 EDIMessageFormat.php:248
-#: FixedAssetCategories.php:347 FixedAssetLocations.php:157
-#: FreightCosts.php:342 GeocodeSetup.php:271 GLAccounts.php:262 Labels.php:531
-#: Locations.php:607 MRPDemands.php:424 MRPDemandTypes.php:188
-#: OffersReceived.php:57 OffersReceived.php:146 PaymentMethods.php:300
-#: PaymentTerms.php:310 PO_AuthorisationLevels.php:262 Prices_Customer.php:361
-#: SalesAnalReptCols.php:552 SalesAnalRepts.php:516 SalesGLPostings.php:417
-#: SalesPeople.php:370 Shippers.php:203 StockCategories.php:613
-#: SupplierContacts.php:282 SuppLoginSetup.php:295 TaxAuthorities.php:329
-#: TaxCategories.php:238 TaxProvinces.php:235 UnitsOfMeasure.php:241
-#: WorkCentres.php:280 WWW_Users.php:699
+#: AccountGroups.php:415
+#: AccountSections.php:259
+#: AddCustomerContacts.php:260
+#: AddCustomerNotes.php:242
+#: AddCustomerTypeNotes.php:221
+#: Areas.php:228
+#: BOMs.php:785
+#: BankAccounts.php:398
+#: COGSGLPostings.php:355
+#: CreditStatus.php:259
+#: Currencies.php:402
+#: CustLoginSetup.php:273
+#: Departments.php:255
+#: DiscountMatrix.php:142
+#: EDIMessageFormat.php:248
+#: FixedAssetCategories.php:347
+#: FixedAssetLocations.php:157
+#: FreightCosts.php:342
+#: GLAccounts.php:262
+#: GeocodeSetup.php:271
+#: Labels.php:531
+#: Locations.php:607
+#: MRPDemandTypes.php:188
+#: MRPDemands.php:424
+#: OffersReceived.php:57
+#: OffersReceived.php:146
+#: PO_AuthorisationLevels.php:262
+#: PaymentMethods.php:300
+#: PaymentTerms.php:310
+#: Prices_Customer.php:361
+#: SalesAnalReptCols.php:552
+#: SalesAnalRepts.php:516
+#: SalesGLPostings.php:417
+#: SalesPeople.php:370
+#: Shippers.php:203
+#: StockCategories.php:613
+#: SuppLoginSetup.php:295
+#: SupplierContacts.php:282
+#: TaxAuthorities.php:329
+#: TaxCategories.php:238
+#: TaxProvinces.php:235
+#: UnitsOfMeasure.php:241
+#: WWW_Users.php:699
+#: WorkCentres.php:280
msgid "Enter Information"
msgstr "Masukkan Informasi"
-#: AccountSections.php:7 includes/MainMenuLinksArray.php:376
+#: AccountSections.php:7
+#: includes/MainMenuLinksArray.php:376
msgid "Account Sections"
-msgstr "Kelompok Rekening"
+msgstr "Tipe Akun"
#: AccountSections.php:61
msgid "The account section already exists in the database"
-msgstr "Kelompok rekening tersebut sudah ada di database"
+msgstr "Tipe akun tersebut sudah ada di database"
#: AccountSections.php:68
-#, fuzzy
msgid "The account section name cannot contain any illegal characters"
-msgstr "Nama kelompok rekening tidak dapat berisi karakter"
+msgstr "Nama tipe akun tidak boleh berisi karakter + ? . & \\ \" < >"
#: AccountSections.php:74
msgid "The account section name must contain at least one character"
-msgstr "Nama kelompok rekening minimum 1 karakter"
+msgstr "Nama tipe akun minimum 1 karakter"
-#: AccountSections.php:80 AccountSections.php:86
+#: AccountSections.php:80
+#: AccountSections.php:86
msgid "The section number must be an integer"
-msgstr "Nomor kelompok rekening harus bilangan bulat"
+msgstr "Nomor tipe akun harus bilangan bulat"
#: AccountSections.php:128
-msgid ""
-"Cannot delete this account section because general ledger accounts groups "
-"have been created using this section"
-msgstr ""
-"Tidak dapat menghapus kelompok rekening ini karena grup rekening buku besar "
-"telah dibuat menggunakan kelompok ini"
+msgid "Cannot delete this account section because general ledger accounts groups have been created using this section"
+msgstr "Tidak dapat menghapus tipe akun ini karena grup akun buku besar telah dibuat menggunakan tipe ini"
#: AccountSections.php:130
msgid "general ledger accounts groups that refer to this account section"
-msgstr "rekening buku besar yang mereferensi pada kelompok rekening tersebut"
+msgstr "akun buku besar yang mereferensi pada tipe akun tersebut"
#: AccountSections.php:142
msgid "section has been deleted"
-msgstr "kelompok telah dihapus"
+msgstr "tipe telah dihapus"
#: AccountSections.php:167
msgid "Could not get account group sections because"
-msgstr "Tidak dapat mengambil kelompok grup rekening karena"
+msgstr "Tidak dapat mengambil tipe grup akun karena"
-#: AccountSections.php:173 AccountSections.php:232 AccountSections.php:250
+#: AccountSections.php:173
+#: AccountSections.php:232
+#: AccountSections.php:250
msgid "Section Number"
-msgstr "Nomor Kelompok"
+msgstr "Nomor Tipe"
-#: AccountSections.php:174 AccountSections.php:254
+#: AccountSections.php:174
+#: AccountSections.php:254
msgid "Section Description"
-msgstr "Keterangan Kelompok"
+msgstr "Keterangan Tipe"
#: AccountSections.php:191
msgid "Restricted"
@@ -536,84 +917,107 @@
#: AccountSections.php:202
msgid "Review Account Sections"
-msgstr "Tinjau Semua Kelompok Rekening"
+msgstr "Tinjau Semua Tipe Akun"
#: AccountSections.php:221
msgid "Could not retrieve the requested section please try again."
-msgstr "Tidak dapat mengambil kelompok yang diminta, silahkan coba kembali."
+msgstr "Tidak dapat mengambil tipe yang diminta, silahkan coba kembali."
-#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:607
+#: AddCustomerContacts.php:6
+#: AddCustomerContacts.php:59
+#: SelectCustomer.php:607
#: SelectCustomer.php:640
msgid "Customer Contacts"
-msgstr "Kontak Person Customer"
+msgstr "Kontak Customer"
-#: AddCustomerContacts.php:20 CustEDISetup.php:9 CustLoginSetup.php:21
+#: AddCustomerContacts.php:20
+#: CustEDISetup.php:9
+#: CustLoginSetup.php:21
#: Z_CheckDebtorsControl.php:14
msgid "Back to Customers"
msgstr "Kembali ke Data Customer"
#: AddCustomerContacts.php:25
-#, fuzzy
msgid "Contacts for Customer"
-msgstr "Kontak Person untuk Customer : <b>"
+msgstr "Kontak untuk Customer"
#: AddCustomerContacts.php:27
-#, fuzzy
msgid "Edit contact for"
msgstr "Edit kontak untuk"
#: AddCustomerContacts.php:39
-#, fuzzy
msgid "The Contact ID must be an integer."
-msgstr "Kontak Person tersebut harus bilangan bulat"
+msgstr "ID Kontak harus bilangan bulat"
#: AddCustomerContacts.php:42
-#, fuzzy
msgid "The contact name must be forty characters or less long"
-msgstr "Nama kontak person maksimum 40 karakter"
+msgstr "Nama kontak maksimum 40 karakter"
#: AddCustomerContacts.php:45
-#, fuzzy
msgid "The contact name may not be empty"
-msgstr "Nama kontak person tidak boleh kosong"
+msgstr "Nama kontak tidak boleh kosong"
#: AddCustomerContacts.php:48
-#, fuzzy
msgid "The contact email address is not a valid email address"
-msgstr ""
-"Alamat email tidak muncul untuk menjadi alamat email yang valid. Transaksi "
-"ini tidak diemail"
+msgstr "Alamat email kontak tidak benar"
-#: AddCustomerContacts.php:59 AddCustomerNotes.php:51
-#: AddCustomerTypeNotes.php:48 Areas.php:71 CustomerTypes.php:69
-#: DeliveryDetails.php:773 DeliveryDetails.php:784 Factors.php:105
-#: FixedAssetItems.php:246 MRPCalendar.php:176 PcAssignCashToTab.php:88
-#: PcClaimExpensesFromTab.php:79 PcExpenses.php:95 PcTabs.php:101
-#: PcTypeTabs.php:60 PO_Items.php:370 SalesAnalReptCols.php:129
-#: SalesPeople.php:97 SalesTypes.php:66 Stocks.php:508 Suppliers.php:513
+#: AddCustomerContacts.php:59
+#: AddCustomerNotes.php:51
+#: AddCustomerTypeNotes.php:48
+#: Areas.php:71
+#: CustomerTypes.php:69
+#: DeliveryDetails.php:778
+#: DeliveryDetails.php:789
+#: Factors.php:105
+#: FixedAssetItems.php:246
+#: MRPCalendar.php:176
+#: PO_Items.php:370
+#: PcAssignCashToTab.php:88
+#: PcClaimExpensesFromTab.php:79
+#: PcExpenses.php:95
+#: PcTabs.php:101
+#: PcTypeTabs.php:60
+#: SalesAnalReptCols.php:129
+#: SalesPeople.php:97
+#: SalesTypes.php:66
+#: Stocks.php:508
#: SupplierTypes.php:67
+#: Suppliers.php:513
msgid "has been updated"
msgstr "telah diperbarui"
#: AddCustomerContacts.php:74
msgid "The contact record has been added"
-msgstr "Data kontak person telah ditambahkan"
+msgstr "Data kontak telah ditambahkan"
#: AddCustomerContacts.php:103
msgid "The contact record has been deleted"
-msgstr "Data kontak person telah dihapus"
+msgstr "Data kontak telah dihapus"
-#: AddCustomerContacts.php:126 CompanyPreferences.php:224
-#: CustomerBranches.php:368 Customers.php:1020 Customers.php:1028
-#: SalesPeople.php:200 SelectCustomer.php:610 StockDispatch.php:237
-#: StockDispatch.php:248 StockDispatch.php:259 SupplierContacts.php:150
-#: SuppTransGLAnalysis.php:105 includes/InputSerialItemsFile.php:92
-#: includes/InputSerialItemsFile.php:144 includes/PDFTaxPageHeader.inc:37
+#: AddCustomerContacts.php:126
+#: CompanyPreferences.php:224
+#: CustomerBranches.php:368
+#: Customers.php:1020
+#: Customers.php:1028
+#: SalesPeople.php:200
+#: SelectCustomer.php:610
+#: StockDispatch.php:237
+#: StockDispatch.php:248
+#: StockDispatch.php:259
+#: SuppTransGLAnalysis.php:105
+#: SupplierContacts.php:150
+#: includes/PDFTaxPageHeader.inc:37
+#: includes/InputSerialItemsFile.php:92
+#: includes/InputSerialItemsFile.php:144
msgid "Name"
msgstr "Nama"
-#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1021
-#: Customers.php:1029 SelectCustomer.php:611 WWW_Access.php:107
+#: AddCustomerContacts.php:127
+#: AddCustomerContacts.php:223
+#: Customers.php:1021
+#: Customers.php:1029
+#: SelectCustomer.php:611
+#: WWW_Access.php:107
#: WWW_Access.php:170
msgid "Role"
msgstr "Posisi"
@@ -622,186 +1026,266 @@
msgid "Phone no"
msgstr "Telpon"
-#: AddCustomerContacts.php:129 AddCustomerContacts.php:241
-#: CustomerBranches.php:374 CustomerBranches.php:783 CustomerInquiry.php:257
-#: Customers.php:1023 Customers.php:1031 EmailCustTrans.php:15
-#: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:573
-#: OrderDetails.php:109 PDFRemittanceAdvice.php:251 PO_PDFPurchOrder.php:379
-#: PO_PDFPurchOrder.php:382 PrintCustTrans.php:718 PrintCustTrans.php:949
-#: PrintCustTrans.php:998 PrintCustTransPortrait.php:756
-#: PrintCustTransPortrait.php:1002 PrintCustTransPortrait.php:1058
-#: SelectCustomer.php:422 SelectCustomer.php:613 SupplierContacts.php:154
-#: SupplierContacts.php:275 UserSettings.php:185 WWW_Users.php:281
-#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:67
+#: AddCustomerContacts.php:129
+#: AddCustomerContacts.php:241
+#: CustomerBranches.php:374
+#: CustomerBranches.php:783
+#: CustomerInquiry.php:257
+#: Customers.php:1023
+#: Customers.php:1031
+#: EmailCustTrans.php:15
+#: EmailCustTrans.php:64
+#: Factors.php:246
+#: Factors.php:297
+#: Locations.php:573
+#: OrderDetails.php:109
+#: PDFRemittanceAdvice.php:251
+#: PO_PDFPurchOrder.php:379
+#: PO_PDFPurchOrder.php:382
+#: PrintCustTrans.php:718
+#: PrintCustTrans.php:949
+#: PrintCustTrans.php:998
+#: PrintCustTransPortrait.php:766
+#: PrintCustTransPortrait.php:1012
+#: PrintCustTransPortrait.php:1068
+#: SelectCustomer.php:422
+#: SelectCustomer.php:613
+#: SupplierContacts.php:154
+#: SupplierContacts.php:275
+#: UserSettings.php:185
+#: WWW_Users.php:281
+#: includes/PDFPickingListHeader.inc:25
+#: includes/PDFStatementPageHeader.inc:67
#: includes/PDFTransPageHeader.inc:82
-#: includes/PDFTransPageHeaderPortrait.inc:109
+#: includes/PDFTransPageHeaderPortrait.inc:135
#: includes/PO_PDFOrderPageHeader.inc:29
msgid "Email"
msgstr "Email"
-#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1024
-#: Customers.php:1032 PcAssignCashToTab.php:238 PcAssignCashToTab.php:369
-#: PcAuthorizeExpenses.php:92 PcClaimExpensesFromTab.php:227
-#: PcClaimExpensesFromTab.php:386 PcReportTab.php:331 SelectCustomer.php:614
-#: SystemParameters.php:339 WOSerialNos.php:292 WOSerialNos.php:298
+#: AddCustomerContacts.php:130
+#: AddCustomerContacts.php:250
+#: Customers.php:1024
+#: Customers.php:1032
+#: PcAssignCashToTab.php:238
+#: PcAssignCashToTab.php:369
+#: PcAuthorizeExpenses.php:92
+#: PcClaimExpensesFromTab.php:227
+#: PcClaimExpensesFromTab.php:386
+#: PcReportTab.php:331
+#: SelectCustomer.php:614
+#: SystemParameters.php:339
+#: WOSerialNos.php:292
+#: WOSerialNos.php:298
msgid "Notes"
msgstr "Catatan"
-#: AddCustomerContacts.php:149 SupplierContacts.php:164
+#: AddCustomerContacts.php:149
+#: SupplierContacts.php:164
#, php-format
msgid "Are you sure you wish to delete this contact?"
-msgstr "Apakah Anda yakin ingin menghapus kontak person ini?"
+msgstr "Apakah Anda yakin ingin menghapus kontak ini?"
#: AddCustomerContacts.php:168
msgid "Review all contacts for this Customer"
-msgstr "Tinjau semua kontak person untuk Customer ini"
+msgstr "Tinjau semua kontak untuk Customer ini"
#: AddCustomerContacts.php:206
msgid "Contact Code"
-msgstr "Kode Kontak Person"
+msgstr "Kode Kontak"
-#: AddCustomerContacts.php:214 Factors.php:234 SupplierContacts.php:237
+#: AddCustomerContacts.php:214
+#: Factors.php:234
+#: SupplierContacts.php:237
msgid "Contact Name"
-msgstr "Nama Kontak Person"
+msgstr "Nama Kontak"
-#: AddCustomerContacts.php:232 Contracts.php:775 PDFRemittanceAdvice.php:247
-#: PO_Header.php:1000 PO_Header.php:1080 SelectCreditItems.php:241
-#: SelectCustomer.php:420 SelectOrderItems.php:621
-#: SupplierTenderCreate.php:374 includes/PDFStatementPageHeader.inc:63
+#: AddCustomerContacts.php:232
+#: Contracts.php:775
+#: PDFRemittanceAdvice.php:247
+#: PO_Header.php:1000
+#: PO_Header.php:1080
+#: SelectCreditItems.php:241
+#: SelectCustomer.php:420
+#: SelectOrderItems.php:621
+#: SupplierTenderCreate.php:374
+#: includes/PDFStatementPageHeader.inc:63
#: includes/PDFTransPageHeader.inc:81
-#: includes/PDFTransPageHeaderPortrait.inc:105
+#: includes/PDFTransPageHeaderPortrait.inc:131
msgid "Phone"
msgstr "Telpon"
-#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:649
+#: AddCustomerNotes.php:6
+#: AddCustomerNotes.php:51
+#: SelectCustomer.php:649
#: SelectCustomer.php:680
msgid "Customer Notes"
msgstr "Catatan Customer"
-#: AddCustomerNotes.php:21 AddCustomerTypeNotes.php:19
+#: AddCustomerNotes.php:21
+#: AddCustomerTypeNotes.php:19
msgid "Back to Select Customer"
msgstr "Kembali ke Data Customer"
#: AddCustomerNotes.php:34
msgid "The contact priority must be an integer."
-msgstr "Prioritas kontak person harus bilangan bulat"
+msgstr "Prioritas kontak harus bilangan bulat"
#: AddCustomerNotes.php:37
msgid "The contact's notes must be two hundred characters or less long"
-msgstr "Catatan kontak person maksimum 200 karakter"
+msgstr "Catatan kontak maksimum 200 karakter"
#: AddCustomerNotes.php:40
msgid "The contact's notes may not be empty"
-msgstr "Catatan kontak person tidak boleh kosong"
+msgstr "Catatan kontak tidak boleh kosong"
#: AddCustomerNotes.php:64
msgid "The contact notes record has been added"
-msgstr "Data catatan kontak person telah ditambah"
+msgstr "Data catatan kontak telah ditambah"
#: AddCustomerNotes.php:91
msgid "The contact note record has been deleted"
-msgstr "Data catatan kontak person telah dihapus"
+msgstr "Data catatan kontak telah dihapus"
#: AddCustomerNotes.php:101
msgid "Notes for Customer"
-msgstr "Catatan untuk Pelanggan"
+msgstr "Catatan untuk Customer"
-#: AddCustomerNotes.php:117 AddCustomerNotes.php:222
-#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
-#: BankMatching.php:272 BankReconciliation.php:209 BankReconciliation.php:286
-#: ContractCosting.php:173 CustomerAllocations.php:330
-#: CustomerAllocations.php:364 CustomerInquiry.php:200
-#: CustomerTransInquiry.php:102 GLAccountInquiry.php:155
-#: GLAccountReport.php:340 GLTransInquiry.php:42 MRPCalendar.php:219
-#: PaymentAllocations.php:66 PcAssignCashToTab.php:234
-#: PcAuthorizeExpenses.php:88 PDFRemittanceAdvice.php:308
-#: PrintCustTrans.php:826 PrintCustTransPortrait.php:870 ReverseGRN.php:392
-#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:491
-#: StockDispatch.php:239 StockDispatch.php:250 StockDispatch.php:261
-#: StockLocMovements.php:91 StockMovements.php:95
-#: StockSerialItemResearch.php:81 SupplierAllocations.php:456
-#: SupplierAllocations.php:569 SupplierAllocations.php:644
-#: SupplierInquiry.php:211 SupplierTransInquiry.php:105
-#: includes/PDFQuotationPageHeader.inc:93
+#: AddCustomerNotes.php:117
+#: AddCustomerNotes.php:222
+#: AddCustomerTypeNotes.php:111
+#: AddCustomerTypeNotes.php:211
+#: BankMatching.php:272
+#: BankReconciliation.php:209
+#: BankReconciliation.php:286
+#: ContractCosting.php:173
+#: CustomerAllocations.php:330
+#: CustomerAllocations.php:364
+#: CustomerInquiry.php:200
+#: CustomerTransInquiry.php:102
+#: GLAccountInquiry.php:155
+#: GLAccountReport.php:340
+#: GLTransInquiry.php:42
+#: MRPCalendar.php:219
+#: PDFRemittanceAdvice.php:308
+#: PaymentAllocations.php:66
+#: PcAssignCashToTab.php:234
+#: PcAuthorizeExpenses.php:88
+#: PrintCustTrans.php:826
+#: PrintCustTransPortrait.php:880
+#: ReverseGRN.php:392
+#: ShipmentCosting.php:538
+#: ShipmentCosting.php:615
+#: Shipments.php:491
+#: StockDispatch.php:239
+#: StockDispatch.php:250
+#: StockDispatch.php:261
+#: StockLocMovements.php:91
+#: StockMovements.php:95
+#: StockSerialItemResearch.php:81
+#: SupplierAllocations.php:456
+#: SupplierAllocations.php:569
+#: SupplierAllocations.php:644
+#: SupplierInquiry.php:211
+#: SupplierTransInquiry.php:105
+#: includes/PDFQuotationPageHeader.inc:107
#: includes/PDFQuotationPortraitPageHeader.inc:91
-#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
+#: includes/PDFStatementPageHeader.inc:169
+#: includes/PDFTaxPageHeader.inc:36
#: includes/PDFTransPageHeader.inc:48
#: includes/PDFTransPageHeaderPortrait.inc:58
+#: reportwriter/languages/en_US/reports.php:64
msgid "Date"
msgstr "Tanggal"
-#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:176
-#: Stocks.php:1055 Up...
[truncated message content] |
|
From: <dai...@us...> - 2012-09-06 09:37:13
|
Revision: 5626
http://web-erp.svn.sourceforge.net/web-erp/?rev=5626&view=rev
Author: daintree
Date: 2012-09-06 09:36:49 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
Thomas Timothy Lie: updated Indonesian translation
Modified Paths:
--------------
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-09-06 01:51:57 UTC (rev 5625)
+++ trunk/doc/Change.log 2012-09-06 09:36:49 UTC (rev 5626)
@@ -1,4 +1,5 @@
webERP Change Log
+6/9/12 Thomas Timothy Lie and baliboss.com Team: updated Indonesian translation
1/9/12 Carlos Rubio: AccountGroups.php now has option to move to alternative accountgroups
30/8/2012 Exson: fixed sql problem reported bymodpr0be
24/8/12 Serge Gélinas: Added new fr_CA.utf8 French Quebec translation
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2012-09-06 01:51:57 UTC (rev 5625)
+++ trunk/doc/Manual/ManualContributors.html 2012-09-06 09:36:49 UTC (rev 5626)
@@ -169,6 +169,8 @@
<br />
Serge Gélinas - French Quebec<br />
<br />
+ Thomas Timothy Lie and baliboss.com Team - Indonesian<br />
+ <br />
Thiago Mansinho de Lima - Portuguese Brazilian<br />
<br />
Roberto del Pino - Spanish<br />
Modified: trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po 2012-09-06 01:51:57 UTC (rev 5625)
+++ trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po 2012-09-06 09:36:49 UTC (rev 5626)
@@ -1,47 +1,42 @@
# Indonesian translations for PACKAGE package.
-# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2009-2012 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# Thomas Timothy Lie <tho...@gm...>, 2009.
+# Thomas Timothy Lie <op...@ba...>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: weberp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-24 09:40+1200\n"
-"PO-Revision-Date: 2011-02-05 16:44+0000\n"
-"Last-Translator: Tim Schofield <Unknown>\n"
+"POT-Creation-Date: 2012-08-31 16:00+0700\n"
+"PO-Revision-Date: 2012-09-06 15:23+0700\n"
+"Last-Translator: Thomas Timothy Lie <op...@ba...>\n"
"Language-Team: www.baliboss.com <op...@ba...>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-31 06:29+0000\n"
"X-Generator: Launchpad (build 12696)\n"
"X-Poedit-Country: INDONESIA\n"
-"Language: \n"
"X-Poedit-Language: Indonesian\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
-#: AccountGroups.php:7 includes/MainMenuLinksArray.php:375
+#: AccountGroups.php:7
+#: includes/MainMenuLinksArray.php:375
msgid "Account Groups"
-msgstr "Grup Rekening"
+msgstr "Grup Akun"
#: AccountGroups.php:17
-msgid ""
-"An error occurred in retrieving the account groups of the parent account "
-"group during the check for recursion"
-msgstr ""
-"Kesalahan terjadi saat mengambil grup rekening induk selama pemeriksaan "
-"untuk pengulangan (recursion)"
+msgid "An error occurred in retrieving the account groups of the parent account group during the check for recursion"
+msgstr "Kesalahan terjadi saat mengambil grup akun induk selama pemeriksaan untuk pengulangan (recursion)"
#: AccountGroups.php:18
-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 yang digunakan untuk mengambil grup rekening induk dan yang gagal dalam "
-"proses adalah"
+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 yang digunakan untuk mengambil grup akun induk dan yang gagal dalam proses adalah"
-#: AccountGroups.php:58 AccountGroups.php:95 AccountGroups.php:176
+#: AccountGroups.php:58
+#: AccountGroups.php:95
+#: AccountGroups.php:176
#: AccountGroups.php:186
msgid "The SQL that was used to retrieve the information was"
msgstr "SQL yang digunakan untuk mengambil informasi adalah"
@@ -52,77 +47,70 @@
#: AccountGroups.php:66
msgid "The account group name already exists in the database"
-msgstr "Nama rekening grup tersebut sudah ada di database"
+msgstr "Nama grup akun tersebut sudah ada di database"
#: AccountGroups.php:72
msgid "The account group name cannot contain the character"
-msgstr "Nama rekening grup tidak dapat berisi karakter"
+msgstr "Nama grup akun tidak boleh berisi karakter"
-#: AccountGroups.php:72 Departments.php:30 TaxCategories.php:31
+#: AccountGroups.php:72
+#: Departments.php:30
+#: TaxCategories.php:31
msgid "or the character"
msgstr "atau karakter"
#: AccountGroups.php:78
msgid "The account group name must be at least one character long"
-msgstr "Nama grup rekening minimum 1 karakter"
+msgstr "Nama grup akun minimum 1 karakter"
#: AccountGroups.php:85
-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 ""
-"Grup rekening induk yang dipilih nampaknya mengakibatkan struktur rekening "
-"berulang (recursive) - pilih grup rekening induk yang lain atau jadikan grup "
-"ini grup rekening tingkat utama (top level)"
+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 "Grup akun induk yang dipilih nampaknya mengakibatkan struktur akun berulang (recursive) - pilih grup akun induk yang lain atau jadikan grup ini grup akun tingkat utama (top level)"
#: AccountGroups.php:96
msgid "Could not check whether the group is recursive because"
-msgstr ""
-"Tidak dapat memeriksa apakah grupnya bersifat berulang (recursive) karena"
+msgstr "Tidak dapat memeriksa apakah grupnya bersifat berulang (recursive) karena"
#: AccountGroups.php:104
-msgid ""
-"Since this account group is a child group, the sequence in the trial "
-"balance, the section in the accounts and whether or not the account group "
-"appears in the balance sheet or profit and loss account are all properties "
-"inherited from the parent account group. Any changes made to these fields "
-"will have no effect."
-msgstr ""
+msgid "Since this account group is a child group, the sequence in the trial balance, the section in the accounts and whether or not the account group appears in the balance sheet or profit and loss account are all properties inherited from the parent account group. Any changes made to these fields will have no effect."
+msgstr "Karena grup akun ini grup anak, urutan di neraca percobaan, tipe akun dan apakah atau tidak grup akun muncul di neraca atau akun laba rugi adalah semua ciri diperoleh dari grup akun induk. Perubahan apapun yg dibuat terhadap kolom-kolom ini tidak akan berpengaruh."
#: AccountGroups.php:109
msgid "The section in accounts must be an integer"
-msgstr "Kelompok rekening harus bilangan bulat"
+msgstr "Tipe akun harus bilangan bulat"
#: AccountGroups.php:115
msgid "The sequence in the trial balance must be an integer"
-msgstr "Urutan dari neraca saldo harus bilangan bulat"
+msgstr "Urutan di neraca percobaan harus bilangan bulat"
#: AccountGroups.php:121
msgid "The sequence in the TB must be numeric and less than"
-msgstr "Urutan dari neraca saldo harus berupa angka dan kurang dari"
+msgstr "Urutan di neraca percobaan harus berupa angka dan kurang dari"
#: AccountGroups.php:137
msgid "An error occurred in updating the account group"
-msgstr "Kesalahan terjadi saat memperbarui grup rekening"
+msgstr "Kesalahan terjadi saat memperbarui grup akun"
#: AccountGroups.php:138
msgid "The SQL that was used to update the account group was"
-msgstr "SQL yang digunakan untuk memperbaharui grup rekening adalah"
+msgstr "SQL yang digunakan untuk memperbaharui grup akun adalah"
-#: AccountGroups.php:140 AccountSections.php:98 PaymentMethods.php:83
+#: AccountGroups.php:140
+#: AccountSections.php:98
+#: PaymentMethods.php:83
msgid "Record Updated"
-msgstr "Data telah diperbaharui"
+msgstr "Data telah Diperbaharui"
#: AccountGroups.php:156
msgid "An error occurred in inserting the account group"
-msgstr "Kesalahan terjadi saat memasukkan grup rekening"
+msgstr "Kesalahan terjadi saat memasukkan grup akun"
#: AccountGroups.php:157
msgid "The SQL that was used to insert the account group was"
-msgstr "SQL yang digunakan untuk memasukkan grup rekening adalah"
+msgstr "SQL yang digunakan untuk memasukkan grup akun adalah"
-#: AccountGroups.php:158 AccountSections.php:108
+#: AccountGroups.php:158
+#: AccountSections.php:108
msgid "Record inserted"
msgstr "Data telah dimasukkan"
@@ -131,63 +119,102 @@
msgstr "Kesalahan terjadi saat mengambil informasi grup dari tabel chartmaster"
#: AccountGroups.php:180
-msgid ""
-"Cannot delete this account group because general ledger accounts have been "
-"created using this group"
-msgstr ""
-"Tidak dapat menghapus grup rekening ini karena rekening buku besar telah "
-"dibuat menggunakan grup ini"
+msgid "Cannot delete this account group because general ledger accounts have been created using this group"
+msgstr "Tidak dapat menghapus grup akun ini karena akun buku besar telah dibuat menggunakan grup ini"
-#: AccountGroups.php:181 AccountGroups.php:191 AccountSections.php:130
-#: Areas.php:114 Areas.php:123 BankAccounts.php:158 CreditStatus.php:125
-#: Currencies.php:166 Currencies.php:174 Currencies.php:182
-#: CustomerBranches.php:286 CustomerBranches.php:296 CustomerBranches.php:306
-#: CustomerBranches.php:316 Customers.php:289 Customers.php:298
-#: Customers.php:306 Customers.php:314 CustomerTypes.php:147
-#: CustomerTypes.php:157 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:134 GLAccounts.php:80 GLAccounts.php:96
-#: Locations.php:237 Locations.php:245 Locations.php:256 Locations.php:265
-#: Locations.php:274 Locations.php:283 Locations.php:292 Locations.php:301
-#: Locations.php:309 MRPDemandTypes.php:87 PaymentMethods.php:142
-#: PaymentTerms.php:146 PaymentTerms.php:153 PcExpenses.php:158
-#: SalesCategories.php:125 SalesCategories.php:132 SalesPeople.php:150
-#: SalesPeople.php:157 SalesPeople.php:163 SalesTypes.php:140
-#: SalesTypes.php:150 Shippers.php:81 Shippers.php:93 StockCategories.php:187
-#: Stocks.php:653 Stocks.php:662 Stocks.php:670 Stocks.php:678 Stocks.php:686
-#: Stocks.php:694 Suppliers.php:612 Suppliers.php:621 Suppliers.php:629
-#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:132
-#: TaxGroups.php:140 TaxProvinces.php:129 UnitsOfMeasure.php:135
-#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:83
+#: AccountGroups.php:181
+#: AccountGroups.php:191
+#: AccountSections.php:130
+#: Areas.php:114
+#: Areas.php:123
+#: BankAccounts.php:158
+#: CreditStatus.php:125
+#: Currencies.php:166
+#: Currencies.php:174
+#: Currencies.php:182
+#: CustomerBranches.php:286
+#: CustomerBranches.php:296
+#: CustomerBranches.php:306
+#: CustomerBranches.php:316
+#: CustomerTypes.php:147
+#: CustomerTypes.php:157
+#: Customers.php:289
+#: Customers.php:298
+#: Customers.php:306
+#: Customers.php:314
+#: Departments.php:141
+#: Factors.php:134
+#: FixedAssetCategories.php:134
+#: GLAccounts.php:80
+#: GLAccounts.php:96
+#: Locations.php:237
+#: Locations.php:245
+#: Locations.php:256
+#: Locations.php:265
+#: Locations.php:274
+#: Locations.php:283
+#: Locations.php:292
+#: Locations.php:301
+#: Locations.php:309
+#: MRPDemandTypes.php:87
+#: PaymentMethods.php:142
+#: PaymentTerms.php:146
+#: PaymentTerms.php:153
+#: PcExpenses.php:158
+#: SalesCategories.php:125
+#: SalesCategories.php:132
+#: SalesPeople.php:150
+#: SalesPeople.php:157
+#: SalesPeople.php:163
+#: SalesTypes.php:140
+#: SalesTypes.php:150
+#: Shippers.php:81
+#: Shippers.php:93
+#: StockCategories.php:187
+#: Stocks.php:653
+#: Stocks.php:662
+#: Stocks.php:670
+#: Stocks.php:678
+#: Stocks.php:686
+#: Stocks.php:694
+#: SupplierTypes.php:145
+#: Suppliers.php:612
+#: Suppliers.php:621
+#: Suppliers.php:629
+#: TaxCategories.php:131
+#: TaxGroups.php:132
+#: TaxGroups.php:140
+#: TaxProvinces.php:129
+#: UnitsOfMeasure.php:135
+#: WWW_Access.php:83
+#: WorkCentres.php:89
+#: WorkCentres.php:95
msgid "There are"
msgstr "Ada"
#: AccountGroups.php:181
msgid "general ledger accounts that refer to this account group"
-msgstr "rekening buku besar yang mereferensi pada grup rekening ini"
+msgstr "akun buku besar yang mereferensi pada grup akun ini"
#: AccountGroups.php:185
msgid "An error occurred in retrieving the parent group information"
msgstr "Kesalahan terjadi saat mengambil informasi grup induk"
#: AccountGroups.php:190
-msgid ""
-"Cannot delete this account group because it is a parent account group of "
-"other account group(s)"
-msgstr ""
-"Tidak dapat menghapus grup rekening ini karena digunakan sebagai induk dari "
-"grup rekening yang lain"
+msgid "Cannot delete this account group because it is a parent account group of other account group(s)"
+msgstr "Tidak dapat menghapus grup akun ini karena digunakan sebagai induk dari grup akun yang lain"
#: AccountGroups.php:191
msgid "account groups that have this group as its/there parent account group"
-msgstr "grup rekening yang mempunyai grup ini sebagai grup rekening induk nya"
+msgstr "grup akun yang mempunyai grup ini sebagai grup akun induk nya"
#: AccountGroups.php:194
msgid "An error occurred in deleting the account group"
-msgstr "Kesalahan terjadi saat menghapus grup rekening"
+msgstr "Kesalahan terjadi saat menghapus grup akun"
#: AccountGroups.php:195
msgid "The SQL that was used to delete the account group was"
-msgstr "SQL yang digunakan untuk menghapus grup rekening adalah"
+msgstr "SQL yang digunakan untuk menghapus grup akun adalah"
#: AccountGroups.php:197
msgid "group has been deleted"
@@ -195,55 +222,133 @@
#: AccountGroups.php:222
msgid "The sql that was used to retrieve the account group information was "
-msgstr "SQL yang digunakan untuk mengambil informasi grup rekening adalah "
+msgstr "SQL yang digunakan untuk mengambil informasi grup akun adalah "
#: AccountGroups.php:223
msgid "Could not get account groups because"
-msgstr "Tidak dapat mengambil grup rekening karena"
+msgstr "Tidak dapat mengambil grup akun karena"
-#: AccountGroups.php:225 AccountSections.php:169 AddCustomerContacts.php:25
-#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
-#: AddCustomerTypeNotes.php:94 AgedDebtors.php:444 AgedSuppliers.php:276
-#: Areas.php:143 AuditTrail.php:11 BankReconciliation.php:14
-#: BOMExtendedQty.php:250 BOMIndented.php:246 BOMIndentedReverse.php:235
-#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:858
-#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2037
-#: CounterSales.php:2163 Credit_Invoice.php:255 CreditStatus.php:21
-#: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:11
-#: DebtorsAtPeriodEnd.php:125 DiscountCategories.php:10
-#: DiscountCategories.php:134 DiscountMatrix.php:16 EDIMessageFormat.php:105
-#: FixedAssetLocations.php:9 FixedAssetRegister.php:13
-#: FixedAssetRegister.php:249 FixedAssetTransfer.php:32 FormDesigner.php:129
-#: GLBalanceSheet.php:378 GLBudgets.php:29 GLJournal.php:247
-#: InternalStockRequest.php:281 InventoryPlanning.php:374
-#: InventoryPlanningPrefSupplier.php:467 MRPReport.php:516 NoSalesItems.php:93
-#: OutstandingGRNs.php:163 PcAssignCashToTab.php:56 PcAssignCashToTab.php:130
-#: PcAssignCashToTab.php:146 PcAssignCashToTab.php:190 PDFPickingList.php:28
-#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
-#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:140
-#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:30
-#: PurchData.php:152 PurchData.php:286 PurchData.php:312
-#: RecurringSalesOrders.php:309 SalesAnalReptCols.php:51 SalesAnalRepts.php:11
-#: SalesCategories.php:11 SalesGLPostings.php:17 SalesGraph.php:35
-#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:46
-#: SelectCompletedOrder.php:11 SelectContract.php:65 SelectCreditItems.php:216
-#: SelectCreditItems.php:287 SelectCustomer.php:263 SelectGLAccount.php:17
-#: SelectGLAccount.php:87 SelectOrderItems.php:586 SelectOrderItems.php:1498
-#: SelectOrderItems.php:1620 SelectProduct.php:505 SelectSalesOrder.php:534
-#: SelectSupplier.php:9 SelectSupplier.php:199 SelectWorkOrder.php:9
-#: SelectWorkOrder.php:152 ShipmentCosting.php:11 Shipments.php:17
-#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
-#: StockLocMovements.php:14 StockLocStatus.php:28
-#: StockSerialItemResearch.php:30 SupplierPriceList.php:15
-#: SupplierPriceList.php:214 SupplierPriceList.php:384
-#: SupplierPriceList.php:388 SupplierPriceList.php:439
-#: SupplierPriceList.php:489 Suppliers.php:302 SupplierTenderCreate.php:522
-#: SupplierTenderCreate.php:628 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TaxGroups.php:15
-#: TaxProvinces.php:11 TopItems.php:114 WhereUsedInquiry.php:18
-#: WorkCentres.php:111 WorkCentres.php:162 WorkOrderCosting.php:13
-#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:17
-#: WorkOrderStatus.php:42 WWW_Access.php:11 WWW_Users.php:33
+#: AccountGroups.php:225
+#: AccountSections.php:169
+#: AddCustomerContacts.php:25
+#: AddCustomerContacts.php:27
+#: AddCustomerNotes.php:101
+#: AddCustomerTypeNotes.php:94
+#: AgedDebtors.php:444
+#: AgedSuppliers.php:276
+#: Areas.php:143
+#: AuditTrail.php:11
+#: BOMExtendedQty.php:250
+#: BOMIndented.php:246
+#: BOMIndentedReverse.php:235
+#: BOMInquiry.php:187
+#: BOMListing.php:109
+#: BOMs.php:231
+#: BOMs.php:858
+#: BankReconciliation.php:14
+#: COGSGLPostings.php:18
+#: CompanyPreferences.php:153
+#: CounterSales.php:2037
+#: CounterSales.php:2163
+#: CreditStatus.php:21
+#: Credit_Invoice.php:256
+#: Currencies.php:28
+#: CustEDISetup.php:17
+#: DailyBankTransactions.php:11
+#: DebtorsAtPeriodEnd.php:125
+#: DiscountCategories.php:10
+#: DiscountCategories.php:134
+#: DiscountMatrix.php:16
+#: EDIMessageFormat.php:105
+#: FixedAssetLocations.php:9
+#: FixedAssetRegister.php:13
+#: FixedAssetRegister.php:249
+#: FixedAssetTransfer.php:32
+#: FormDesigner.php:129
+#: GLBalanceSheet.php:378
+#: GLBudgets.php:29
+#: GLJournal.php:247
+#: InternalStockRequest.php:281
+#: InventoryPlanning.php:376
+#: InventoryPlanningPrefSupplier.php:469
+#: MRPReport.php:516
+#: NoSalesItems.php:93
+#: OutstandingGRNs.php:163
+#: PDFPickingList.php:28
+#: PDFStockLocTransfer.php:16
+#: POReport.php:60
+#: POReport.php:64
+#: POReport.php:68
+#: PO_AuthorisationLevels.php:10
+#: PO_SelectOSPurchOrder.php:140
+#: PcAssignCashToTab.php:56
+#: PcAssignCashToTab.php:130
+#: PcAssignCashToTab.php:146
+#: PcAssignCashToTab.php:190
+#: Prices.php:30
+#: PricesBasedOnMarkUp.php:8
+#: Prices_Customer.php:35
+#: PurchData.php:152
+#: PurchData.php:286
+#: PurchData.php:312
+#: RecurringSalesOrders.php:309
+#: SalesAnalReptCols.php:51
+#: SalesAnalRepts.php:11
+#: SalesCategories.php:11
+#: SalesGLPostings.php:17
+#: SalesGraph.php:35
+#: SalesPeople.php:20
+#: SalesTypes.php:20
+#: SelectAsset.php:46
+#: SelectCompletedOrder.php:11
+#: SelectContract.php:65
+#: SelectCreditItems.php:216
+#: SelectCreditItems.php:287
+#: SelectCustomer.php:263
+#: SelectGLAccount.php:17
+#: SelectGLAccount.php:87
+#: SelectOrderItems.php:586
+#: SelectOrderItems.php:1498
+#: SelectOrderItems.php:1621
+#: SelectProduct.php:505
+#: SelectSalesOrder.php:534
+#: SelectSupplier.php:9
+#: SelectSupplier.php:199
+#: SelectWorkOrder.php:9
+#: SelectWorkOrder.php:152
+#: ShipmentCosting.php:11
+#: Shipments.php:17
+#: Shippers.php:123
+#: Shippers.php:160
+#: Shipt_Select.php:8
+#: StockLocMovements.php:14
+#: StockLocStatus.php:28
+#: StockSerialItemResearch.php:30
+#: SupplierPriceList.php:15
+#: SupplierPriceList.php:214
+#: SupplierPriceList.php:384
+#: SupplierPriceList.php:388
+#: SupplierPriceList.php:439
+#: SupplierPriceList.php:489
+#: SupplierTenderCreate.php:522
+#: SupplierTenderCreate.php:628
+#: SupplierTenders.php:322
+#: SupplierTenders.php:388
+#: SupplierTransInquiry.php:10
+#: Suppliers.php:302
+#: TaxGroups.php:15
+#: TaxProvinces.php:11
+#: TopItems.php:114
+#: WWW_Access.php:11
+#: WWW_Users.php:33
+#: WhereUsedInquiry.php:18
+#: WorkCentres.php:111
+#: WorkCentres.php:162
+#: WorkOrderCosting.php:13
+#: WorkOrderEntry.php:11
+#: WorkOrderIssue.php:22
+#: WorkOrderReceive.php:17
+#: WorkOrderStatus.php:42
#: Z_BottomUpCosts.php:57
msgid "Search"
msgstr "Cari"
@@ -252,283 +357,559 @@
msgid "Group Name"
msgstr "Nama Grup"
-#: AccountGroups.php:230 EDIMessageFormat.php:129 EDIMessageFormat.php:208
+#: AccountGroups.php:230
+#: EDIMessageFormat.php:129
+#: EDIMessageFormat.php:208
msgid "Section"
-msgstr "Kelompok"
+msgstr "Tipe"
-#: AccountGroups.php:231 AccountGroups.php:410
+#: AccountGroups.php:231
+#: AccountGroups.php:410
msgid "Sequence In TB"
-msgstr "Urutan di Neraca Saldo"
+msgstr "Urutan di Neraca Percobaan"
-#: AccountGroups.php:232 AccountGroups.php:393 GLProfit_Loss.php:6
-#: GLProfit_Loss.php:126 GLProfit_Loss.php:127 GLProfit_Loss.php:178
-#: SelectGLAccount.php:40 SelectGLAccount.php:54 SelectGLAccount.php:68
+#: AccountGroups.php:232
+#: AccountGroups.php:393
+#: GLProfit_Loss.php:6
+#: GLProfit_Loss.php:126
+#: GLProfit_Loss.php:127
+#: GLProfit_Loss.php:178
+#: SelectGLAccount.php:40
+#: SelectGLAccount.php:54
+#: SelectGLAccount.php:68
msgid "Profit and Loss"
msgstr "Laba/Rugi"
-#: AccountGroups.php:233 AccountGroups.php:354
+#: AccountGroups.php:233
+#: AccountGroups.php:354
msgid "Parent Group"
msgstr "Grup Induk"
-#: AccountGroups.php:249 AccountGroups.php:252 AccountGroups.php:397
-#: AccountGroups.php:399 BOMs.php:124 BOMs.php:772 BOMs.php:774
-#: CompanyPreferences.php:477 CompanyPreferences.php:479
-#: CompanyPreferences.php:492 CompanyPreferences.php:494
-#: CompanyPreferences.php:507 CompanyPreferences.php:509
-#: ContractCosting.php:198 CustomerBranches.php:411 Customers.php:594
-#: Customers.php:947 Customers.php:956 Customers.php:959
-#: DeliveryDetails.php:1082 DeliveryDetails.php:1125 DeliveryDetails.php:1128
-#: GLTransInquiry.php:69 Labels.php:491 Labels.php:493 Labels.php:518
-#: MRPCalendar.php:224 MRP.php:529 MRP.php:533 MRP.php:537 MRP.php:541
-#: PaymentMethods.php:204 PaymentMethods.php:205 PaymentMethods.php:206
-#: PaymentMethods.php:207 PaymentMethods.php:273 PaymentMethods.php:280
-#: PaymentMethods.php:287 PaymentMethods.php:294 PcAuthorizeExpenses.php:243
-#: PDFChequeListing.php:63 PDFDeliveryDifferences.php:76 PDFDIFOT.php:76
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:792 PO_PDFPurchOrder.php:392 PO_PDFPurchOrder.php:395
-#: PurchData.php:212 PurchData.php:554 PurchData.php:557
-#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
-#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
-#: SalesAnalReptCols.php:422 SalesAnalRepts.php:417 SalesAnalRepts.php:420
-#: SalesAnalRepts.php:445 SalesAnalRepts.php:448 SalesAnalRepts.php:473
-#: SalesAnalRepts.php:476 SalesPeople.php:219 SalesPeople.php:356
-#: SalesPeople.php:358 SelectProduct.php:385 ShipmentCosting.php:667
-#: Stocks.php:1051 Stocks.php:1053 Stocks.php:1076 Stocks.php:1078
-#: SuppContractChgs.php:90 SystemParameters.php:401 SystemParameters.php:424
-#: SystemParameters.php:440 SystemParameters.php:503 SystemParameters.php:511
-#: SystemParameters.php:551 SystemParameters.php:631 SystemParameters.php:640
-#: SystemParameters.php:648 SystemParameters.php:666 SystemParameters.php:673
-#: SystemParameters.php:717 SystemParameters.php:813 SystemParameters.php:948
-#: SystemParameters.php:950 SystemParameters.php:960 SystemParameters.php:962
-#: SystemParameters.php:1016 SystemParameters.php:1028
-#: SystemParameters.php:1030 TaxGroups.php:311 TaxGroups.php:314
-#: TaxGroups.php:371 WWW_Users.php:484 WWW_Users.php:486 WWW_Users.php:657
+#: AccountGroups.php:249
+#: AccountGroups.php:252
+#: AccountGroups.php:397
+#: AccountGroups.php:399
+#: BOMs.php:124
+#: BOMs.php:772
+#: BOMs.php:774
+#: CompanyPreferences.php:477
+#: CompanyPreferences.php:479
+#: CompanyPreferences.php:492
+#: CompanyPreferences.php:494
+#: CompanyPreferences.php:507
+#: CompanyPreferences.php:509
+#: ContractCosting.php:198
+#: CustomerBranches.php:411
+#: Customers.php:594
+#: Customers.php:947
+#: Customers.php:956
+#: Customers.php:959
+#: DeliveryDetails.php:1087
+#: GLTransInquiry.php:69
+#: Labels.php:491
+#: Labels.php:493
+#: Labels.php:518
+#: MRP.php:529
+#: MRP.php:533
+#: MRP.php:537
+#: MRP.php:541
+#: MRPCalendar.php:224
+#: PDFChequeListing.php:63
+#: PDFDIFOT.php:76
+#: PDFDeliveryDifferences.php:76
+#: PO_AuthorisationLevels.php:134
+#: PO_AuthorisationLevels.php:139
+#: PO_Header.php:792
+#: PO_PDFPurchOrder.php:392
+#: PO_PDFPurchOrder.php:395
+#: PaymentMethods.php:204
+#: PaymentMethods.php:205
+#: PaymentMethods.php:206
+#: PaymentMethods.php:207
+#: PaymentMethods.php:273
+#: PaymentMethods.php:280
+#: PaymentMethods.php:287
+#: PaymentMethods.php:294
+#: PcAuthorizeExpenses.php:243
+#: PurchData.php:212
+#: PurchData.php:554
+#: PurchData.php:557
+#: RecurringSalesOrders.php:482
+#: RecurringSalesOrders.php:485
+#: SalesAnalReptCols.php:284
+#: SalesAnalReptCols.php:419
+#: SalesAnalReptCols.php:422
+#: SalesAnalRepts.php:417
+#: SalesAnalRepts.php:420
+#: SalesAnalRepts.php:445
+#: SalesAnalRepts.php:448
+#: SalesAnalRepts.php:473
+#: SalesAnalRepts.php:476
+#: SalesPeople.php:219
+#: SalesPeople.php:356
+#: SalesPeople.php:358
+#: SelectProduct.php:385
+#: ShipmentCosting.php:667
+#: Stocks.php:1051
+#: Stocks.php:1053
+#: Stocks.php:1076
+#: Stocks.php:1078
+#: SuppContractChgs.php:90
+#: SystemParameters.php:401
+#: SystemParameters.php:424
+#: SystemParameters.php:440
+#: SystemParameters.php:503
+#: SystemParameters.php:511
+#: SystemParameters.php:551
+#: SystemParameters.php:631
+#: SystemParameters.php:640
+#: SystemParameters.php:648
+#: SystemParameters.php:666
+#: SystemParameters.php:673
+#: SystemParameters.php:717
+#: SystemParameters.php:813
+#: SystemParameters.php:948
+#: SystemParameters.php:950
+#: SystemParameters.php:960
+#: SystemParameters.php:962
+#: SystemParameters.php:1016
+#: SystemParameters.php:1028
+#: SystemParameters.php:1030
+#: TaxGroups.php:311
+#: TaxGroups.php:314
+#: TaxGroups.php:371
+#: WWW_Users.php:484
+#: WWW_Users.php:486
+#: WWW_Users.php:657
#: WWW_Users.php:659
+#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "Ya"
-#: AccountGroups.php:255 AccountGroups.php:402 AccountGroups.php:404
-#: BankAccounts.php:209 BankAccounts.php:378 BankAccounts.php:380
-#: BankAccounts.php:384 BankAccounts.php:392 BOMs.php:126 BOMs.php:771
-#: BOMs.php:775 CompanyPreferences.php:476 CompanyPreferences.php:480
-#: CompanyPreferences.php:491 CompanyPreferences.php:495
-#: CompanyPreferences.php:506 CompanyPreferences.php:510
-#: ContractCosting.php:196 CustomerBranches.php:411 Customers.php:593
-#: Customers.php:942 Customers.php:955 Customers.php:958
-#: DeliveryDetails.php:1083 DeliveryDetails.php:1126 DeliveryDetails.php:1129
-#: GLTransInquiry.php:86 Labels.php:490 Labels.php:494 Labels.php:519
-#: MRPCalendar.php:226 MRP.php:527 MRP.php:531 MRP.php:535 MRP.php:539
-#: NoSalesItems.php:153 PaymentMethods.php:204 PaymentMethods.php:205
-#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:274
-#: PaymentMethods.php:281 PaymentMethods.php:288 PaymentMethods.php:295
-#: PcAuthorizeExpenses.php:241 PDFChequeListing.php:62
-#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75
-#: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
-#: PO_Header.php:791 PO_PDFPurchOrder.php:393 PO_PDFPurchOrder.php:396
-#: PurchData.php:215 PurchData.php:555 PurchData.php:558
-#: RecurringSalesOrders.php:481 RecurringSalesOrders.php:484
-#: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
-#: SalesAnalReptCols.php:423 SalesAnalRepts.php:416 SalesAnalRepts.php:419
-#: SalesAnalRepts.php:444 SalesAnalRepts.php:447 SalesAnalRepts.php:472
-#: SalesAnalRepts.php:475 SalesPeople.php:221 SalesPeople.php:361
-#: SalesPeople.php:363 SelectProduct.php:387 ShipmentCosting.php:668
-#: Stocks.php:1046 Stocks.php:1048 Stocks.php:1071 Stocks.php:1073
-#: SuppContractChgs.php:92 SystemParameters.php:402 SystemParameters.php:425
-#: SystemParameters.php:441 SystemParameters.php:504 SystemParameters.php:512
-#: SystemParameters.php:552 SystemParameters.php:632 SystemParameters.php:641
-#: SystemParameters.php:649 SystemParameters.php:667 SystemParameters.php:674
-#: SystemParameters.php:718 SystemParameters.php:814 SystemParameters.php:947
-#: SystemParameters.php:951 SystemParameters.php:959 SystemParameters.php:963
-#: SystemParameters.php:1017 SystemParameters.php:1027
-#: SystemParameters.php:1031 TaxGroups.php:312 TaxGroups.php:315
-#: TaxGroups.php:373 WWW_Users.php:483 WWW_Users.php:487 WWW_Users.php:656
-#: WWW_Users.php:660 includes/PDFLowGPPageHeader.inc:44
+#: AccountGroups.php:255
+#: AccountGroups.php:402
+#: AccountGroups.php:404
+#: BOMs.php:126
+#: BOMs.php:771
+#: BOMs.php:775
+#: BankAccounts.php:209
+#: BankAccounts.php:378
+#: BankAccounts.php:380
+#: BankAccounts.php:384
+#: BankAccounts.php:392
+#: CompanyPreferences.php:476
+#: CompanyPreferences.php:480
+#: CompanyPreferences.php:491
+#: CompanyPreferences.php:495
+#: CompanyPreferences.php:506
+#: CompanyPreferences.php:510
+#: ContractCosting.php:196
+#: CustomerBranches.php:411
+#: Customers.php:593
+#: Customers.php:942
+#: Customers.php:955
+#: Customers.php:958
+#: DeliveryDetails.php:1088
+#: GLTransInquiry.php:86
+#: Labels.php:490
+#: Labels.php:494
+#: Labels.php:519
+#: MRP.php:527
+#: MRP.php:531
+#: MRP.php:535
+#: MRP.php:539
+#: MRPCalendar.php:226
+#: NoSalesItems.php:153
+#: PDFChequeListing.php:62
+#: PDFDIFOT.php:75
+#: PDFDeliveryDifferences.php:75
+#: PO_AuthorisationLevels.php:136
+#: PO_AuthorisationLevels.php:141
+#: PO_Header.php:791
+#: PO_PDFPurchOrder.php:393
+#: PO_PDFPurchOrder.php:396
+#: PaymentMethods.php:204
+#: PaymentMethods.php:205
+#: PaymentMethods.php:206
+#: PaymentMethods.php:207
+#: PaymentMethods.php:274
+#: PaymentMethods.php:281
+#: PaymentMethods.php:288
+#: PaymentMethods.php:295
+#: PcAuthorizeExpenses.php:241
+#: PurchData.php:215
+#: PurchData.php:555
+#: PurchData.php:558
+#: RecurringSalesOrders.php:481
+#: RecurringSalesOrders.php:484
+#: SalesAnalReptCols.php:282
+#: SalesAnalReptCols.php:420
+#: SalesAnalReptCols.php:423
+#: SalesAnalRepts.php:416
+#: SalesAnalRepts.php:419
+#: SalesAnalRepts.php:444
+#: SalesAnalRepts.php:447
+#: SalesAnalRepts.php:472
+#: SalesAnalRepts.php:475
+#: SalesPeople.php:221
+#: SalesPeople.php:361
+#: SalesPeople.php:363
+#: SelectProduct.php:387
+#: ShipmentCosting.php:668
+#: Stocks.php:1046
+#: Stocks.php:1048
+#: Stocks.php:1071
+#: Stocks.php:1073
+#: SuppContractChgs.php:92
+#: SystemParameters.php:402
+#: SystemParameters.php:425
+#: SystemParameters.php:441
+#: SystemParameters.php:504
+#: SystemParameters.php:512
+#: SystemParameters.php:552
+#: SystemParameters.php:632
+#: SystemParameters.php:641
+#: SystemParameters.php:649
+#: SystemParameters.php:667
+#: SystemParameters.php:674
+#: SystemParameters.php:718
+#: SystemParameters.php:814
+#: SystemParameters.php:947
+#: SystemParameters.php:951
+#: SystemParameters.php:959
+#: SystemParameters.php:963
+#: SystemParameters.php:1017
+#: SystemParameters.php:1027
+#: SystemParameters.php:1031
+#: TaxGroups.php:312
+#: TaxGroups.php:315
+#: TaxGroups.php:373
+#: WWW_Users.php:483
+#: WWW_Users.php:487
+#: WWW_Users.php:656
+#: WWW_Users.php:660
+#: includes/PDFLowGPPageHeader.inc:44
#: includes/PDFTaxPageHeader.inc:35
+#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "No"
-#: AccountGroups.php:264 AccountSections.php:189 AddCustomerContacts.php:148
-#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:163
-#: BankAccounts.php:222 BOMs.php:151 COGSGLPostings.php:108
-#: COGSGLPostings.php:206 CreditStatus.php:175 Currencies.php:272
-#: CustomerBranches.php:415 Customers.php:1033 Customers.php:1067
-#: CustomerTypes.php:206 Departments.php:186 EDIMessageFormat.php:150
-#: Factors.php:334 FixedAssetCategories.php:187 FixedAssetLocations.php:107
-#: FreightCosts.php:242 GeocodeSetup.php:173 GLAccounts.php:312 GLTags.php:93
-#: InternalStockRequest.php:263 Labels.php:223 Labels.php:248
-#: Locations.php:391 MRPDemands.php:309 MRPDemandTypes.php:120
-#: PaymentMethods.php:208 PaymentTerms.php:205 PcAssignCashToTab.php:273
-#: PcClaimExpensesFromTab.php:265 PcExpenses.php:223 PcTabs.php:233
-#: PcTypeTabs.php:174 PO_AuthorisationLevels.php:151 Prices_Customer.php:278
-#: Prices.php:249 PurchData.php:227 SalesCategories.php:256
-#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:232
-#: SalesTypes.php:206 SecurityTokens.php:130 SelectCustomer.php:615
-#: SelectCustomer.php:633 SelectCustomer.php:656 SelectCustomer.php:673
-#: SelectCustomer.php:696 SelectCustomer.php:713 Shippers.php:144
-#: StockCategories.php:263 SupplierContacts.php:163
-#: SupplierTenderCreate.php:145 SupplierTypes.php:189
-#: SuppTransGLAnalysis.php:120 TaxAuthorities.php:174 TaxCategories.php:182
-#: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185
-#: WorkCentres.php:141 WWW_Access.php:123 WWW_Users.php:325
-#: includes/InputSerialItems.php:90 includes/OutputSerialItems.php:20
+#: AccountGroups.php:264
+#: AccountSections.php:189
+#: AddCustomerContacts.php:148
+#: AddCustomerNotes.php:137
+#: AddCustomerTypeNotes.php:131
+#: Areas.php:163
+#: BOMs.php:151
+#: BankAccounts.php:222
+#: COGSGLPostings.php:108
+#: COGSGLPostings.php:206
+#: CreditStatus.php:175
+#: Currencies.php:272
+#: CustomerBranches.php:415
+#: CustomerTypes.php:206
+#: Customers.php:1033
+#: Customers.php:1067
+#: Departments.php:186
+#: EDIMessageFormat.php:150
+#: Factors.php:334
+#: FixedAssetCategories.php:187
+#: FixedAssetLocations.php:107
+#: FreightCosts.php:242
+#: GLAccounts.php:312
+#: GLTags.php:93
+#: GeocodeSetup.php:173
+#: InternalStockRequest.php:263
+#: Labels.php:223
+#: Labels.php:248
+#: Locations.php:391
+#: MRPDemandTypes.php:120
+#: MRPDemands.php:309
+#: PO_AuthorisationLevels.php:151
+#: PaymentMethods.php:208
+#: PaymentTerms.php:205
+#: PcAssignCashToTab.php:273
+#: PcClaimExpensesFromTab.php:265
+#: PcExpenses.php:223
+#: PcTabs.php:233
+#: PcTypeTabs.php:174
+#: Prices.php:249
+#: Prices_Customer.php:278
+#: PurchData.php:227
+#: SalesCategories.php:256
+#: SalesGLPostings.php:132
+#: SalesGLPostings.php:245
+#: SalesPeople.php:232
+#: SalesTypes.php:206
+#: SecurityTokens.php:130
+#: SelectCustomer.php:615
+#: SelectCustomer.php:633
+#: SelectCustomer.php:656
+#: SelectCustomer.php:673
+#: SelectCustomer.php:696
+#: SelectCustomer.php:713
+#: Shippers.php:144
+#: StockCategories.php:263
+#: SuppTransGLAnalysis.php:120
+#: SupplierContacts.php:163
+#: SupplierTenderCreate.php:145
+#: SupplierTypes.php:189
+#: TaxAuthorities.php:174
+#: TaxCategories.php:182
+#: TaxGroups.php:188
+#: TaxProvinces.php:180
+#: UnitsOfMeasure.php:185
+#: WWW_Access.php:123
+#: WWW_Users.php:325
+#: WorkCentres.php:141
+#: includes/InputSerialItems.php:90
+#: includes/OutputSerialItems.php:20
+#: reportwriter/languages/en_US/reports.php:143
#, php-format
msgid "Edit"
msgstr "Edit"
#: AccountGroups.php:265
-#, fuzzy
msgid "Are you sure you wish to delete this account group?"
-msgstr "Apakah Anda yakin ingin menghapus cabang ini?"
+msgstr "Apakah Anda yakin ingin menghapus grup akun ini?"
-#: AccountGroups.php:265 AccountSections.php:193 AddCustomerContacts.php:149
-#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:164
-#: BankAccounts.php:223 BOMs.php:153 COGSGLPostings.php:109
-#: COGSGLPostings.php:207 ContractBOM.php:267 ContractOtherReqts.php:120
-#: CounterSales.php:830 Credit_Invoice.php:401 CreditStatus.php:176
-#: Currencies.php:275 CustomerReceipt.php:925 Customers.php:1068
-#: CustomerTypes.php:207 Departments.php:187 DiscountCategories.php:223
-#: DiscountMatrix.php:183 EDIMessageFormat.php:151
-#: FixedAssetCategories.php:188 FreightCosts.php:243 GeocodeSetup.php:174
-#: GLAccounts.php:313 GLJournal.php:426 GLTags.php:94
-#: InternalStockRequest.php:264 Labels.php:224 Labels.php:249 Labels.php:497
-#: Locations.php:392 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:209 Payments.php:1083 PaymentTerms.php:206
-#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:266 PcExpenses.php:224
-#: PcExpensesTypeTab.php:187 PcTabs.php:234 PcTypeTabs.php:175
-#: PO_AuthorisationLevels.php:153 PO_Items.php:712 Prices_Customer.php:279
-#: Prices.php:250 PurchData.php:229 SalesAnalReptCols.php:299
-#: SalesAnalRepts.php:304 SalesCategories.php:257 SalesGLPostings.php:133
-#: SalesGLPostings.php:246 SalesPeople.php:233 SalesTypes.php:207
-#: SecurityTokens.php:131 SelectCreditItems.php:767 SelectCustomer.php:616
-#: SelectCustomer.php:634 SelectCustomer.php:657 SelectCustomer.php:674
-#: SelectCustomer.php:697 SelectCustomer.php:714 SelectOrderItems.php:1417
-#: Shipments.php:440 Shippers.php:145 SpecialOrder.php:667
-#: StockCategories.php:264 StockCategories.php:586 StockLocTransfer.php:332
-#: SuppContractChgs.php:99 SuppCreditGRNs.php:112 SuppFixedAssetChgs.php:87
-#: SuppInvGRNs.php:147 SupplierContacts.php:164 SupplierTenderCreate.php:401
-#: SupplierTenderCreate.php:429 SupplierTypes.php:191 SuppShiptChgs.php:90
-#: SuppTransGLAnalysis.php:121 TaxAuthorities.php:175 TaxCategories.php:183
-#: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186
-#: WorkCentres.php:142 WOSerialNos.php:321 WWW_Access.php:124
-#: WWW_Users.php:326 includes/InputSerialItemsKeyed.php:58
+#: AccountGroups.php:265
+#: AccountSections.php:193
+#: AddCustomerContacts.php:149
+#: AddCustomerNotes.php:138
+#: AddCustomerTypeNotes.php:132
+#: Areas.php:164
+#: BOMs.php:153
+#: BankAccounts.php:223
+#: COGSGLPostings.php:109
+#: COGSGLPostings.php:207
+#: ContractBOM.php:267
+#: ContractOtherReqts.php:120
+#: CounterSales.php:830
+#: CreditStatus.php:176
+#: Credit_Invoice.php:394
+#: Currencies.php:275
+#: CustomerReceipt.php:925
+#: CustomerTypes.php:207
+#: Customers.php:1068
+#: Departments.php:187
+#: DiscountCategories.php:223
+#: DiscountMatrix.php:183
+#: EDIMessageFormat.php:151
+#: FixedAssetCategories.php:188
+#: FreightCosts.php:243
+#: GLAccounts.php:313
+#: GLJournal.php:426
+#: GLTags.php:94
+#: GeocodeSetup.php:174
+#: InternalStockRequest.php:264
+#: Labels.php:224
+#: Labels.php:249
+#: Labels.php:497
+#: Locations.php:392
+#: MRPDemandTypes.php:121
+#: MRPDemands.php:310
+#: PO_AuthorisationLevels.php:153
+#: PO_Items.php:712
+#: PaymentMethods.php:209
+#: PaymentTerms.php:206
+#: Payments.php:1083
+#: PcAssignCashToTab.php:277
+#: PcClaimExpensesFromTab.php:266
+#: PcExpenses.php:224
+#: PcExpensesTypeTab.php:187
+#: PcTabs.php:234
+#: PcTypeTabs.php:175
+#: Prices.php:250
+#: Prices_Customer.php:279
+#: PurchData.php:229
+#: SalesAnalReptCols.php:299
+#: SalesAnalRepts.php:304
+#: SalesCategories.php:257
+#: SalesGLPostings.php:133
+#: SalesGLPostings.php:246
+#: SalesPeople.php:233
+#: SalesTypes.php:207
+#: SecurityTokens.php:131
+#: SelectCreditItems.php:767
+#: SelectCustomer.php:616
+#: SelectCustomer.php:634
+#: SelectCustomer.php:657
+#: SelectCustomer.php:674
+#: SelectCustomer.php:697
+#: SelectCustomer.php:714
+#: SelectOrderItems.php:1417
+#: Shipments.php:440
+#: Shippers.php:145
+#: SpecialOrder.php:667
+#: StockCategories.php:264
+#: StockCategories.php:586
+#: StockLocTransfer.php:332
+#: SuppContractChgs.php:99
+#: SuppCreditGRNs.php:112
+#: SuppFixedAssetChgs.php:87
+#: SuppInvGRNs.php:147
+#: SuppShiptChgs.php:90
+#: SuppTransGLAnalysis.php:121
+#: SupplierContacts.php:164
+#: SupplierTenderCreate.php:401
+#: SupplierTenderCreate.php:429
+#: SupplierTypes.php:191
+#: TaxAuthorities.php:175
+#: TaxCategories.php:183
+#: TaxGroups.php:189
+#: TaxProvinces.php:181
+#: UnitsOfMeasure.php:186
+#: WOSerialNos.php:321
+#: WWW_Access.php:124
+#: WWW_Users.php:326
+#: WorkCentres.php:142
+#: includes/InputSerialItemsKeyed.php:58
#: includes/OutputSerialItems.php:99
+#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "Hapus"
#: AccountGroups.php:273
msgid "Review Account Groups"
-msgstr "Tinjau Semua Grup Rekening"
+msgstr "Tinjau Semua Grup Akun"
#: AccountGroups.php:293
msgid "An error occurred in retrieving the account group information"
-msgstr "Kesalahan terjadi saat mengambil informasi grup rekening"
+msgstr "Kesalahan terjadi saat mengambil informasi grup akun"
#: AccountGroups.php:294
-msgid ""
-"The SQL that was used to retrieve the account group and that failed in the "
-"process was"
-msgstr ""
-"SQL yang digunakan untuk mengambil grup rekening dan yang gagal dalam proses "
-"adalah"
+msgid "The SQL that was used to retrieve the account group and that failed in the process was"
+msgstr "SQL yang digunakan untuk mengambil grup akun dan yang gagal dalam proses adalah"
#: AccountGroups.php:297
msgid "The account group name does not exist in the database"
msgstr "Nama grup akun tidak ada dalam database"
#: AccountGroups.php:311
-#, fuzzy
msgid "Edit Account Group Details"
-msgstr "Account Rincian Grup"
+msgstr "Edit Rincian Grup Akun"
-#: AccountGroups.php:319 GLAccounts.php:244 GLAccounts.php:292
+#: AccountGroups.php:319
+#: GLAccounts.php:244
+#: GLAccounts.php:292
#: Z_ImportGLAccountGroups.php:26
msgid "Account Group"
-msgstr "Grup Rekening"
+msgstr "Grup Akun"
#: AccountGroups.php:343
-#, fuzzy
msgid "New Account Group Details"
-msgstr "Account Rincian Grup"
+msgstr "Rincian Grup Akun Baru"
#: AccountGroups.php:349
msgid "Account Group Name"
-msgstr "Nama Grup Rekening"
+msgstr "Nama Grup Akun"
-#: AccountGroups.php:360 AccountGroups.php:362
+#: AccountGroups.php:360
+#: AccountGroups.php:362
msgid "Top Level Group"
msgstr "Grup Tingkat Utama (Top Level)"
#: AccountGroups.php:377
msgid "Section In Accounts"
-msgstr "Kelompok Rekening"
+msgstr "Tipe Akun"
-#: AccountGroups.php:415 AccountSections.php:259 AddCustomerContacts.php:260
-#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:228
-#: BankAccounts.php:398 BOMs.php:785 COGSGLPostings.php:355
-#: CreditStatus.php:259 Currencies.php:402 CustLoginSetup.php:273
-#: Departments.php:255 DiscountMatrix.php:142 EDIMessageFormat.php:248
-#: FixedAssetCategories.php:347 FixedAssetLocations.php:157
-#: FreightCosts.php:342 GeocodeSetup.php:271 GLAccounts.php:262 Labels.php:531
-#: Locations.php:607 MRPDemands.php:424 MRPDemandTypes.php:188
-#: OffersReceived.php:57 OffersReceived.php:146 PaymentMethods.php:300
-#: PaymentTerms.php:310 PO_AuthorisationLevels.php:262 Prices_Customer.php:361
-#: SalesAnalReptCols.php:552 SalesAnalRepts.php:516 SalesGLPostings.php:417
-#: SalesPeople.php:370 Shippers.php:203 StockCategories.php:613
-#: SupplierContacts.php:282 SuppLoginSetup.php:295 TaxAuthorities.php:329
-#: TaxCategories.php:238 TaxProvinces.php:235 UnitsOfMeasure.php:241
-#: WorkCentres.php:280 WWW_Users.php:699
+#: AccountGroups.php:415
+#: AccountSections.php:259
+#: AddCustomerContacts.php:260
+#: AddCustomerNotes.php:242
+#: AddCustomerTypeNotes.php:221
+#: Areas.php:228
+#: BOMs.php:785
+#: BankAccounts.php:398
+#: COGSGLPostings.php:355
+#: CreditStatus.php:259
+#: Currencies.php:402
+#: CustLoginSetup.php:273
+#: Departments.php:255
+#: DiscountMatrix.php:142
+#: EDIMessageFormat.php:248
+#: FixedAssetCategories.php:347
+#: FixedAssetLocations.php:157
+#: FreightCosts.php:342
+#: GLAccounts.php:262
+#: GeocodeSetup.php:271
+#: Labels.php:531
+#: Locations.php:607
+#: MRPDemandTypes.php:188
+#: MRPDemands.php:424
+#: OffersReceived.php:57
+#: OffersReceived.php:146
+#: PO_AuthorisationLevels.php:262
+#: PaymentMethods.php:300
+#: PaymentTerms.php:310
+#: Prices_Customer.php:361
+#: SalesAnalReptCols.php:552
+#: SalesAnalRepts.php:516
+#: SalesGLPostings.php:417
+#: SalesPeople.php:370
+#: Shippers.php:203
+#: StockCategories.php:613
+#: SuppLoginSetup.php:295
+#: SupplierContacts.php:282
+#: TaxAuthorities.php:329
+#: TaxCategories.php:238
+#: TaxProvinces.php:235
+#: UnitsOfMeasure.php:241
+#: WWW_Users.php:699
+#: WorkCentres.php:280
msgid "Enter Information"
msgstr "Masukkan Informasi"
-#: AccountSections.php:7 includes/MainMenuLinksArray.php:376
+#: AccountSections.php:7
+#: includes/MainMenuLinksArray.php:376
msgid "Account Sections"
-msgstr "Kelompok Rekening"
+msgstr "Tipe Akun"
#: AccountSections.php:61
msgid "The account section already exists in the database"
-msgstr "Kelompok rekening tersebut sudah ada di database"
+msgstr "Tipe akun tersebut sudah ada di database"
#: AccountSections.php:68
-#, fuzzy
msgid "The account section name cannot contain any illegal characters"
-msgstr "Nama kelompok rekening tidak dapat berisi karakter"
+msgstr "Nama tipe akun tidak boleh berisi karakter + ? . & \\ \" < >"
#: AccountSections.php:74
msgid "The account section name must contain at least one character"
-msgstr "Nama kelompok rekening minimum 1 karakter"
+msgstr "Nama tipe akun minimum 1 karakter"
-#: AccountSections.php:80 AccountSections.php:86
+#: AccountSections.php:80
+#: AccountSections.php:86
msgid "The section number must be an integer"
-msgstr "Nomor kelompok rekening harus bilangan bulat"
+msgstr "Nomor tipe akun harus bilangan bulat"
#: AccountSections.php:128
-msgid ""
-"Cannot delete this account section because general ledger accounts groups "
-"have been created using this section"
-msgstr ""
-"Tidak dapat menghapus kelompok rekening ini karena grup rekening buku besar "
-"telah dibuat menggunakan kelompok ini"
+msgid "Cannot delete this account section because general ledger accounts groups have been created using this section"
+msgstr "Tidak dapat menghapus tipe akun ini karena grup akun buku besar telah dibuat menggunakan tipe ini"
#: AccountSections.php:130
msgid "general ledger accounts groups that refer to this account section"
-msgstr "rekening buku besar yang mereferensi pada kelompok rekening tersebut"
+msgstr "akun buku besar yang mereferensi pada tipe akun tersebut"
#: AccountSections.php:142
msgid "section has been deleted"
-msgstr "kelompok telah dihapus"
+msgstr "tipe telah dihapus"
#: AccountSections.php:167
msgid "Could not get account group sections because"
-msgstr "Tidak dapat mengambil kelompok grup rekening karena"
+msgstr "Tidak dapat mengambil tipe grup akun karena"
-#: AccountSections.php:173 AccountSections.php:232 AccountSections.php:250
+#: AccountSections.php:173
+#: AccountSections.php:232
+#: AccountSections.php:250
msgid "Section Number"
-msgstr "Nomor Kelompok"
+msgstr "Nomor Tipe"
-#: AccountSections.php:174 AccountSections.php:254
+#: AccountSections.php:174
+#: AccountSections.php:254
msgid "Section Description"
-msgstr "Keterangan Kelompok"
+msgstr "Keterangan Tipe"
#: AccountSections.php:191
msgid "Restricted"
@@ -536,84 +917,107 @@
#: AccountSections.php:202
msgid "Review Account Sections"
-msgstr "Tinjau Semua Kelompok Rekening"
+msgstr "Tinjau Semua Tipe Akun"
#: AccountSections.php:221
msgid "Could not retrieve the requested section please try again."
-msgstr "Tidak dapat mengambil kelompok yang diminta, silahkan coba kembali."
+msgstr "Tidak dapat mengambil tipe yang diminta, silahkan coba kembali."
-#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:607
+#: AddCustomerContacts.php:6
+#: AddCustomerContacts.php:59
+#: SelectCustomer.php:607
#: SelectCustomer.php:640
msgid "Customer Contacts"
-msgstr "Kontak Person Customer"
+msgstr "Kontak Customer"
-#: AddCustomerContacts.php:20 CustEDISetup.php:9 CustLoginSetup.php:21
+#: AddCustomerContacts.php:20
+#: CustEDISetup.php:9
+#: CustLoginSetup.php:21
#: Z_CheckDebtorsControl.php:14
msgid "Back to Customers"
msgstr "Kembali ke Data Customer"
#: AddCustomerContacts.php:25
-#, fuzzy
msgid "Contacts for Customer"
-msgstr "Kontak Person untuk Customer : <b>"
+msgstr "Kontak untuk Customer"
#: AddCustomerContacts.php:27
-#, fuzzy
msgid "Edit contact for"
msgstr "Edit kontak untuk"
#: AddCustomerContacts.php:39
-#, fuzzy
msgid "The Contact ID must be an integer."
-msgstr "Kontak Person tersebut harus bilangan bulat"
+msgstr "ID Kontak harus bilangan bulat"
#: AddCustomerContacts.php:42
-#, fuzzy
msgid "The contact name must be forty characters or less long"
-msgstr "Nama kontak person maksimum 40 karakter"
+msgstr "Nama kontak maksimum 40 karakter"
#: AddCustomerContacts.php:45
-#, fuzzy
msgid "The contact name may not be empty"
-msgstr "Nama kontak person tidak boleh kosong"
+msgstr "Nama kontak tidak boleh kosong"
#: AddCustomerContacts.php:48
-#, fuzzy
msgid "The contact email address is not a valid email address"
-msgstr ""
-"Alamat email tidak muncul untuk menjadi alamat email yang valid. Transaksi "
-"ini tidak diemail"
+msgstr "Alamat email kontak tidak benar"
-#: AddCustomerContacts.php:59 AddCustomerNotes.php:51
-#: AddCustomerTypeNotes.php:48 Areas.php:71 CustomerTypes.php:69
-#: DeliveryDetails.php:773 DeliveryDetails.php:784 Factors.php:105
-#: FixedAssetItems.php:246 MRPCalendar.php:176 PcAssignCashToTab.php:88
-#: PcClaimExpensesFromTab.php:79 PcExpenses.php:95 PcTabs.php:101
-#: PcTypeTabs.php:60 PO_Items.php:370 SalesAnalReptCols.php:129
-#: SalesPeople.php:97 SalesTypes.php:66 Stocks.php:508 Suppliers.php:513
+#: AddCustomerContacts.php:59
+#: AddCustomerNotes.php:51
+#: AddCustomerTypeNotes.php:48
+#: Areas.php:71
+#: CustomerTypes.php:69
+#: DeliveryDetails.php:778
+#: DeliveryDetails.php:789
+#: Factors.php:105
+#: FixedAssetItems.php:246
+#: MRPCalendar.php:176
+#: PO_Items.php:370
+#: PcAssignCashToTab.php:88
+#: PcClaimExpensesFromTab.php:79
+#: PcExpenses.php:95
+#: PcTabs.php:101
+#: PcTypeTabs.php:60
+#: SalesAnalReptCols.php:129
+#: SalesPeople.php:97
+#: SalesTypes.php:66
+#: Stocks.php:508
#: SupplierTypes.php:67
+#: Suppliers.php:513
msgid "has been updated"
msgstr "telah diperbarui"
#: AddCustomerContacts.php:74
msgid "The contact record has been added"
-msgstr "Data kontak person telah ditambahkan"
+msgstr "Data kontak telah ditambahkan"
#: AddCustomerContacts.php:103
msgid "The contact record has been deleted"
-msgstr "Data kontak person telah dihapus"
+msgstr "Data kontak telah dihapus"
-#: AddCustomerContacts.php:126 CompanyPreferences.php:224
-#: CustomerBranches.php:368 Customers.php:1020 Customers.php:1028
-#: SalesPeople.php:200 SelectCustomer.php:610 StockDispatch.php:237
-#: StockDispatch.php:248 StockDispatch.php:259 SupplierContacts.php:150
-#: SuppTransGLAnalysis.php:105 includes/InputSerialItemsFile.php:92
-#: includes/InputSerialItemsFile.php:144 includes/PDFTaxPageHeader.inc:37
+#: AddCustomerContacts.php:126
+#: CompanyPreferences.php:224
+#: CustomerBranches.php:368
+#: Customers.php:1020
+#: Customers.php:1028
+#: SalesPeople.php:200
+#: SelectCustomer.php:610
+#: StockDispatch.php:237
+#: StockDispatch.php:248
+#: StockDispatch.php:259
+#: SuppTransGLAnalysis.php:105
+#: SupplierContacts.php:150
+#: includes/PDFTaxPageHeader.inc:37
+#: includes/InputSerialItemsFile.php:92
+#: includes/InputSerialItemsFile.php:144
msgid "Name"
msgstr "Nama"
-#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1021
-#: Customers.php:1029 SelectCustomer.php:611 WWW_Access.php:107
+#: AddCustomerContacts.php:127
+#: AddCustomerContacts.php:223
+#: Customers.php:1021
+#: Customers.php:1029
+#: SelectCustomer.php:611
+#: WWW_Access.php:107
#: WWW_Access.php:170
msgid "Role"
msgstr "Posisi"
@@ -622,186 +1026,266 @@
msgid "Phone no"
msgstr "Telpon"
-#: AddCustomerContacts.php:129 AddCustomerContacts.php:241
-#: CustomerBranches.php:374 CustomerBranches.php:783 CustomerInquiry.php:257
-#: Customers.php:1023 Customers.php:1031 EmailCustTrans.php:15
-#: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:573
-#: OrderDetails.php:109 PDFRemittanceAdvice.php:251 PO_PDFPurchOrder.php:379
-#: PO_PDFPurchOrder.php:382 PrintCustTrans.php:718 PrintCustTrans.php:949
-#: PrintCustTrans.php:998 PrintCustTransPortrait.php:756
-#: PrintCustTransPortrait.php:1002 PrintCustTransPortrait.php:1058
-#: SelectCustomer.php:422 SelectCustomer.php:613 SupplierContacts.php:154
-#: SupplierContacts.php:275 UserSettings.php:185 WWW_Users.php:281
-#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:67
+#: AddCustomerContacts.php:129
+#: AddCustomerContacts.php:241
+#: CustomerBranches.php:374
+#: CustomerBranches.php:783
+#: CustomerInquiry.php:257
+#: Customers.php:1023
+#: Customers.php:1031
+#: EmailCustTrans.php:15
+#: EmailCustTrans.php:64
+#: Factors.php:246
+#: Factors.php:297
+#: Locations.php:573
+#: OrderDetails.php:109
+#: PDFRemittanceAdvice.php:251
+#: PO_PDFPurchOrder.php:379
+#: PO_PDFPurchOrder.php:382
+#: PrintCustTrans.php:718
+#: PrintCustTrans.php:949
+#: PrintCustTrans.php:998
+#: PrintCustTransPortrait.php:766
+#: PrintCustTransPortrait.php:1012
+#: PrintCustTransPortrait.php:1068
+#: SelectCustomer.php:422
+#: SelectCustomer.php:613
+#: SupplierContacts.php:154
+#: SupplierContacts.php:275
+#: UserSettings.php:185
+#: WWW_Users.php:281
+#: includes/PDFPickingListHeader.inc:25
+#: includes/PDFStatementPageHeader.inc:67
#: includes/PDFTransPageHeader.inc:82
-#: includes/PDFTransPageHeaderPortrait.inc:109
+#: includes/PDFTransPageHeaderPortrait.inc:135
#: includes/PO_PDFOrderPageHeader.inc:29
msgid "Email"
msgstr "Email"
-#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1024
-#: Customers.php:1032 PcAssignCashToTab.php:238 PcAssignCashToTab.php:369
-#: PcAuthorizeExpenses.php:92 PcClaimExpensesFromTab.php:227
-#: PcClaimExpensesFromTab.php:386 PcReportTab.php:331 SelectCustomer.php:614
-#: SystemParameters.php:339 WOSerialNos.php:292 WOSerialNos.php:298
+#: AddCustomerContacts.php:130
+#: AddCustomerContacts.php:250
+#: Customers.php:1024
+#: Customers.php:1032
+#: PcAssignCashToTab.php:238
+#: PcAssignCashToTab.php:369
+#: PcAuthorizeExpenses.php:92
+#: PcClaimExpensesFromTab.php:227
+#: PcClaimExpensesFromTab.php:386
+#: PcReportTab.php:331
+#: SelectCustomer.php:614
+#: SystemParameters.php:339
+#: WOSerialNos.php:292
+#: WOSerialNos.php:298
msgid "Notes"
msgstr "Catatan"
-#: AddCustomerContacts.php:149 SupplierContacts.php:164
+#: AddCustomerContacts.php:149
+#: SupplierContacts.php:164
#, php-format
msgid "Are you sure you wish to delete this contact?"
-msgstr "Apakah Anda yakin ingin menghapus kontak person ini?"
+msgstr "Apakah Anda yakin ingin menghapus kontak ini?"
#: AddCustomerContacts.php:168
msgid "Review all contacts for this Customer"
-msgstr "Tinjau semua kontak person untuk Customer ini"
+msgstr "Tinjau semua kontak untuk Customer ini"
#: AddCustomerContacts.php:206
msgid "Contact Code"
-msgstr "Kode Kontak Person"
+msgstr "Kode Kontak"
-#: AddCustomerContacts.php:214 Factors.php:234 SupplierContacts.php:237
+#: AddCustomerContacts.php:214
+#: Factors.php:234
+#: SupplierContacts.php:237
msgid "Contact Name"
-msgstr "Nama Kontak Person"
+msgstr "Nama Kontak"
-#: AddCustomerContacts.php:232 Contracts.php:775 PDFRemittanceAdvice.php:247
-#: PO_Header.php:1000 PO_Header.php:1080 SelectCreditItems.php:241
-#: SelectCustomer.php:420 SelectOrderItems.php:621
-#: SupplierTenderCreate.php:374 includes/PDFStatementPageHeader.inc:63
+#: AddCustomerContacts.php:232
+#: Contracts.php:775
+#: PDFRemittanceAdvice.php:247
+#: PO_Header.php:1000
+#: PO_Header.php:1080
+#: SelectCreditItems.php:241
+#: SelectCustomer.php:420
+#: SelectOrderItems.php:621
+#: SupplierTenderCreate.php:374
+#: includes/PDFStatementPageHeader.inc:63
#: includes/PDFTransPageHeader.inc:81
-#: includes/PDFTransPageHeaderPortrait.inc:105
+#: includes/PDFTransPageHeaderPortrait.inc:131
msgid "Phone"
msgstr "Telpon"
-#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:649
+#: AddCustomerNotes.php:6
+#: AddCustomerNotes.php:51
+#: SelectCustomer.php:649
#: SelectCustomer.php:680
msgid "Customer Notes"
msgstr "Catatan Customer"
-#: AddCustomerNotes.php:21 AddCustomerTypeNotes.php:19
+#: AddCustomerNotes.php:21
+#: AddCustomerTypeNotes.php:19
msgid "Back to Select Customer"
msgstr "Kembali ke Data Customer"
#: AddCustomerNotes.php:34
msgid "The contact priority must be an integer."
-msgstr "Prioritas kontak person harus bilangan bulat"
+msgstr "Prioritas kontak harus bilangan bulat"
#: AddCustomerNotes.php:37
msgid "The contact's notes must be two hundred characters or less long"
-msgstr "Catatan kontak person maksimum 200 karakter"
+msgstr "Catatan kontak maksimum 200 karakter"
#: AddCustomerNotes.php:40
msgid "The contact's notes may not be empty"
-msgstr "Catatan kontak person tidak boleh kosong"
+msgstr "Catatan kontak tidak boleh kosong"
#: AddCustomerNotes.php:64
msgid "The contact notes record has been added"
-msgstr "Data catatan kontak person telah ditambah"
+msgstr "Data catatan kontak telah ditambah"
#: AddCustomerNotes.php:91
msgid "The contact note record has been deleted"
-msgstr "Data catatan kontak person telah dihapus"
+msgstr "Data catatan kontak telah dihapus"
#: AddCustomerNotes.php:101
msgid "Notes for Customer"
-msgstr "Catatan untuk Pelanggan"
+msgstr "Catatan untuk Customer"
-#: AddCustomerNotes.php:117 AddCustomerNotes.php:222
-#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
-#: BankMatching.php:272 BankReconciliation.php:209 BankReconciliation.php:286
-#: ContractCosting.php:173 CustomerAllocations.php:330
-#: CustomerAllocations.php:364 CustomerInquiry.php:200
-#: CustomerTransInquiry.php:102 GLAccountInquiry.php:155
-#: GLAccountReport.php:340 GLTransInquiry.php:42 MRPCalendar.php:219
-#: PaymentAllocations.php:66 PcAssignCashToTab.php:234
-#: PcAuthorizeExpenses.php:88 PDFRemittanceAdvice.php:308
-#: PrintCustTrans.php:826 PrintCustTransPortrait.php:870 ReverseGRN.php:392
-#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:491
-#: StockDispatch.php:239 StockDispatch.php:250 StockDispatch.php:261
-#: StockLocMovements.php:91 StockMovements.php:95
-#: StockSerialItemResearch.php:81 SupplierAllocations.php:456
-#: SupplierAllocations.php:569 SupplierAllocations.php:644
-#: SupplierInquiry.php:211 SupplierTransInquiry.php:105
-#: includes/PDFQuotationPageHeader.inc:93
+#: AddCustomerNotes.php:117
+#: AddCustomerNotes.php:222
+#: AddCustomerTypeNotes.php:111
+#: AddCustomerTypeNotes.php:211
+#: BankMatching.php:272
+#: BankReconciliation.php:209
+#: BankReconciliation.php:286
+#: ContractCosting.php:173
+#: CustomerAllocations.php:330
+#: CustomerAllocations.php:364
+#: CustomerInquiry.php:200
+#: CustomerTransInquiry.php:102
+#: GLAccountInquiry.php:155
+#: GLAccountReport.php:340
+#: GLTransInquiry.php:42
+#: MRPCalendar.php:219
+#: PDFRemittanceAdvice.php:308
+#: PaymentAllocations.php:66
+#: PcAssignCashToTab.php:234
+#: PcAuthorizeExpenses.php:88
+#: PrintCustTrans.php:826
+#: PrintCustTransPortrait.php:880
+#: ReverseGRN.php:392
+#: ShipmentCosting.php:538
+#: ShipmentCosting.php:615
+#: Shipments.php:491
+#: StockDispatch.php:239
+#: StockDispatch.php:250
+#: StockDispatch.php:261
+#: StockLocMovements.php:91
+#: StockMovements.php:95
+#: StockSerialItemResearch.php:81
+#: SupplierAllocations.php:456
+#: SupplierAllocations.php:569
+#: SupplierAllocations.php:644
+#: SupplierInquiry.php:211
+#: SupplierTransInquiry.php:105
+#: includes/PDFQuotationPageHeader.inc:107
#: includes/PDFQuotationPortraitPageHeader.inc:91
-#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
+#: includes/PDFStatementPageHeader.inc:169
+#: includes/PDFTaxPageHeader.inc:36
#: includes/PDFTransPageHeader.inc:48
#: includes/PDFTransPageHeaderPortrait.inc:58
+#: reportwriter/languages/en_US/reports.php:64
msgid "Date"
msgstr "Tanggal"
-#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:176
-#: Stocks.php:1055 Up...
[truncated message content] |
|
From: <dai...@us...> - 2012-09-07 22:46:25
|
Revision: 5631
http://web-erp.svn.sourceforge.net/web-erp/?rev=5631&view=rev
Author: daintree
Date: 2012-09-07 22:46:18 +0000 (Fri, 07 Sep 2012)
Log Message:
-----------
remove use of REQUEST
Modified Paths:
--------------
trunk/SelectSalesOrder.php
trunk/SelectWorkOrder.php
trunk/WorkOrderEntry.php
trunk/WorkOrderStatus.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2012-09-07 11:56:04 UTC (rev 5630)
+++ trunk/SelectSalesOrder.php 2012-09-07 22:46:18 UTC (rev 5631)
@@ -7,10 +7,22 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
-if (isset($_REQUEST['SelectedStockItem'])) {
- $_REQUEST['SelectedStockItem'] = DB_escape_string($_REQUEST['SelectedStockItem']);
+if (isset($_GET['SelectedStockItem'])) {
+ $SelectedStockItem = $_GET['SelectedStockItem'];
+} elseif (isset($_POST['SelectedStockItem'])){
+ $SelectedStockItem = $_POST['SelectedStockItem'];
+} else {
+ unset($SelectedStockItem);
}
+if (isset($_GET['SelectedCustomer'])) {
+ $SelectedCustomer = $_GET['SelectedCustomer'];
+} elseif (isset($_POST['SelectedCustomer'])){
+ $SelectedCustomer = $_POST['SelectedCustomer'];
+} else {
+ unset($SelectedCustomer);
+}
+
if (isset($_POST['PlacePO'])){ /*user hit button to place PO for selected orders */
/*Note the button would not have been displayed if the user had no authority to create purchase orders */
@@ -392,7 +404,7 @@
if (isset($_POST['ResetPart'])){
- unset($_REQUEST['SelectedStockItem']);
+ unset($SelectedStockItem);
}
echo '<br /><div class="centre">';
@@ -408,12 +420,12 @@
echo _('Order Number') . ' - ' . $_REQUEST['OrderNumber'];
}
} else {
- if (isset($_REQUEST['SelectedCustomer'])) {
- echo _('For customer') . ': ' . $_REQUEST['SelectedCustomer'] . ' ' . _('and') . ' ';
- echo '<input type="hidden" name="SelectedCustomer" value="' . $_REQUEST['SelectedCustomer'] . '" />';
+ if (isset($SelectedCustomer)) {
+ echo _('For customer') . ': ' . $SelectedCustomer . ' ' . _('and') . ' ';
+ echo '<input type="hidden" name="SelectedCustomer" value="' . $SelectedCustomer . '" />';
}
- if (isset($_REQUEST['SelectedStockItem'])) {
- echo _('for the part') . ': ' . $_REQUEST['SelectedStockItem'] . ' ' . _('and') . ' <input type="hidden" name="SelectedStockItem" value="' . $_REQUEST['SelectedStockItem'] . '" />';
+ if (isset($SelectedStockItem)) {
+ echo _('for the part') . ': ' . $SelectedStockItem . ' ' . _('and') . ' <input type="hidden" name="SelectedStockItem" value="' . $SelectedStockItem . '" />';
}
}
@@ -492,7 +504,7 @@
$OrdersAfterDate = Date('d/m/Y',Mktime(0,0,0,Date('m')-2,Date('d'),Date('Y')));
*/
- if (!isset($_REQUEST['OrderNumber']) or $_REQUEST['OrderNumber']==''){
+ if (!isset($_REQUEST['OrderNumber']) OR $_REQUEST['OrderNumber']==''){
echo '<table class="selection">
<tr>
@@ -673,9 +685,9 @@
} else {
/* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
- if (isset($_REQUEST['SelectedCustomer'])) {
+ if (isset($SelectedCustomer)) {
- if (isset($_REQUEST['SelectedStockItem'])) {
+ if (isset($SelectedStockItem)) {
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
custbranch.brname,
@@ -697,8 +709,8 @@
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorderdetails.completed=0
AND salesorders.quotation =" .$Quotations . "
- AND salesorderdetails.stkcode='". $_REQUEST['SelectedStockItem'] ."'
- AND salesorders.debtorno='" . $_REQUEST['SelectedCustomer'] ."'
+ AND salesorderdetails.stkcode='". $SelectedStockItem ."'
+ AND salesorders.debtorno='" . $SelectedCustomer ."'
AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'
ORDER BY salesorders.orderno";
@@ -725,7 +737,7 @@
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorders.quotation =" .$Quotations . "
AND salesorderdetails.completed=0
- AND salesorders.debtorno='" . $_REQUEST['SelectedCustomer'] . "'
+ AND salesorders.debtorno='" . $SelectedCustomer . "'
AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'
GROUP BY salesorders.orderno,
debtorsmaster.name,
@@ -740,7 +752,7 @@
}
} else { //no customer selected
- if (isset($_REQUEST['SelectedStockItem'])) {
+ if (isset($SelectedStockItem)) {
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
custbranch.brname,
@@ -762,7 +774,7 @@
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorderdetails.completed=0
AND salesorders.quotation =" .$Quotations . "
- AND salesorderdetails.stkcode='". $_REQUEST['SelectedStockItem'] . "'
+ AND salesorderdetails.stkcode='". $SelectedStockItem . "'
AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'
GROUP BY salesorders.orderno,
debtorsmaster.name,
Modified: trunk/SelectWorkOrder.php
===================================================================
--- trunk/SelectWorkOrder.php 2012-09-07 11:56:04 UTC (rev 5630)
+++ trunk/SelectWorkOrder.php 2012-09-07 22:46:18 UTC (rev 5631)
@@ -12,19 +12,36 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+if (isset($_GET['WO'])) {
+ $SelectedWO = $_GET['WO'];
+} elseif (isset($_POST['WO'])){
+ $SelectedWO = $_POST['WO'];
+} else {
+ unset($SelectedWO);
+}
+
+if (isset($_GET['SelectedStockItem'])) {
+ $SelectedStockItem = $_GET['SelectedStockItem'];
+} elseif (isset($_POST['SelectedStockItem'])){
+ $SelectedStockItem = $_POST['SelectedStockItem'];
+} else {
+ unset($SelectedStockItem);
+}
+
+
if (isset($_POST['ResetPart'])){
- unset($_REQUEST['SelectedStockItem']);
+ unset($SelectedStockItem);
}
-if (isset($_REQUEST['WO']) AND $_REQUEST['WO']!='') {
- $_REQUEST['WO'] = trim($_REQUEST['WO']);
- if (!is_numeric($_REQUEST['WO'])){
+if (isset($SelectedWO) AND $SelectedWO!='') {
+ $SelectedWO = trim($SelectedWO);
+ if (!is_numeric($SelectedWO)){
prnMsg(_('The work order number entered MUST be numeric'),'warn');
- unset ($_REQUEST['WO']);
+ unset ($SelectedWO);
include('includes/footer.inc');
exit;
} else {
- echo _('Work Order Number') . ' - ' . $_REQUEST['WO'];
+ echo _('Work Order Number') . ' - ' . $SelectedWO;
}
}
@@ -108,10 +125,10 @@
$OrdersAfterDate = Date('d/m/Y',Mktime(0,0,0,Date('m')-2,Date('d'),Date('Y')));
*/
- if (!isset($_REQUEST['WO']) or ($_REQUEST['WO']=='')){
+ if (!isset($SelectedWO) or ($SelectedWO=='')){
echo '<table class="selection"><tr><td>';
- if (isset($_REQUEST['SelectedStockItem'])) {
- echo _('For the item') . ': ' . $_REQUEST['SelectedStockItem'] . ' ' . _('and') . ' <input type="hidden" name="SelectedStockItem" value="' . $_REQUEST['SelectedStockItem'] . '" />';
+ if (isset($SelectedStockItem)) {
+ echo _('For the item') . ': ' . $SelectedStockItem . ' ' . _('and') . ' <input type="hidden" name="SelectedStockItem" value="' . $SelectedStockItem . '" />';
}
echo _('Work Order number') . ': <input type="text" name="WO" maxlength="8" size="9" /> ' . _('Processing at') . ':<select name="StockLocation"> ';
@@ -244,7 +261,7 @@
} else {
$ClosedOrOpen = 1;
}
- if (isset($_REQUEST['WO']) AND $_REQUEST['WO'] !='') {
+ if (isset($SelectedWO) AND $SelectedWO !='') {
$SQL = "SELECT workorders.wo,
woitems.stockid,
stockmaster.description,
@@ -257,13 +274,13 @@
INNER JOIN woitems ON workorders.wo=woitems.wo
INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
WHERE workorders.closed='" . $ClosedOrOpen . "'
- AND workorders.wo='". $_REQUEST['WO'] ."'
+ AND workorders.wo='". $SelectedWO ."'
ORDER BY workorders.wo,
woitems.stockid";
} else {
/* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
- if (isset($_REQUEST['SelectedStockItem'])) {
+ if (isset($SelectedStockItem)) {
$SQL = "SELECT workorders.wo,
woitems.stockid,
stockmaster.description,
@@ -276,7 +293,7 @@
INNER JOIN woitems ON workorders.wo=woitems.wo
INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
WHERE workorders.closed='" . $ClosedOrOpen . "'
- AND woitems.stockid='". $_REQUEST['SelectedStockItem'] ."'
+ AND woitems.stockid='". $SelectedStockItem ."'
AND workorders.loccode='" . $_POST['StockLocation'] . "'
ORDER BY workorders.wo,
woitems.stockid";
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2012-09-07 11:56:04 UTC (rev 5630)
+++ trunk/WorkOrderEntry.php 2012-09-07 22:46:18 UTC (rev 5631)
@@ -11,6 +11,15 @@
<img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'
</p>';
+
+if (isset($_GET['WO'])) {
+ $SelectedWO = $_GET['WO'];
+} elseif (isset($_POST['WO'])){
+ $SelectedWO = $_POST['WO'];
+} else {
+ unset($SelectedWO);
+}
+
if (isset($_GET['ReqDate'])){
$ReqDate = ConvertSQLDate($_GET['ReqDate']);
} else {
@@ -36,9 +45,9 @@
}
// check for new or modify condition
-if (isset($_REQUEST['WO']) AND$_REQUEST['WO']!=''){
+if (isset($SelectedWO) AND$SelectedWO!=''){
// modify
- $_POST['WO'] = (int)$_REQUEST['WO'];
+ $_POST['WO'] = (int)$SelectedWO;
$EditingExisting = true;
} else {
// new
@@ -274,7 +283,7 @@
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') .'">' . _('Enter a new work order') . '</a>';
echo '<br /><a href="' . $rootpath . '/SelectWorkOrder.php">' . _('Select an existing work order') . '</a>';
- echo '<br /><a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Go to Costing'). '</a></div>';
+ echo '<br /><a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $SelectedWO . '">' . _('Go to Costing'). '</a></div>';
$Input_Error = false; //hope for the best
for ($i=1;$i<=$_POST['NumberOfOutputs'];$i++){
Modified: trunk/WorkOrderStatus.php
===================================================================
--- trunk/WorkOrderStatus.php 2012-09-07 11:56:04 UTC (rev 5630)
+++ trunk/WorkOrderStatus.php 2012-09-07 22:46:18 UTC (rev 5631)
@@ -5,117 +5,133 @@
$title = _('Work Order Status Inquiry');
include('includes/header.inc');
- $ErrMsg = _('Could not retrieve the details of the selected work order item');
- $WOResult = DB_query("SELECT workorders.loccode,
- locations.locationname,
- workorders.requiredby,
- workorders.startdate,
- workorders.closed,
- stockmaster.description,
- stockmaster.decimalplaces,
- stockmaster.units,
- woitems.qtyreqd,
- woitems.qtyrecd
- FROM workorders INNER JOIN locations
- ON workorders.loccode=locations.loccode
- INNER JOIN woitems
- ON workorders.wo=woitems.wo
- INNER JOIN stockmaster
- ON woitems.stockid=stockmaster.stockid
- WHERE woitems.stockid='" . $_REQUEST['StockID'] . "'
- AND woitems.wo ='" . $_REQUEST['WO'] . "'",
- $db,
- $ErrMsg);
+if (isset($_GET['WO'])) {
+ $SelectedWO = $_GET['WO'];
+} elseif (isset($_POST['WO'])){
+ $SelectedWO = $_POST['WO'];
+} else {
+ unset($SelectedWO);
+}
+if (isset($_GET['StockID'])) {
+ $StockID = $_GET['StockID'];
+} elseif (isset($_POST['StockID'])){
+ $StockID = $_POST['StockID'];
+} else {
+ unset($StockID);
+}
- if (DB_num_rows($WOResult)==0){
- prnMsg(_('The selected work order item cannot be retrieved from the database'),'info');
- include('includes/footer.inc');
- exit;
- }
- $WORow = DB_fetch_array($WOResult);
- echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a><br />';
- echo '<a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Back to Costing'). '</a><br />';
+$ErrMsg = _('Could not retrieve the details of the selected work order item');
+$WOResult = DB_query("SELECT workorders.loccode,
+ locations.locationname,
+ workorders.requiredby,
+ workorders.startdate,
+ workorders.closed,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ stockmaster.units,
+ woitems.qtyreqd,
+ woitems.qtyrecd
+ FROM workorders INNER JOIN locations
+ ON workorders.loccode=locations.loccode
+ INNER JOIN woitems
+ ON workorders.wo=woitems.wo
+ INNER JOIN stockmaster
+ ON woitems.stockid=stockmaster.stockid
+ WHERE woitems.stockid='" . $StockID . "'
+ AND woitems.wo ='" . $SelectedWO . "'",
+ $db,
+ $ErrMsg);
- echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $title.'
- </p>';
+if (DB_num_rows($WOResult)==0){
+ prnMsg(_('The selected work order item cannot be retrieved from the database'),'info');
+ include('includes/footer.inc');
+ exit;
+}
+$WORow = DB_fetch_array($WOResult);
- echo '<table cellpadding="2" class="selection">
- <tr>
- <td class="label">' . _('Work order Number') . ':</td>
- <td>' . $_REQUEST['WO'] .'</td>
- <td class="label">' . _('Item') . ':</td>
- <td>' . $_REQUEST['StockID'] . ' - ' . $WORow['description'] . '</td>
- </tr>
- <tr>
- <td class="label">' . _('Manufactured at') . ':</td>
- <td>' . $WORow['locationname'] . '</td>
- <td class="label">' . _('Required By') . ':</td>
- <td>' . ConvertSQLDate($WORow['requiredby']) . '</td>
- </tr>
- <tr>
- <td class="label">' . _('Quantity Ordered') . ':</td>
- <td class="number">' . locale_number_format($WORow['qtyreqd'],$WORow['decimalplaces']) . '</td>
- <td colspan="2">' . $WORow['units'] . '</td>
- </tr>
- <tr>
- <td class="label">' . _('Already Received') . ':</td>
- <td class="number">' . locale_number_format($WORow['qtyrecd'],$WORow['decimalplaces']) . '</td>
- <td colspan="2">' . $WORow['units'] . '</td>
- </tr>
- <tr>
- <td class="label">' . _('Start Date') . ':</td>
- <td>' . ConvertSQLDate($WORow['startdate']) . '</td>
- </tr>
- </table>
- <br />';
+echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a><br />';
+echo '<a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $SelectedWO . '">' . _('Back to Costing'). '</a><br />';
- //set up options for selection of the item to be issued to the WO
- echo '<table class="selection">
- <tr>
- <th colspan="5"><h3>' . _('Material Requirements For this Work Order') . '</h3></th>
- </tr>';
- echo '<tr>
- <th colspan="2">' . _('Item') . '</th>
- <th>' . _('Qty Required') . '</th>
- <th>' . _('Qty Issued') . '</th>
+echo '<p class="page_title_text">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' .
+ _('Search') . '" alt="" />' . ' ' . $title.'
+ </p>';
+
+echo '<table cellpadding="2" class="selection">
+ <tr>
+ <td class="label">' . _('Work order Number') . ':</td>
+ <td>' . $SelectedWO .'</td>
+ <td class="label">' . _('Item') . ':</td>
+ <td>' . $StockID . ' - ' . $WORow['description'] . '</td>
+ </tr>
+ <tr>
+ <td class="label">' . _('Manufactured at') . ':</td>
+ <td>' . $WORow['locationname'] . '</td>
+ <td class="label">' . _('Required By') . ':</td>
+ <td>' . ConvertSQLDate($WORow['requiredby']) . '</td>
+ </tr>
+ <tr>
+ <td class="label">' . _('Quantity Ordered') . ':</td>
+ <td class="number">' . locale_number_format($WORow['qtyreqd'],$WORow['decimalplaces']) . '</td>
+ <td colspan="2">' . $WORow['units'] . '</td>
+ </tr>
+ <tr>
+ <td class="label">' . _('Already Received') . ':</td>
+ <td class="number">' . locale_number_format($WORow['qtyrecd'],$WORow['decimalplaces']) . '</td>
+ <td colspan="2">' . $WORow['units'] . '</td>
+ </tr>
+ <tr>
+ <td class="label">' . _('Start Date') . ':</td>
+ <td>' . ConvertSQLDate($WORow['startdate']) . '</td>
+ </tr>
+ </table>
+ <br />';
+
+ //set up options for selection of the item to be issued to the WO
+ echo '<table class="selection">
+ <tr>
+ <th colspan="5"><h3>' . _('Material Requirements For this Work Order') . '</h3></th>
</tr>';
+ echo '<tr>
+ <th colspan="2">' . _('Item') . '</th>
+ <th>' . _('Qty Required') . '</th>
+ <th>' . _('Qty Issued') . '</th>
+ </tr>';
- $RequirmentsResult = DB_query("SELECT worequirements.stockid,
- stockmaster.description,
- stockmaster.decimalplaces,
- autoissue,
- qtypu
- FROM worequirements INNER JOIN stockmaster
- ON worequirements.stockid=stockmaster.stockid
- WHERE wo='" . $_REQUEST['WO'] . "'",
- $db);
+ $RequirmentsResult = DB_query("SELECT worequirements.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ autoissue,
+ qtypu
+ FROM worequirements INNER JOIN stockmaster
+ ON worequirements.stockid=stockmaster.stockid
+ WHERE wo='" . $SelectedWO . "'",
+ $db);
- while ($RequirementsRow = DB_fetch_array($RequirmentsResult)){
- if ($RequirementsRow['autoissue']==0){
- echo '<tr>
- <td>' . _('Manual Issue') . '</td>
- <td>' . $RequirementsRow['stockid'] . ' - ' . $RequirementsRow['description'] . '</td>';
- } else {
- echo '<tr>
- <td class="notavailable">' . _('Auto Issue') . '</td>
- <td class="notavailable">' .$RequirementsRow['stockid'] . ' - ' . $RequirementsRow['description'] .'</td>';
- }
- $IssuedAlreadyResult = DB_query("SELECT SUM(-qty) FROM stockmoves
- WHERE stockmoves.type=28
- AND stockid='" . $RequirementsRow['stockid'] . "'
- AND reference='" . $_REQUEST['WO'] . "'",
- $db);
- $IssuedAlreadyRow = DB_fetch_row($IssuedAlreadyResult);
-
- echo '<td align="right">' . locale_number_format($WORow['qtyreqd']*$RequirementsRow['qtypu'],$RequirementsRow['decimalplaces']) . '</td>
- <td align="right">' . locale_number_format($IssuedAlreadyRow[0],$RequirementsRow['decimalplaces']) . '</td></tr>';
+ while ($RequirementsRow = DB_fetch_array($RequirmentsResult)){
+ if ($RequirementsRow['autoissue']==0){
+ echo '<tr>
+ <td>' . _('Manual Issue') . '</td>
+ <td>' . $RequirementsRow['stockid'] . ' - ' . $RequirementsRow['description'] . '</td>';
+ } else {
+ echo '<tr>
+ <td class="notavailable">' . _('Auto Issue') . '</td>
+ <td class="notavailable">' .$RequirementsRow['stockid'] . ' - ' . $RequirementsRow['description'] .'</td>';
}
+ $IssuedAlreadyResult = DB_query("SELECT SUM(-qty) FROM stockmoves
+ WHERE stockmoves.type=28
+ AND stockid='" . $RequirementsRow['stockid'] . "'
+ AND reference='" . $SelectedWO . "'",
+ $db);
+ $IssuedAlreadyRow = DB_fetch_row($IssuedAlreadyResult);
- echo '</table>';
+ echo '<td align="right">' . locale_number_format($WORow['qtyreqd']*$RequirementsRow['qtypu'],$RequirementsRow['decimalplaces']) . '</td>
+ <td align="right">' . locale_number_format($IssuedAlreadyRow[0],$RequirementsRow['decimalplaces']) . '</td></tr>';
+ }
+ echo '</table>';
+
include('includes/footer.inc');
?>
\ 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: <dai...@us...> - 2012-09-07 22:46:25
|
Revision: 5631
http://web-erp.svn.sourceforge.net/web-erp/?rev=5631&view=rev
Author: daintree
Date: 2012-09-07 22:46:18 +0000 (Fri, 07 Sep 2012)
Log Message:
-----------
remove use of REQUEST
Modified Paths:
--------------
trunk/SelectSalesOrder.php
trunk/SelectWorkOrder.php
trunk/WorkOrderEntry.php
trunk/WorkOrderStatus.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2012-09-07 11:56:04 UTC (rev 5630)
+++ trunk/SelectSalesOrder.php 2012-09-07 22:46:18 UTC (rev 5631)
@@ -7,10 +7,22 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
-if (isset($_REQUEST['SelectedStockItem'])) {
- $_REQUEST['SelectedStockItem'] = DB_escape_string($_REQUEST['SelectedStockItem']);
+if (isset($_GET['SelectedStockItem'])) {
+ $SelectedStockItem = $_GET['SelectedStockItem'];
+} elseif (isset($_POST['SelectedStockItem'])){
+ $SelectedStockItem = $_POST['SelectedStockItem'];
+} else {
+ unset($SelectedStockItem);
}
+if (isset($_GET['SelectedCustomer'])) {
+ $SelectedCustomer = $_GET['SelectedCustomer'];
+} elseif (isset($_POST['SelectedCustomer'])){
+ $SelectedCustomer = $_POST['SelectedCustomer'];
+} else {
+ unset($SelectedCustomer);
+}
+
if (isset($_POST['PlacePO'])){ /*user hit button to place PO for selected orders */
/*Note the button would not have been displayed if the user had no authority to create purchase orders */
@@ -392,7 +404,7 @@
if (isset($_POST['ResetPart'])){
- unset($_REQUEST['SelectedStockItem']);
+ unset($SelectedStockItem);
}
echo '<br /><div class="centre">';
@@ -408,12 +420,12 @@
echo _('Order Number') . ' - ' . $_REQUEST['OrderNumber'];
}
} else {
- if (isset($_REQUEST['SelectedCustomer'])) {
- echo _('For customer') . ': ' . $_REQUEST['SelectedCustomer'] . ' ' . _('and') . ' ';
- echo '<input type="hidden" name="SelectedCustomer" value="' . $_REQUEST['SelectedCustomer'] . '" />';
+ if (isset($SelectedCustomer)) {
+ echo _('For customer') . ': ' . $SelectedCustomer . ' ' . _('and') . ' ';
+ echo '<input type="hidden" name="SelectedCustomer" value="' . $SelectedCustomer . '" />';
}
- if (isset($_REQUEST['SelectedStockItem'])) {
- echo _('for the part') . ': ' . $_REQUEST['SelectedStockItem'] . ' ' . _('and') . ' <input type="hidden" name="SelectedStockItem" value="' . $_REQUEST['SelectedStockItem'] . '" />';
+ if (isset($SelectedStockItem)) {
+ echo _('for the part') . ': ' . $SelectedStockItem . ' ' . _('and') . ' <input type="hidden" name="SelectedStockItem" value="' . $SelectedStockItem . '" />';
}
}
@@ -492,7 +504,7 @@
$OrdersAfterDate = Date('d/m/Y',Mktime(0,0,0,Date('m')-2,Date('d'),Date('Y')));
*/
- if (!isset($_REQUEST['OrderNumber']) or $_REQUEST['OrderNumber']==''){
+ if (!isset($_REQUEST['OrderNumber']) OR $_REQUEST['OrderNumber']==''){
echo '<table class="selection">
<tr>
@@ -673,9 +685,9 @@
} else {
/* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
- if (isset($_REQUEST['SelectedCustomer'])) {
+ if (isset($SelectedCustomer)) {
- if (isset($_REQUEST['SelectedStockItem'])) {
+ if (isset($SelectedStockItem)) {
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
custbranch.brname,
@@ -697,8 +709,8 @@
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorderdetails.completed=0
AND salesorders.quotation =" .$Quotations . "
- AND salesorderdetails.stkcode='". $_REQUEST['SelectedStockItem'] ."'
- AND salesorders.debtorno='" . $_REQUEST['SelectedCustomer'] ."'
+ AND salesorderdetails.stkcode='". $SelectedStockItem ."'
+ AND salesorders.debtorno='" . $SelectedCustomer ."'
AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'
ORDER BY salesorders.orderno";
@@ -725,7 +737,7 @@
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorders.quotation =" .$Quotations . "
AND salesorderdetails.completed=0
- AND salesorders.debtorno='" . $_REQUEST['SelectedCustomer'] . "'
+ AND salesorders.debtorno='" . $SelectedCustomer . "'
AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'
GROUP BY salesorders.orderno,
debtorsmaster.name,
@@ -740,7 +752,7 @@
}
} else { //no customer selected
- if (isset($_REQUEST['SelectedStockItem'])) {
+ if (isset($SelectedStockItem)) {
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
custbranch.brname,
@@ -762,7 +774,7 @@
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorderdetails.completed=0
AND salesorders.quotation =" .$Quotations . "
- AND salesorderdetails.stkcode='". $_REQUEST['SelectedStockItem'] . "'
+ AND salesorderdetails.stkcode='". $SelectedStockItem . "'
AND salesorders.fromstkloc = '". $_POST['StockLocation'] . "'
GROUP BY salesorders.orderno,
debtorsmaster.name,
Modified: trunk/SelectWorkOrder.php
===================================================================
--- trunk/SelectWorkOrder.php 2012-09-07 11:56:04 UTC (rev 5630)
+++ trunk/SelectWorkOrder.php 2012-09-07 22:46:18 UTC (rev 5631)
@@ -12,19 +12,36 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+if (isset($_GET['WO'])) {
+ $SelectedWO = $_GET['WO'];
+} elseif (isset($_POST['WO'])){
+ $SelectedWO = $_POST['WO'];
+} else {
+ unset($SelectedWO);
+}
+
+if (isset($_GET['SelectedStockItem'])) {
+ $SelectedStockItem = $_GET['SelectedStockItem'];
+} elseif (isset($_POST['SelectedStockItem'])){
+ $SelectedStockItem = $_POST['SelectedStockItem'];
+} else {
+ unset($SelectedStockItem);
+}
+
+
if (isset($_POST['ResetPart'])){
- unset($_REQUEST['SelectedStockItem']);
+ unset($SelectedStockItem);
}
-if (isset($_REQUEST['WO']) AND $_REQUEST['WO']!='') {
- $_REQUEST['WO'] = trim($_REQUEST['WO']);
- if (!is_numeric($_REQUEST['WO'])){
+if (isset($SelectedWO) AND $SelectedWO!='') {
+ $SelectedWO = trim($SelectedWO);
+ if (!is_numeric($SelectedWO)){
prnMsg(_('The work order number entered MUST be numeric'),'warn');
- unset ($_REQUEST['WO']);
+ unset ($SelectedWO);
include('includes/footer.inc');
exit;
} else {
- echo _('Work Order Number') . ' - ' . $_REQUEST['WO'];
+ echo _('Work Order Number') . ' - ' . $SelectedWO;
}
}
@@ -108,10 +125,10 @@
$OrdersAfterDate = Date('d/m/Y',Mktime(0,0,0,Date('m')-2,Date('d'),Date('Y')));
*/
- if (!isset($_REQUEST['WO']) or ($_REQUEST['WO']=='')){
+ if (!isset($SelectedWO) or ($SelectedWO=='')){
echo '<table class="selection"><tr><td>';
- if (isset($_REQUEST['SelectedStockItem'])) {
- echo _('For the item') . ': ' . $_REQUEST['SelectedStockItem'] . ' ' . _('and') . ' <input type="hidden" name="SelectedStockItem" value="' . $_REQUEST['SelectedStockItem'] . '" />';
+ if (isset($SelectedStockItem)) {
+ echo _('For the item') . ': ' . $SelectedStockItem . ' ' . _('and') . ' <input type="hidden" name="SelectedStockItem" value="' . $SelectedStockItem . '" />';
}
echo _('Work Order number') . ': <input type="text" name="WO" maxlength="8" size="9" /> ' . _('Processing at') . ':<select name="StockLocation"> ';
@@ -244,7 +261,7 @@
} else {
$ClosedOrOpen = 1;
}
- if (isset($_REQUEST['WO']) AND $_REQUEST['WO'] !='') {
+ if (isset($SelectedWO) AND $SelectedWO !='') {
$SQL = "SELECT workorders.wo,
woitems.stockid,
stockmaster.description,
@@ -257,13 +274,13 @@
INNER JOIN woitems ON workorders.wo=woitems.wo
INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
WHERE workorders.closed='" . $ClosedOrOpen . "'
- AND workorders.wo='". $_REQUEST['WO'] ."'
+ AND workorders.wo='". $SelectedWO ."'
ORDER BY workorders.wo,
woitems.stockid";
} else {
/* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
- if (isset($_REQUEST['SelectedStockItem'])) {
+ if (isset($SelectedStockItem)) {
$SQL = "SELECT workorders.wo,
woitems.stockid,
stockmaster.description,
@@ -276,7 +293,7 @@
INNER JOIN woitems ON workorders.wo=woitems.wo
INNER JOIN stockmaster ON woitems.stockid=stockmaster.stockid
WHERE workorders.closed='" . $ClosedOrOpen . "'
- AND woitems.stockid='". $_REQUEST['SelectedStockItem'] ."'
+ AND woitems.stockid='". $SelectedStockItem ."'
AND workorders.loccode='" . $_POST['StockLocation'] . "'
ORDER BY workorders.wo,
woitems.stockid";
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2012-09-07 11:56:04 UTC (rev 5630)
+++ trunk/WorkOrderEntry.php 2012-09-07 22:46:18 UTC (rev 5631)
@@ -11,6 +11,15 @@
<img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'
</p>';
+
+if (isset($_GET['WO'])) {
+ $SelectedWO = $_GET['WO'];
+} elseif (isset($_POST['WO'])){
+ $SelectedWO = $_POST['WO'];
+} else {
+ unset($SelectedWO);
+}
+
if (isset($_GET['ReqDate'])){
$ReqDate = ConvertSQLDate($_GET['ReqDate']);
} else {
@@ -36,9 +45,9 @@
}
// check for new or modify condition
-if (isset($_REQUEST['WO']) AND$_REQUEST['WO']!=''){
+if (isset($SelectedWO) AND$SelectedWO!=''){
// modify
- $_POST['WO'] = (int)$_REQUEST['WO'];
+ $_POST['WO'] = (int)$SelectedWO;
$EditingExisting = true;
} else {
// new
@@ -274,7 +283,7 @@
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') .'">' . _('Enter a new work order') . '</a>';
echo '<br /><a href="' . $rootpath . '/SelectWorkOrder.php">' . _('Select an existing work order') . '</a>';
- echo '<br /><a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Go to Costing'). '</a></div>';
+ echo '<br /><a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $SelectedWO . '">' . _('Go to Costing'). '</a></div>';
$Input_Error = false; //hope for the best
for ($i=1;$i<=$_POST['NumberOfOutputs'];$i++){
Modified: trunk/WorkOrderStatus.php
===================================================================
--- trunk/WorkOrderStatus.php 2012-09-07 11:56:04 UTC (rev 5630)
+++ trunk/WorkOrderStatus.php 2012-09-07 22:46:18 UTC (rev 5631)
@@ -5,117 +5,133 @@
$title = _('Work Order Status Inquiry');
include('includes/header.inc');
- $ErrMsg = _('Could not retrieve the details of the selected work order item');
- $WOResult = DB_query("SELECT workorders.loccode,
- locations.locationname,
- workorders.requiredby,
- workorders.startdate,
- workorders.closed,
- stockmaster.description,
- stockmaster.decimalplaces,
- stockmaster.units,
- woitems.qtyreqd,
- woitems.qtyrecd
- FROM workorders INNER JOIN locations
- ON workorders.loccode=locations.loccode
- INNER JOIN woitems
- ON workorders.wo=woitems.wo
- INNER JOIN stockmaster
- ON woitems.stockid=stockmaster.stockid
- WHERE woitems.stockid='" . $_REQUEST['StockID'] . "'
- AND woitems.wo ='" . $_REQUEST['WO'] . "'",
- $db,
- $ErrMsg);
+if (isset($_GET['WO'])) {
+ $SelectedWO = $_GET['WO'];
+} elseif (isset($_POST['WO'])){
+ $SelectedWO = $_POST['WO'];
+} else {
+ unset($SelectedWO);
+}
+if (isset($_GET['StockID'])) {
+ $StockID = $_GET['StockID'];
+} elseif (isset($_POST['StockID'])){
+ $StockID = $_POST['StockID'];
+} else {
+ unset($StockID);
+}
- if (DB_num_rows($WOResult)==0){
- prnMsg(_('The selected work order item cannot be retrieved from the database'),'info');
- include('includes/footer.inc');
- exit;
- }
- $WORow = DB_fetch_array($WOResult);
- echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a><br />';
- echo '<a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Back to Costing'). '</a><br />';
+$ErrMsg = _('Could not retrieve the details of the selected work order item');
+$WOResult = DB_query("SELECT workorders.loccode,
+ locations.locationname,
+ workorders.requiredby,
+ workorders.startdate,
+ workorders.closed,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ stockmaster.units,
+ woitems.qtyreqd,
+ woitems.qtyrecd
+ FROM workorders INNER JOIN locations
+ ON workorders.loccode=locations.loccode
+ INNER JOIN woitems
+ ON workorders.wo=woitems.wo
+ INNER JOIN stockmaster
+ ON woitems.stockid=stockmaster.stockid
+ WHERE woitems.stockid='" . $StockID . "'
+ AND woitems.wo ='" . $SelectedWO . "'",
+ $db,
+ $ErrMsg);
- echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $title.'
- </p>';
+if (DB_num_rows($WOResult)==0){
+ prnMsg(_('The selected work order item cannot be retrieved from the database'),'info');
+ include('includes/footer.inc');
+ exit;
+}
+$WORow = DB_fetch_array($WOResult);
- echo '<table cellpadding="2" class="selection">
- <tr>
- <td class="label">' . _('Work order Number') . ':</td>
- <td>' . $_REQUEST['WO'] .'</td>
- <td class="label">' . _('Item') . ':</td>
- <td>' . $_REQUEST['StockID'] . ' - ' . $WORow['description'] . '</td>
- </tr>
- <tr>
- <td class="label">' . _('Manufactured at') . ':</td>
- <td>' . $WORow['locationname'] . '</td>
- <td class="label">' . _('Required By') . ':</td>
- <td>' . ConvertSQLDate($WORow['requiredby']) . '</td>
- </tr>
- <tr>
- <td class="label">' . _('Quantity Ordered') . ':</td>
- <td class="number">' . locale_number_format($WORow['qtyreqd'],$WORow['decimalplaces']) . '</td>
- <td colspan="2">' . $WORow['units'] . '</td>
- </tr>
- <tr>
- <td class="label">' . _('Already Received') . ':</td>
- <td class="number">' . locale_number_format($WORow['qtyrecd'],$WORow['decimalplaces']) . '</td>
- <td colspan="2">' . $WORow['units'] . '</td>
- </tr>
- <tr>
- <td class="label">' . _('Start Date') . ':</td>
- <td>' . ConvertSQLDate($WORow['startdate']) . '</td>
- </tr>
- </table>
- <br />';
+echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a><br />';
+echo '<a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $SelectedWO . '">' . _('Back to Costing'). '</a><br />';
- //set up options for selection of the item to be issued to the WO
- echo '<table class="selection">
- <tr>
- <th colspan="5"><h3>' . _('Material Requirements For this Work Order') . '</h3></th>
- </tr>';
- echo '<tr>
- <th colspan="2">' . _('Item') . '</th>
- <th>' . _('Qty Required') . '</th>
- <th>' . _('Qty Issued') . '</th>
+echo '<p class="page_title_text">
+ <img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' .
+ _('Search') . '" alt="" />' . ' ' . $title.'
+ </p>';
+
+echo '<table cellpadding="2" class="selection">
+ <tr>
+ <td class="label">' . _('Work order Number') . ':</td>
+ <td>' . $SelectedWO .'</td>
+ <td class="label">' . _('Item') . ':</td>
+ <td>' . $StockID . ' - ' . $WORow['description'] . '</td>
+ </tr>
+ <tr>
+ <td class="label">' . _('Manufactured at') . ':</td>
+ <td>' . $WORow['locationname'] . '</td>
+ <td class="label">' . _('Required By') . ':</td>
+ <td>' . ConvertSQLDate($WORow['requiredby']) . '</td>
+ </tr>
+ <tr>
+ <td class="label">' . _('Quantity Ordered') . ':</td>
+ <td class="number">' . locale_number_format($WORow['qtyreqd'],$WORow['decimalplaces']) . '</td>
+ <td colspan="2">' . $WORow['units'] . '</td>
+ </tr>
+ <tr>
+ <td class="label">' . _('Already Received') . ':</td>
+ <td class="number">' . locale_number_format($WORow['qtyrecd'],$WORow['decimalplaces']) . '</td>
+ <td colspan="2">' . $WORow['units'] . '</td>
+ </tr>
+ <tr>
+ <td class="label">' . _('Start Date') . ':</td>
+ <td>' . ConvertSQLDate($WORow['startdate']) . '</td>
+ </tr>
+ </table>
+ <br />';
+
+ //set up options for selection of the item to be issued to the WO
+ echo '<table class="selection">
+ <tr>
+ <th colspan="5"><h3>' . _('Material Requirements For this Work Order') . '</h3></th>
</tr>';
+ echo '<tr>
+ <th colspan="2">' . _('Item') . '</th>
+ <th>' . _('Qty Required') . '</th>
+ <th>' . _('Qty Issued') . '</th>
+ </tr>';
- $RequirmentsResult = DB_query("SELECT worequirements.stockid,
- stockmaster.description,
- stockmaster.decimalplaces,
- autoissue,
- qtypu
- FROM worequirements INNER JOIN stockmaster
- ON worequirements.stockid=stockmaster.stockid
- WHERE wo='" . $_REQUEST['WO'] . "'",
- $db);
+ $RequirmentsResult = DB_query("SELECT worequirements.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ autoissue,
+ qtypu
+ FROM worequirements INNER JOIN stockmaster
+ ON worequirements.stockid=stockmaster.stockid
+ WHERE wo='" . $SelectedWO . "'",
+ $db);
- while ($RequirementsRow = DB_fetch_array($RequirmentsResult)){
- if ($RequirementsRow['autoissue']==0){
- echo '<tr>
- <td>' . _('Manual Issue') . '</td>
- <td>' . $RequirementsRow['stockid'] . ' - ' . $RequirementsRow['description'] . '</td>';
- } else {
- echo '<tr>
- <td class="notavailable">' . _('Auto Issue') . '</td>
- <td class="notavailable">' .$RequirementsRow['stockid'] . ' - ' . $RequirementsRow['description'] .'</td>';
- }
- $IssuedAlreadyResult = DB_query("SELECT SUM(-qty) FROM stockmoves
- WHERE stockmoves.type=28
- AND stockid='" . $RequirementsRow['stockid'] . "'
- AND reference='" . $_REQUEST['WO'] . "'",
- $db);
- $IssuedAlreadyRow = DB_fetch_row($IssuedAlreadyResult);
-
- echo '<td align="right">' . locale_number_format($WORow['qtyreqd']*$RequirementsRow['qtypu'],$RequirementsRow['decimalplaces']) . '</td>
- <td align="right">' . locale_number_format($IssuedAlreadyRow[0],$RequirementsRow['decimalplaces']) . '</td></tr>';
+ while ($RequirementsRow = DB_fetch_array($RequirmentsResult)){
+ if ($RequirementsRow['autoissue']==0){
+ echo '<tr>
+ <td>' . _('Manual Issue') . '</td>
+ <td>' . $RequirementsRow['stockid'] . ' - ' . $RequirementsRow['description'] . '</td>';
+ } else {
+ echo '<tr>
+ <td class="notavailable">' . _('Auto Issue') . '</td>
+ <td class="notavailable">' .$RequirementsRow['stockid'] . ' - ' . $RequirementsRow['description'] .'</td>';
}
+ $IssuedAlreadyResult = DB_query("SELECT SUM(-qty) FROM stockmoves
+ WHERE stockmoves.type=28
+ AND stockid='" . $RequirementsRow['stockid'] . "'
+ AND reference='" . $SelectedWO . "'",
+ $db);
+ $IssuedAlreadyRow = DB_fetch_row($IssuedAlreadyResult);
- echo '</table>';
+ echo '<td align="right">' . locale_number_format($WORow['qtyreqd']*$RequirementsRow['qtypu'],$RequirementsRow['decimalplaces']) . '</td>
+ <td align="right">' . locale_number_format($IssuedAlreadyRow[0],$RequirementsRow['decimalplaces']) . '</td></tr>';
+ }
+ echo '</table>';
+
include('includes/footer.inc');
?>
\ 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: <dai...@us...> - 2012-09-08 03:26:39
|
Revision: 5633
http://web-erp.svn.sourceforge.net/web-erp/?rev=5633&view=rev
Author: daintree
Date: 2012-09-08 03:26:33 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
translations per Thomas Lie
Modified Paths:
--------------
trunk/PO_Items.php
trunk/PO_SelectPurchOrder.php
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2012-09-08 01:26:39 UTC (rev 5632)
+++ trunk/PO_Items.php 2012-09-08 03:26:33 UTC (rev 5633)
@@ -730,9 +730,9 @@
</tr></table>';
echo '<br />
<div class="centre">
- <input type="submit" name="UpdateLines" value="Update Order Lines" />';
+ <input type="submit" name="UpdateLines" value="' . _('Update Order Lines') . '" />';
- echo ' <input type="submit" name="Commit" value="Process Order" />
+ echo ' <input type="submit" name="Commit" value="' . _('Process Order') . '" />
</div>';
} /*Only display the order line items if there are any !! */
@@ -743,7 +743,8 @@
echo '<br /><table class="selection"><tr>
<td>' . _('Item Description') . '</td>';
echo '<td><input type="text" name="ItemDescription" size="40" /></td></tr>';
- echo '<tr><td>' . _('General Ledger Code') . '</td>';
+ echo '<tr>
+ <td>' . _('General Ledger Code') . '</td>';
echo '<td><select name="GLCode">';
$sql="SELECT accountcode,
accountname
@@ -755,7 +756,8 @@
echo '<option value="'.$myrow['accountcode'].'">'.$myrow['accountcode'].' - '.$myrow['accountname'].'</option>';
}
echo '</select></td></tr>';
- echo '<tr><td>'._('OR Asset ID'). '</td>
+ echo '<tr>
+ <td>'._('OR Asset ID'). '</td>
<td><select name="AssetID">';
$AssetsResult = DB_query("SELECT assetid, description, datepurchased FROM fixedassets ORDER BY assetid DESC",$db);
echo '<option selected="selected" value="Not an Asset">' . _('Not an Asset') . '</option>';
@@ -768,18 +770,26 @@
echo '<option value="' . $AssetRow['assetid'] . '">' . $AssetRow['assetid'] . ' - '. $DatePurchased . ' - ' . $AssetRow['description'] . '</option>';
}
- echo'</select><a href="FixedAssetItems.php" target=_blank>'. _('New Fixed Asset') . '</a></td>
- <tr><td>'._('Quantity to purchase').'</td>
- <td><input type="text" class="number" name="Qty" size="10" value="1" /></td></tr>
- <tr><td>'._('Price per item').'</td>
- <td><input type="text" class="number" name="Price" size="10" /></td></tr>
- <tr><td>'._('Unit').'</td>
- <td><input type="text" name="SuppliersUnit" size="10" value="' . _('each') . '" /></td></tr>
- <tr><td>'._('Delivery Date').'</td>
- <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ReqDelDate" size="11" value="'.$_SESSION['PO'.$identifier]->DeliveryDate .'" /></td></tr>';
- echo '</table>';
- echo '<div class="centre">
- <input type="submit" name="EnterLine" value="Enter Item" />
+ echo'</select><a href="FixedAssetItems.php" target=_blank>'. _('New Fixed Asset') . '</a></td></tr>
+ <tr>
+ <td>'._('Quantity to purchase').'</td>
+ <td><input type="text" class="number" name="Qty" size="10" value="1" /></td>
+ </tr>
+ <tr>
+ <td>'._('Price per item').'</td>
+ <td><input type="text" class="number" name="Price" size="10" /></td>
+ </tr>
+ <tr>
+ <td>'._('Unit').'</td>
+ <td><input type="text" name="SuppliersUnit" size="10" value="' . _('each') . '" /></td>
+ </tr>
+ <tr>
+ <td>'._('Delivery Date').'</td>
+ <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ReqDelDate" size="11" value="'.$_SESSION['PO'.$identifier]->DeliveryDate .'" /></td>
+ </tr>
+ </table>
+ <div class="centre">
+ <input type="submit" name="EnterLine" value="' . _('Enter Item') . '" />
</div>';
}
Modified: trunk/PO_SelectPurchOrder.php
===================================================================
--- trunk/PO_SelectPurchOrder.php 2012-09-08 01:26:39 UTC (rev 5632)
+++ trunk/PO_SelectPurchOrder.php 2012-09-08 03:26:33 UTC (rev 5633)
@@ -30,7 +30,7 @@
if (isset($_POST['ResetPart'])) {
unset($SelectedStockItem);
}
-if (isset($OrderNumber) && $OrderNumber != "") {
+if (isset($OrderNumber) AND $OrderNumber != '') {
if (!is_numeric($OrderNumber)) {
prnMsg(_('The Order Number entered') . ' <U>' . _('MUST') . '</U> ' . _('be numeric'), 'error');
unset($OrderNumber);
@@ -192,7 +192,7 @@
</tr>
<tr>
<td></td>
- <td><b>' . _('OR') . ' </b>' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</td>
+ <td><b>' . _('OR') . ' </b>' . _('Enter extract of the') . '<b> ' . _('Stock Code') . '</b>:</td>
<td><input type="text" name="StockCode" size="15" maxlength="18" /></td>
</tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-08 03:26:39
|
Revision: 5633
http://web-erp.svn.sourceforge.net/web-erp/?rev=5633&view=rev
Author: daintree
Date: 2012-09-08 03:26:33 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
translations per Thomas Lie
Modified Paths:
--------------
trunk/PO_Items.php
trunk/PO_SelectPurchOrder.php
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2012-09-08 01:26:39 UTC (rev 5632)
+++ trunk/PO_Items.php 2012-09-08 03:26:33 UTC (rev 5633)
@@ -730,9 +730,9 @@
</tr></table>';
echo '<br />
<div class="centre">
- <input type="submit" name="UpdateLines" value="Update Order Lines" />';
+ <input type="submit" name="UpdateLines" value="' . _('Update Order Lines') . '" />';
- echo ' <input type="submit" name="Commit" value="Process Order" />
+ echo ' <input type="submit" name="Commit" value="' . _('Process Order') . '" />
</div>';
} /*Only display the order line items if there are any !! */
@@ -743,7 +743,8 @@
echo '<br /><table class="selection"><tr>
<td>' . _('Item Description') . '</td>';
echo '<td><input type="text" name="ItemDescription" size="40" /></td></tr>';
- echo '<tr><td>' . _('General Ledger Code') . '</td>';
+ echo '<tr>
+ <td>' . _('General Ledger Code') . '</td>';
echo '<td><select name="GLCode">';
$sql="SELECT accountcode,
accountname
@@ -755,7 +756,8 @@
echo '<option value="'.$myrow['accountcode'].'">'.$myrow['accountcode'].' - '.$myrow['accountname'].'</option>';
}
echo '</select></td></tr>';
- echo '<tr><td>'._('OR Asset ID'). '</td>
+ echo '<tr>
+ <td>'._('OR Asset ID'). '</td>
<td><select name="AssetID">';
$AssetsResult = DB_query("SELECT assetid, description, datepurchased FROM fixedassets ORDER BY assetid DESC",$db);
echo '<option selected="selected" value="Not an Asset">' . _('Not an Asset') . '</option>';
@@ -768,18 +770,26 @@
echo '<option value="' . $AssetRow['assetid'] . '">' . $AssetRow['assetid'] . ' - '. $DatePurchased . ' - ' . $AssetRow['description'] . '</option>';
}
- echo'</select><a href="FixedAssetItems.php" target=_blank>'. _('New Fixed Asset') . '</a></td>
- <tr><td>'._('Quantity to purchase').'</td>
- <td><input type="text" class="number" name="Qty" size="10" value="1" /></td></tr>
- <tr><td>'._('Price per item').'</td>
- <td><input type="text" class="number" name="Price" size="10" /></td></tr>
- <tr><td>'._('Unit').'</td>
- <td><input type="text" name="SuppliersUnit" size="10" value="' . _('each') . '" /></td></tr>
- <tr><td>'._('Delivery Date').'</td>
- <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ReqDelDate" size="11" value="'.$_SESSION['PO'.$identifier]->DeliveryDate .'" /></td></tr>';
- echo '</table>';
- echo '<div class="centre">
- <input type="submit" name="EnterLine" value="Enter Item" />
+ echo'</select><a href="FixedAssetItems.php" target=_blank>'. _('New Fixed Asset') . '</a></td></tr>
+ <tr>
+ <td>'._('Quantity to purchase').'</td>
+ <td><input type="text" class="number" name="Qty" size="10" value="1" /></td>
+ </tr>
+ <tr>
+ <td>'._('Price per item').'</td>
+ <td><input type="text" class="number" name="Price" size="10" /></td>
+ </tr>
+ <tr>
+ <td>'._('Unit').'</td>
+ <td><input type="text" name="SuppliersUnit" size="10" value="' . _('each') . '" /></td>
+ </tr>
+ <tr>
+ <td>'._('Delivery Date').'</td>
+ <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ReqDelDate" size="11" value="'.$_SESSION['PO'.$identifier]->DeliveryDate .'" /></td>
+ </tr>
+ </table>
+ <div class="centre">
+ <input type="submit" name="EnterLine" value="' . _('Enter Item') . '" />
</div>';
}
Modified: trunk/PO_SelectPurchOrder.php
===================================================================
--- trunk/PO_SelectPurchOrder.php 2012-09-08 01:26:39 UTC (rev 5632)
+++ trunk/PO_SelectPurchOrder.php 2012-09-08 03:26:33 UTC (rev 5633)
@@ -30,7 +30,7 @@
if (isset($_POST['ResetPart'])) {
unset($SelectedStockItem);
}
-if (isset($OrderNumber) && $OrderNumber != "") {
+if (isset($OrderNumber) AND $OrderNumber != '') {
if (!is_numeric($OrderNumber)) {
prnMsg(_('The Order Number entered') . ' <U>' . _('MUST') . '</U> ' . _('be numeric'), 'error');
unset($OrderNumber);
@@ -192,7 +192,7 @@
</tr>
<tr>
<td></td>
- <td><b>' . _('OR') . ' </b>' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</td>
+ <td><b>' . _('OR') . ' </b>' . _('Enter extract of the') . '<b> ' . _('Stock Code') . '</b>:</td>
<td><input type="text" name="StockCode" size="15" maxlength="18" /></td>
</tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-08 04:03:16
|
Revision: 5634
http://web-erp.svn.sourceforge.net/web-erp/?rev=5634&view=rev
Author: daintree
Date: 2012-09-08 04:03:09 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
remove REQUEST use
Modified Paths:
--------------
trunk/EmailConfirmation.php
trunk/WorkOrderCosting.php
trunk/WorkOrderReceive.php
Modified: trunk/EmailConfirmation.php
===================================================================
--- trunk/EmailConfirmation.php 2012-09-08 03:26:33 UTC (rev 5633)
+++ trunk/EmailConfirmation.php 2012-09-08 04:03:09 UTC (rev 5634)
@@ -4,8 +4,9 @@
include('includes/session.inc');
include('includes/SQL_CommonFunctions.inc');
+
//Get Out if we have no order number to work with
-If (!isset($_GET['TransNo']) OR $_GET['TransNo']==""){
+If (!isset($_GET['TransNo']) OR $_GET['TransNo']==''){
$title = _('Select Order To Print');
include('includes/header.inc');
echo '<div class="centre">
@@ -20,8 +21,8 @@
<tr>
<td class="menu_group_item">
<ul>
- <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
</ul>
</td>
</tr>
@@ -31,11 +32,11 @@
<br />
<br />';
include('includes/footer.inc');
- exit();
+ exit;
}
$MailTo = $_GET['EMail'];
-$headers = 'From: Bethany Manufacturing <sa...@be...>' . '\n';
+$headers = 'From: weberp.org <in...@we...>' . '\n';
$headers .= 'MIME-Version: 1.0\n' . 'Content-Type: text/html; charset="utf-8"\n';
/*retrieve the order details from the database to print */
@@ -103,7 +104,7 @@
<br />
<br />';
include('includes/footer.inc');
- exit();
+ exit;
} elseif (DB_num_rows($result)==1){ /*There is only one order header returned - thats good! */
$myrow = DB_fetch_array($result);
@@ -122,18 +123,20 @@
<br />
<br />';
echo _('Or select another Order Number to Print');
- echo '<table class="table_index"><tr><td class="menu_group_item">
- <ul>
- <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
- </ul>
- </td>
+ echo '<table class="table_index">
+ <tr>
+ <td class="menu_group_item">
+ <ul>
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ </ul>
+ </td>
</tr>
- </table>
- </div>
- <br />
- <br />
- <br />';
+ </table>
+ </div>
+ <br />
+ <br />
+ <br />';
include('includes/footer.inc');
exit;
@@ -141,46 +144,69 @@
$MailSubject = _('Order Confirmation-Sales Order') . ' ' . $_GET['TransNo'] . ' - '. _('Your PO') . ' ' . $myrow['customerref'] ;
}
-/*retrieve the order details from the database to print */
-
-/* Then there's an order to print and its not been printed already (or its been flagged for reprinting/ge_Width=807;
-)
-LETS GO */
-
-$MailMessage = '<html><head><title>' . _('Email Confirmation') . '</title></head>
+$MailMessage = '<html>
+ <head>
+ <title>' . _('Email Confirmation') . '</title>
+ </head>
<body>
<table cellpadding="2" cellspacing="2">
<tr>
- <td align="center" colspan="4"><h1>' . $_SESSION['CompanyRecord']['coyname'] . '</h1></td>
+ <td align="center" colspan="4"><h1>' . $_SESSION['CompanyRecord']['coyname'] . '</h1></td>
</tr>
- <tr><td colspan="4"> <b>' . $_SESSION['CompanyRecord']['regoffice1'] . '</td>
+ <tr>
+ <td colspan="4"> <b>' . $_SESSION['CompanyRecord']['regoffice1'] . '</td>
</tr>
- <tr><td colspan="4"> <b>' . $_SESSION['CompanyRecord']['regoffice4'] . ',<b>' . $_SESSION['CompanyRecord']['regoffice5'] . '</td>
+ <tr>
+ <td colspan="4"> <b>' . $_SESSION['CompanyRecord']['regoffice4'] . ',<b>' . $_SESSION['CompanyRecord']['regoffice5'] . '</td>
</tr>
- <tr><td colspan="4"> <b>' . $_SESSION['CompanyRecord']['telephone'] . ' ' . _('Fax'). ': ' . $_SESSION['CompanyRecord']['fax'] . '</td>
+ <tr>
+ <td colspan="4"> <b>' . $_SESSION['CompanyRecord']['telephone'] . ' ' . _('Fax'). ': ' . $_SESSION['CompanyRecord']['fax'] . '</td>
</tr>
- <tr><td colspan="4"> <b>' . $_SESSION['CompanyRecord']['email'] . '<br /><br /><br /></td>
+ <tr>
+ <td colspan="4"> <b>' . $_SESSION['CompanyRecord']['email'] . '
+ <br />
+ <br />
+ <br /></td>
</tr>
</table>
<table>
- <tr><td align="center" colspan="4">
- <h2>' . _('Order Acknowledgement') . '</h2></td>
+ <tr>
+ <td align="center" colspan="4">
+ <h2>' . _('Order Acknowledgement') . '</h2>
+ </td>
</tr>
- <tr><td align="center" colspan="4"> <b>' . _('Order Number') . ' ' . $_GET['TransNo'] . '</b><br /><br /><br /></td>
+ <tr>
+ <td align="center" colspan="4"> <b>' . _('Order Number') . ' ' . $_GET['TransNo'] . '</b>
+ <br />
+ <br />
+ <br /></td>
</tr>
- <tr><td colspan="4"> <b>' . _('Delivered To') . ':</b></td>
+ <tr>
+ <td colspan="4"> <b>' . _('Delivered To') . ':</b></td>
</tr>
- <tr><td colspan="4"> <b>' . $myrow['deliverto'] . '</td>
+ <tr>
+ <td colspan="4"> <b>' . $myrow['deliverto'] . '</td>
</tr>
- <tr><td colspan="4"> <b>' . $myrow['deladd1'] . '</td>
+ <tr>
+ <td colspan="4"> <b>' . $myrow['deladd1'] . '</td>
</tr>';
if(mb_strlen(trim($myrow['deladd2']))) {
- $MailMessage .= '<tr><td> <b>' . $myrow['deladd2'] . '</td></tr>
- <tr><td> <b>' . $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']. '<br /><br /><br /></td>
- </tr>';
+ $MailMessage .= '<tr>
+ <td> <b>' . $myrow['deladd2'] . '</td>
+ </tr>
+ <tr>
+ <td> <b>' . $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']. '
+ <br />
+ <br />
+ <br /></td>
+ /tr>';
} else {
- $MailMessage .= '<tr><td> <b>' . $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5'] . '<br /><br /><br /></td>
+ $MailMessage .= '<tr>
+ <td> <b>' . $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5'] . '
+ <br />
+ <br />
+ <br /></td>
</tr>';
}
$MailMessage .= '</table>
@@ -229,106 +255,101 @@
if($_REQUEST['POLine'] == 1){
$MailMessage .= '<td align="right">' . $POLine[$i] . '</td>';
}
- $MailMessage .= '<td>' . $myrow2['stkcode'] . '</td><td>' . $myrow2['description'] . '</td>
+ $MailMessage .= '<td>' . $myrow2['stkcode'] . '</td>
+ <td>' . $myrow2['description'] . '</td>
<td align="right">' . $DisplayQty . '</td>
<td align="center">' . $ItemDue[$i] . '</td>
</tr>';
-
- $i = $i + 1;
-
+ $i++;
} //end while there are line items to print out
-
} /*end if there are order details to show on the order*/
$MailMessage .= '</table>
</body>
</html>';
// echo $MailMessage . "=mailMessage<br />";
-IF(mail( $MailTo, $MailSubject, $MailMessage, $headers )){
+iF(mail( $MailTo, $MailSubject, $MailMessage, $headers )){
echo ' ' ._('The following E-Mail was sent to') . ' ' . $MailTo . ' :';
}
-?>
-<html>
-<head>
-<title>Email Confirmation</title>
-</head>
-<body>
-<table width='60%'>
- <tr>
- <td align='center' colspan='4'> <?php echo "<IMG src='" . $rootpath . '/' . $_SESSION['LogoFile'] . "' alt='Logo'" .
- "width='500' height='100' align='center' border='0'>" ?>
- </td>
- </tr>
- <tr>
- <td align='center' colspan='4'> <h2> Order Acknowledgement</h2></td>
- </tr>
- <tr>
- <td align='center' colspan='4'> <b>Order Number <?=$_GET['TransNo']?> </b><br /><br /><br /></td>
- </tr>
- <tr>
- <td colspan='2' nowrap width="50%"> <b><?=$_SESSION['CompanyRecord']['coyname']?></b></td>
- <td colspan='2' nowrap width="50%"> <b>Delivered To:</b></td>
- </tr>
- <tr>
- <td colspan='2' nowrap width="50%"> <b><?=$_SESSION['CompanyRecord']['regoffice1']?> </b></td>
- <td colspan='2' nowrap width="50%"> <b><?=$myrow['deliverto']?></td>
- </tr>
- <tr>
- <td colspan='2' nowrap width="50%">
- <b><?=$_SESSION['CompanyRecord']['regoffice4']?>,
- <?=$_SESSION['CompanyRecord']['regoffice5']?> </b>
- </td>
- <td colspan='2' nowrap width="50%"> <b><?=$myrow['deladd1']?></td>
- </tr>
- <tr>
- <td colspan='2' nowrap width="50%">
- <b><?=$_SESSION['CompanyRecord']['telephone']?>
- Fax:<?=$_SESSION['CompanyRecord']['fax']?></b>
- </td>
- <td nowrap width="50%"><b><?=$myrow['deladd2']?></td>
- </tr>
- <tr>
- <td colspan='2' nowrap width="50%">
- <b><?=$_SESSION['CompanyRecord']['email']?><br /><br /><br />
- </td>
- <td nowrap width="50%">
- <b><?=$myrow['deladd3']?> <?=$myrow['deladd4'] ?> <?=$myrow['deladd5']?><br /><br /><br />
- </td>
- </tr>
-</table>
-<table border='1' width='60%' cellpadding="2" cellspacing='2'>
- <tr>
-<?
-if($_REQUEST['POLine'] == 1){
-?>
- <td align="center">PO Line</td>
-<?
+
+echo '<html>
+ <head>
+ <title>' . _('Email Confirmation') . '</title>
+ </head>
+ <body>
+ <table width="60%">
+ <tr>
+ <td align="center" colspan="4"><img src="' . $rootpath . '/' . $_SESSION['LogoFile'] . '" alt="Logo" width="500" height="100" align="center" border="0" /></td>
+ </tr>
+ <tr>
+ <td align="center" colspan="4"><h2>' . _('Order Acknowledgement') . '</h2></td>
+ </tr>
+ <tr>
+ <td align="center" colspan="4"> <b>' . _('Order Number') . ' ' . $_GET['TransNo'] . '</b>
+ <br />
+ <br />
+ <br /></td>
+ </tr>
+ <tr>
+ <td colspan="2" nowrap width="50%"> <b>' . $_SESSION['CompanyRecord']['coyname'] . '</b></td>
+ <td colspan="2" nowrap width="50%"> <b>' . _('Delivered To') . ':</b></td>
+ </tr>
+ <tr>
+ <td colspan="2" nowrap width="50%"> <b>' . $_SESSION['CompanyRecord']['regoffice1'] . '</b></td>
+ <td colspan="2" nowrap width="50%"> <b>' . $myrow['deliverto'] . '</td>
+ </tr>
+ <tr>
+ <td colspan="2" nowrap width="50%">
+ <b>' . $_SESSION['CompanyRecord']['regoffice4'] . ',
+ <br />' . $_SESSION['CompanyRecord']['regoffice5'] . '</b>
+ </td>
+ <td colspan="2" nowrap width="50%"> <b>' . $myrow['deladd1'] . '</td>
+ </tr>
+ <tr>
+ <td colspan="2" nowrap width="50%">
+ <b>' . $_SESSION['CompanyRecord']['telephone'] . '
+ <br />' . _('Fax') . ': ' . $_SESSION['CompanyRecord']['fax'] . '</b>
+ </td>
+ <td nowrap width="50%"><b>' . $myrow['deladd2'] . '</td>
+ </tr>
+ <tr>
+ <td colspan="2" nowrap width="50%">
+ <b>' . $_SESSION['CompanyRecord']['email'] . '
+ <br />
+ <br />
+ <br />
+ </td>
+ <td nowrap width="50%">
+ <b>' . $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5'] . '
+ <br />
+ <br />
+ <br />
+ </td>
+ </tr>
+ </table>
+ <table border="1" width="60%" cellpadding="2" cellspacing="2">
+ <tr>';
+
+if($_GET['POLine'] == 1){
+ echo '<td align="center">' . _('PO Line') . '</td>';
}
-?>
- <td align="center">Stock Code</td>
- <td align="center">Description</td>
- <td align="center">Quantity Ordered</td>
- <td align="center">Due Date</td>
- </tr>
-<?
-For( $j=0; $j<$i; $j++)
-{
-?>
- <tr>
-<?
- if($_REQUEST['POLine']){
-?>
- <td align='right'><?=$POLine[$j]?></td>
-<?
+echo '<td align="center">' . _('Stock Code') . '</td>
+ <td align="center">' . _('Description') . '</td>
+ <td align="center">' . _('Quantity Ordered') . '</td>
+ <td align="center">' . _('Due Date') . '</td>
+ </tr>';
+
+for( $j=0; $j<$i; $j++){
+ echo '<tr>';
+ if($_GET['POLine']){
+ echo '<td align="right">' . $POLine[$j] . '</td>';
}
-?>
- <td><?=$StkCode[$j]?></td>
- <td><?=$DscCode[$j]?></td>
- <td align="right"><?=$QtyCode[$j]?></td>
- <td align="center"><?=$ItemDue[$j]?></td>
- </tr>
-<?
+ echo '<td>' . $StkCode[$j] . '</td>
+ <td>' . $DscCode[$j] . '</td>
+ <td align="right">' . $QtyCode[$j] . '</td>
+ <td align="center">' . $ItemDue[$j] . '</td>
+ </tr>';
}
-?>
-</table>
-</body>
-</html>
+echo '</table>
+ </body>
+ </html>';
+?>
\ No newline at end of file
Modified: trunk/WorkOrderCosting.php
===================================================================
--- trunk/WorkOrderCosting.php 2012-09-08 03:26:33 UTC (rev 5633)
+++ trunk/WorkOrderCosting.php 2012-09-08 04:03:09 UTC (rev 5634)
@@ -6,6 +6,15 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
+
+if (isset($_GET['WO'])) {
+ $SelectedWO = $_GET['WO'];
+} elseif (isset($_POST['WO'])){
+ $SelectedWO = $_POST['WO'];
+} else {
+ unset($SelectedWO);
+}
+
echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a>
<br />
<p class="page_title_text">
@@ -17,7 +26,7 @@
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-if (!isset($_REQUEST['WO'])) {
+if (!isset($SelectedWO)) {
/* This page can only be called with a work order number */
echo '<div class="centre><a href="' . $rootpath . '/SelectWorkOrder.php">'.
_('Select a work order').'</a></div>';
@@ -25,8 +34,8 @@
include ('includes/footer.inc');
exit;
} else {
- echo '<input type="hidden" name="WO" value="' .$_REQUEST['WO'] . '" />';
- $_POST['WO']=$_REQUEST['WO'];
+ echo '<input type="hidden" name="WO" value="' .$SelectedWO . '" />';
+ $_POST['WO']=$SelectedWO;
}
Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php 2012-09-08 03:26:33 UTC (rev 5633)
+++ trunk/WorkOrderReceive.php 2012-09-08 04:03:09 UTC (rev 5634)
@@ -6,12 +6,26 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
-echo '<div>';
-echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a>
- <br />';
-echo '<a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Back to Costing'). '</a>
- <br />';
-echo '</div>';
+if (isset($_GET['WO'])) {
+ $SelectedWO = $_GET['WO'];
+} elseif (isset($_POST['WO'])){
+ $SelectedWO = $_POST['WO'];
+} else {
+ unset($SelectedWO);
+}
+if (isset($_GET['StockID'])) {
+ $StockID = $_GET['StockID'];
+} elseif (isset($_POST['StockID'])){
+ $StockID = $_POST['StockID'];
+} else {
+ unset($StockID);
+}
+echo '<div>
+ <a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a>
+ <br />
+ <a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $SelectedWO . '">' . _('Back to Costing'). '</a>
+ <br />
+ </div>';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' .
_('Search') . '" alt="" />' . ' ' . $title.'</p>';
@@ -20,7 +34,7 @@
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-if (!isset($_REQUEST['WO']) OR !isset($_REQUEST['StockID'])) {
+if (!isset($SelectedWO) OR !isset($StockID)) {
/* This page can only be called with a purchase order number for invoicing*/
echo '<div class="centre">
<a href="' . $rootpath . '/SelectWorkOrder.php">'. _('Select a work order to receive').'</a>
@@ -29,10 +43,10 @@
include ('includes/footer.inc');
exit;
} else {
- echo '<input type="hidden" name="WO" value="' .$_REQUEST['WO'] . '" />';
- $_POST['WO']=$_REQUEST['WO'];
- echo '<input type="hidden" name="StockID" value="' .$_REQUEST['StockID'] . '" />';
- $_POST['StockID']=$_REQUEST['StockID'];
+ echo '<input type="hidden" name="WO" value="' .$SelectedWO . '" />';
+ $_POST['WO']=$SelectedWO;
+ echo '<input type="hidden" name="StockID" value="' .$StockID . '" />';
+ $_POST['StockID']=$StockID;
}
if (isset($_POST['Process'])){ //user hit the process the work order receipts entered.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-08 04:03:16
|
Revision: 5634
http://web-erp.svn.sourceforge.net/web-erp/?rev=5634&view=rev
Author: daintree
Date: 2012-09-08 04:03:09 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
remove REQUEST use
Modified Paths:
--------------
trunk/EmailConfirmation.php
trunk/WorkOrderCosting.php
trunk/WorkOrderReceive.php
Modified: trunk/EmailConfirmation.php
===================================================================
--- trunk/EmailConfirmation.php 2012-09-08 03:26:33 UTC (rev 5633)
+++ trunk/EmailConfirmation.php 2012-09-08 04:03:09 UTC (rev 5634)
@@ -4,8 +4,9 @@
include('includes/session.inc');
include('includes/SQL_CommonFunctions.inc');
+
//Get Out if we have no order number to work with
-If (!isset($_GET['TransNo']) OR $_GET['TransNo']==""){
+If (!isset($_GET['TransNo']) OR $_GET['TransNo']==''){
$title = _('Select Order To Print');
include('includes/header.inc');
echo '<div class="centre">
@@ -20,8 +21,8 @@
<tr>
<td class="menu_group_item">
<ul>
- <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
</ul>
</td>
</tr>
@@ -31,11 +32,11 @@
<br />
<br />';
include('includes/footer.inc');
- exit();
+ exit;
}
$MailTo = $_GET['EMail'];
-$headers = 'From: Bethany Manufacturing <sa...@be...>' . '\n';
+$headers = 'From: weberp.org <in...@we...>' . '\n';
$headers .= 'MIME-Version: 1.0\n' . 'Content-Type: text/html; charset="utf-8"\n';
/*retrieve the order details from the database to print */
@@ -103,7 +104,7 @@
<br />
<br />';
include('includes/footer.inc');
- exit();
+ exit;
} elseif (DB_num_rows($result)==1){ /*There is only one order header returned - thats good! */
$myrow = DB_fetch_array($result);
@@ -122,18 +123,20 @@
<br />
<br />';
echo _('Or select another Order Number to Print');
- echo '<table class="table_index"><tr><td class="menu_group_item">
- <ul>
- <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
- </ul>
- </td>
+ echo '<table class="table_index">
+ <tr>
+ <td class="menu_group_item">
+ <ul>
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ </ul>
+ </td>
</tr>
- </table>
- </div>
- <br />
- <br />
- <br />';
+ </table>
+ </div>
+ <br />
+ <br />
+ <br />';
include('includes/footer.inc');
exit;
@@ -141,46 +144,69 @@
$MailSubject = _('Order Confirmation-Sales Order') . ' ' . $_GET['TransNo'] . ' - '. _('Your PO') . ' ' . $myrow['customerref'] ;
}
-/*retrieve the order details from the database to print */
-
-/* Then there's an order to print and its not been printed already (or its been flagged for reprinting/ge_Width=807;
-)
-LETS GO */
-
-$MailMessage = '<html><head><title>' . _('Email Confirmation') . '</title></head>
+$MailMessage = '<html>
+ <head>
+ <title>' . _('Email Confirmation') . '</title>
+ </head>
<body>
<table cellpadding="2" cellspacing="2">
<tr>
- <td align="center" colspan="4"><h1>' . $_SESSION['CompanyRecord']['coyname'] . '</h1></td>
+ <td align="center" colspan="4"><h1>' . $_SESSION['CompanyRecord']['coyname'] . '</h1></td>
</tr>
- <tr><td colspan="4"> <b>' . $_SESSION['CompanyRecord']['regoffice1'] . '</td>
+ <tr>
+ <td colspan="4"> <b>' . $_SESSION['CompanyRecord']['regoffice1'] . '</td>
</tr>
- <tr><td colspan="4"> <b>' . $_SESSION['CompanyRecord']['regoffice4'] . ',<b>' . $_SESSION['CompanyRecord']['regoffice5'] . '</td>
+ <tr>
+ <td colspan="4"> <b>' . $_SESSION['CompanyRecord']['regoffice4'] . ',<b>' . $_SESSION['CompanyRecord']['regoffice5'] . '</td>
</tr>
- <tr><td colspan="4"> <b>' . $_SESSION['CompanyRecord']['telephone'] . ' ' . _('Fax'). ': ' . $_SESSION['CompanyRecord']['fax'] . '</td>
+ <tr>
+ <td colspan="4"> <b>' . $_SESSION['CompanyRecord']['telephone'] . ' ' . _('Fax'). ': ' . $_SESSION['CompanyRecord']['fax'] . '</td>
</tr>
- <tr><td colspan="4"> <b>' . $_SESSION['CompanyRecord']['email'] . '<br /><br /><br /></td>
+ <tr>
+ <td colspan="4"> <b>' . $_SESSION['CompanyRecord']['email'] . '
+ <br />
+ <br />
+ <br /></td>
</tr>
</table>
<table>
- <tr><td align="center" colspan="4">
- <h2>' . _('Order Acknowledgement') . '</h2></td>
+ <tr>
+ <td align="center" colspan="4">
+ <h2>' . _('Order Acknowledgement') . '</h2>
+ </td>
</tr>
- <tr><td align="center" colspan="4"> <b>' . _('Order Number') . ' ' . $_GET['TransNo'] . '</b><br /><br /><br /></td>
+ <tr>
+ <td align="center" colspan="4"> <b>' . _('Order Number') . ' ' . $_GET['TransNo'] . '</b>
+ <br />
+ <br />
+ <br /></td>
</tr>
- <tr><td colspan="4"> <b>' . _('Delivered To') . ':</b></td>
+ <tr>
+ <td colspan="4"> <b>' . _('Delivered To') . ':</b></td>
</tr>
- <tr><td colspan="4"> <b>' . $myrow['deliverto'] . '</td>
+ <tr>
+ <td colspan="4"> <b>' . $myrow['deliverto'] . '</td>
</tr>
- <tr><td colspan="4"> <b>' . $myrow['deladd1'] . '</td>
+ <tr>
+ <td colspan="4"> <b>' . $myrow['deladd1'] . '</td>
</tr>';
if(mb_strlen(trim($myrow['deladd2']))) {
- $MailMessage .= '<tr><td> <b>' . $myrow['deladd2'] . '</td></tr>
- <tr><td> <b>' . $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']. '<br /><br /><br /></td>
- </tr>';
+ $MailMessage .= '<tr>
+ <td> <b>' . $myrow['deladd2'] . '</td>
+ </tr>
+ <tr>
+ <td> <b>' . $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']. '
+ <br />
+ <br />
+ <br /></td>
+ /tr>';
} else {
- $MailMessage .= '<tr><td> <b>' . $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5'] . '<br /><br /><br /></td>
+ $MailMessage .= '<tr>
+ <td> <b>' . $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5'] . '
+ <br />
+ <br />
+ <br /></td>
</tr>';
}
$MailMessage .= '</table>
@@ -229,106 +255,101 @@
if($_REQUEST['POLine'] == 1){
$MailMessage .= '<td align="right">' . $POLine[$i] . '</td>';
}
- $MailMessage .= '<td>' . $myrow2['stkcode'] . '</td><td>' . $myrow2['description'] . '</td>
+ $MailMessage .= '<td>' . $myrow2['stkcode'] . '</td>
+ <td>' . $myrow2['description'] . '</td>
<td align="right">' . $DisplayQty . '</td>
<td align="center">' . $ItemDue[$i] . '</td>
</tr>';
-
- $i = $i + 1;
-
+ $i++;
} //end while there are line items to print out
-
} /*end if there are order details to show on the order*/
$MailMessage .= '</table>
</body>
</html>';
// echo $MailMessage . "=mailMessage<br />";
-IF(mail( $MailTo, $MailSubject, $MailMessage, $headers )){
+iF(mail( $MailTo, $MailSubject, $MailMessage, $headers )){
echo ' ' ._('The following E-Mail was sent to') . ' ' . $MailTo . ' :';
}
-?>
-<html>
-<head>
-<title>Email Confirmation</title>
-</head>
-<body>
-<table width='60%'>
- <tr>
- <td align='center' colspan='4'> <?php echo "<IMG src='" . $rootpath . '/' . $_SESSION['LogoFile'] . "' alt='Logo'" .
- "width='500' height='100' align='center' border='0'>" ?>
- </td>
- </tr>
- <tr>
- <td align='center' colspan='4'> <h2> Order Acknowledgement</h2></td>
- </tr>
- <tr>
- <td align='center' colspan='4'> <b>Order Number <?=$_GET['TransNo']?> </b><br /><br /><br /></td>
- </tr>
- <tr>
- <td colspan='2' nowrap width="50%"> <b><?=$_SESSION['CompanyRecord']['coyname']?></b></td>
- <td colspan='2' nowrap width="50%"> <b>Delivered To:</b></td>
- </tr>
- <tr>
- <td colspan='2' nowrap width="50%"> <b><?=$_SESSION['CompanyRecord']['regoffice1']?> </b></td>
- <td colspan='2' nowrap width="50%"> <b><?=$myrow['deliverto']?></td>
- </tr>
- <tr>
- <td colspan='2' nowrap width="50%">
- <b><?=$_SESSION['CompanyRecord']['regoffice4']?>,
- <?=$_SESSION['CompanyRecord']['regoffice5']?> </b>
- </td>
- <td colspan='2' nowrap width="50%"> <b><?=$myrow['deladd1']?></td>
- </tr>
- <tr>
- <td colspan='2' nowrap width="50%">
- <b><?=$_SESSION['CompanyRecord']['telephone']?>
- Fax:<?=$_SESSION['CompanyRecord']['fax']?></b>
- </td>
- <td nowrap width="50%"><b><?=$myrow['deladd2']?></td>
- </tr>
- <tr>
- <td colspan='2' nowrap width="50%">
- <b><?=$_SESSION['CompanyRecord']['email']?><br /><br /><br />
- </td>
- <td nowrap width="50%">
- <b><?=$myrow['deladd3']?> <?=$myrow['deladd4'] ?> <?=$myrow['deladd5']?><br /><br /><br />
- </td>
- </tr>
-</table>
-<table border='1' width='60%' cellpadding="2" cellspacing='2'>
- <tr>
-<?
-if($_REQUEST['POLine'] == 1){
-?>
- <td align="center">PO Line</td>
-<?
+
+echo '<html>
+ <head>
+ <title>' . _('Email Confirmation') . '</title>
+ </head>
+ <body>
+ <table width="60%">
+ <tr>
+ <td align="center" colspan="4"><img src="' . $rootpath . '/' . $_SESSION['LogoFile'] . '" alt="Logo" width="500" height="100" align="center" border="0" /></td>
+ </tr>
+ <tr>
+ <td align="center" colspan="4"><h2>' . _('Order Acknowledgement') . '</h2></td>
+ </tr>
+ <tr>
+ <td align="center" colspan="4"> <b>' . _('Order Number') . ' ' . $_GET['TransNo'] . '</b>
+ <br />
+ <br />
+ <br /></td>
+ </tr>
+ <tr>
+ <td colspan="2" nowrap width="50%"> <b>' . $_SESSION['CompanyRecord']['coyname'] . '</b></td>
+ <td colspan="2" nowrap width="50%"> <b>' . _('Delivered To') . ':</b></td>
+ </tr>
+ <tr>
+ <td colspan="2" nowrap width="50%"> <b>' . $_SESSION['CompanyRecord']['regoffice1'] . '</b></td>
+ <td colspan="2" nowrap width="50%"> <b>' . $myrow['deliverto'] . '</td>
+ </tr>
+ <tr>
+ <td colspan="2" nowrap width="50%">
+ <b>' . $_SESSION['CompanyRecord']['regoffice4'] . ',
+ <br />' . $_SESSION['CompanyRecord']['regoffice5'] . '</b>
+ </td>
+ <td colspan="2" nowrap width="50%"> <b>' . $myrow['deladd1'] . '</td>
+ </tr>
+ <tr>
+ <td colspan="2" nowrap width="50%">
+ <b>' . $_SESSION['CompanyRecord']['telephone'] . '
+ <br />' . _('Fax') . ': ' . $_SESSION['CompanyRecord']['fax'] . '</b>
+ </td>
+ <td nowrap width="50%"><b>' . $myrow['deladd2'] . '</td>
+ </tr>
+ <tr>
+ <td colspan="2" nowrap width="50%">
+ <b>' . $_SESSION['CompanyRecord']['email'] . '
+ <br />
+ <br />
+ <br />
+ </td>
+ <td nowrap width="50%">
+ <b>' . $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5'] . '
+ <br />
+ <br />
+ <br />
+ </td>
+ </tr>
+ </table>
+ <table border="1" width="60%" cellpadding="2" cellspacing="2">
+ <tr>';
+
+if($_GET['POLine'] == 1){
+ echo '<td align="center">' . _('PO Line') . '</td>';
}
-?>
- <td align="center">Stock Code</td>
- <td align="center">Description</td>
- <td align="center">Quantity Ordered</td>
- <td align="center">Due Date</td>
- </tr>
-<?
-For( $j=0; $j<$i; $j++)
-{
-?>
- <tr>
-<?
- if($_REQUEST['POLine']){
-?>
- <td align='right'><?=$POLine[$j]?></td>
-<?
+echo '<td align="center">' . _('Stock Code') . '</td>
+ <td align="center">' . _('Description') . '</td>
+ <td align="center">' . _('Quantity Ordered') . '</td>
+ <td align="center">' . _('Due Date') . '</td>
+ </tr>';
+
+for( $j=0; $j<$i; $j++){
+ echo '<tr>';
+ if($_GET['POLine']){
+ echo '<td align="right">' . $POLine[$j] . '</td>';
}
-?>
- <td><?=$StkCode[$j]?></td>
- <td><?=$DscCode[$j]?></td>
- <td align="right"><?=$QtyCode[$j]?></td>
- <td align="center"><?=$ItemDue[$j]?></td>
- </tr>
-<?
+ echo '<td>' . $StkCode[$j] . '</td>
+ <td>' . $DscCode[$j] . '</td>
+ <td align="right">' . $QtyCode[$j] . '</td>
+ <td align="center">' . $ItemDue[$j] . '</td>
+ </tr>';
}
-?>
-</table>
-</body>
-</html>
+echo '</table>
+ </body>
+ </html>';
+?>
\ No newline at end of file
Modified: trunk/WorkOrderCosting.php
===================================================================
--- trunk/WorkOrderCosting.php 2012-09-08 03:26:33 UTC (rev 5633)
+++ trunk/WorkOrderCosting.php 2012-09-08 04:03:09 UTC (rev 5634)
@@ -6,6 +6,15 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
+
+if (isset($_GET['WO'])) {
+ $SelectedWO = $_GET['WO'];
+} elseif (isset($_POST['WO'])){
+ $SelectedWO = $_POST['WO'];
+} else {
+ unset($SelectedWO);
+}
+
echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a>
<br />
<p class="page_title_text">
@@ -17,7 +26,7 @@
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-if (!isset($_REQUEST['WO'])) {
+if (!isset($SelectedWO)) {
/* This page can only be called with a work order number */
echo '<div class="centre><a href="' . $rootpath . '/SelectWorkOrder.php">'.
_('Select a work order').'</a></div>';
@@ -25,8 +34,8 @@
include ('includes/footer.inc');
exit;
} else {
- echo '<input type="hidden" name="WO" value="' .$_REQUEST['WO'] . '" />';
- $_POST['WO']=$_REQUEST['WO'];
+ echo '<input type="hidden" name="WO" value="' .$SelectedWO . '" />';
+ $_POST['WO']=$SelectedWO;
}
Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php 2012-09-08 03:26:33 UTC (rev 5633)
+++ trunk/WorkOrderReceive.php 2012-09-08 04:03:09 UTC (rev 5634)
@@ -6,12 +6,26 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
-echo '<div>';
-echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a>
- <br />';
-echo '<a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Back to Costing'). '</a>
- <br />';
-echo '</div>';
+if (isset($_GET['WO'])) {
+ $SelectedWO = $_GET['WO'];
+} elseif (isset($_POST['WO'])){
+ $SelectedWO = $_POST['WO'];
+} else {
+ unset($SelectedWO);
+}
+if (isset($_GET['StockID'])) {
+ $StockID = $_GET['StockID'];
+} elseif (isset($_POST['StockID'])){
+ $StockID = $_POST['StockID'];
+} else {
+ unset($StockID);
+}
+echo '<div>
+ <a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a>
+ <br />
+ <a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $SelectedWO . '">' . _('Back to Costing'). '</a>
+ <br />
+ </div>';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' .
_('Search') . '" alt="" />' . ' ' . $title.'</p>';
@@ -20,7 +34,7 @@
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-if (!isset($_REQUEST['WO']) OR !isset($_REQUEST['StockID'])) {
+if (!isset($SelectedWO) OR !isset($StockID)) {
/* This page can only be called with a purchase order number for invoicing*/
echo '<div class="centre">
<a href="' . $rootpath . '/SelectWorkOrder.php">'. _('Select a work order to receive').'</a>
@@ -29,10 +43,10 @@
include ('includes/footer.inc');
exit;
} else {
- echo '<input type="hidden" name="WO" value="' .$_REQUEST['WO'] . '" />';
- $_POST['WO']=$_REQUEST['WO'];
- echo '<input type="hidden" name="StockID" value="' .$_REQUEST['StockID'] . '" />';
- $_POST['StockID']=$_REQUEST['StockID'];
+ echo '<input type="hidden" name="WO" value="' .$SelectedWO . '" />';
+ $_POST['WO']=$SelectedWO;
+ echo '<input type="hidden" name="StockID" value="' .$StockID . '" />';
+ $_POST['StockID']=$StockID;
}
if (isset($_POST['Process'])){ //user hit the process the work order receipts entered.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-08 04:24:15
|
Revision: 5635
http://web-erp.svn.sourceforge.net/web-erp/?rev=5635&view=rev
Author: daintree
Date: 2012-09-08 04:24:09 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
remove REQUEST use
Modified Paths:
--------------
trunk/EmailConfirmation.php
trunk/SelectSalesOrder.php
Modified: trunk/EmailConfirmation.php
===================================================================
--- trunk/EmailConfirmation.php 2012-09-08 04:03:09 UTC (rev 5634)
+++ trunk/EmailConfirmation.php 2012-09-08 04:24:09 UTC (rev 5635)
@@ -211,7 +211,7 @@
}
$MailMessage .= '</table>
<table border="1" width="50%"><tr>';
-if($_REQUEST['POLine'] == 1){
+if($_GET['POLine'] == 1){
$MailMessage .= '<td>' . _('PO Line') . '</td>';
}
$MailMessage .= '<td>' . _('Stock Code') . '</td>
@@ -252,7 +252,7 @@
$ItemDue[$i] = date('M d, Y',strtotime($myrow2['itemdue']));
}
$MailMessage .= '<tr>';
- if($_REQUEST['POLine'] == 1){
+ if($_GET['POLine'] == 1){
$MailMessage .= '<td align="right">' . $POLine[$i] . '</td>';
}
$MailMessage .= '<td>' . $myrow2['stkcode'] . '</td>
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2012-09-08 04:03:09 UTC (rev 5634)
+++ trunk/SelectSalesOrder.php 2012-09-08 04:24:09 UTC (rev 5635)
@@ -190,8 +190,8 @@
//if the user has authority to authorise the PO then it should be created as authorised
$AuthSQL ="SELECT authlevel
FROM purchorderauth
- WHERE userid='".$_SESSION['UserID']."'
- AND currabrev='".$SuppRow['currcode']."'";
+ WHERE userid='" . $_SESSION['UserID'] . "'
+ AND currabrev='" . $SuppRow['currcode'] . "'";
$AuthResult=DB_query($AuthSQL,$db);
$AuthRow=DB_fetch_array($AuthResult);
@@ -234,7 +234,7 @@
$PO_OrderNo = GetNextTransNo(18, $db); //get the next PO number
$SupplierID = $ItemRow['supplierno'];
- $Order_Value =0;
+ $Order_Value = 0;
/*Now get all the required details for the supplier */
$sql = "SELECT address1,
address2,
@@ -409,15 +409,25 @@
echo '<br /><div class="centre">';
-if (isset($_REQUEST['OrderNumber']) AND $_REQUEST['OrderNumber']!='') {
- $_REQUEST['OrderNumber'] = trim($_REQUEST['OrderNumber']);
- if (!is_numeric($_REQUEST['OrderNumber'])){
- echo '<br /><b>' . _('The Order Number entered MUST be numeric') . '</b><br />';
- unset ($_REQUEST['OrderNumber']);
+if (isset($_GET['OrderNumber'])){
+ $OrderNumber = $_GET['OrderNumber'];
+} elseif (isset($_POST['OrderNumber'])){
+ $OrderNumber = $_POST['OrderNumber'];
+} else {
+ unset($OrderNumber);
+}
+
+if (isset($OrderNumber) AND $OrderNumber!='') {
+ $OrderNumber = trim($OrderNumber);
+ if (!is_numeric($OrderNumber)){
+ echo '<br />
+ <b>' . _('The Order Number entered MUST be numeric') . '</b>
+ <br />';
+ unset ($OrderNumber);
include('includes/footer.inc');
exit;
} else {
- echo _('Order Number') . ' - ' . $_REQUEST['OrderNumber'];
+ echo _('Order Number') . ' - ' . $OrderNumber;
}
} else {
if (isset($SelectedCustomer)) {
@@ -504,7 +514,7 @@
$OrdersAfterDate = Date('d/m/Y',Mktime(0,0,0,Date('m')-2,Date('d'),Date('Y')));
*/
- if (!isset($_REQUEST['OrderNumber']) OR $_REQUEST['OrderNumber']==''){
+ if (!isset($OrderNumber) OR $OrderNumber==''){
echo '<table class="selection">
<tr>
@@ -648,8 +658,8 @@
if(!isset($_POST['StockLocation'])) {
$_POST['StockLocation'] = '';
}
- if (isset($_REQUEST['OrderNumber'])
- AND $_REQUEST['OrderNumber'] !='') {
+ if (isset($OrderNumber)
+ AND $OrderNumber !='') {
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
custbranch.brname,
@@ -670,7 +680,7 @@
INNER JOIN currencies
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorderdetails.completed=0
- AND salesorders.orderno=". $_REQUEST['OrderNumber'] ."
+ AND salesorders.orderno=". $OrderNumber ."
AND salesorders.quotation =" .$Quotations . "
GROUP BY salesorders.orderno,
debtorsmaster.name,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-08 04:24:15
|
Revision: 5635
http://web-erp.svn.sourceforge.net/web-erp/?rev=5635&view=rev
Author: daintree
Date: 2012-09-08 04:24:09 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
remove REQUEST use
Modified Paths:
--------------
trunk/EmailConfirmation.php
trunk/SelectSalesOrder.php
Modified: trunk/EmailConfirmation.php
===================================================================
--- trunk/EmailConfirmation.php 2012-09-08 04:03:09 UTC (rev 5634)
+++ trunk/EmailConfirmation.php 2012-09-08 04:24:09 UTC (rev 5635)
@@ -211,7 +211,7 @@
}
$MailMessage .= '</table>
<table border="1" width="50%"><tr>';
-if($_REQUEST['POLine'] == 1){
+if($_GET['POLine'] == 1){
$MailMessage .= '<td>' . _('PO Line') . '</td>';
}
$MailMessage .= '<td>' . _('Stock Code') . '</td>
@@ -252,7 +252,7 @@
$ItemDue[$i] = date('M d, Y',strtotime($myrow2['itemdue']));
}
$MailMessage .= '<tr>';
- if($_REQUEST['POLine'] == 1){
+ if($_GET['POLine'] == 1){
$MailMessage .= '<td align="right">' . $POLine[$i] . '</td>';
}
$MailMessage .= '<td>' . $myrow2['stkcode'] . '</td>
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2012-09-08 04:03:09 UTC (rev 5634)
+++ trunk/SelectSalesOrder.php 2012-09-08 04:24:09 UTC (rev 5635)
@@ -190,8 +190,8 @@
//if the user has authority to authorise the PO then it should be created as authorised
$AuthSQL ="SELECT authlevel
FROM purchorderauth
- WHERE userid='".$_SESSION['UserID']."'
- AND currabrev='".$SuppRow['currcode']."'";
+ WHERE userid='" . $_SESSION['UserID'] . "'
+ AND currabrev='" . $SuppRow['currcode'] . "'";
$AuthResult=DB_query($AuthSQL,$db);
$AuthRow=DB_fetch_array($AuthResult);
@@ -234,7 +234,7 @@
$PO_OrderNo = GetNextTransNo(18, $db); //get the next PO number
$SupplierID = $ItemRow['supplierno'];
- $Order_Value =0;
+ $Order_Value = 0;
/*Now get all the required details for the supplier */
$sql = "SELECT address1,
address2,
@@ -409,15 +409,25 @@
echo '<br /><div class="centre">';
-if (isset($_REQUEST['OrderNumber']) AND $_REQUEST['OrderNumber']!='') {
- $_REQUEST['OrderNumber'] = trim($_REQUEST['OrderNumber']);
- if (!is_numeric($_REQUEST['OrderNumber'])){
- echo '<br /><b>' . _('The Order Number entered MUST be numeric') . '</b><br />';
- unset ($_REQUEST['OrderNumber']);
+if (isset($_GET['OrderNumber'])){
+ $OrderNumber = $_GET['OrderNumber'];
+} elseif (isset($_POST['OrderNumber'])){
+ $OrderNumber = $_POST['OrderNumber'];
+} else {
+ unset($OrderNumber);
+}
+
+if (isset($OrderNumber) AND $OrderNumber!='') {
+ $OrderNumber = trim($OrderNumber);
+ if (!is_numeric($OrderNumber)){
+ echo '<br />
+ <b>' . _('The Order Number entered MUST be numeric') . '</b>
+ <br />';
+ unset ($OrderNumber);
include('includes/footer.inc');
exit;
} else {
- echo _('Order Number') . ' - ' . $_REQUEST['OrderNumber'];
+ echo _('Order Number') . ' - ' . $OrderNumber;
}
} else {
if (isset($SelectedCustomer)) {
@@ -504,7 +514,7 @@
$OrdersAfterDate = Date('d/m/Y',Mktime(0,0,0,Date('m')-2,Date('d'),Date('Y')));
*/
- if (!isset($_REQUEST['OrderNumber']) OR $_REQUEST['OrderNumber']==''){
+ if (!isset($OrderNumber) OR $OrderNumber==''){
echo '<table class="selection">
<tr>
@@ -648,8 +658,8 @@
if(!isset($_POST['StockLocation'])) {
$_POST['StockLocation'] = '';
}
- if (isset($_REQUEST['OrderNumber'])
- AND $_REQUEST['OrderNumber'] !='') {
+ if (isset($OrderNumber)
+ AND $OrderNumber !='') {
$SQL = "SELECT salesorders.orderno,
debtorsmaster.name,
custbranch.brname,
@@ -670,7 +680,7 @@
INNER JOIN currencies
ON debtorsmaster.currcode = currencies.currabrev
WHERE salesorderdetails.completed=0
- AND salesorders.orderno=". $_REQUEST['OrderNumber'] ."
+ AND salesorders.orderno=". $OrderNumber ."
AND salesorders.quotation =" .$Quotations . "
GROUP BY salesorders.orderno,
debtorsmaster.name,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-08 06:07:37
|
Revision: 5637
http://web-erp.svn.sourceforge.net/web-erp/?rev=5637&view=rev
Author: daintree
Date: 2012-09-08 06:07:30 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
remove REQUEST use
Modified Paths:
--------------
trunk/MRP.php
trunk/PDFTopItems.php
trunk/SelectAsset.php
trunk/TopItems.php
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2012-09-08 04:28:27 UTC (rev 5636)
+++ trunk/MRP.php 2012-09-08 06:07:30 UTC (rev 5637)
@@ -245,10 +245,11 @@
salesorderdetails.orderno,
'1',
stkcode
- FROM salesorders, salesorderdetails, stockmaster
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND stockmaster.stockid = salesorderdetails.stkcode
- AND stockmaster.discontinued = 0
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN stockmaster
+ ON stockmaster.stockid = salesorderdetails.stkcode
+ WHERE stockmaster.discontinued = 0
AND (quantity - qtyinvoiced) > 0
AND salesorderdetails.completed = 0
AND salesorders.quotation = 0";
Modified: trunk/PDFTopItems.php
===================================================================
--- trunk/PDFTopItems.php 2012-09-08 04:28:27 UTC (rev 5636)
+++ trunk/PDFTopItems.php 2012-09-08 06:07:30 UTC (rev 5637)
@@ -13,7 +13,7 @@
$FromDate = FormatDateForSQL(DateAdd(Date($_SESSION['DefaultDateFormat']),'d', -$_GET['NumberOfDays']));
//the situation if the location and customer type selected "All"
-if (($_GET['Location'] == 'All') and ($_GET['Customers'] == 'All')) {
+if (($_GET['Location'] == 'All') AND ($_GET['Customers'] == 'All')) {
$SQL = "SELECT salesorderdetails.stkcode,
SUM(salesorderdetails.qtyinvoiced) totalinvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS valuesales,
@@ -26,8 +26,8 @@
AND salesorders.debtorno = debtorsmaster.debtorno
AND salesorderdetails.actualdispatchdate >='" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_GET['Sequence'] . " DESC
- LIMIT " . $_GET['NumberOfTopItems'] ;
+ ORDER BY `" . $_GET['Sequence'] . "` DESC
+ LIMIT " . intval($_GET['NumberOfTopItems']) ;
} else { //the situation if only location type selected "All"
if ($_GET['Location'] == 'All') {
$SQL = "SELECT salesorderdetails.stkcode,
@@ -42,8 +42,8 @@
AND debtorsmaster.typeid = '" . $_GET['Customers'] . "'
AND salesorderdetails.ActualDispatchDate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_GET['Sequence'] . " DESC
- LIMIT " . $_GET['NumberOfTopItems'];
+ ORDER BY `" . $_GET['Sequence'] . "` DESC
+ LIMIT " . intval($_GET['NumberOfTopItems']);
} else {
//the situation if the customer type selected "All"
if ($_GET['Customers'] == 'All') {
@@ -60,8 +60,8 @@
AND salesorders.fromstkloc = '" . $_GET['Location'] . "'
AND salesorderdetails.ActualDispatchDate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_GET['Sequence'] . " DESC
- LIMIT 0," . $_GET['NumberOfTopItems'];
+ ORDER BY `" . $_GET['Sequence'] . "` DESC
+ LIMIT 0," . intval($_GET['NumberOfTopItems']);
} else {
//the situation if the location and customer type not selected "All"
$SQL = "SELECT salesorderdetails.stkcode,
@@ -78,8 +78,8 @@
AND debtorsmaster.typeid = '" . $_GET['Customers'] . "'
AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_GET['Sequence'] . " DESC
- LIMIT " . $_GET['NumberOfTopItems'];
+ ORDER BY `" . $_GET['Sequence'] . "` DESC
+ LIMIT " . intval($_GET['NumberOfTopItems']);
}
}
}
@@ -90,7 +90,7 @@
//find the quantity onhand item
$sqloh = "SELECT sum(quantity)as qty
FROM locstock
- WHERE stockid='" . $myrow['stkcode'] . "'";
+ WHERE stockid='" . DB_escape_string($myrow['stkcode']) . "'";
$oh = DB_query($sqloh, $db);
$ohRow = DB_fetch_row($oh);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 1, $YPos, 80, $FontSize, $myrow['stkcode']);
Modified: trunk/SelectAsset.php
===================================================================
--- trunk/SelectAsset.php 2012-09-08 04:28:27 UTC (rev 5636)
+++ trunk/SelectAsset.php 2012-09-08 06:07:30 UTC (rev 5637)
@@ -40,7 +40,7 @@
}
// end of showing search facilities
-echo '<form action="SelectAsset.php?' . SID . '" method="post">';
+echo '<form action="SelectAsset.php" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>';
@@ -200,31 +200,31 @@
}
$ErrMsg = _('No assets were returned by the SQL because');
$DbgMsg = _('The SQL that returned an error was');
- $searchresult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
+ $SearchResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
- if (DB_num_rows($searchresult) == 0) {
+ if (DB_num_rows($SearchResult) == 0) {
prnMsg(_('No assets were returned by this search please re-enter alternative criteria to try again'), 'info');
}
unset($_POST['Search']);
}
/* end query for list of records */
/* display list if there is more than one record */
-if (isset($searchresult) AND !isset($_POST['Select'])) {
- echo '<form action="FixedAssetItems.php" method="post">';
+if (isset($SearchResult) AND !isset($_POST['Select'])) {
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- $ListCount = DB_num_rows($searchresult);
+ $ListCount = DB_num_rows($SearchResult);
if ($ListCount > 0) {
// If the user hit the search button and there is more than one item to show
$ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
if (isset($_POST['Next'])) {
if ($_POST['PageOffset'] < $ListPageMax) {
- $_POST['PageOffset'] = $_POST['PageOffset'] + 1;
+ $_POST['PageOffset'] ++;
}
}
if (isset($_POST['Previous'])) {
if ($_POST['PageOffset'] > 1) {
- $_POST['PageOffset'] = $_POST['PageOffset'] - 1;
+ $_POST['PageOffset']--;
}
}
if ($_POST['PageOffset'] > $ListPageMax) {
@@ -260,10 +260,10 @@
$j = 1;
$k = 0; //row counter to determine background colour
$RowIndex = 0;
- if (DB_num_rows($searchresult) <> 0) {
- DB_data_seek($searchresult, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
+ if (DB_num_rows($SearchResult) <> 0) {
+ DB_data_seek($SearchResult, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
}
- while (($myrow = DB_fetch_array($searchresult)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
+ while (($myrow = DB_fetch_array($SearchResult)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
if ($k == 1) {
echo '<tr class="EvenTableRows">';
$k = 0;
Modified: trunk/TopItems.php
===================================================================
--- trunk/TopItems.php 2012-09-08 04:28:27 UTC (rev 5636)
+++ trunk/TopItems.php 2012-09-08 06:07:30 UTC (rev 5637)
@@ -148,7 +148,7 @@
}
$SQL = $SQL . " GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_POST['Sequence'] . " DESC
+ ORDER BY `" . $_POST['Sequence'] . "` DESC
LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
$result = DB_query($SQL, $db);
@@ -191,13 +191,13 @@
case 'B':
$QOHResult = DB_query("SELECT sum(quantity)
FROM locstock
- WHERE stockid = '" . $myrow['stkcode'] . "'", $db);
+ WHERE stockid = '" . DB_escape_string($myrow['stkcode']) . "'", $db);
$QOHRow = DB_fetch_row($QOHResult);
$QOH = $QOHRow[0];
$QOOSQL="SELECT SUM(purchorderdetails.quantityord -purchorderdetails.quantityrecd) AS QtyOnOrder
FROM purchorders INNER JOIN purchorderdetails
ON purchorders.orderno=purchorderdetails.orderno
- WHERE purchorderdetails.itemcode='" . $myrow['stkcode'] . "'
+ WHERE purchorderdetails.itemcode='" . DB_escape_string($myrow['stkcode']) . "'
AND purchorderdetails.completed =0
AND purchorders.status<>'Cancelled'
AND purchorders.status<>'Pending'
@@ -214,7 +214,7 @@
FROM woitems INNER JOIN workorders
ON woitems.wo=workorders.wo
WHERE workorders.closed=0
- AND woitems.stockid='" . $myrow['stkcode'] . "'";
+ AND woitems.stockid='" . DB_escape_string($myrow['stkcode']) . "'";
$ErrMsg = _('The quantity on work orders for this product cannot be retrieved because');
$QOOResult = DB_query($sql, $db, $ErrMsg);
if (DB_num_rows($QOOResult) == 1) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-08 06:07:37
|
Revision: 5637
http://web-erp.svn.sourceforge.net/web-erp/?rev=5637&view=rev
Author: daintree
Date: 2012-09-08 06:07:30 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
remove REQUEST use
Modified Paths:
--------------
trunk/MRP.php
trunk/PDFTopItems.php
trunk/SelectAsset.php
trunk/TopItems.php
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2012-09-08 04:28:27 UTC (rev 5636)
+++ trunk/MRP.php 2012-09-08 06:07:30 UTC (rev 5637)
@@ -245,10 +245,11 @@
salesorderdetails.orderno,
'1',
stkcode
- FROM salesorders, salesorderdetails, stockmaster
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND stockmaster.stockid = salesorderdetails.stkcode
- AND stockmaster.discontinued = 0
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN stockmaster
+ ON stockmaster.stockid = salesorderdetails.stkcode
+ WHERE stockmaster.discontinued = 0
AND (quantity - qtyinvoiced) > 0
AND salesorderdetails.completed = 0
AND salesorders.quotation = 0";
Modified: trunk/PDFTopItems.php
===================================================================
--- trunk/PDFTopItems.php 2012-09-08 04:28:27 UTC (rev 5636)
+++ trunk/PDFTopItems.php 2012-09-08 06:07:30 UTC (rev 5637)
@@ -13,7 +13,7 @@
$FromDate = FormatDateForSQL(DateAdd(Date($_SESSION['DefaultDateFormat']),'d', -$_GET['NumberOfDays']));
//the situation if the location and customer type selected "All"
-if (($_GET['Location'] == 'All') and ($_GET['Customers'] == 'All')) {
+if (($_GET['Location'] == 'All') AND ($_GET['Customers'] == 'All')) {
$SQL = "SELECT salesorderdetails.stkcode,
SUM(salesorderdetails.qtyinvoiced) totalinvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS valuesales,
@@ -26,8 +26,8 @@
AND salesorders.debtorno = debtorsmaster.debtorno
AND salesorderdetails.actualdispatchdate >='" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_GET['Sequence'] . " DESC
- LIMIT " . $_GET['NumberOfTopItems'] ;
+ ORDER BY `" . $_GET['Sequence'] . "` DESC
+ LIMIT " . intval($_GET['NumberOfTopItems']) ;
} else { //the situation if only location type selected "All"
if ($_GET['Location'] == 'All') {
$SQL = "SELECT salesorderdetails.stkcode,
@@ -42,8 +42,8 @@
AND debtorsmaster.typeid = '" . $_GET['Customers'] . "'
AND salesorderdetails.ActualDispatchDate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_GET['Sequence'] . " DESC
- LIMIT " . $_GET['NumberOfTopItems'];
+ ORDER BY `" . $_GET['Sequence'] . "` DESC
+ LIMIT " . intval($_GET['NumberOfTopItems']);
} else {
//the situation if the customer type selected "All"
if ($_GET['Customers'] == 'All') {
@@ -60,8 +60,8 @@
AND salesorders.fromstkloc = '" . $_GET['Location'] . "'
AND salesorderdetails.ActualDispatchDate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_GET['Sequence'] . " DESC
- LIMIT 0," . $_GET['NumberOfTopItems'];
+ ORDER BY `" . $_GET['Sequence'] . "` DESC
+ LIMIT 0," . intval($_GET['NumberOfTopItems']);
} else {
//the situation if the location and customer type not selected "All"
$SQL = "SELECT salesorderdetails.stkcode,
@@ -78,8 +78,8 @@
AND debtorsmaster.typeid = '" . $_GET['Customers'] . "'
AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_GET['Sequence'] . " DESC
- LIMIT " . $_GET['NumberOfTopItems'];
+ ORDER BY `" . $_GET['Sequence'] . "` DESC
+ LIMIT " . intval($_GET['NumberOfTopItems']);
}
}
}
@@ -90,7 +90,7 @@
//find the quantity onhand item
$sqloh = "SELECT sum(quantity)as qty
FROM locstock
- WHERE stockid='" . $myrow['stkcode'] . "'";
+ WHERE stockid='" . DB_escape_string($myrow['stkcode']) . "'";
$oh = DB_query($sqloh, $db);
$ohRow = DB_fetch_row($oh);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 1, $YPos, 80, $FontSize, $myrow['stkcode']);
Modified: trunk/SelectAsset.php
===================================================================
--- trunk/SelectAsset.php 2012-09-08 04:28:27 UTC (rev 5636)
+++ trunk/SelectAsset.php 2012-09-08 06:07:30 UTC (rev 5637)
@@ -40,7 +40,7 @@
}
// end of showing search facilities
-echo '<form action="SelectAsset.php?' . SID . '" method="post">';
+echo '<form action="SelectAsset.php" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>';
@@ -200,31 +200,31 @@
}
$ErrMsg = _('No assets were returned by the SQL because');
$DbgMsg = _('The SQL that returned an error was');
- $searchresult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
+ $SearchResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
- if (DB_num_rows($searchresult) == 0) {
+ if (DB_num_rows($SearchResult) == 0) {
prnMsg(_('No assets were returned by this search please re-enter alternative criteria to try again'), 'info');
}
unset($_POST['Search']);
}
/* end query for list of records */
/* display list if there is more than one record */
-if (isset($searchresult) AND !isset($_POST['Select'])) {
- echo '<form action="FixedAssetItems.php" method="post">';
+if (isset($SearchResult) AND !isset($_POST['Select'])) {
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- $ListCount = DB_num_rows($searchresult);
+ $ListCount = DB_num_rows($SearchResult);
if ($ListCount > 0) {
// If the user hit the search button and there is more than one item to show
$ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
if (isset($_POST['Next'])) {
if ($_POST['PageOffset'] < $ListPageMax) {
- $_POST['PageOffset'] = $_POST['PageOffset'] + 1;
+ $_POST['PageOffset'] ++;
}
}
if (isset($_POST['Previous'])) {
if ($_POST['PageOffset'] > 1) {
- $_POST['PageOffset'] = $_POST['PageOffset'] - 1;
+ $_POST['PageOffset']--;
}
}
if ($_POST['PageOffset'] > $ListPageMax) {
@@ -260,10 +260,10 @@
$j = 1;
$k = 0; //row counter to determine background colour
$RowIndex = 0;
- if (DB_num_rows($searchresult) <> 0) {
- DB_data_seek($searchresult, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
+ if (DB_num_rows($SearchResult) <> 0) {
+ DB_data_seek($SearchResult, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
}
- while (($myrow = DB_fetch_array($searchresult)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
+ while (($myrow = DB_fetch_array($SearchResult)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
if ($k == 1) {
echo '<tr class="EvenTableRows">';
$k = 0;
Modified: trunk/TopItems.php
===================================================================
--- trunk/TopItems.php 2012-09-08 04:28:27 UTC (rev 5636)
+++ trunk/TopItems.php 2012-09-08 06:07:30 UTC (rev 5637)
@@ -148,7 +148,7 @@
}
$SQL = $SQL . " GROUP BY salesorderdetails.stkcode
- ORDER BY " . $_POST['Sequence'] . " DESC
+ ORDER BY `" . $_POST['Sequence'] . "` DESC
LIMIT " . filter_number_format($_POST['NumberOfTopItems']);
$result = DB_query($SQL, $db);
@@ -191,13 +191,13 @@
case 'B':
$QOHResult = DB_query("SELECT sum(quantity)
FROM locstock
- WHERE stockid = '" . $myrow['stkcode'] . "'", $db);
+ WHERE stockid = '" . DB_escape_string($myrow['stkcode']) . "'", $db);
$QOHRow = DB_fetch_row($QOHResult);
$QOH = $QOHRow[0];
$QOOSQL="SELECT SUM(purchorderdetails.quantityord -purchorderdetails.quantityrecd) AS QtyOnOrder
FROM purchorders INNER JOIN purchorderdetails
ON purchorders.orderno=purchorderdetails.orderno
- WHERE purchorderdetails.itemcode='" . $myrow['stkcode'] . "'
+ WHERE purchorderdetails.itemcode='" . DB_escape_string($myrow['stkcode']) . "'
AND purchorderdetails.completed =0
AND purchorders.status<>'Cancelled'
AND purchorders.status<>'Pending'
@@ -214,7 +214,7 @@
FROM woitems INNER JOIN workorders
ON woitems.wo=workorders.wo
WHERE workorders.closed=0
- AND woitems.stockid='" . $myrow['stkcode'] . "'";
+ AND woitems.stockid='" . DB_escape_string($myrow['stkcode']) . "'";
$ErrMsg = _('The quantity on work orders for this product cannot be retrieved because');
$QOOResult = DB_query($sql, $db, $ErrMsg);
if (DB_num_rows($QOOResult) == 1) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-09-10 11:32:28
|
Revision: 5657
http://web-erp.svn.sourceforge.net/web-erp/?rev=5657&view=rev
Author: daintree
Date: 2012-09-10 11:32:07 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
reinstated css
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/doc/Change.log
Added Paths:
-----------
trunk/css/
trunk/css/aguapop/
trunk/css/aguapop/default.css
trunk/css/aguapop/images/
trunk/css/aguapop/images/allocation.png
trunk/css/aguapop/images/ar.png
trunk/css/aguapop/images/bank.png
trunk/css/aguapop/images/company.png
trunk/css/aguapop/images/contract.png
trunk/css/aguapop/images/credit.gif
trunk/css/aguapop/images/currency.png
trunk/css/aguapop/images/customer.png
trunk/css/aguapop/images/email.gif
trunk/css/aguapop/images/error.png
trunk/css/aguapop/images/folder_add.png
trunk/css/aguapop/images/folders.gif
trunk/css/aguapop/images/footer.png
trunk/css/aguapop/images/gl.png
trunk/css/aguapop/images/group_add.png
trunk/css/aguapop/images/help.png
trunk/css/aguapop/images/input.png
trunk/css/aguapop/images/input_bg.png
trunk/css/aguapop/images/inventory.png
trunk/css/aguapop/images/magnifier.png
trunk/css/aguapop/images/maintenance.png
trunk/css/aguapop/images/money_add.png
trunk/css/aguapop/images/money_delete.png
trunk/css/aguapop/images/note_add.png
trunk/css/aguapop/images/pdf.png
trunk/css/aguapop/images/preview.gif
trunk/css/aguapop/images/preview.png
trunk/css/aguapop/images/printer.png
trunk/css/aguapop/images/reports.png
trunk/css/aguapop/images/sales.png
trunk/css/aguapop/images/security.png
trunk/css/aguapop/images/stripe.png
trunk/css/aguapop/images/supplier.png
trunk/css/aguapop/images/tick.png
trunk/css/aguapop/images/top_bg.png
trunk/css/aguapop/images/transactions.png
trunk/css/aguapop/images/user.png
trunk/css/aguapop/login.css
trunk/css/bg.gif
trunk/css/default/
trunk/css/default/default.css
trunk/css/default/images/
trunk/css/default/images/Graphique-32.png
trunk/css/default/images/allocation.gif
trunk/css/default/images/allocation.png
trunk/css/default/images/ar.gif
trunk/css/default/images/ar.png
trunk/css/default/images/back.png
trunk/css/default/images/bank.gif
trunk/css/default/images/bar.png
trunk/css/default/images/button_bg.png
trunk/css/default/images/company.gif
trunk/css/default/images/company.png
trunk/css/default/images/contract.png
trunk/css/default/images/credit.gif
trunk/css/default/images/currency.gif
trunk/css/default/images/customer.png
trunk/css/default/images/email.gif
trunk/css/default/images/error.png
trunk/css/default/images/folder_add.png
trunk/css/default/images/folders.gif
trunk/css/default/images/gelblue.png
trunk/css/default/images/gelbluebutton.png
trunk/css/default/images/gelblueh.png
trunk/css/default/images/gl.png
trunk/css/default/images/group_add.png
trunk/css/default/images/hoverbuttonblue.png
trunk/css/default/images/input.png
trunk/css/default/images/input_bg.png
trunk/css/default/images/inputh.png
trunk/css/default/images/inputhtxt.png
trunk/css/default/images/inputtxt.png
trunk/css/default/images/inquiries.png
trunk/css/default/images/inventory.gif
trunk/css/default/images/inventory.png
trunk/css/default/images/magnifier.png
trunk/css/default/images/maintenance.gif
trunk/css/default/images/maintenance.png
trunk/css/default/images/menu_bg.png
trunk/css/default/images/menu_bg_blue.png
trunk/css/default/images/menu_bg_dblue.png
trunk/css/default/images/menu_bg_grey.png
trunk/css/default/images/menu_bg_indigo.png
trunk/css/default/images/menu_bg_white.png
trunk/css/default/images/menucurve.gif
trunk/css/default/images/money_add.png
trunk/css/default/images/money_delete.png
trunk/css/default/images/note_add.png
trunk/css/default/images/pdf.png
trunk/css/default/images/preview.gif
trunk/css/default/images/printer.png
trunk/css/default/images/reports.gif
trunk/css/default/images/reports.png
trunk/css/default/images/sales.png
trunk/css/default/images/security.png
trunk/css/default/images/stripe.png
trunk/css/default/images/supplier.png
trunk/css/default/images/tick.png
trunk/css/default/images/transactions.gif
trunk/css/default/images/transactions.png
trunk/css/default/images/user.png
trunk/css/default/login.css
trunk/css/fluid/
trunk/css/fluid/default.css
trunk/css/fluid/images/
trunk/css/fluid/images/allocation.png
trunk/css/fluid/images/ar.png
trunk/css/fluid/images/back.png
trunk/css/fluid/images/bank.gif
trunk/css/fluid/images/company.png
trunk/css/fluid/images/contract.png
trunk/css/fluid/images/credit.gif
trunk/css/fluid/images/currency.gif
trunk/css/fluid/images/customer.png
trunk/css/fluid/images/email.gif
trunk/css/fluid/images/error.png
trunk/css/fluid/images/folder_add.png
trunk/css/fluid/images/gl.png
trunk/css/fluid/images/group_add.png
trunk/css/fluid/images/inquiries.png
trunk/css/fluid/images/inventory.png
trunk/css/fluid/images/magnifier.png
trunk/css/fluid/images/maintenance.png
trunk/css/fluid/images/money_add.png
trunk/css/fluid/images/money_delete.png
trunk/css/fluid/images/note_add.png
trunk/css/fluid/images/pdf.png
trunk/css/fluid/images/preview.gif
trunk/css/fluid/images/printer.png
trunk/css/fluid/images/reports.gif
trunk/css/fluid/images/reports.png
trunk/css/fluid/images/sales.png
trunk/css/fluid/images/security.png
trunk/css/fluid/images/supplier.png
trunk/css/fluid/images/tick.png
trunk/css/fluid/images/transactions.gif
trunk/css/fluid/images/transactions.png
trunk/css/fluid/images/user.png
trunk/css/fluid/login.css
trunk/css/fresh/
trunk/css/fresh/bullet.gif
trunk/css/fresh/default.css
trunk/css/fresh/images/
trunk/css/fresh/images/Graphique-32.png
trunk/css/fresh/images/allocation.gif
trunk/css/fresh/images/allocation.png
trunk/css/fresh/images/ar.gif
trunk/css/fresh/images/ar.png
trunk/css/fresh/images/back.png
trunk/css/fresh/images/bank.gif
trunk/css/fresh/images/bar.png
trunk/css/fresh/images/button_bg.png
trunk/css/fresh/images/company.gif
trunk/css/fresh/images/company.png
trunk/css/fresh/images/contract.png
trunk/css/fresh/images/credit.gif
trunk/css/fresh/images/currency.gif
trunk/css/fresh/images/customer.png
trunk/css/fresh/images/email.gif
trunk/css/fresh/images/error.png
trunk/css/fresh/images/folder_add.png
trunk/css/fresh/images/folders.gif
trunk/css/fresh/images/gelblue.png
trunk/css/fresh/images/gelbluebutton.png
trunk/css/fresh/images/gelblueh.png
trunk/css/fresh/images/gl.png
trunk/css/fresh/images/group_add.png
trunk/css/fresh/images/hoverbuttonblue.png
trunk/css/fresh/images/input.png
trunk/css/fresh/images/input_bg.png
trunk/css/fresh/images/inputh.png
trunk/css/fresh/images/inputhtxt.png
trunk/css/fresh/images/inputtxt.png
trunk/css/fresh/images/inquiries.png
trunk/css/fresh/images/inventory.gif
trunk/css/fresh/images/inventory.png
trunk/css/fresh/images/magnifier.png
trunk/css/fresh/images/maintenance.gif
trunk/css/fresh/images/maintenance.png
trunk/css/fresh/images/menu_bg.png
trunk/css/fresh/images/menu_bg_blue.png
trunk/css/fresh/images/menu_bg_dblue.png
trunk/css/fresh/images/menu_bg_grey.png
trunk/css/fresh/images/menu_bg_indigo.png
trunk/css/fresh/images/menu_bg_white.png
trunk/css/fresh/images/menucurve.gif
trunk/css/fresh/images/money_add.png
trunk/css/fresh/images/money_delete.png
trunk/css/fresh/images/note_add.png
trunk/css/fresh/images/pdf.png
trunk/css/fresh/images/preview.gif
trunk/css/fresh/images/printer.png
trunk/css/fresh/images/reports.gif
trunk/css/fresh/images/reports.png
trunk/css/fresh/images/sales.png
trunk/css/fresh/images/security.png
trunk/css/fresh/images/stripe.png
trunk/css/fresh/images/supplier.png
trunk/css/fresh/images/tick.png
trunk/css/fresh/images/transactions.gif
trunk/css/fresh/images/transactions.png
trunk/css/fresh/images/user.png
trunk/css/fresh/login.css
trunk/css/gel/
trunk/css/gel/default.css
trunk/css/gel/images/
trunk/css/gel/images/allocation.png
trunk/css/gel/images/ar.png
trunk/css/gel/images/back.png
trunk/css/gel/images/bar.png
trunk/css/gel/images/company.png
trunk/css/gel/images/contract.png
trunk/css/gel/images/credit.gif
trunk/css/gel/images/customer.png
trunk/css/gel/images/email.gif
trunk/css/gel/images/error.png
trunk/css/gel/images/folder_add.png
trunk/css/gel/images/folders.gif
trunk/css/gel/images/gelblue.png
trunk/css/gel/images/gl.png
trunk/css/gel/images/group_add.png
trunk/css/gel/images/input.png
trunk/css/gel/images/inputh.png
trunk/css/gel/images/inputhtxt.png
trunk/css/gel/images/inputtxt.png
trunk/css/gel/images/inventory.png
trunk/css/gel/images/magnifier.png
trunk/css/gel/images/maintenance.gif
trunk/css/gel/images/maintenance.png
trunk/css/gel/images/menu_bg.png
trunk/css/gel/images/menu_bg_blue.png
trunk/css/gel/images/menu_bg_dblue.png
trunk/css/gel/images/menu_bg_grey.png
trunk/css/gel/images/menu_bg_indigo.png
trunk/css/gel/images/menu_bg_white.png
trunk/css/gel/images/menucurve.gif
trunk/css/gel/images/money_add.png
trunk/css/gel/images/money_delete.png
trunk/css/gel/images/note_add.png
trunk/css/gel/images/pdf.png
trunk/css/gel/images/preview.gif
trunk/css/gel/images/printer.png
trunk/css/gel/images/reports.gif
trunk/css/gel/images/reports.png
trunk/css/gel/images/sales.png
trunk/css/gel/images/security.png
trunk/css/gel/images/stripe.png
trunk/css/gel/images/supplier.png
trunk/css/gel/images/tick.png
trunk/css/gel/images/transactions.gif
trunk/css/gel/images/transactions.png
trunk/css/gel/images/user.png
trunk/css/gel/login.css
trunk/css/labelsDim.png
trunk/css/paramsLabel.png
trunk/css/professional/
trunk/css/professional/default.css
trunk/css/professional/images/
trunk/css/professional/images/allocation.png
trunk/css/professional/images/ar.png
trunk/css/professional/images/company.png
trunk/css/professional/images/contract.png
trunk/css/professional/images/credit.gif
trunk/css/professional/images/currency.gif
trunk/css/professional/images/customer.png
trunk/css/professional/images/email.gif
trunk/css/professional/images/error.png
trunk/css/professional/images/folder_add.png
trunk/css/professional/images/gl.png
trunk/css/professional/images/group_add.png
trunk/css/professional/images/input_bg.png
trunk/css/professional/images/inputtxt.png
trunk/css/professional/images/inquiries.png
trunk/css/professional/images/inventory.png
trunk/css/professional/images/magnifier.png
trunk/css/professional/images/maintenance.png
trunk/css/professional/images/money_add.png
trunk/css/professional/images/money_delete.png
trunk/css/professional/images/note_add.png
trunk/css/professional/images/pdf.png
trunk/css/professional/images/preview.gif
trunk/css/professional/images/printer.png
trunk/css/professional/images/reports.gif
trunk/css/professional/images/reports.png
trunk/css/professional/images/sales.png
trunk/css/professional/images/security.png
trunk/css/professional/images/stripe.png
trunk/css/professional/images/supplier.png
trunk/css/professional/images/tick.png
trunk/css/professional/images/transactions.gif
trunk/css/professional/images/transactions.png
trunk/css/professional/images/user.png
trunk/css/professional/login.css
trunk/css/professional-rtl/
trunk/css/professional-rtl/default.css
trunk/css/professional-rtl/images/
trunk/css/professional-rtl/images/allocation.gif
trunk/css/professional-rtl/images/allocation.png
trunk/css/professional-rtl/images/ar.gif
trunk/css/professional-rtl/images/ar.png
trunk/css/professional-rtl/images/bank.gif
trunk/css/professional-rtl/images/company.png
trunk/css/professional-rtl/images/credit.gif
trunk/css/professional-rtl/images/customer.png
trunk/css/professional-rtl/images/email.gif
trunk/css/professional-rtl/images/error.png
trunk/css/professional-rtl/images/folder_add.png
trunk/css/professional-rtl/images/folders.gif
trunk/css/professional-rtl/images/gl.png
trunk/css/professional-rtl/images/group_add.png
trunk/css/professional-rtl/images/input_bg.png
trunk/css/professional-rtl/images/inputtxt.png
trunk/css/professional-rtl/images/inventory.png
trunk/css/professional-rtl/images/magnifier.png
trunk/css/professional-rtl/images/maintenance.png
trunk/css/professional-rtl/images/money_add.png
trunk/css/professional-rtl/images/money_delete.png
trunk/css/professional-rtl/images/note_add.png
trunk/css/professional-rtl/images/pdf.png
trunk/css/professional-rtl/images/preview.gif
trunk/css/professional-rtl/images/printer.png
trunk/css/professional-rtl/images/reports.gif
trunk/css/professional-rtl/images/reports.png
trunk/css/professional-rtl/images/sales.png
trunk/css/professional-rtl/images/security.png
trunk/css/professional-rtl/images/supplier.png
trunk/css/professional-rtl/images/tick.png
trunk/css/professional-rtl/images/transactions.png
trunk/css/professional-rtl/images/user.png
trunk/css/professional-rtl/login.css
trunk/css/silverwolf/
trunk/css/silverwolf/default.css
trunk/css/silverwolf/images/
trunk/css/silverwolf/images/allocation.png
trunk/css/silverwolf/images/ar.png
trunk/css/silverwolf/images/back.png
trunk/css/silverwolf/images/bar.png
trunk/css/silverwolf/images/company.png
trunk/css/silverwolf/images/contract.png
trunk/css/silverwolf/images/credit.gif
trunk/css/silverwolf/images/customer.png
trunk/css/silverwolf/images/email.gif
trunk/css/silverwolf/images/error.png
trunk/css/silverwolf/images/folder_add.png
trunk/css/silverwolf/images/gl.png
trunk/css/silverwolf/images/group_add.png
trunk/css/silverwolf/images/input_bg.png
trunk/css/silverwolf/images/inventory.png
trunk/css/silverwolf/images/magnifier.png
trunk/css/silverwolf/images/maintenance.png
trunk/css/silverwolf/images/menu_bg.png
trunk/css/silverwolf/images/menu_bg_dblue.png
trunk/css/silverwolf/images/money_add.png
trunk/css/silverwolf/images/money_delete.png
trunk/css/silverwolf/images/note_add.png
trunk/css/silverwolf/images/pdf.png
trunk/css/silverwolf/images/preview.gif
trunk/css/silverwolf/images/printer.png
trunk/css/silverwolf/images/reports.png
trunk/css/silverwolf/images/sales.png
trunk/css/silverwolf/images/security.png
trunk/css/silverwolf/images/stripe.png
trunk/css/silverwolf/images/supplier.png
trunk/css/silverwolf/images/tick.png
trunk/css/silverwolf/images/transactions.png
trunk/css/silverwolf/images/user.png
trunk/css/silverwolf/login.css
trunk/css/spacer.gif
trunk/css/webERP.gif
trunk/css/webERPsm.gif
trunk/css/wood/
trunk/css/wood/bullet.gif
trunk/css/wood/default.css
trunk/css/wood/images/
trunk/css/wood/images/User.png
trunk/css/wood/images/allocation.png
trunk/css/wood/images/ar.png
trunk/css/wood/images/company.png
trunk/css/wood/images/contract.png
trunk/css/wood/images/credit.gif
trunk/css/wood/images/customer.png
trunk/css/wood/images/desk.jpg
trunk/css/wood/images/email.gif
trunk/css/wood/images/error.png
trunk/css/wood/images/folder_add.png
trunk/css/wood/images/folders.gif
trunk/css/wood/images/gl.png
trunk/css/wood/images/group_add.png
trunk/css/wood/images/inquiries.png
trunk/css/wood/images/inventory.png
trunk/css/wood/images/magnifier.png
trunk/css/wood/images/maintenance.png
trunk/css/wood/images/money_add.png
trunk/css/wood/images/money_delete.png
trunk/css/wood/images/note_add.png
trunk/css/wood/images/pdf.png
trunk/css/wood/images/preview.gif
trunk/css/wood/images/printer.png
trunk/css/wood/images/reports.gif
trunk/css/wood/images/reports.png
trunk/css/wood/images/sales.png
trunk/css/wood/images/security.png
trunk/css/wood/images/supplier.png
trunk/css/wood/images/tick.png
trunk/css/wood/images/transactions 2.png
trunk/css/wood/images/transactions.png
trunk/css/wood/images/wood.jpg
trunk/css/wood/login.css
Removed Paths:
-------------
trunk/css/aguapop/
trunk/css/aguapop/default.css
trunk/css/aguapop/images/
trunk/css/aguapop/images/allocation.png
trunk/css/aguapop/images/ar.png
trunk/css/aguapop/images/bank.png
trunk/css/aguapop/images/company.png
trunk/css/aguapop/images/contract.png
trunk/css/aguapop/images/credit.gif
trunk/css/aguapop/images/currency.png
trunk/css/aguapop/images/customer.png
trunk/css/aguapop/images/email.gif
trunk/css/aguapop/images/error.png
trunk/css/aguapop/images/folder_add.png
trunk/css/aguapop/images/folders.gif
trunk/css/aguapop/images/footer.png
trunk/css/aguapop/images/gl.png
trunk/css/aguapop/images/group_add.png
trunk/css/aguapop/images/help.png
trunk/css/aguapop/images/input.png
trunk/css/aguapop/images/input_bg.png
trunk/css/aguapop/images/inventory.png
trunk/css/aguapop/images/magnifier.png
trunk/css/aguapop/images/maintenance.png
trunk/css/aguapop/images/money_add.png
trunk/css/aguapop/images/money_delete.png
trunk/css/aguapop/images/note_add.png
trunk/css/aguapop/images/pdf.png
trunk/css/aguapop/images/preview.gif
trunk/css/aguapop/images/preview.png
trunk/css/aguapop/images/printer.png
trunk/css/aguapop/images/reports.png
trunk/css/aguapop/images/sales.png
trunk/css/aguapop/images/security.png
trunk/css/aguapop/images/stripe.png
trunk/css/aguapop/images/supplier.png
trunk/css/aguapop/images/tick.png
trunk/css/aguapop/images/top_bg.png
trunk/css/aguapop/images/transactions.png
trunk/css/aguapop/images/user.png
trunk/css/aguapop/login.css
trunk/css/bg.gif
trunk/css/default/
trunk/css/default/default.css
trunk/css/default/images/
trunk/css/default/images/Graphique-32.png
trunk/css/default/images/allocation.gif
trunk/css/default/images/allocation.png
trunk/css/default/images/ar.gif
trunk/css/default/images/ar.png
trunk/css/default/images/back.png
trunk/css/default/images/bank.gif
trunk/css/default/images/bar.png
trunk/css/default/images/button_bg.png
trunk/css/default/images/company.gif
trunk/css/default/images/company.png
trunk/css/default/images/contract.png
trunk/css/default/images/credit.gif
trunk/css/default/images/currency.gif
trunk/css/default/images/customer.png
trunk/css/default/images/email.gif
trunk/css/default/images/error.png
trunk/css/default/images/folder_add.png
trunk/css/default/images/folders.gif
trunk/css/default/images/gelblue.png
trunk/css/default/images/gelbluebutton.png
trunk/css/default/images/gelblueh.png
trunk/css/default/images/gl.png
trunk/css/default/images/group_add.png
trunk/css/default/images/hoverbuttonblue.png
trunk/css/default/images/input.png
trunk/css/default/images/input_bg.png
trunk/css/default/images/inputh.png
trunk/css/default/images/inputhtxt.png
trunk/css/default/images/inputtxt.png
trunk/css/default/images/inquiries.png
trunk/css/default/images/inventory.gif
trunk/css/default/images/inventory.png
trunk/css/default/images/magnifier.png
trunk/css/default/images/maintenance.gif
trunk/css/default/images/maintenance.png
trunk/css/default/images/menu_bg.png
trunk/css/default/images/menu_bg_blue.png
trunk/css/default/images/menu_bg_dblue.png
trunk/css/default/images/menu_bg_grey.png
trunk/css/default/images/menu_bg_indigo.png
trunk/css/default/images/menu_bg_white.png
trunk/css/default/images/menucurve.gif
trunk/css/default/images/money_add.png
trunk/css/default/images/money_delete.png
trunk/css/default/images/note_add.png
trunk/css/default/images/pdf.png
trunk/css/default/images/preview.gif
trunk/css/default/images/printer.png
trunk/css/default/images/reports.gif
trunk/css/default/images/reports.png
trunk/css/default/images/sales.png
trunk/css/default/images/security.png
trunk/css/default/images/stripe.png
trunk/css/default/images/supplier.png
trunk/css/default/images/tick.png
trunk/css/default/images/transactions.gif
trunk/css/default/images/transactions.png
trunk/css/default/images/user.png
trunk/css/default/login.css
trunk/css/fluid/
trunk/css/fluid/default.css
trunk/css/fluid/images/
trunk/css/fluid/images/allocation.png
trunk/css/fluid/images/ar.png
trunk/css/fluid/images/back.png
trunk/css/fluid/images/bank.gif
trunk/css/fluid/images/company.png
trunk/css/fluid/images/contract.png
trunk/css/fluid/images/credit.gif
trunk/css/fluid/images/currency.gif
trunk/css/fluid/images/customer.png
trunk/css/fluid/images/email.gif
trunk/css/fluid/images/error.png
trunk/css/fluid/images/folder_add.png
trunk/css/fluid/images/gl.png
trunk/css/fluid/images/group_add.png
trunk/css/fluid/images/inquiries.png
trunk/css/fluid/images/inventory.png
trunk/css/fluid/images/magnifier.png
trunk/css/fluid/images/maintenance.png
trunk/css/fluid/images/money_add.png
trunk/css/fluid/images/money_delete.png
trunk/css/fluid/images/note_add.png
trunk/css/fluid/images/pdf.png
trunk/css/fluid/images/preview.gif
trunk/css/fluid/images/printer.png
trunk/css/fluid/images/reports.gif
trunk/css/fluid/images/reports.png
trunk/css/fluid/images/sales.png
trunk/css/fluid/images/security.png
trunk/css/fluid/images/supplier.png
trunk/css/fluid/images/tick.png
trunk/css/fluid/images/transactions.gif
trunk/css/fluid/images/transactions.png
trunk/css/fluid/images/user.png
trunk/css/fluid/login.css
trunk/css/fresh/
trunk/css/fresh/bullet.gif
trunk/css/fresh/default.css
trunk/css/fresh/images/
trunk/css/fresh/images/Graphique-32.png
trunk/css/fresh/images/allocation.gif
trunk/css/fresh/images/allocation.png
trunk/css/fresh/images/ar.gif
trunk/css/fresh/images/ar.png
trunk/css/fresh/images/back.png
trunk/css/fresh/images/bank.gif
trunk/css/fresh/images/bar.png
trunk/css/fresh/images/button_bg.png
trunk/css/fresh/images/company.gif
trunk/css/fresh/images/company.png
trunk/css/fresh/images/contract.png
trunk/css/fresh/images/credit.gif
trunk/css/fresh/images/currency.gif
trunk/css/fresh/images/customer.png
trunk/css/fresh/images/email.gif
trunk/css/fresh/images/error.png
trunk/css/fresh/images/folder_add.png
trunk/css/fresh/images/folders.gif
trunk/css/fresh/images/gelblue.png
trunk/css/fresh/images/gelbluebutton.png
trunk/css/fresh/images/gelblueh.png
trunk/css/fresh/images/gl.png
trunk/css/fresh/images/group_add.png
trunk/css/fresh/images/hoverbuttonblue.png
trunk/css/fresh/images/input.png
trunk/css/fresh/images/input_bg.png
trunk/css/fresh/images/inputh.png
trunk/css/fresh/images/inputhtxt.png
trunk/css/fresh/images/inputtxt.png
trunk/css/fresh/images/inquiries.png
trunk/css/fresh/images/inventory.gif
trunk/css/fresh/images/inventory.png
trunk/css/fresh/images/magnifier.png
trunk/css/fresh/images/maintenance.gif
trunk/css/fresh/images/maintenance.png
trunk/css/fresh/images/menu_bg.png
trunk/css/fresh/images/menu_bg_blue.png
trunk/css/fresh/images/menu_bg_dblue.png
trunk/css/fresh/images/menu_bg_grey.png
trunk/css/fresh/images/menu_bg_indigo.png
trunk/css/fresh/images/menu_bg_white.png
trunk/css/fresh/images/menucurve.gif
trunk/css/fresh/images/money_add.png
trunk/css/fresh/images/money_delete.png
trunk/css/fresh/images/note_add.png
trunk/css/fresh/images/pdf.png
trunk/css/fresh/images/preview.gif
trunk/css/fresh/images/printer.png
trunk/css/fresh/images/reports.gif
trunk/css/fresh/images/reports.png
trunk/css/fresh/images/sales.png
trunk/css/fresh/images/security.png
trunk/css/fresh/images/stripe.png
trunk/css/fresh/images/supplier.png
trunk/css/fresh/images/tick.png
trunk/css/fresh/images/transactions.gif
trunk/css/fresh/images/transactions.png
trunk/css/fresh/images/user.png
trunk/css/fresh/login.css
trunk/css/gel/
trunk/css/gel/default.css
trunk/css/gel/images/
trunk/css/gel/images/allocation.png
trunk/css/gel/images/ar.png
trunk/css/gel/images/back.png
trunk/css/gel/images/bar.png
trunk/css/gel/images/company.png
trunk/css/gel/images/contract.png
trunk/css/gel/images/credit.gif
trunk/css/gel/images/customer.png
trunk/css/gel/images/email.gif
trunk/css/gel/images/error.png
trunk/css/gel/images/folder_add.png
trunk/css/gel/images/folders.gif
trunk/css/gel/images/gelblue.png
trunk/css/gel/images/gl.png
trunk/css/gel/images/group_add.png
trunk/css/gel/images/input.png
trunk/css/gel/images/inputh.png
trunk/css/gel/images/inputhtxt.png
trunk/css/gel/images/inputtxt.png
trunk/css/gel/images/inventory.png
trunk/css/gel/images/magnifier.png
trunk/css/gel/images/maintenance.gif
trunk/css/gel/images/maintenance.png
trunk/css/gel/images/menu_bg.png
trunk/css/gel/images/menu_bg_blue.png
trunk/css/gel/images/menu_bg_dblue.png
trunk/css/gel/images/menu_bg_grey.png
trunk/css/gel/images/menu_bg_indigo.png
trunk/css/gel/images/menu_bg_white.png
trunk/css/gel/images/menucurve.gif
trunk/css/gel/images/money_add.png
trunk/css/gel/images/money_delete.png
trunk/css/gel/images/note_add.png
trunk/css/gel/images/pdf.png
trunk/css/gel/images/preview.gif
trunk/css/gel/images/printer.png
trunk/css/gel/images/reports.gif
trunk/css/gel/images/reports.png
trunk/css/gel/images/sales.png
trunk/css/gel/images/security.png
trunk/css/gel/images/stripe.png
trunk/css/gel/images/supplier.png
trunk/css/gel/images/tick.png
trunk/css/gel/images/transactions.gif
trunk/css/gel/images/transactions.png
trunk/css/gel/images/user.png
trunk/css/gel/login.css
trunk/css/labelsDim.png
trunk/css/paramsLabel.png
trunk/css/professional/
trunk/css/professional/default.css
trunk/css/professional/images/
trunk/css/professional/images/allocation.png
trunk/css/professional/images/ar.png
trunk/css/professional/images/company.png
trunk/css/professional/images/contract.png
trunk/css/professional/images/credit.gif
trunk/css/professional/images/currency.gif
trunk/css/professional/images/customer.png
trunk/css/professional/images/email.gif
trunk/css/professional/images/error.png
trunk/css/professional/images/folder_add.png
trunk/css/professional/images/gl.png
trunk/css/professional/images/group_add.png
trunk/css/professional/images/input_bg.png
trunk/css/professional/images/inputtxt.png
trunk/css/professional/images/inquiries.png
trunk/css/professional/images/inventory.png
trunk/css/professional/images/magnifier.png
trunk/css/professional/images/maintenance.png
trunk/css/professional/images/money_add.png
trunk/css/professional/images/money_delete.png
trunk/css/professional/images/note_add.png
trunk/css/professional/images/pdf.png
trunk/css/professional/images/preview.gif
trunk/css/professional/images/printer.png
trunk/css/professional/images/reports.gif
trunk/css/professional/images/reports.png
trunk/css/professional/images/sales.png
trunk/css/professional/images/security.png
trunk/css/professional/images/stripe.png
trunk/css/professional/images/supplier.png
trunk/css/professional/images/tick.png
trunk/css/professional/images/transactions.gif
trunk/css/professional/images/transactions.png
trunk/css/professional/images/user.png
trunk/css/professional/login.css
trunk/css/professional-rtl/
trunk/css/professional-rtl/default.css
trunk/css/professional-rtl/images/
trunk/css/professional-rtl/images/allocation.gif
trunk/css/professional-rtl/images/allocation.png
trunk/css/professional-rtl/images/ar.gif
trunk/css/professional-rtl/images/ar.png
trunk/css/professional-rtl/images/bank.gif
trunk/css/professional-rtl/images/company.png
trunk/css/professional-rtl/images/credit.gif
trunk/css/professional-rtl/images/customer.png
trunk/css/professional-rtl/images/email.gif
trunk/css/professional-rtl/images/error.png
trunk/css/professional-rtl/images/folder_add.png
trunk/css/professional-rtl/images/folders.gif
trunk/css/professional-rtl/images/gl.png
trunk/css/professional-rtl/images/group_add.png
trunk/css/professional-rtl/images/input_bg.png
trunk/css/professional-rtl/images/inputtxt.png
trunk/css/professional-rtl/images/inventory.png
trunk/css/professional-rtl/images/magnifier.png
trunk/css/professional-rtl/images/maintenance.png
trunk/css/professional-rtl/images/money_add.png
trunk/css/professional-rtl/images/money_delete.png
trunk/css/professional-rtl/images/note_add.png
trunk/css/professional-rtl/images/pdf.png
trunk/css/professional-rtl/images/preview.gif
trunk/css/professional-rtl/images/printer.png
trunk/css/professional-rtl/images/reports.gif
trunk/css/professional-rtl/images/reports.png
trunk/css/professional-rtl/images/sales.png
trunk/css/professional-rtl/images/security.png
trunk/css/professional-rtl/images/supplier.png
trunk/css/professional-rtl/images/tick.png
trunk/css/professional-rtl/images/transactions.png
trunk/css/professional-rtl/images/user.png
trunk/css/professional-rtl/login.css
trunk/css/silverwolf/
trunk/css/silverwolf/default.css
trunk/css/silverwolf/images/
trunk/css/silverwolf/images/allocation.png
trunk/css/silverwolf/images/ar.png
trunk/css/silverwolf/images/back.png
trunk/css/silverwolf/images/bar.png
trunk/css/silverwolf/images/company.png
trunk/css/silverwolf/images/contract.png
trunk/css/silverwolf/images/credit.gif
trunk/css/silverwolf/images/customer.png
trunk/css/silverwolf/images/email.gif
trunk/css/silverwolf/images/error.png
trunk/css/silverwolf/images/folder_add.png
trunk/css/silverwolf/images/gl.png
trunk/css/silverwolf/images/group_add.png
trunk/css/silverwolf/images/input_bg.png
trunk/css/silverwolf/images/inventory.png
trunk/css/silverwolf/images/magnifier.png
trunk/css/silverwolf/images/maintenance.png
trunk/css/silverwolf/images/menu_bg.png
trunk/css/silverwolf/images/menu_bg_dblue.png
trunk/css/silverwolf/images/money_add.png
trunk/css/silverwolf/images/money_delete.png
trunk/css/silverwolf/images/note_add.png
trunk/css/silverwolf/images/pdf.png
trunk/css/silverwolf/images/preview.gif
trunk/css/silverwolf/images/printer.png
trunk/css/silverwolf/images/reports.png
trunk/css/silverwolf/images/sales.png
trunk/css/silverwolf/images/security.png
trunk/css/silverwolf/images/stripe.png
trunk/css/silverwolf/images/supplier.png
trunk/css/silverwolf/images/tick.png
trunk/css/silverwolf/images/transactions.png
trunk/css/silverwolf/images/user.png
trunk/css/silverwolf/login.css
trunk/css/spacer.gif
trunk/css/webERP.gif
trunk/css/webERPsm.gif
trunk/css/wood/
trunk/css/wood/bullet.gif
trunk/css/wood/default.css
trunk/css/wood/images/
trunk/css/wood/images/User.png
trunk/css/wood/images/allocation.png
trunk/css/wood/images/ar.png
trunk/css/wood/images/company.png
trunk/css/wood/images/contract.png
trunk/css/wood/images/credit.gif
trunk/css/wood/images/customer.png
trunk/css/wood/images/desk.jpg
trunk/css/wood/images/email.gif
trunk/css/wood/images/error.png
trunk/css/wood/images/folder_add.png
trunk/css/wood/images/folders.gif
trunk/css/wood/images/gl.png
trunk/css/wood/images/group_add.png
trunk/css/wood/images/inquiries.png
trunk/css/wood/images/inventory.png
trunk/css/wood/images/magnifier.png
trunk/css/wood/images/maintenance.png
trunk/css/wood/images/money_add.png
trunk/css/wood/images/money_delete.png
trunk/css/wood/images/note_add.png
trunk/css/wood/images/pdf.png
trunk/css/wood/images/preview.gif
trunk/css/wood/images/printer.png
trunk/css/wood/images/reports.gif
trunk/css/wood/images/reports.png
trunk/css/wood/images/sales.png
trunk/css/wood/images/security.png
trunk/css/wood/images/supplier.png
trunk/css/wood/images/tick.png
trunk/css/wood/images/transactions 2.png
trunk/css/wood/images/transactions.png
trunk/css/wood/images/wood.jpg
trunk/css/wood/login.css
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-09-10 03:43:09 UTC (rev 5656)
+++ trunk/AccountGroups.php 2012-09-10 11:32:07 UTC (rev 5657)
@@ -212,7 +212,8 @@
echo '</td></tr>';
echo '<tr>
<td colspan="2"><div class="centre"><input tabindex="6" type="submit" name="MoveGroup" value="' . _('Move Group') . '" /></div></td>
- </tr>';
+ </tr>
+ </table>';
} else {
$sql = "SELECT COUNT(groupname) groupnames FROM accountgroups WHERE parentgroupname = '" . $_GET['SelectedAccountGroup'] . "'";
Deleted: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2012-09-10 01:41:55 UTC (rev 5647)
+++ trunk/css/aguapop/default.css 2012-09-10 11:32:07 UTC (rev 5657)
@@ -1,463 +0,0 @@
-/*
-
-New "AguaPop" Theme for WebERP
-
-v2, 2012-08-03
-
-by Hindra Joshua
-
-*/
-
-body {
-font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
-background: silver;
-margin:0;
-padding:0;
-}
-
-/* default styles */
-
-a{
-color:blue;
-text-decoration:none;
-}
-a:hover{
-color:red;
-text-decoration:underline;
-}
-a:active{
-}
-
-img{ /* icon on page title, etc */
-border:none;
-vertical-align:middle;
-}
-
-p{ /* some text need to be centered */
-/*text-align:center;*/
-}
-p.page_title_text { /* page title */
-color:black;
-font-weight:bold;
-margin:0 auto;
-padding:5px;
-text-align:center;
-}
-p.good {
-font-weight: bold;
-color: green;
-}
-p.bad {
-font-weight: bold;
-color:red;
-}
-
-
-table {
-width:auto;
-max-width:90%;
-margin:5px auto;
-padding-bottom:5px;
-}
-table.selection {
-width:auto;
-max-width:90%;
-/*padding-bottom:5px;*/
-}
-th {
-background-color:skyblue;
-color:black;
-font-weight:normal;
-padding:3px;
-}
-th.number {
-text-align: right;
-font-weight: normal;
-background-color: skyblue;
-color: white;
-}
-
-td {
-font-family: Arial, Verdana, Helvetica, sans-serif;
-text-align: left;
-}
-td.select {
-background-color: whitesmoke;
-padding:3px;
-}
-td.number {
-text-align: right;
-}
-
-div.centre {
-padding:5px;
-text-align:center;
-}
-
-input { /*specifies the input field text characteristics*/
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-size: 9px;
-font-style: italic;
-}
-input.number{
-text-align: right;
-}
-input.image {
-border-width: 0px;
-background-color: transparent;
-}
-input:hover{
-background:#9ffffb;
-}
-
-select {
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-size: 11px;
-}
-select:hover { /* drop down */
-background:#9ffffb;
-}
-
-textarea{
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-size: 10px;
-}
-textarea:hover{
-background:#9ffffb;
-}
-
-.EvenTableRows {
-background-color: gainsboro;
-}
-.OddTableRows {
-background-color: whitesmoke;
-}
-
-div{ /* some input/buttons need to be centered */
-}
-div.error {
-background-color: mistyrose;
-width: 98%;
-margin: 5px auto;
-color: red;
-border: 1px solid red;
-}
-div.warn {
-background-color: pink;
-width: 98%;
-margin: 5px auto;
-color: maroon;
-border: 1px solid maroon;
-}
-div.success {
-background-color: aquamarine;
-width: 98%;
-margin: 5px auto;
-color: green;
-border: 1px solid green;
-}
-div.info {
-background-color: lightskyblue;
-width: 98%;
-margin: 5px auto;
-color:navy;
-border: 1px solid navy;
-}
-DIV.page_help_text {
-background: lightgrey url(images/help.png) top left no-repeat;
-border: maroon 1px solid;
-padding-top:2px;
-padding-bottom: 2px;
-z-index: 1;
-width: 80%;
-float: none;
-visibility: visible;
-margin: 0 auto;
-position: static;
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-weight: normal;
-font-size: 10px;
-color: black;
-text-align:center;
-padding-left: 24px;
-min-height:26px;
-}
-
-/* date picker */
-.dpTbl {
- border: solid navy 1px;
- background:white;
-}
-.dpTD {
-border: 0;
-width: 20px;
-background-color: whitesmoke;
-text-align: right;
-cursor: pointer;
-}
-.dpDayHighlight {
-border: 0;
-width: 20px;
-background-color: yellow;
-text-align: right;
-cursor: pointer;
-}
-.dpTDHover {
-border: 0;
-width: 20px;
-background-color: gainsboro;
-text-align: right;
-cursor: pointer;
-}
-
-/* Table type is used for UI tables type 1 */
-.table1 {
-width:90%;
-background: whitesmoke;
-border: 1px solid darkslategray;
-margin: 0 auto;
-}
-.tableheader {
-font-weight: normal;
-background-color: skyblue;
-color: white;
-}
-.notavailable {
-font-weight: lighter;
-font-style: italic;
-color: gray;
-}
-.label {
-font-weight: bold;
-font-style: normal;
-font-size: 11px;
-color: black;
-background-color: gainsboro;
-}
-.table_index {
-background-color: aliceblue;
-}
-li {
-/*list-style-image: url(bullet.gif);*/
-}
-
-/* CANVAS */
-
-#CanvasDiv {
-background:steelblue;
-border-radius:20px;
-box-shadow:3px 3px 4px #86C3D7 inset, -3px -3px 4px #383878 inset, 0 0 10px black;
-margin:10px;
-}
-
-/* HEADER */
-
-#HeaderDiv {
-overflow:hidden;
-color:white;
-padding:5px 10px 0;
-}
-#HeaderDiv a{
-border-radius:10px;
-color:white;
-text-decoration:none;
-padding:3px;
-}
-#HeaderDiv a:hover{
-color:cyan;
-border-radius:10px;
-box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
-padding:3px;
-}
-#HeaderWrapDiv{
-}
-
-/* HEADER - APP INFO */
-
-#AppInfoDiv{
-float:left; /* REQUIRED: to the left */
-}
-#AppInfoCompanyDiv{
-display:table-cell; /* REQUIRED: as a cell */
-}
-#AppInfoUserDiv{
-display:table-cell; /* REQUIRED: as a cell */
-padding-left:5px;
-}
-#AppInfoModuleDiv{
-font-weight:bold;
-font-size:12px;
-padding:3px;
-}
-
-/* HEADER - QUICK MENU */
-
-#QuickMenuDiv{
-float:right;
-margin-top:7px;
-}
-#QuickMenuDiv ul{
-list-style:none;
-float:right;
-}
-#QuickMenuDiv ul li{
-float: left;
-display:inline;
-margin: 0px 3px;
-}
-
-/* BODY */
-
-#BodyDiv {
-clear:both;
-overflow:hidden;
-text-align:center; /* needed to center some buttons on SelectSupplier.php */
-}
-#BodyWrapDiv{
-background:lightsteelblue;
-box-shadow:2px 2px 3px inset;
-margin:0 5px;
-}
-
-/* BODY - MAIN MENU */
-
-#MainMenuDiv{
-float:left;
-background:steelblue;
-white-space:nowrap;
-text-align:center;
-padding-left:3px;
-padding-top:3px;
-width:11%;
-}
-#MainMenuDiv ul{
-margin:0;
-padding:0;
-}
-#MainMenuDiv li{
-list-style:none;
-}
-#MainMenuDiv li a,
-#MainMenuDiv li a:hover,
-#MainMenuDiv .main_menu_selected a{
-display:block; /* REQUIRED */
-border-radius:10px;
-color:white;
-text-decoration:none;
-padding:3px;
-margin-bottom:5px;
-}
-#MainMenuDiv li a:hover{
-color:cyan;
-box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
-}
-#MainMenuDiv .main_menu_selected a{ /* the selected button */
-box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
-}
-
-/* BODY - SUB MENU */
-
-#SubMenuDiv{
-display:table; /* display as table, sub menu will auto adjust width */
-float:right;
-overflow: hidden;
-margin-left:auto;
-margin-right:auto;
-width:88%; /* main menu is 10% */
-text-align:left;
-}
-#SubMenuDiv ul{
-margin:0;
-padding:0;
-}
-#SubMenuDiv li{
-list-style:none; /* REQUIRED: hide bullets */
-}
-#SubMenuDiv p{
-}
-
-#SubMenuDiv a{
-color:black;
-text-decoration:none;
-}
-#SubMenuDiv a:hover{
-color:black;
-text-decoration:underline;
-}
-
-.menu_group_headers {
-background:steelblue;
-border:2px outset white;
-color:white;
-font-weight:bold;
-text-align:center;
-padding:3px;
-}
-
-.menu_group_item {
-padding:2px;
-text-align:left;
-}
-.menu_group_item:hover{
-background:lightblue;
-text-align:left;
-}
-
-.menu_group_item p { /* bullet */
-color: red; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
-text-indent: -10px; /* this makes the bullet to appear as the li tag previously used */
-margin: 0 0 0 12px;
-text-align:left;
-}
-.menu_group_item a{
-color:black;
-text-decoration:none;
-}
-.menu_group_item a:hover{
-color:red;
-text-decoration:none;
-}
-
-#TransactionsDiv,#InquiriesDiv,#MaintenanceDiv{
-background:whitesmoke;
-border:2px solid steelblue;
-display:table-cell;
-}
-#InquiriesDiv div{ /* to center custom report/form header */
-background:lightsteelblue;
-font-weight:bold;
-color:black;
-padding:2px;
-}
-
-/*** FOOTER ***/
-
-#FooterDiv{
-clear:both;
-color:white;
-height:53px;
-padding:0;
-}
-#FooterWrapDiv{
-padding:5px;
-}
-#FooterLogoDiv{
-background:white;
-border:2px outset steelblue;
-border-radius:8px 8px 8px 8px;
-float:left;
-padding:3px;
-}
-#FooterVersionDiv{
-float:left;
-margin-left:10px;
-margin-top:15px;
-
-}
-#FooterTimeDiv{
-float:right;
-margin-top:15px;
-}
-
-/**** END ***/
\ No newline at end of file
Copied: trunk/css/aguapop/default.css (from rev 5647, trunk/css/aguapop/default.css)
===================================================================
--- trunk/css/aguapop/default.css (rev 0)
+++ trunk/css/aguapop/default.css 2012-09-10 11:32:07 UTC (rev 5657)
@@ -0,0 +1,463 @@
+/*
+
+New "AguaPop" Theme for WebERP
+
+v2, 2012-08-03
+
+by Hindra Joshua
+
+*/
+
+body {
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
+background: silver;
+margin:0;
+padding:0;
+}
+
+/* default styles */
+
+a{
+color:blue;
+text-decoration:none;
+}
+a:hover{
+color:red;
+text-decoration:underline;
+}
+a:active{
+}
+
+img{ /* icon on page title, etc */
+border:none;
+vertical-align:middle;
+}
+
+p{ /* some text need to be centered */
+/*text-align:center;*/
+}
+p.page_title_text { /* page title */
+color:black;
+font-weight:bold;
+margin:0 auto;
+padding:5px;
+text-align:center;
+}
+p.good {
+font-weight: bold;
+color: green;
+}
+p.bad {
+font-weight: bold;
+color:red;
+}
+
+
+table {
+width:auto;
+max-width:90%;
+margin:5px auto;
+padding-bottom:5px;
+}
+table.selection {
+width:auto;
+max-width:90%;
+/*padding-bottom:5px;*/
+}
+th {
+background-color:skyblue;
+color:black;
+font-weight:normal;
+padding:3px;
+}
+th.number {
+text-align: right;
+font-weight: normal;
+background-color: skyblue;
+color: white;
+}
+
+td {
+font-family: Arial, Verdana, Helvetica, sans-serif;
+text-align: left;
+}
+td.select {
+background-color: whitesmoke;
+padding:3px;
+}
+td.number {
+text-align: right;
+}
+
+div.centre {
+padding:5px;
+text-align:center;
+}
+
+input { /*specifies the input field text characteristics*/
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-size: 9px;
+font-style: italic;
+}
+input.number{
+text-align: right;
+}
+input.image {
+border-width: 0px;
+background-color: transparent;
+}
+input:hover{
+background:#9ffffb;
+}
+
+select {
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-size: 11px;
+}
+select:hover { /* drop down */
+background:#9ffffb;
+}
+
+textarea{
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-size: 10px;
+}
+textarea:hover{
+background:#9ffffb;
+}
+
+.EvenTableRows {
+background-color: gainsboro;
+}
+.OddTableRows {
+background-color: whitesmoke;
+}
+
+div{ /* some input/buttons need to be centered */
+}
+div.error {
+background-color: mistyrose;
+width: 98%;
+margin: 5px auto;
+color: red;
+border: 1px solid red;
+}
+div.warn {
+background-color: pink;
+width: 98%;
+margin: 5px auto;
+color: maroon;
+border: 1px solid maroon;
+}
+div.success {
+background-color: aquamarine;
+width: 98%;
+margin: 5px auto;
+color: green;
+border: 1px solid green;
+}
+div.info {
+background-color: lightskyblue;
+width: 98%;
+margin: 5px auto;
+color:navy;
+border: 1px solid navy;
+}
+DIV.page_help_text {
+background: lightgrey url(images/help.png) top left no-repeat;
+border: maroon 1px solid;
+padding-top:2px;
+padding-bottom: 2px;
+z-index: 1;
+width: 80%;
+float: none;
+visibility: visible;
+margin: 0 auto;
+position: static;
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-weight: normal;
+font-size: 10px;
+color: black;
+text-align:center;
+padding-left: 24px;
+min-height:26px;
+}
+
+/* date picker */
+.dpTbl {
+ border: solid navy 1px;
+ background:white;
+}
+.dpTD {
+border: 0;
+width: 20px;
+background-color: whitesmoke;
+text-align: right;
+cursor: pointer;
+}
+.dpDayHighlight {
+border: 0;
+width: 20px;
+background-color: yellow;
+text-align: right;
+cursor: pointer;
+}
+.dpTDHover {
+border: 0;
+width: 20px;
+background-color: gainsboro;
+text-align: right;
+cursor: pointer;
+}
+
+/* Table type is used for UI tables type 1 */
+.table1 {
+width:90%;
+background: whitesmoke;
+border: 1px solid darkslategray;
+margin: 0 auto;
+}
+.tableheader {
+font-weight: normal;
+background-color: skyblue;
+color: white;
+}
+.notavailable {
+font-weight: lighter;
+font-style: italic;
+color: gray;
+}
+.label {
+font-weight: bold;
+font-style: normal;
+font-size: 11px;
+color: black;
+background-color: gainsboro;
+}
+.table_index {
+background-color: aliceblue;
+}
+li {
+/*list-style-image: url(bullet.gif);*/
+}
+
+/* CANVAS */
+
+#CanvasDiv {
+background:steelblue;
+border-radius:20px;
+box-shadow:3px 3px 4px #86C3D7 inset, -3px -3px 4px #383878 inset, 0 0 10px black;
+margin:10px;
+}
+
+/* HEADER */
+
+#HeaderDiv {
+overflow:hidden;
+color:white;
+padding:5px 10px 0;
+}
+#HeaderDiv a{
+border-radius:10px;
+color:white;
+text-decoration:none;
+padding:3px;
+}
+#HeaderDiv a:hover{
+color:cyan;
+border-radius:10px;
+box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+padding:3px;
+}
+#HeaderWrapDiv{
+}
+
+/* HEADER - APP INFO */
+
+#AppInfoDiv{
+float:left; /* REQUIRED: to the left */
+}
+#AppInfoCompanyDiv{
+display:table-cell; /* REQUIRED: as a cell */
+}
+#AppInfoUserDiv{
+display:table-cell; /* REQUIRED: as a cell */
+padding-left:5px;
+}
+#AppInfoModuleDiv{
+font-weight:bold;
+font-size:12px;
+padding:3px;
+}
+
+/* HEADER - QUICK MENU */
+
+#QuickMenuDiv{
+float:right;
+margin-top:7px;
+}
+#QuickMenuDiv ul{
+list-style:none;
+float:right;
+}
+#QuickMenuDiv ul li{
+float: left;
+display:inline;
+margin: 0px 3px;
+}
+
+/* BODY */
+
+#BodyDiv {
+clear:both;
+overflow:hidden;
+text-align:center; /* needed to center some buttons on SelectSupplier.php */
+}
+#BodyWrapDiv{
+background:lightsteelblue;
+box-shadow:2px 2px 3px inset;
+margin:0 5px;
+}
+
+/* BODY - MAIN MENU */
+
+#MainMenuDiv{
+float:left;
+background:steelblue;
+white-space:nowrap;
+text-align:center;
+padding-left:3px;
+padding-top:3px;
+width:11%;
+}
+#MainMenuDiv ul{
+margin:0;
+padding:0;
+}
+#MainMenuDiv li{
+list-style:none;
+}
+#MainMenuDiv li a,
+#MainMenuDiv li a:hover,
+#MainMenuDiv .main_menu_selected a{
+display:block; /* REQUIRED */
+border-radius:10px;
+color:white;
+text-decoration:none;
+padding:3px;
+margin-bottom:5px;
+}
+#MainMenuDiv li a:hover{
+color:cyan;
+box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+}
+#MainMenuDiv .main_menu_selected a{ /* the selected button */
+box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+}
+
+/* BODY - SUB MENU */
+
+#SubMenuDiv{
+display:table; /* display as table, sub menu will auto adjust width */
+float:right;
+overflow: hidden;
+margin-left:auto;
+margin-right:auto;
+width:88%; /* main menu is 10% */
+text-align:left;
+}
+#SubMenuDiv ul{
+margin:0;
+padding:0;
+}
+#SubMenuDiv li{
+list-style:none; /* REQUIRED: hide bullets */
+}
+#SubMenuDiv p{
+}
+
+#SubMenuDiv a{
+color:black;
+text-decoration:none;
+}
+#SubMenuDiv a:hover{
+color:black;
+text-decoration:underline;
+}
+
+.menu_group_headers {
+background:steelblue;
+border:2px outset white;
+color:white;
+font-weight:bold;
+text-align:center;
+padding:3px;
+}
+
+.menu_group_item {
+padding:2px;
+text-align:left;
+}
+.menu_group_item:hover{
+background:lightblue;
+text-align:left;
+}
+
+.menu_group_item p { /* bullet */
+color: red; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+text-indent: -10px; /* this makes the bullet to appear as the li tag previously used */
+margin: 0 0 0 12px;
+text-align:left;
+}
+.menu_group_item a{
+color:black;
+text-decoration:none;
+}
+.menu_group_item a:hover{
+color:red;
+text-decoration:none;
+}
+
+#TransactionsDiv,#InquiriesDiv,#MaintenanceDiv{
+background:whitesmoke;
+border:2px solid steelblue;
+display:table-cell;
+}
+#InquiriesDiv div{ /* to center custom report/form header */
+background:lightsteelblue;
+font-weight:bold;
+color:black;
+padding:2px;
+}
+
+/*** FOOTER ***/
+
+#FooterDiv{
+clear:both;
+color:white;
+height:53px;
+padding:0;
+}
+#FooterWrapDiv{
+padding:5px;
+}
+#FooterLogoDiv{
+background:white;
+border:2px outset steelblue;
+border-radius:8px 8px 8px 8px;
+float:left;
+padding:3px;
+}
+#FooterVersionDiv{
+float:left;
+margin-left:10px;
+margin-top:15px;
+
+}
+#FooterTimeDiv{
+float:right;
+margin-top:15px;
+}
+
+/**** END ***/
\ No newline at end of file
Deleted: trunk/css/aguapop/images/allocation.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/allocation.png (from rev 5647, trunk/css/aguapop/images/allocation.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/ar.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/ar.png (from rev 5647, trunk/css/aguapop/images/ar.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/bank.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/bank.png (from rev 5647, trunk/css/aguapop/images/bank.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/company.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/company.png (from rev 5647, trunk/css/aguapop/images/company.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/contract.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/contract.png (from rev 5647, trunk/css/aguapop/images/contract.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/credit.gif
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/credit.gif (from rev 5647, trunk/css/aguapop/images/credit.gif)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/currency.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/currency.png (from rev 5647, trunk/css/aguapop/images/currency.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/customer.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/customer.png (from rev 5647, trunk/css/aguapop/images/customer.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/email.gif
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/email.gif (from rev 5647, trunk/css/aguapop/images/email.gif)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/error.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/error.png (from rev 5647, trunk/css/aguapop/images/error.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/folder_add.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/folder_add.png (from rev 5647, trunk/css/aguapop/images/folder_add.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/folders.gif
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/folders.gif (from rev 5647, trunk/css/aguapop/images/folders.gif)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/footer.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/footer.png (from rev 5647, trunk/css/aguapop/images/footer.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/gl.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/gl.png (from rev 5647, trunk/css/aguapop/images/gl.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/group_add.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/group_add.png (from rev 5647, trunk/css/aguapop/images/group_add.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/help.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/help.png (from rev 5647, trunk/css/aguapop/images/help.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/input.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/input.png (from rev 5647, trunk/css/aguapop/images/input.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/input_bg.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/input_bg.png (from rev 5647, trunk/css/aguapop/images/input_bg.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/inventory.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/inventory.png (from rev 5647, trunk/css/aguapop/images/inventory.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/magnifier.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/magnifier.png (from rev 5647, trunk/css/aguapop/images/magnifier.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/maintenance.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/maintenance.png (from rev 5647, trunk/css/aguapop/images/maintenance.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/money_add.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/money_add.png (from rev 5647, trunk/css/aguapop/images/money_add.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/money_delete.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/money_delete.png (from rev 5647, trunk/css/aguapop/images/money_delete.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/note_add.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/note_add.png (from rev 5647, trunk/css/aguapop/images/note_add.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/pdf.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/pdf.png (from rev 5647, trunk/css/aguapop/images/pdf.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/preview.gif
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/preview.gif (from rev 5647, trunk/css/aguapop/images/preview.gif)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/preview.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/preview.png (from rev 5647, trunk/css/aguapop/images/preview.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/printer.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/printer.png (from rev 5647, trunk/css/aguapop/images/printer.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/reports.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/reports.png (from rev 5647, trunk/css/aguapop/images/reports.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/sales.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/sales.png (from rev 5647, trunk/css/aguapop/images/sales.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/security.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/security.png (from rev 5647, trunk/css/aguapop/images/security.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/stripe.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/stripe.png (from rev 5647, trunk/css/aguapop/images/stripe.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/supplier.png
=========================...
[truncated message content] |
|
From: <dai...@us...> - 2012-09-10 11:32:30
|
Revision: 5657
http://web-erp.svn.sourceforge.net/web-erp/?rev=5657&view=rev
Author: daintree
Date: 2012-09-10 11:32:07 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
reinstated css
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/doc/Change.log
Added Paths:
-----------
trunk/css/
trunk/css/aguapop/
trunk/css/aguapop/default.css
trunk/css/aguapop/images/
trunk/css/aguapop/images/allocation.png
trunk/css/aguapop/images/ar.png
trunk/css/aguapop/images/bank.png
trunk/css/aguapop/images/company.png
trunk/css/aguapop/images/contract.png
trunk/css/aguapop/images/credit.gif
trunk/css/aguapop/images/currency.png
trunk/css/aguapop/images/customer.png
trunk/css/aguapop/images/email.gif
trunk/css/aguapop/images/error.png
trunk/css/aguapop/images/folder_add.png
trunk/css/aguapop/images/folders.gif
trunk/css/aguapop/images/footer.png
trunk/css/aguapop/images/gl.png
trunk/css/aguapop/images/group_add.png
trunk/css/aguapop/images/help.png
trunk/css/aguapop/images/input.png
trunk/css/aguapop/images/input_bg.png
trunk/css/aguapop/images/inventory.png
trunk/css/aguapop/images/magnifier.png
trunk/css/aguapop/images/maintenance.png
trunk/css/aguapop/images/money_add.png
trunk/css/aguapop/images/money_delete.png
trunk/css/aguapop/images/note_add.png
trunk/css/aguapop/images/pdf.png
trunk/css/aguapop/images/preview.gif
trunk/css/aguapop/images/preview.png
trunk/css/aguapop/images/printer.png
trunk/css/aguapop/images/reports.png
trunk/css/aguapop/images/sales.png
trunk/css/aguapop/images/security.png
trunk/css/aguapop/images/stripe.png
trunk/css/aguapop/images/supplier.png
trunk/css/aguapop/images/tick.png
trunk/css/aguapop/images/top_bg.png
trunk/css/aguapop/images/transactions.png
trunk/css/aguapop/images/user.png
trunk/css/aguapop/login.css
trunk/css/bg.gif
trunk/css/default/
trunk/css/default/default.css
trunk/css/default/images/
trunk/css/default/images/Graphique-32.png
trunk/css/default/images/allocation.gif
trunk/css/default/images/allocation.png
trunk/css/default/images/ar.gif
trunk/css/default/images/ar.png
trunk/css/default/images/back.png
trunk/css/default/images/bank.gif
trunk/css/default/images/bar.png
trunk/css/default/images/button_bg.png
trunk/css/default/images/company.gif
trunk/css/default/images/company.png
trunk/css/default/images/contract.png
trunk/css/default/images/credit.gif
trunk/css/default/images/currency.gif
trunk/css/default/images/customer.png
trunk/css/default/images/email.gif
trunk/css/default/images/error.png
trunk/css/default/images/folder_add.png
trunk/css/default/images/folders.gif
trunk/css/default/images/gelblue.png
trunk/css/default/images/gelbluebutton.png
trunk/css/default/images/gelblueh.png
trunk/css/default/images/gl.png
trunk/css/default/images/group_add.png
trunk/css/default/images/hoverbuttonblue.png
trunk/css/default/images/input.png
trunk/css/default/images/input_bg.png
trunk/css/default/images/inputh.png
trunk/css/default/images/inputhtxt.png
trunk/css/default/images/inputtxt.png
trunk/css/default/images/inquiries.png
trunk/css/default/images/inventory.gif
trunk/css/default/images/inventory.png
trunk/css/default/images/magnifier.png
trunk/css/default/images/maintenance.gif
trunk/css/default/images/maintenance.png
trunk/css/default/images/menu_bg.png
trunk/css/default/images/menu_bg_blue.png
trunk/css/default/images/menu_bg_dblue.png
trunk/css/default/images/menu_bg_grey.png
trunk/css/default/images/menu_bg_indigo.png
trunk/css/default/images/menu_bg_white.png
trunk/css/default/images/menucurve.gif
trunk/css/default/images/money_add.png
trunk/css/default/images/money_delete.png
trunk/css/default/images/note_add.png
trunk/css/default/images/pdf.png
trunk/css/default/images/preview.gif
trunk/css/default/images/printer.png
trunk/css/default/images/reports.gif
trunk/css/default/images/reports.png
trunk/css/default/images/sales.png
trunk/css/default/images/security.png
trunk/css/default/images/stripe.png
trunk/css/default/images/supplier.png
trunk/css/default/images/tick.png
trunk/css/default/images/transactions.gif
trunk/css/default/images/transactions.png
trunk/css/default/images/user.png
trunk/css/default/login.css
trunk/css/fluid/
trunk/css/fluid/default.css
trunk/css/fluid/images/
trunk/css/fluid/images/allocation.png
trunk/css/fluid/images/ar.png
trunk/css/fluid/images/back.png
trunk/css/fluid/images/bank.gif
trunk/css/fluid/images/company.png
trunk/css/fluid/images/contract.png
trunk/css/fluid/images/credit.gif
trunk/css/fluid/images/currency.gif
trunk/css/fluid/images/customer.png
trunk/css/fluid/images/email.gif
trunk/css/fluid/images/error.png
trunk/css/fluid/images/folder_add.png
trunk/css/fluid/images/gl.png
trunk/css/fluid/images/group_add.png
trunk/css/fluid/images/inquiries.png
trunk/css/fluid/images/inventory.png
trunk/css/fluid/images/magnifier.png
trunk/css/fluid/images/maintenance.png
trunk/css/fluid/images/money_add.png
trunk/css/fluid/images/money_delete.png
trunk/css/fluid/images/note_add.png
trunk/css/fluid/images/pdf.png
trunk/css/fluid/images/preview.gif
trunk/css/fluid/images/printer.png
trunk/css/fluid/images/reports.gif
trunk/css/fluid/images/reports.png
trunk/css/fluid/images/sales.png
trunk/css/fluid/images/security.png
trunk/css/fluid/images/supplier.png
trunk/css/fluid/images/tick.png
trunk/css/fluid/images/transactions.gif
trunk/css/fluid/images/transactions.png
trunk/css/fluid/images/user.png
trunk/css/fluid/login.css
trunk/css/fresh/
trunk/css/fresh/bullet.gif
trunk/css/fresh/default.css
trunk/css/fresh/images/
trunk/css/fresh/images/Graphique-32.png
trunk/css/fresh/images/allocation.gif
trunk/css/fresh/images/allocation.png
trunk/css/fresh/images/ar.gif
trunk/css/fresh/images/ar.png
trunk/css/fresh/images/back.png
trunk/css/fresh/images/bank.gif
trunk/css/fresh/images/bar.png
trunk/css/fresh/images/button_bg.png
trunk/css/fresh/images/company.gif
trunk/css/fresh/images/company.png
trunk/css/fresh/images/contract.png
trunk/css/fresh/images/credit.gif
trunk/css/fresh/images/currency.gif
trunk/css/fresh/images/customer.png
trunk/css/fresh/images/email.gif
trunk/css/fresh/images/error.png
trunk/css/fresh/images/folder_add.png
trunk/css/fresh/images/folders.gif
trunk/css/fresh/images/gelblue.png
trunk/css/fresh/images/gelbluebutton.png
trunk/css/fresh/images/gelblueh.png
trunk/css/fresh/images/gl.png
trunk/css/fresh/images/group_add.png
trunk/css/fresh/images/hoverbuttonblue.png
trunk/css/fresh/images/input.png
trunk/css/fresh/images/input_bg.png
trunk/css/fresh/images/inputh.png
trunk/css/fresh/images/inputhtxt.png
trunk/css/fresh/images/inputtxt.png
trunk/css/fresh/images/inquiries.png
trunk/css/fresh/images/inventory.gif
trunk/css/fresh/images/inventory.png
trunk/css/fresh/images/magnifier.png
trunk/css/fresh/images/maintenance.gif
trunk/css/fresh/images/maintenance.png
trunk/css/fresh/images/menu_bg.png
trunk/css/fresh/images/menu_bg_blue.png
trunk/css/fresh/images/menu_bg_dblue.png
trunk/css/fresh/images/menu_bg_grey.png
trunk/css/fresh/images/menu_bg_indigo.png
trunk/css/fresh/images/menu_bg_white.png
trunk/css/fresh/images/menucurve.gif
trunk/css/fresh/images/money_add.png
trunk/css/fresh/images/money_delete.png
trunk/css/fresh/images/note_add.png
trunk/css/fresh/images/pdf.png
trunk/css/fresh/images/preview.gif
trunk/css/fresh/images/printer.png
trunk/css/fresh/images/reports.gif
trunk/css/fresh/images/reports.png
trunk/css/fresh/images/sales.png
trunk/css/fresh/images/security.png
trunk/css/fresh/images/stripe.png
trunk/css/fresh/images/supplier.png
trunk/css/fresh/images/tick.png
trunk/css/fresh/images/transactions.gif
trunk/css/fresh/images/transactions.png
trunk/css/fresh/images/user.png
trunk/css/fresh/login.css
trunk/css/gel/
trunk/css/gel/default.css
trunk/css/gel/images/
trunk/css/gel/images/allocation.png
trunk/css/gel/images/ar.png
trunk/css/gel/images/back.png
trunk/css/gel/images/bar.png
trunk/css/gel/images/company.png
trunk/css/gel/images/contract.png
trunk/css/gel/images/credit.gif
trunk/css/gel/images/customer.png
trunk/css/gel/images/email.gif
trunk/css/gel/images/error.png
trunk/css/gel/images/folder_add.png
trunk/css/gel/images/folders.gif
trunk/css/gel/images/gelblue.png
trunk/css/gel/images/gl.png
trunk/css/gel/images/group_add.png
trunk/css/gel/images/input.png
trunk/css/gel/images/inputh.png
trunk/css/gel/images/inputhtxt.png
trunk/css/gel/images/inputtxt.png
trunk/css/gel/images/inventory.png
trunk/css/gel/images/magnifier.png
trunk/css/gel/images/maintenance.gif
trunk/css/gel/images/maintenance.png
trunk/css/gel/images/menu_bg.png
trunk/css/gel/images/menu_bg_blue.png
trunk/css/gel/images/menu_bg_dblue.png
trunk/css/gel/images/menu_bg_grey.png
trunk/css/gel/images/menu_bg_indigo.png
trunk/css/gel/images/menu_bg_white.png
trunk/css/gel/images/menucurve.gif
trunk/css/gel/images/money_add.png
trunk/css/gel/images/money_delete.png
trunk/css/gel/images/note_add.png
trunk/css/gel/images/pdf.png
trunk/css/gel/images/preview.gif
trunk/css/gel/images/printer.png
trunk/css/gel/images/reports.gif
trunk/css/gel/images/reports.png
trunk/css/gel/images/sales.png
trunk/css/gel/images/security.png
trunk/css/gel/images/stripe.png
trunk/css/gel/images/supplier.png
trunk/css/gel/images/tick.png
trunk/css/gel/images/transactions.gif
trunk/css/gel/images/transactions.png
trunk/css/gel/images/user.png
trunk/css/gel/login.css
trunk/css/labelsDim.png
trunk/css/paramsLabel.png
trunk/css/professional/
trunk/css/professional/default.css
trunk/css/professional/images/
trunk/css/professional/images/allocation.png
trunk/css/professional/images/ar.png
trunk/css/professional/images/company.png
trunk/css/professional/images/contract.png
trunk/css/professional/images/credit.gif
trunk/css/professional/images/currency.gif
trunk/css/professional/images/customer.png
trunk/css/professional/images/email.gif
trunk/css/professional/images/error.png
trunk/css/professional/images/folder_add.png
trunk/css/professional/images/gl.png
trunk/css/professional/images/group_add.png
trunk/css/professional/images/input_bg.png
trunk/css/professional/images/inputtxt.png
trunk/css/professional/images/inquiries.png
trunk/css/professional/images/inventory.png
trunk/css/professional/images/magnifier.png
trunk/css/professional/images/maintenance.png
trunk/css/professional/images/money_add.png
trunk/css/professional/images/money_delete.png
trunk/css/professional/images/note_add.png
trunk/css/professional/images/pdf.png
trunk/css/professional/images/preview.gif
trunk/css/professional/images/printer.png
trunk/css/professional/images/reports.gif
trunk/css/professional/images/reports.png
trunk/css/professional/images/sales.png
trunk/css/professional/images/security.png
trunk/css/professional/images/stripe.png
trunk/css/professional/images/supplier.png
trunk/css/professional/images/tick.png
trunk/css/professional/images/transactions.gif
trunk/css/professional/images/transactions.png
trunk/css/professional/images/user.png
trunk/css/professional/login.css
trunk/css/professional-rtl/
trunk/css/professional-rtl/default.css
trunk/css/professional-rtl/images/
trunk/css/professional-rtl/images/allocation.gif
trunk/css/professional-rtl/images/allocation.png
trunk/css/professional-rtl/images/ar.gif
trunk/css/professional-rtl/images/ar.png
trunk/css/professional-rtl/images/bank.gif
trunk/css/professional-rtl/images/company.png
trunk/css/professional-rtl/images/credit.gif
trunk/css/professional-rtl/images/customer.png
trunk/css/professional-rtl/images/email.gif
trunk/css/professional-rtl/images/error.png
trunk/css/professional-rtl/images/folder_add.png
trunk/css/professional-rtl/images/folders.gif
trunk/css/professional-rtl/images/gl.png
trunk/css/professional-rtl/images/group_add.png
trunk/css/professional-rtl/images/input_bg.png
trunk/css/professional-rtl/images/inputtxt.png
trunk/css/professional-rtl/images/inventory.png
trunk/css/professional-rtl/images/magnifier.png
trunk/css/professional-rtl/images/maintenance.png
trunk/css/professional-rtl/images/money_add.png
trunk/css/professional-rtl/images/money_delete.png
trunk/css/professional-rtl/images/note_add.png
trunk/css/professional-rtl/images/pdf.png
trunk/css/professional-rtl/images/preview.gif
trunk/css/professional-rtl/images/printer.png
trunk/css/professional-rtl/images/reports.gif
trunk/css/professional-rtl/images/reports.png
trunk/css/professional-rtl/images/sales.png
trunk/css/professional-rtl/images/security.png
trunk/css/professional-rtl/images/supplier.png
trunk/css/professional-rtl/images/tick.png
trunk/css/professional-rtl/images/transactions.png
trunk/css/professional-rtl/images/user.png
trunk/css/professional-rtl/login.css
trunk/css/silverwolf/
trunk/css/silverwolf/default.css
trunk/css/silverwolf/images/
trunk/css/silverwolf/images/allocation.png
trunk/css/silverwolf/images/ar.png
trunk/css/silverwolf/images/back.png
trunk/css/silverwolf/images/bar.png
trunk/css/silverwolf/images/company.png
trunk/css/silverwolf/images/contract.png
trunk/css/silverwolf/images/credit.gif
trunk/css/silverwolf/images/customer.png
trunk/css/silverwolf/images/email.gif
trunk/css/silverwolf/images/error.png
trunk/css/silverwolf/images/folder_add.png
trunk/css/silverwolf/images/gl.png
trunk/css/silverwolf/images/group_add.png
trunk/css/silverwolf/images/input_bg.png
trunk/css/silverwolf/images/inventory.png
trunk/css/silverwolf/images/magnifier.png
trunk/css/silverwolf/images/maintenance.png
trunk/css/silverwolf/images/menu_bg.png
trunk/css/silverwolf/images/menu_bg_dblue.png
trunk/css/silverwolf/images/money_add.png
trunk/css/silverwolf/images/money_delete.png
trunk/css/silverwolf/images/note_add.png
trunk/css/silverwolf/images/pdf.png
trunk/css/silverwolf/images/preview.gif
trunk/css/silverwolf/images/printer.png
trunk/css/silverwolf/images/reports.png
trunk/css/silverwolf/images/sales.png
trunk/css/silverwolf/images/security.png
trunk/css/silverwolf/images/stripe.png
trunk/css/silverwolf/images/supplier.png
trunk/css/silverwolf/images/tick.png
trunk/css/silverwolf/images/transactions.png
trunk/css/silverwolf/images/user.png
trunk/css/silverwolf/login.css
trunk/css/spacer.gif
trunk/css/webERP.gif
trunk/css/webERPsm.gif
trunk/css/wood/
trunk/css/wood/bullet.gif
trunk/css/wood/default.css
trunk/css/wood/images/
trunk/css/wood/images/User.png
trunk/css/wood/images/allocation.png
trunk/css/wood/images/ar.png
trunk/css/wood/images/company.png
trunk/css/wood/images/contract.png
trunk/css/wood/images/credit.gif
trunk/css/wood/images/customer.png
trunk/css/wood/images/desk.jpg
trunk/css/wood/images/email.gif
trunk/css/wood/images/error.png
trunk/css/wood/images/folder_add.png
trunk/css/wood/images/folders.gif
trunk/css/wood/images/gl.png
trunk/css/wood/images/group_add.png
trunk/css/wood/images/inquiries.png
trunk/css/wood/images/inventory.png
trunk/css/wood/images/magnifier.png
trunk/css/wood/images/maintenance.png
trunk/css/wood/images/money_add.png
trunk/css/wood/images/money_delete.png
trunk/css/wood/images/note_add.png
trunk/css/wood/images/pdf.png
trunk/css/wood/images/preview.gif
trunk/css/wood/images/printer.png
trunk/css/wood/images/reports.gif
trunk/css/wood/images/reports.png
trunk/css/wood/images/sales.png
trunk/css/wood/images/security.png
trunk/css/wood/images/supplier.png
trunk/css/wood/images/tick.png
trunk/css/wood/images/transactions 2.png
trunk/css/wood/images/transactions.png
trunk/css/wood/images/wood.jpg
trunk/css/wood/login.css
Removed Paths:
-------------
trunk/css/aguapop/
trunk/css/aguapop/default.css
trunk/css/aguapop/images/
trunk/css/aguapop/images/allocation.png
trunk/css/aguapop/images/ar.png
trunk/css/aguapop/images/bank.png
trunk/css/aguapop/images/company.png
trunk/css/aguapop/images/contract.png
trunk/css/aguapop/images/credit.gif
trunk/css/aguapop/images/currency.png
trunk/css/aguapop/images/customer.png
trunk/css/aguapop/images/email.gif
trunk/css/aguapop/images/error.png
trunk/css/aguapop/images/folder_add.png
trunk/css/aguapop/images/folders.gif
trunk/css/aguapop/images/footer.png
trunk/css/aguapop/images/gl.png
trunk/css/aguapop/images/group_add.png
trunk/css/aguapop/images/help.png
trunk/css/aguapop/images/input.png
trunk/css/aguapop/images/input_bg.png
trunk/css/aguapop/images/inventory.png
trunk/css/aguapop/images/magnifier.png
trunk/css/aguapop/images/maintenance.png
trunk/css/aguapop/images/money_add.png
trunk/css/aguapop/images/money_delete.png
trunk/css/aguapop/images/note_add.png
trunk/css/aguapop/images/pdf.png
trunk/css/aguapop/images/preview.gif
trunk/css/aguapop/images/preview.png
trunk/css/aguapop/images/printer.png
trunk/css/aguapop/images/reports.png
trunk/css/aguapop/images/sales.png
trunk/css/aguapop/images/security.png
trunk/css/aguapop/images/stripe.png
trunk/css/aguapop/images/supplier.png
trunk/css/aguapop/images/tick.png
trunk/css/aguapop/images/top_bg.png
trunk/css/aguapop/images/transactions.png
trunk/css/aguapop/images/user.png
trunk/css/aguapop/login.css
trunk/css/bg.gif
trunk/css/default/
trunk/css/default/default.css
trunk/css/default/images/
trunk/css/default/images/Graphique-32.png
trunk/css/default/images/allocation.gif
trunk/css/default/images/allocation.png
trunk/css/default/images/ar.gif
trunk/css/default/images/ar.png
trunk/css/default/images/back.png
trunk/css/default/images/bank.gif
trunk/css/default/images/bar.png
trunk/css/default/images/button_bg.png
trunk/css/default/images/company.gif
trunk/css/default/images/company.png
trunk/css/default/images/contract.png
trunk/css/default/images/credit.gif
trunk/css/default/images/currency.gif
trunk/css/default/images/customer.png
trunk/css/default/images/email.gif
trunk/css/default/images/error.png
trunk/css/default/images/folder_add.png
trunk/css/default/images/folders.gif
trunk/css/default/images/gelblue.png
trunk/css/default/images/gelbluebutton.png
trunk/css/default/images/gelblueh.png
trunk/css/default/images/gl.png
trunk/css/default/images/group_add.png
trunk/css/default/images/hoverbuttonblue.png
trunk/css/default/images/input.png
trunk/css/default/images/input_bg.png
trunk/css/default/images/inputh.png
trunk/css/default/images/inputhtxt.png
trunk/css/default/images/inputtxt.png
trunk/css/default/images/inquiries.png
trunk/css/default/images/inventory.gif
trunk/css/default/images/inventory.png
trunk/css/default/images/magnifier.png
trunk/css/default/images/maintenance.gif
trunk/css/default/images/maintenance.png
trunk/css/default/images/menu_bg.png
trunk/css/default/images/menu_bg_blue.png
trunk/css/default/images/menu_bg_dblue.png
trunk/css/default/images/menu_bg_grey.png
trunk/css/default/images/menu_bg_indigo.png
trunk/css/default/images/menu_bg_white.png
trunk/css/default/images/menucurve.gif
trunk/css/default/images/money_add.png
trunk/css/default/images/money_delete.png
trunk/css/default/images/note_add.png
trunk/css/default/images/pdf.png
trunk/css/default/images/preview.gif
trunk/css/default/images/printer.png
trunk/css/default/images/reports.gif
trunk/css/default/images/reports.png
trunk/css/default/images/sales.png
trunk/css/default/images/security.png
trunk/css/default/images/stripe.png
trunk/css/default/images/supplier.png
trunk/css/default/images/tick.png
trunk/css/default/images/transactions.gif
trunk/css/default/images/transactions.png
trunk/css/default/images/user.png
trunk/css/default/login.css
trunk/css/fluid/
trunk/css/fluid/default.css
trunk/css/fluid/images/
trunk/css/fluid/images/allocation.png
trunk/css/fluid/images/ar.png
trunk/css/fluid/images/back.png
trunk/css/fluid/images/bank.gif
trunk/css/fluid/images/company.png
trunk/css/fluid/images/contract.png
trunk/css/fluid/images/credit.gif
trunk/css/fluid/images/currency.gif
trunk/css/fluid/images/customer.png
trunk/css/fluid/images/email.gif
trunk/css/fluid/images/error.png
trunk/css/fluid/images/folder_add.png
trunk/css/fluid/images/gl.png
trunk/css/fluid/images/group_add.png
trunk/css/fluid/images/inquiries.png
trunk/css/fluid/images/inventory.png
trunk/css/fluid/images/magnifier.png
trunk/css/fluid/images/maintenance.png
trunk/css/fluid/images/money_add.png
trunk/css/fluid/images/money_delete.png
trunk/css/fluid/images/note_add.png
trunk/css/fluid/images/pdf.png
trunk/css/fluid/images/preview.gif
trunk/css/fluid/images/printer.png
trunk/css/fluid/images/reports.gif
trunk/css/fluid/images/reports.png
trunk/css/fluid/images/sales.png
trunk/css/fluid/images/security.png
trunk/css/fluid/images/supplier.png
trunk/css/fluid/images/tick.png
trunk/css/fluid/images/transactions.gif
trunk/css/fluid/images/transactions.png
trunk/css/fluid/images/user.png
trunk/css/fluid/login.css
trunk/css/fresh/
trunk/css/fresh/bullet.gif
trunk/css/fresh/default.css
trunk/css/fresh/images/
trunk/css/fresh/images/Graphique-32.png
trunk/css/fresh/images/allocation.gif
trunk/css/fresh/images/allocation.png
trunk/css/fresh/images/ar.gif
trunk/css/fresh/images/ar.png
trunk/css/fresh/images/back.png
trunk/css/fresh/images/bank.gif
trunk/css/fresh/images/bar.png
trunk/css/fresh/images/button_bg.png
trunk/css/fresh/images/company.gif
trunk/css/fresh/images/company.png
trunk/css/fresh/images/contract.png
trunk/css/fresh/images/credit.gif
trunk/css/fresh/images/currency.gif
trunk/css/fresh/images/customer.png
trunk/css/fresh/images/email.gif
trunk/css/fresh/images/error.png
trunk/css/fresh/images/folder_add.png
trunk/css/fresh/images/folders.gif
trunk/css/fresh/images/gelblue.png
trunk/css/fresh/images/gelbluebutton.png
trunk/css/fresh/images/gelblueh.png
trunk/css/fresh/images/gl.png
trunk/css/fresh/images/group_add.png
trunk/css/fresh/images/hoverbuttonblue.png
trunk/css/fresh/images/input.png
trunk/css/fresh/images/input_bg.png
trunk/css/fresh/images/inputh.png
trunk/css/fresh/images/inputhtxt.png
trunk/css/fresh/images/inputtxt.png
trunk/css/fresh/images/inquiries.png
trunk/css/fresh/images/inventory.gif
trunk/css/fresh/images/inventory.png
trunk/css/fresh/images/magnifier.png
trunk/css/fresh/images/maintenance.gif
trunk/css/fresh/images/maintenance.png
trunk/css/fresh/images/menu_bg.png
trunk/css/fresh/images/menu_bg_blue.png
trunk/css/fresh/images/menu_bg_dblue.png
trunk/css/fresh/images/menu_bg_grey.png
trunk/css/fresh/images/menu_bg_indigo.png
trunk/css/fresh/images/menu_bg_white.png
trunk/css/fresh/images/menucurve.gif
trunk/css/fresh/images/money_add.png
trunk/css/fresh/images/money_delete.png
trunk/css/fresh/images/note_add.png
trunk/css/fresh/images/pdf.png
trunk/css/fresh/images/preview.gif
trunk/css/fresh/images/printer.png
trunk/css/fresh/images/reports.gif
trunk/css/fresh/images/reports.png
trunk/css/fresh/images/sales.png
trunk/css/fresh/images/security.png
trunk/css/fresh/images/stripe.png
trunk/css/fresh/images/supplier.png
trunk/css/fresh/images/tick.png
trunk/css/fresh/images/transactions.gif
trunk/css/fresh/images/transactions.png
trunk/css/fresh/images/user.png
trunk/css/fresh/login.css
trunk/css/gel/
trunk/css/gel/default.css
trunk/css/gel/images/
trunk/css/gel/images/allocation.png
trunk/css/gel/images/ar.png
trunk/css/gel/images/back.png
trunk/css/gel/images/bar.png
trunk/css/gel/images/company.png
trunk/css/gel/images/contract.png
trunk/css/gel/images/credit.gif
trunk/css/gel/images/customer.png
trunk/css/gel/images/email.gif
trunk/css/gel/images/error.png
trunk/css/gel/images/folder_add.png
trunk/css/gel/images/folders.gif
trunk/css/gel/images/gelblue.png
trunk/css/gel/images/gl.png
trunk/css/gel/images/group_add.png
trunk/css/gel/images/input.png
trunk/css/gel/images/inputh.png
trunk/css/gel/images/inputhtxt.png
trunk/css/gel/images/inputtxt.png
trunk/css/gel/images/inventory.png
trunk/css/gel/images/magnifier.png
trunk/css/gel/images/maintenance.gif
trunk/css/gel/images/maintenance.png
trunk/css/gel/images/menu_bg.png
trunk/css/gel/images/menu_bg_blue.png
trunk/css/gel/images/menu_bg_dblue.png
trunk/css/gel/images/menu_bg_grey.png
trunk/css/gel/images/menu_bg_indigo.png
trunk/css/gel/images/menu_bg_white.png
trunk/css/gel/images/menucurve.gif
trunk/css/gel/images/money_add.png
trunk/css/gel/images/money_delete.png
trunk/css/gel/images/note_add.png
trunk/css/gel/images/pdf.png
trunk/css/gel/images/preview.gif
trunk/css/gel/images/printer.png
trunk/css/gel/images/reports.gif
trunk/css/gel/images/reports.png
trunk/css/gel/images/sales.png
trunk/css/gel/images/security.png
trunk/css/gel/images/stripe.png
trunk/css/gel/images/supplier.png
trunk/css/gel/images/tick.png
trunk/css/gel/images/transactions.gif
trunk/css/gel/images/transactions.png
trunk/css/gel/images/user.png
trunk/css/gel/login.css
trunk/css/labelsDim.png
trunk/css/paramsLabel.png
trunk/css/professional/
trunk/css/professional/default.css
trunk/css/professional/images/
trunk/css/professional/images/allocation.png
trunk/css/professional/images/ar.png
trunk/css/professional/images/company.png
trunk/css/professional/images/contract.png
trunk/css/professional/images/credit.gif
trunk/css/professional/images/currency.gif
trunk/css/professional/images/customer.png
trunk/css/professional/images/email.gif
trunk/css/professional/images/error.png
trunk/css/professional/images/folder_add.png
trunk/css/professional/images/gl.png
trunk/css/professional/images/group_add.png
trunk/css/professional/images/input_bg.png
trunk/css/professional/images/inputtxt.png
trunk/css/professional/images/inquiries.png
trunk/css/professional/images/inventory.png
trunk/css/professional/images/magnifier.png
trunk/css/professional/images/maintenance.png
trunk/css/professional/images/money_add.png
trunk/css/professional/images/money_delete.png
trunk/css/professional/images/note_add.png
trunk/css/professional/images/pdf.png
trunk/css/professional/images/preview.gif
trunk/css/professional/images/printer.png
trunk/css/professional/images/reports.gif
trunk/css/professional/images/reports.png
trunk/css/professional/images/sales.png
trunk/css/professional/images/security.png
trunk/css/professional/images/stripe.png
trunk/css/professional/images/supplier.png
trunk/css/professional/images/tick.png
trunk/css/professional/images/transactions.gif
trunk/css/professional/images/transactions.png
trunk/css/professional/images/user.png
trunk/css/professional/login.css
trunk/css/professional-rtl/
trunk/css/professional-rtl/default.css
trunk/css/professional-rtl/images/
trunk/css/professional-rtl/images/allocation.gif
trunk/css/professional-rtl/images/allocation.png
trunk/css/professional-rtl/images/ar.gif
trunk/css/professional-rtl/images/ar.png
trunk/css/professional-rtl/images/bank.gif
trunk/css/professional-rtl/images/company.png
trunk/css/professional-rtl/images/credit.gif
trunk/css/professional-rtl/images/customer.png
trunk/css/professional-rtl/images/email.gif
trunk/css/professional-rtl/images/error.png
trunk/css/professional-rtl/images/folder_add.png
trunk/css/professional-rtl/images/folders.gif
trunk/css/professional-rtl/images/gl.png
trunk/css/professional-rtl/images/group_add.png
trunk/css/professional-rtl/images/input_bg.png
trunk/css/professional-rtl/images/inputtxt.png
trunk/css/professional-rtl/images/inventory.png
trunk/css/professional-rtl/images/magnifier.png
trunk/css/professional-rtl/images/maintenance.png
trunk/css/professional-rtl/images/money_add.png
trunk/css/professional-rtl/images/money_delete.png
trunk/css/professional-rtl/images/note_add.png
trunk/css/professional-rtl/images/pdf.png
trunk/css/professional-rtl/images/preview.gif
trunk/css/professional-rtl/images/printer.png
trunk/css/professional-rtl/images/reports.gif
trunk/css/professional-rtl/images/reports.png
trunk/css/professional-rtl/images/sales.png
trunk/css/professional-rtl/images/security.png
trunk/css/professional-rtl/images/supplier.png
trunk/css/professional-rtl/images/tick.png
trunk/css/professional-rtl/images/transactions.png
trunk/css/professional-rtl/images/user.png
trunk/css/professional-rtl/login.css
trunk/css/silverwolf/
trunk/css/silverwolf/default.css
trunk/css/silverwolf/images/
trunk/css/silverwolf/images/allocation.png
trunk/css/silverwolf/images/ar.png
trunk/css/silverwolf/images/back.png
trunk/css/silverwolf/images/bar.png
trunk/css/silverwolf/images/company.png
trunk/css/silverwolf/images/contract.png
trunk/css/silverwolf/images/credit.gif
trunk/css/silverwolf/images/customer.png
trunk/css/silverwolf/images/email.gif
trunk/css/silverwolf/images/error.png
trunk/css/silverwolf/images/folder_add.png
trunk/css/silverwolf/images/gl.png
trunk/css/silverwolf/images/group_add.png
trunk/css/silverwolf/images/input_bg.png
trunk/css/silverwolf/images/inventory.png
trunk/css/silverwolf/images/magnifier.png
trunk/css/silverwolf/images/maintenance.png
trunk/css/silverwolf/images/menu_bg.png
trunk/css/silverwolf/images/menu_bg_dblue.png
trunk/css/silverwolf/images/money_add.png
trunk/css/silverwolf/images/money_delete.png
trunk/css/silverwolf/images/note_add.png
trunk/css/silverwolf/images/pdf.png
trunk/css/silverwolf/images/preview.gif
trunk/css/silverwolf/images/printer.png
trunk/css/silverwolf/images/reports.png
trunk/css/silverwolf/images/sales.png
trunk/css/silverwolf/images/security.png
trunk/css/silverwolf/images/stripe.png
trunk/css/silverwolf/images/supplier.png
trunk/css/silverwolf/images/tick.png
trunk/css/silverwolf/images/transactions.png
trunk/css/silverwolf/images/user.png
trunk/css/silverwolf/login.css
trunk/css/spacer.gif
trunk/css/webERP.gif
trunk/css/webERPsm.gif
trunk/css/wood/
trunk/css/wood/bullet.gif
trunk/css/wood/default.css
trunk/css/wood/images/
trunk/css/wood/images/User.png
trunk/css/wood/images/allocation.png
trunk/css/wood/images/ar.png
trunk/css/wood/images/company.png
trunk/css/wood/images/contract.png
trunk/css/wood/images/credit.gif
trunk/css/wood/images/customer.png
trunk/css/wood/images/desk.jpg
trunk/css/wood/images/email.gif
trunk/css/wood/images/error.png
trunk/css/wood/images/folder_add.png
trunk/css/wood/images/folders.gif
trunk/css/wood/images/gl.png
trunk/css/wood/images/group_add.png
trunk/css/wood/images/inquiries.png
trunk/css/wood/images/inventory.png
trunk/css/wood/images/magnifier.png
trunk/css/wood/images/maintenance.png
trunk/css/wood/images/money_add.png
trunk/css/wood/images/money_delete.png
trunk/css/wood/images/note_add.png
trunk/css/wood/images/pdf.png
trunk/css/wood/images/preview.gif
trunk/css/wood/images/printer.png
trunk/css/wood/images/reports.gif
trunk/css/wood/images/reports.png
trunk/css/wood/images/sales.png
trunk/css/wood/images/security.png
trunk/css/wood/images/supplier.png
trunk/css/wood/images/tick.png
trunk/css/wood/images/transactions 2.png
trunk/css/wood/images/transactions.png
trunk/css/wood/images/wood.jpg
trunk/css/wood/login.css
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-09-10 03:43:09 UTC (rev 5656)
+++ trunk/AccountGroups.php 2012-09-10 11:32:07 UTC (rev 5657)
@@ -212,7 +212,8 @@
echo '</td></tr>';
echo '<tr>
<td colspan="2"><div class="centre"><input tabindex="6" type="submit" name="MoveGroup" value="' . _('Move Group') . '" /></div></td>
- </tr>';
+ </tr>
+ </table>';
} else {
$sql = "SELECT COUNT(groupname) groupnames FROM accountgroups WHERE parentgroupname = '" . $_GET['SelectedAccountGroup'] . "'";
Deleted: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2012-09-10 01:41:55 UTC (rev 5647)
+++ trunk/css/aguapop/default.css 2012-09-10 11:32:07 UTC (rev 5657)
@@ -1,463 +0,0 @@
-/*
-
-New "AguaPop" Theme for WebERP
-
-v2, 2012-08-03
-
-by Hindra Joshua
-
-*/
-
-body {
-font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
-background: silver;
-margin:0;
-padding:0;
-}
-
-/* default styles */
-
-a{
-color:blue;
-text-decoration:none;
-}
-a:hover{
-color:red;
-text-decoration:underline;
-}
-a:active{
-}
-
-img{ /* icon on page title, etc */
-border:none;
-vertical-align:middle;
-}
-
-p{ /* some text need to be centered */
-/*text-align:center;*/
-}
-p.page_title_text { /* page title */
-color:black;
-font-weight:bold;
-margin:0 auto;
-padding:5px;
-text-align:center;
-}
-p.good {
-font-weight: bold;
-color: green;
-}
-p.bad {
-font-weight: bold;
-color:red;
-}
-
-
-table {
-width:auto;
-max-width:90%;
-margin:5px auto;
-padding-bottom:5px;
-}
-table.selection {
-width:auto;
-max-width:90%;
-/*padding-bottom:5px;*/
-}
-th {
-background-color:skyblue;
-color:black;
-font-weight:normal;
-padding:3px;
-}
-th.number {
-text-align: right;
-font-weight: normal;
-background-color: skyblue;
-color: white;
-}
-
-td {
-font-family: Arial, Verdana, Helvetica, sans-serif;
-text-align: left;
-}
-td.select {
-background-color: whitesmoke;
-padding:3px;
-}
-td.number {
-text-align: right;
-}
-
-div.centre {
-padding:5px;
-text-align:center;
-}
-
-input { /*specifies the input field text characteristics*/
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-size: 9px;
-font-style: italic;
-}
-input.number{
-text-align: right;
-}
-input.image {
-border-width: 0px;
-background-color: transparent;
-}
-input:hover{
-background:#9ffffb;
-}
-
-select {
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-size: 11px;
-}
-select:hover { /* drop down */
-background:#9ffffb;
-}
-
-textarea{
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-size: 10px;
-}
-textarea:hover{
-background:#9ffffb;
-}
-
-.EvenTableRows {
-background-color: gainsboro;
-}
-.OddTableRows {
-background-color: whitesmoke;
-}
-
-div{ /* some input/buttons need to be centered */
-}
-div.error {
-background-color: mistyrose;
-width: 98%;
-margin: 5px auto;
-color: red;
-border: 1px solid red;
-}
-div.warn {
-background-color: pink;
-width: 98%;
-margin: 5px auto;
-color: maroon;
-border: 1px solid maroon;
-}
-div.success {
-background-color: aquamarine;
-width: 98%;
-margin: 5px auto;
-color: green;
-border: 1px solid green;
-}
-div.info {
-background-color: lightskyblue;
-width: 98%;
-margin: 5px auto;
-color:navy;
-border: 1px solid navy;
-}
-DIV.page_help_text {
-background: lightgrey url(images/help.png) top left no-repeat;
-border: maroon 1px solid;
-padding-top:2px;
-padding-bottom: 2px;
-z-index: 1;
-width: 80%;
-float: none;
-visibility: visible;
-margin: 0 auto;
-position: static;
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-weight: normal;
-font-size: 10px;
-color: black;
-text-align:center;
-padding-left: 24px;
-min-height:26px;
-}
-
-/* date picker */
-.dpTbl {
- border: solid navy 1px;
- background:white;
-}
-.dpTD {
-border: 0;
-width: 20px;
-background-color: whitesmoke;
-text-align: right;
-cursor: pointer;
-}
-.dpDayHighlight {
-border: 0;
-width: 20px;
-background-color: yellow;
-text-align: right;
-cursor: pointer;
-}
-.dpTDHover {
-border: 0;
-width: 20px;
-background-color: gainsboro;
-text-align: right;
-cursor: pointer;
-}
-
-/* Table type is used for UI tables type 1 */
-.table1 {
-width:90%;
-background: whitesmoke;
-border: 1px solid darkslategray;
-margin: 0 auto;
-}
-.tableheader {
-font-weight: normal;
-background-color: skyblue;
-color: white;
-}
-.notavailable {
-font-weight: lighter;
-font-style: italic;
-color: gray;
-}
-.label {
-font-weight: bold;
-font-style: normal;
-font-size: 11px;
-color: black;
-background-color: gainsboro;
-}
-.table_index {
-background-color: aliceblue;
-}
-li {
-/*list-style-image: url(bullet.gif);*/
-}
-
-/* CANVAS */
-
-#CanvasDiv {
-background:steelblue;
-border-radius:20px;
-box-shadow:3px 3px 4px #86C3D7 inset, -3px -3px 4px #383878 inset, 0 0 10px black;
-margin:10px;
-}
-
-/* HEADER */
-
-#HeaderDiv {
-overflow:hidden;
-color:white;
-padding:5px 10px 0;
-}
-#HeaderDiv a{
-border-radius:10px;
-color:white;
-text-decoration:none;
-padding:3px;
-}
-#HeaderDiv a:hover{
-color:cyan;
-border-radius:10px;
-box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
-padding:3px;
-}
-#HeaderWrapDiv{
-}
-
-/* HEADER - APP INFO */
-
-#AppInfoDiv{
-float:left; /* REQUIRED: to the left */
-}
-#AppInfoCompanyDiv{
-display:table-cell; /* REQUIRED: as a cell */
-}
-#AppInfoUserDiv{
-display:table-cell; /* REQUIRED: as a cell */
-padding-left:5px;
-}
-#AppInfoModuleDiv{
-font-weight:bold;
-font-size:12px;
-padding:3px;
-}
-
-/* HEADER - QUICK MENU */
-
-#QuickMenuDiv{
-float:right;
-margin-top:7px;
-}
-#QuickMenuDiv ul{
-list-style:none;
-float:right;
-}
-#QuickMenuDiv ul li{
-float: left;
-display:inline;
-margin: 0px 3px;
-}
-
-/* BODY */
-
-#BodyDiv {
-clear:both;
-overflow:hidden;
-text-align:center; /* needed to center some buttons on SelectSupplier.php */
-}
-#BodyWrapDiv{
-background:lightsteelblue;
-box-shadow:2px 2px 3px inset;
-margin:0 5px;
-}
-
-/* BODY - MAIN MENU */
-
-#MainMenuDiv{
-float:left;
-background:steelblue;
-white-space:nowrap;
-text-align:center;
-padding-left:3px;
-padding-top:3px;
-width:11%;
-}
-#MainMenuDiv ul{
-margin:0;
-padding:0;
-}
-#MainMenuDiv li{
-list-style:none;
-}
-#MainMenuDiv li a,
-#MainMenuDiv li a:hover,
-#MainMenuDiv .main_menu_selected a{
-display:block; /* REQUIRED */
-border-radius:10px;
-color:white;
-text-decoration:none;
-padding:3px;
-margin-bottom:5px;
-}
-#MainMenuDiv li a:hover{
-color:cyan;
-box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
-}
-#MainMenuDiv .main_menu_selected a{ /* the selected button */
-box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
-}
-
-/* BODY - SUB MENU */
-
-#SubMenuDiv{
-display:table; /* display as table, sub menu will auto adjust width */
-float:right;
-overflow: hidden;
-margin-left:auto;
-margin-right:auto;
-width:88%; /* main menu is 10% */
-text-align:left;
-}
-#SubMenuDiv ul{
-margin:0;
-padding:0;
-}
-#SubMenuDiv li{
-list-style:none; /* REQUIRED: hide bullets */
-}
-#SubMenuDiv p{
-}
-
-#SubMenuDiv a{
-color:black;
-text-decoration:none;
-}
-#SubMenuDiv a:hover{
-color:black;
-text-decoration:underline;
-}
-
-.menu_group_headers {
-background:steelblue;
-border:2px outset white;
-color:white;
-font-weight:bold;
-text-align:center;
-padding:3px;
-}
-
-.menu_group_item {
-padding:2px;
-text-align:left;
-}
-.menu_group_item:hover{
-background:lightblue;
-text-align:left;
-}
-
-.menu_group_item p { /* bullet */
-color: red; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
-text-indent: -10px; /* this makes the bullet to appear as the li tag previously used */
-margin: 0 0 0 12px;
-text-align:left;
-}
-.menu_group_item a{
-color:black;
-text-decoration:none;
-}
-.menu_group_item a:hover{
-color:red;
-text-decoration:none;
-}
-
-#TransactionsDiv,#InquiriesDiv,#MaintenanceDiv{
-background:whitesmoke;
-border:2px solid steelblue;
-display:table-cell;
-}
-#InquiriesDiv div{ /* to center custom report/form header */
-background:lightsteelblue;
-font-weight:bold;
-color:black;
-padding:2px;
-}
-
-/*** FOOTER ***/
-
-#FooterDiv{
-clear:both;
-color:white;
-height:53px;
-padding:0;
-}
-#FooterWrapDiv{
-padding:5px;
-}
-#FooterLogoDiv{
-background:white;
-border:2px outset steelblue;
-border-radius:8px 8px 8px 8px;
-float:left;
-padding:3px;
-}
-#FooterVersionDiv{
-float:left;
-margin-left:10px;
-margin-top:15px;
-
-}
-#FooterTimeDiv{
-float:right;
-margin-top:15px;
-}
-
-/**** END ***/
\ No newline at end of file
Copied: trunk/css/aguapop/default.css (from rev 5647, trunk/css/aguapop/default.css)
===================================================================
--- trunk/css/aguapop/default.css (rev 0)
+++ trunk/css/aguapop/default.css 2012-09-10 11:32:07 UTC (rev 5657)
@@ -0,0 +1,463 @@
+/*
+
+New "AguaPop" Theme for WebERP
+
+v2, 2012-08-03
+
+by Hindra Joshua
+
+*/
+
+body {
+font-family:Arial, Verdana, Helvetica, sans-serif;
+font-size:10px;
+background: silver;
+margin:0;
+padding:0;
+}
+
+/* default styles */
+
+a{
+color:blue;
+text-decoration:none;
+}
+a:hover{
+color:red;
+text-decoration:underline;
+}
+a:active{
+}
+
+img{ /* icon on page title, etc */
+border:none;
+vertical-align:middle;
+}
+
+p{ /* some text need to be centered */
+/*text-align:center;*/
+}
+p.page_title_text { /* page title */
+color:black;
+font-weight:bold;
+margin:0 auto;
+padding:5px;
+text-align:center;
+}
+p.good {
+font-weight: bold;
+color: green;
+}
+p.bad {
+font-weight: bold;
+color:red;
+}
+
+
+table {
+width:auto;
+max-width:90%;
+margin:5px auto;
+padding-bottom:5px;
+}
+table.selection {
+width:auto;
+max-width:90%;
+/*padding-bottom:5px;*/
+}
+th {
+background-color:skyblue;
+color:black;
+font-weight:normal;
+padding:3px;
+}
+th.number {
+text-align: right;
+font-weight: normal;
+background-color: skyblue;
+color: white;
+}
+
+td {
+font-family: Arial, Verdana, Helvetica, sans-serif;
+text-align: left;
+}
+td.select {
+background-color: whitesmoke;
+padding:3px;
+}
+td.number {
+text-align: right;
+}
+
+div.centre {
+padding:5px;
+text-align:center;
+}
+
+input { /*specifies the input field text characteristics*/
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-size: 9px;
+font-style: italic;
+}
+input.number{
+text-align: right;
+}
+input.image {
+border-width: 0px;
+background-color: transparent;
+}
+input:hover{
+background:#9ffffb;
+}
+
+select {
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-size: 11px;
+}
+select:hover { /* drop down */
+background:#9ffffb;
+}
+
+textarea{
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-size: 10px;
+}
+textarea:hover{
+background:#9ffffb;
+}
+
+.EvenTableRows {
+background-color: gainsboro;
+}
+.OddTableRows {
+background-color: whitesmoke;
+}
+
+div{ /* some input/buttons need to be centered */
+}
+div.error {
+background-color: mistyrose;
+width: 98%;
+margin: 5px auto;
+color: red;
+border: 1px solid red;
+}
+div.warn {
+background-color: pink;
+width: 98%;
+margin: 5px auto;
+color: maroon;
+border: 1px solid maroon;
+}
+div.success {
+background-color: aquamarine;
+width: 98%;
+margin: 5px auto;
+color: green;
+border: 1px solid green;
+}
+div.info {
+background-color: lightskyblue;
+width: 98%;
+margin: 5px auto;
+color:navy;
+border: 1px solid navy;
+}
+DIV.page_help_text {
+background: lightgrey url(images/help.png) top left no-repeat;
+border: maroon 1px solid;
+padding-top:2px;
+padding-bottom: 2px;
+z-index: 1;
+width: 80%;
+float: none;
+visibility: visible;
+margin: 0 auto;
+position: static;
+font-family: Arial, Verdana, Helvetica, sans-serif;
+font-weight: normal;
+font-size: 10px;
+color: black;
+text-align:center;
+padding-left: 24px;
+min-height:26px;
+}
+
+/* date picker */
+.dpTbl {
+ border: solid navy 1px;
+ background:white;
+}
+.dpTD {
+border: 0;
+width: 20px;
+background-color: whitesmoke;
+text-align: right;
+cursor: pointer;
+}
+.dpDayHighlight {
+border: 0;
+width: 20px;
+background-color: yellow;
+text-align: right;
+cursor: pointer;
+}
+.dpTDHover {
+border: 0;
+width: 20px;
+background-color: gainsboro;
+text-align: right;
+cursor: pointer;
+}
+
+/* Table type is used for UI tables type 1 */
+.table1 {
+width:90%;
+background: whitesmoke;
+border: 1px solid darkslategray;
+margin: 0 auto;
+}
+.tableheader {
+font-weight: normal;
+background-color: skyblue;
+color: white;
+}
+.notavailable {
+font-weight: lighter;
+font-style: italic;
+color: gray;
+}
+.label {
+font-weight: bold;
+font-style: normal;
+font-size: 11px;
+color: black;
+background-color: gainsboro;
+}
+.table_index {
+background-color: aliceblue;
+}
+li {
+/*list-style-image: url(bullet.gif);*/
+}
+
+/* CANVAS */
+
+#CanvasDiv {
+background:steelblue;
+border-radius:20px;
+box-shadow:3px 3px 4px #86C3D7 inset, -3px -3px 4px #383878 inset, 0 0 10px black;
+margin:10px;
+}
+
+/* HEADER */
+
+#HeaderDiv {
+overflow:hidden;
+color:white;
+padding:5px 10px 0;
+}
+#HeaderDiv a{
+border-radius:10px;
+color:white;
+text-decoration:none;
+padding:3px;
+}
+#HeaderDiv a:hover{
+color:cyan;
+border-radius:10px;
+box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+padding:3px;
+}
+#HeaderWrapDiv{
+}
+
+/* HEADER - APP INFO */
+
+#AppInfoDiv{
+float:left; /* REQUIRED: to the left */
+}
+#AppInfoCompanyDiv{
+display:table-cell; /* REQUIRED: as a cell */
+}
+#AppInfoUserDiv{
+display:table-cell; /* REQUIRED: as a cell */
+padding-left:5px;
+}
+#AppInfoModuleDiv{
+font-weight:bold;
+font-size:12px;
+padding:3px;
+}
+
+/* HEADER - QUICK MENU */
+
+#QuickMenuDiv{
+float:right;
+margin-top:7px;
+}
+#QuickMenuDiv ul{
+list-style:none;
+float:right;
+}
+#QuickMenuDiv ul li{
+float: left;
+display:inline;
+margin: 0px 3px;
+}
+
+/* BODY */
+
+#BodyDiv {
+clear:both;
+overflow:hidden;
+text-align:center; /* needed to center some buttons on SelectSupplier.php */
+}
+#BodyWrapDiv{
+background:lightsteelblue;
+box-shadow:2px 2px 3px inset;
+margin:0 5px;
+}
+
+/* BODY - MAIN MENU */
+
+#MainMenuDiv{
+float:left;
+background:steelblue;
+white-space:nowrap;
+text-align:center;
+padding-left:3px;
+padding-top:3px;
+width:11%;
+}
+#MainMenuDiv ul{
+margin:0;
+padding:0;
+}
+#MainMenuDiv li{
+list-style:none;
+}
+#MainMenuDiv li a,
+#MainMenuDiv li a:hover,
+#MainMenuDiv .main_menu_selected a{
+display:block; /* REQUIRED */
+border-radius:10px;
+color:white;
+text-decoration:none;
+padding:3px;
+margin-bottom:5px;
+}
+#MainMenuDiv li a:hover{
+color:cyan;
+box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+}
+#MainMenuDiv .main_menu_selected a{ /* the selected button */
+box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+}
+
+/* BODY - SUB MENU */
+
+#SubMenuDiv{
+display:table; /* display as table, sub menu will auto adjust width */
+float:right;
+overflow: hidden;
+margin-left:auto;
+margin-right:auto;
+width:88%; /* main menu is 10% */
+text-align:left;
+}
+#SubMenuDiv ul{
+margin:0;
+padding:0;
+}
+#SubMenuDiv li{
+list-style:none; /* REQUIRED: hide bullets */
+}
+#SubMenuDiv p{
+}
+
+#SubMenuDiv a{
+color:black;
+text-decoration:none;
+}
+#SubMenuDiv a:hover{
+color:black;
+text-decoration:underline;
+}
+
+.menu_group_headers {
+background:steelblue;
+border:2px outset white;
+color:white;
+font-weight:bold;
+text-align:center;
+padding:3px;
+}
+
+.menu_group_item {
+padding:2px;
+text-align:left;
+}
+.menu_group_item:hover{
+background:lightblue;
+text-align:left;
+}
+
+.menu_group_item p { /* bullet */
+color: red; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+text-indent: -10px; /* this makes the bullet to appear as the li tag previously used */
+margin: 0 0 0 12px;
+text-align:left;
+}
+.menu_group_item a{
+color:black;
+text-decoration:none;
+}
+.menu_group_item a:hover{
+color:red;
+text-decoration:none;
+}
+
+#TransactionsDiv,#InquiriesDiv,#MaintenanceDiv{
+background:whitesmoke;
+border:2px solid steelblue;
+display:table-cell;
+}
+#InquiriesDiv div{ /* to center custom report/form header */
+background:lightsteelblue;
+font-weight:bold;
+color:black;
+padding:2px;
+}
+
+/*** FOOTER ***/
+
+#FooterDiv{
+clear:both;
+color:white;
+height:53px;
+padding:0;
+}
+#FooterWrapDiv{
+padding:5px;
+}
+#FooterLogoDiv{
+background:white;
+border:2px outset steelblue;
+border-radius:8px 8px 8px 8px;
+float:left;
+padding:3px;
+}
+#FooterVersionDiv{
+float:left;
+margin-left:10px;
+margin-top:15px;
+
+}
+#FooterTimeDiv{
+float:right;
+margin-top:15px;
+}
+
+/**** END ***/
\ No newline at end of file
Deleted: trunk/css/aguapop/images/allocation.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/allocation.png (from rev 5647, trunk/css/aguapop/images/allocation.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/ar.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/ar.png (from rev 5647, trunk/css/aguapop/images/ar.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/bank.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/bank.png (from rev 5647, trunk/css/aguapop/images/bank.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/company.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/company.png (from rev 5647, trunk/css/aguapop/images/company.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/contract.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/contract.png (from rev 5647, trunk/css/aguapop/images/contract.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/credit.gif
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/credit.gif (from rev 5647, trunk/css/aguapop/images/credit.gif)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/currency.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/currency.png (from rev 5647, trunk/css/aguapop/images/currency.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/customer.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/customer.png (from rev 5647, trunk/css/aguapop/images/customer.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/email.gif
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/email.gif (from rev 5647, trunk/css/aguapop/images/email.gif)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/error.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/error.png (from rev 5647, trunk/css/aguapop/images/error.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/folder_add.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/folder_add.png (from rev 5647, trunk/css/aguapop/images/folder_add.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/folders.gif
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/folders.gif (from rev 5647, trunk/css/aguapop/images/folders.gif)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/footer.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/footer.png (from rev 5647, trunk/css/aguapop/images/footer.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/gl.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/gl.png (from rev 5647, trunk/css/aguapop/images/gl.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/group_add.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/group_add.png (from rev 5647, trunk/css/aguapop/images/group_add.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/help.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/help.png (from rev 5647, trunk/css/aguapop/images/help.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/input.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/input.png (from rev 5647, trunk/css/aguapop/images/input.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/input_bg.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/input_bg.png (from rev 5647, trunk/css/aguapop/images/input_bg.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/inventory.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/inventory.png (from rev 5647, trunk/css/aguapop/images/inventory.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/magnifier.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/magnifier.png (from rev 5647, trunk/css/aguapop/images/magnifier.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/maintenance.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/maintenance.png (from rev 5647, trunk/css/aguapop/images/maintenance.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/money_add.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/money_add.png (from rev 5647, trunk/css/aguapop/images/money_add.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/money_delete.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/money_delete.png (from rev 5647, trunk/css/aguapop/images/money_delete.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/note_add.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/note_add.png (from rev 5647, trunk/css/aguapop/images/note_add.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/pdf.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/pdf.png (from rev 5647, trunk/css/aguapop/images/pdf.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/preview.gif
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/preview.gif (from rev 5647, trunk/css/aguapop/images/preview.gif)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/preview.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/preview.png (from rev 5647, trunk/css/aguapop/images/preview.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/printer.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/printer.png (from rev 5647, trunk/css/aguapop/images/printer.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/reports.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/reports.png (from rev 5647, trunk/css/aguapop/images/reports.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/sales.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/sales.png (from rev 5647, trunk/css/aguapop/images/sales.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/security.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/security.png (from rev 5647, trunk/css/aguapop/images/security.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/stripe.png
===================================================================
(Binary files differ)
Copied: trunk/css/aguapop/images/stripe.png (from rev 5647, trunk/css/aguapop/images/stripe.png)
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/supplier.png
=========================...
[truncated message content] |
|
From: <ice...@us...> - 2012-09-12 06:31:05
|
Revision: 5658
http://web-erp.svn.sourceforge.net/web-erp/?rev=5658&view=rev
Author: icedlava
Date: 2012-09-12 06:30:58 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
Correct reference to user setup - change to User Maintenance in manual. Add bookmark links to Manual.
Modified Paths:
--------------
trunk/WWW_Users.php
trunk/doc/Manual/ManualGettingStarted.html
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2012-09-10 11:32:07 UTC (rev 5657)
+++ trunk/WWW_Users.php 2012-09-12 06:30:58 UTC (rev 5658)
@@ -27,6 +27,9 @@
_('Chinese'));
$title = _('User Maintenance');
+/* webERP manual links before header.inc */
+$ViewTopic= "GettingStarted";
+$BookMark = "UserMaintenance";
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -687,7 +690,7 @@
</tr>';
/* Allowed Department for Internal Requests */
-
+
echo '<tr>
<td>' . _('Allowed Department for Internal Requests') . ':</td>';
@@ -712,7 +715,7 @@
}
echo '</select></td>
</tr>';
-
+
/* Account status */
echo '<tr>
Modified: trunk/doc/Manual/ManualGettingStarted.html
===================================================================
--- trunk/doc/Manual/ManualGettingStarted.html 2012-09-10 11:32:07 UTC (rev 5657)
+++ trunk/doc/Manual/ManualGettingStarted.html 2012-09-12 06:30:58 UTC (rev 5658)
@@ -320,11 +320,11 @@
<a class="minitext" href="#top">⬆ Top</a>
</div><!-- Help Begin: WWW_Users -->
-<h2>Setting Up Users</h2>
+<h2><a id="UserMaintenance">Setting Up Users</a></h2>
-<p>Having logged in as user 'demo'. A new user should be defined whom has administrative privileges and the user 'demo' should be deleted. From the menu click on the 'Setup' tab and then click 'User Accounts'. The users defined are displayed. User names must be 5 characters or more. Passwords entered must be 5 characters or more too. The password cannot also be the user name or contain the user name. It is not necessary to enter the full name telephone and other details. The access level selected is important as this determines the pages that the user can access. In any business where the employees are not also the owners it is advisable to split the functions between staff so that no user can complete an entire transaction. There are occasions in smaller businesses where this is impractical. However, the system has great flexibility to allow the user access to be finely defined. See the security schema section.</p>
+<p>Having logged in as user 'demo'. A new user should be defined whom has administrative privileges and the user 'demo' should be deleted. From the menu click on the 'Setup' tab and then click 'User Maintenance'. The users defined are displayed. User names must be 5 characters or more. Passwords entered must be 5 characters or more too. The password cannot also be the user name or contain the user name. It is not necessary to enter the full name telephone and other details. The access level selected is important as this determines the pages that the user can access. In any business where the employees are not also the owners it is advisable to split the functions between staff so that no user can complete an entire transaction. There are occasions in smaller businesses where this is impractical. However, the system has great flexibility to allow the user access to be finely defined. See the security schema section.</p>
-<p>As well as allowing the access to be restricted there is some flexibility about the links that are made available to a user. In the 'User Accounts' screen the system administrator can define which tabs of the main menu are activated and available to the user.</p>
+<p>As well as allowing the access to be restricted there is some flexibility about the links that are made available to a user. In the 'User Maintenance' screen the system administrator can define which tabs of the main menu are activated and available to the user.</p>
<p>There is also the facility to set up customers with their own logon. This restricts them to inquiries on their account including invoice re-prints and to entering new sales orders. Customer logins do not allow any modification to the pricing. To do this the access level must be set to customer logon and the settings for customer logon in config.php must not be modified - i.e. $PageSecurity = 1 allowed only. In addition, the customer code and branch code applicable to the person logging on must be entered.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ice...@us...> - 2012-09-12 06:31:04
|
Revision: 5658
http://web-erp.svn.sourceforge.net/web-erp/?rev=5658&view=rev
Author: icedlava
Date: 2012-09-12 06:30:58 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
Correct reference to user setup - change to User Maintenance in manual. Add bookmark links to Manual.
Modified Paths:
--------------
trunk/WWW_Users.php
trunk/doc/Manual/ManualGettingStarted.html
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2012-09-10 11:32:07 UTC (rev 5657)
+++ trunk/WWW_Users.php 2012-09-12 06:30:58 UTC (rev 5658)
@@ -27,6 +27,9 @@
_('Chinese'));
$title = _('User Maintenance');
+/* webERP manual links before header.inc */
+$ViewTopic= "GettingStarted";
+$BookMark = "UserMaintenance";
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -687,7 +690,7 @@
</tr>';
/* Allowed Department for Internal Requests */
-
+
echo '<tr>
<td>' . _('Allowed Department for Internal Requests') . ':</td>';
@@ -712,7 +715,7 @@
}
echo '</select></td>
</tr>';
-
+
/* Account status */
echo '<tr>
Modified: trunk/doc/Manual/ManualGettingStarted.html
===================================================================
--- trunk/doc/Manual/ManualGettingStarted.html 2012-09-10 11:32:07 UTC (rev 5657)
+++ trunk/doc/Manual/ManualGettingStarted.html 2012-09-12 06:30:58 UTC (rev 5658)
@@ -320,11 +320,11 @@
<a class="minitext" href="#top">⬆ Top</a>
</div><!-- Help Begin: WWW_Users -->
-<h2>Setting Up Users</h2>
+<h2><a id="UserMaintenance">Setting Up Users</a></h2>
-<p>Having logged in as user 'demo'. A new user should be defined whom has administrative privileges and the user 'demo' should be deleted. From the menu click on the 'Setup' tab and then click 'User Accounts'. The users defined are displayed. User names must be 5 characters or more. Passwords entered must be 5 characters or more too. The password cannot also be the user name or contain the user name. It is not necessary to enter the full name telephone and other details. The access level selected is important as this determines the pages that the user can access. In any business where the employees are not also the owners it is advisable to split the functions between staff so that no user can complete an entire transaction. There are occasions in smaller businesses where this is impractical. However, the system has great flexibility to allow the user access to be finely defined. See the security schema section.</p>
+<p>Having logged in as user 'demo'. A new user should be defined whom has administrative privileges and the user 'demo' should be deleted. From the menu click on the 'Setup' tab and then click 'User Maintenance'. The users defined are displayed. User names must be 5 characters or more. Passwords entered must be 5 characters or more too. The password cannot also be the user name or contain the user name. It is not necessary to enter the full name telephone and other details. The access level selected is important as this determines the pages that the user can access. In any business where the employees are not also the owners it is advisable to split the functions between staff so that no user can complete an entire transaction. There are occasions in smaller businesses where this is impractical. However, the system has great flexibility to allow the user access to be finely defined. See the security schema section.</p>
-<p>As well as allowing the access to be restricted there is some flexibility about the links that are made available to a user. In the 'User Accounts' screen the system administrator can define which tabs of the main menu are activated and available to the user.</p>
+<p>As well as allowing the access to be restricted there is some flexibility about the links that are made available to a user. In the 'User Maintenance' screen the system administrator can define which tabs of the main menu are activated and available to the user.</p>
<p>There is also the facility to set up customers with their own logon. This restricts them to inquiries on their account including invoice re-prints and to entering new sales orders. Customer logins do not allow any modification to the pricing. To do this the access level must be set to customer logon and the settings for customer logon in config.php must not be modified - i.e. $PageSecurity = 1 allowed only. In addition, the customer code and branch code applicable to the person logging on must be entered.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ice...@us...> - 2012-09-12 06:33:41
|
Revision: 5659
http://web-erp.svn.sourceforge.net/web-erp/?rev=5659&view=rev
Author: icedlava
Date: 2012-09-12 06:33:35 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
Manual bookmarks for company preferences and configuration.
Modified Paths:
--------------
trunk/CompanyPreferences.php
trunk/SystemParameters.php
trunk/doc/Manual/ManualCreatingNewSystem.html
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2012-09-12 06:30:58 UTC (rev 5658)
+++ trunk/CompanyPreferences.php 2012-09-12 06:33:35 UTC (rev 5659)
@@ -5,7 +5,9 @@
include('includes/session.inc');
$title = _('Company Preferences');
-
+/* webERP manual links before header.inc */
+$ViewTopic= "CreatingNewSystem";
+$BookMark = "CompanyParameters";
include('includes/header.inc');
if (isset($Errors)) {
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2012-09-12 06:30:58 UTC (rev 5658)
+++ trunk/SystemParameters.php 2012-09-12 06:33:35 UTC (rev 5659)
@@ -5,7 +5,7 @@
include('includes/session.inc');
$title = _('System Configuration');
-$ViewTopic= 'CreatingNewSystem';
+$ViewTopic= 'GettingStarted';
$BookMark = 'SystemConfiguration';
include('includes/header.inc');
@@ -125,11 +125,11 @@
if ($_SESSION['QuickEntries'] != $_POST['X_QuickEntries'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_QuickEntries']."' WHERE confname = 'QuickEntries'";
}
-
+
if ($_SESSION['WorkingDaysWeek'] != $_POST['X_WorkingDaysWeek'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_WorkingDaysWeek']."' WHERE confname = 'WorkingDaysWeek'";
}
-
+
if ($_SESSION['DispatchCutOffTime'] != $_POST['X_DispatchCutOffTime'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_DispatchCutOffTime']."' WHERE confname = 'DispatchCutOffTime'";
}
Modified: trunk/doc/Manual/ManualCreatingNewSystem.html
===================================================================
--- trunk/doc/Manual/ManualCreatingNewSystem.html 2012-09-12 06:30:58 UTC (rev 5658)
+++ trunk/doc/Manual/ManualCreatingNewSystem.html 2012-09-12 06:33:35 UTC (rev 5659)
@@ -17,7 +17,7 @@
<p>
In the General Ledger there is a hierarchy of Account Section > Account Group > GL Account. General ledger accounts - the chart of accounts, Account Groups and Account Sections can be added or modified from General Ledger - Maintenance. It is important to get the chart of accounts right before entries are made which make it difficult to modify the chart. You can't delete accounts with postings made to them.</p>
-<h3>Company Parameters</h3>
+<h3><a id="CompanyParameters">System Configuration</a>Company Parameters</a></h3>
<p>
Company parameters need to be set correctly from the company set up screen. Most of these parameters are self -explanatory. Company name, company number, postal address, physical address etc. Also, telephone numbers and the default home currency of the business. If the default currency is not already set up, then from the main menu system set up tab, the link to the currency maintenance form allows new currencies to be defined and for default rates to be updated.</p>
<p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ice...@us...> - 2012-09-12 06:33:46
|
Revision: 5659
http://web-erp.svn.sourceforge.net/web-erp/?rev=5659&view=rev
Author: icedlava
Date: 2012-09-12 06:33:35 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
Manual bookmarks for company preferences and configuration.
Modified Paths:
--------------
trunk/CompanyPreferences.php
trunk/SystemParameters.php
trunk/doc/Manual/ManualCreatingNewSystem.html
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2012-09-12 06:30:58 UTC (rev 5658)
+++ trunk/CompanyPreferences.php 2012-09-12 06:33:35 UTC (rev 5659)
@@ -5,7 +5,9 @@
include('includes/session.inc');
$title = _('Company Preferences');
-
+/* webERP manual links before header.inc */
+$ViewTopic= "CreatingNewSystem";
+$BookMark = "CompanyParameters";
include('includes/header.inc');
if (isset($Errors)) {
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2012-09-12 06:30:58 UTC (rev 5658)
+++ trunk/SystemParameters.php 2012-09-12 06:33:35 UTC (rev 5659)
@@ -5,7 +5,7 @@
include('includes/session.inc');
$title = _('System Configuration');
-$ViewTopic= 'CreatingNewSystem';
+$ViewTopic= 'GettingStarted';
$BookMark = 'SystemConfiguration';
include('includes/header.inc');
@@ -125,11 +125,11 @@
if ($_SESSION['QuickEntries'] != $_POST['X_QuickEntries'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_QuickEntries']."' WHERE confname = 'QuickEntries'";
}
-
+
if ($_SESSION['WorkingDaysWeek'] != $_POST['X_WorkingDaysWeek'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_WorkingDaysWeek']."' WHERE confname = 'WorkingDaysWeek'";
}
-
+
if ($_SESSION['DispatchCutOffTime'] != $_POST['X_DispatchCutOffTime'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_DispatchCutOffTime']."' WHERE confname = 'DispatchCutOffTime'";
}
Modified: trunk/doc/Manual/ManualCreatingNewSystem.html
===================================================================
--- trunk/doc/Manual/ManualCreatingNewSystem.html 2012-09-12 06:30:58 UTC (rev 5658)
+++ trunk/doc/Manual/ManualCreatingNewSystem.html 2012-09-12 06:33:35 UTC (rev 5659)
@@ -17,7 +17,7 @@
<p>
In the General Ledger there is a hierarchy of Account Section > Account Group > GL Account. General ledger accounts - the chart of accounts, Account Groups and Account Sections can be added or modified from General Ledger - Maintenance. It is important to get the chart of accounts right before entries are made which make it difficult to modify the chart. You can't delete accounts with postings made to them.</p>
-<h3>Company Parameters</h3>
+<h3><a id="CompanyParameters">System Configuration</a>Company Parameters</a></h3>
<p>
Company parameters need to be set correctly from the company set up screen. Most of these parameters are self -explanatory. Company name, company number, postal address, physical address etc. Also, telephone numbers and the default home currency of the business. If the default currency is not already set up, then from the main menu system set up tab, the link to the currency maintenance form allows new currencies to be defined and for default rates to be updated.</p>
<p>
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