Thread: [Weberp-svn] SF.net SVN: weberp:[4337] trunk (Page 2)
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
weberp-svn
|
From: <tim...@us...> - 2011-01-19 01:31:08
|
Revision: 4337
http://weberp.svn.sourceforge.net/weberp/?rev=4337&view=rev
Author: tim_schofield
Date: 2011-01-19 01:31:00 +0000 (Wed, 19 Jan 2011)
Log Message:
-----------
Ricard: Corrections to default end date for prices
Modified Paths:
--------------
trunk/PricesBasedOnMarkUp.php
trunk/PricesByCost.php
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
Modified: trunk/PricesBasedOnMarkUp.php
===================================================================
--- trunk/PricesBasedOnMarkUp.php 2011-01-18 16:27:52 UTC (rev 4336)
+++ trunk/PricesBasedOnMarkUp.php 2011-01-19 01:31:00 UTC (rev 4337)
@@ -238,7 +238,7 @@
if (Is_Date($_POST['PriceEndDate'])){
$SQLEndDate = FormatDateForSQL($_POST['PriceEndDate']);
} else {
- $SQLEndDate = '2030-12-31';
+ $SQLEndDate = '2030-01-01';
}
$sql = "SELECT stockid,
materialcost+labourcost+overheadcost AS cost
Modified: trunk/PricesByCost.php
===================================================================
--- trunk/PricesByCost.php 2011-01-18 16:27:52 UTC (rev 4336)
+++ trunk/PricesByCost.php 2011-01-19 01:31:00 UTC (rev 4337)
@@ -73,7 +73,7 @@
'" . $_POST['DebtorNo_' . $PriceCounter] . "',
'" . $_POST['BranchCode_' . $PriceCounter] . "',
'" . date('Y-m-d') . "',
- '2030-12-31'
+ '2030-01-01'
)";
$ResultInsert = DB_query($SQLInsert, $db);
$PriceCounter++;
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo 2011-01-18 16:27:52 UTC (rev 4336)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo 2011-01-19 01:31:00 UTC (rev 4337)
@@ -1,96 +1,2541 @@
-\xDE\x95 |
|
From: <tim...@us...> - 2011-01-20 16:24:29
|
Revision: 4351
http://weberp.svn.sourceforge.net/weberp/?rev=4351&view=rev
Author: tim_schofield
Date: 2011-01-20 16:24:22 +0000 (Thu, 20 Jan 2011)
Log Message:
-----------
Fix up many silly errors in Phils CounterSales.php
Modified Paths:
--------------
trunk/CounterSales.php
trunk/includes/DefineCartClass.php
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-01-20 13:19:22 UTC (rev 4350)
+++ trunk/CounterSales.php 2011-01-20 16:24:22 UTC (rev 4351)
@@ -458,7 +458,6 @@
unset($NewItem);
} /* end of if quick entry */
-
/*Now do non-quick entry delete/edits/adds */
if ((isset($_SESSION['Items'.$identifier])) OR isset($NewItem)) {
@@ -516,7 +515,47 @@
}
}
+if (isset($_POST['Recalculate'])) {
+ foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine) {
+ $NewItem=$OrderLine->StockID;
+ $sql = "SELECT stockmaster.mbflag, stockmaster.controlled
+ FROM stockmaster
+ WHERE stockmaster.stockid='". $OrderLine->StockID."'";
+ $ErrMsg = _('Could not determine if the part being ordered was a kitset or not because');
+ $DbgMsg = _('The sql that was used to determine if the part being ordered was a kitset or not was ');
+ $KitResult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
+ if ($myrow=DB_fetch_array($KitResult)){
+ if ($myrow['mbflag']=='K'){ /*It is a kit set item */
+ $sql = "SELECT bom.component,
+ bom.quantity
+ FROM bom
+ WHERE bom.parent='" . $OrderLine->StockID. "'
+ AND bom.effectiveto > '" . Date('Y-m-d') . "'
+ AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+
+ $ErrMsg = _('Could not retrieve kitset components from the database because');
+ $KitResult = DB_query($sql,$db,$ErrMsg);
+
+ $ParentQty = $NewItemQty;
+ while ($KitParts = DB_fetch_array($KitResult,$db)){
+ $NewItem = $KitParts['component'];
+ $NewItemQty = $KitParts['quantity'] * $ParentQty;
+ $NewPOLine = 0;
+ $NewItemDue = date($_SESSION['DefaultDateFormat']);
+ $_SESSION['Items'.$identifier]->GetTaxes($OrderLine->LineNumber);
+ }
+
+ } else { /*Its not a kit set item*/
+ $NewItemDue = date($_SESSION['DefaultDateFormat']);
+ $NewPOLine = 0;
+ $_SESSION['Items'.$identifier]->GetTaxes($OrderLine->LineNumber);
+ }
+ }
+ unset($NewItem);
+ } /* end of if its a new item */
+}
+
if (isset($NewItem)){
/* get the item details from the database and hold them in the cart object make the quantity 1 by default then add it to the cart
Now figure out if the item is a kit set - the field MBFlag='K'
@@ -738,7 +777,8 @@
}
$TaxTotal += $TaxLineTotal;
-
+ $_SESSION['Items'.$identifier]->TaxTotals=$TaxTotals;
+ $_SESSION['Items'.$identifier]->TaxGLCodes=$TaxGLCodes;
echo '<td class="number">' . number_format($TaxLineTotal ,2) . '</td>';
echo '<td class="number">' . number_format($SubTotal + $TaxLineTotal ,2) . '</td>';
echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?' . SID .'&identifier='.$identifier . '&Delete=' . $OrderLine->LineNumber . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . _('Delete') . '</a></td></tr>';
@@ -762,6 +802,7 @@
<td class="number">' . number_format(($_SESSION['Items'.$identifier]->total+$TaxTotal),2) . '</td>
</tr>
</table>';
+ echo '<input type="hidden" name="TaxTotal" value="'.$TaxTotal.'" />';
echo '<table><tr><td>';
//nested table
echo '<table><tr>
@@ -820,6 +861,7 @@
echo '</th></tr></table>'; //end of column/row/master table
echo '<br /><div class="centre"><input type="submit" name="Recalculate" value="' . _('Re-Calculate') . '" />
<input type="submit" name="ProcessSale" value="' . _('Process The Sale') . '" /></div><hr />';
+
} # end of if lines
/* **********************************
@@ -834,7 +876,7 @@
prnMsg(_('There are no lines on this sale. Please enter lines to invoice first'),'error');
$InputError = true;
}
- if (abs($_POST['AmountPaid'] -($_SESSION['Items'.$identifier]->total+$TaxTotal))>=0.01) {
+ if (abs($_POST['AmountPaid'] -($_SESSION['Items'.$identifier]->total+$_POST['TaxTotal']))>=0.01) {
prnMsg(_('The amount entered as payment does not equal the amount of the invoice. Please ensure the customer has paid the correct amount and re-enter'),'error');
$InputError = true;
}
@@ -1106,7 +1148,7 @@
WoRealRequirements($db, $WONo, $_SESSION['DefaultFactoryLocation'], $StockItem->StockID);
$FactoryManagerEmail = _('A new work order has been created for') .
- ":\n" . $StockItem->StockID . ' - ' . $StockItem->Descr . ' x ' . $WOQuantity . ' ' . $StockItem->UOM .
+ ":\n" . $StockItem->StockID . ' - ' . $StockItem->ItemDescription . ' x ' . $WOQuantity . ' ' . $StockItem->Units .
"\n" . _('These are for') . ' ' . $_SESSION['Items'.$identifier]->CustomerName . ' ' . _('there order ref') . ': ' . $_SESSION['Items'.$identifier]->CustRef . ' ' ._('our order number') . ': ' . $OrderNo;
if ($StockItem->Serialised AND $StockItem->NextSerialNo>0){
@@ -1202,11 +1244,11 @@
'" . $_SESSION['Items'.$identifier]->DefaultSalesType . "',
'" . $OrderNo . "',
'" . $_SESSION['Items'.$identifier]->total . "',
- '" . $TaxTotal . "',
+ '" . $_POST['TaxTotal'] . "',
'" . $ExRate . "',
'" . $_SESSION['Items'.$identifier]->Comments . "',
'" . $_SESSION['Items'.$identifier]->ShipVia . "',
- '" . ($_SESSION['Items'.$identifier]->total + $TaxTotal) . "')";
+ '" . ($_SESSION['Items'.$identifier]->total + $_POST['TaxTotal']) . "')";
$ErrMsg =_('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The debtor transaction record could not be inserted because');
$DbgMsg = _('The following SQL to insert the debtor transaction record was used');
@@ -1215,7 +1257,7 @@
$DebtorTransID = DB_Last_Insert_ID($db,'debtortrans','id');
/* Insert the tax totals for each tax authority where tax was charged on the invoice */
- foreach ($TaxTotals AS $TaxAuthID => $TaxAmount) {
+ foreach ($_SESSION['Items'.$identifier]->TaxTotals AS $TaxAuthID => $TaxAmount) {
$SQL = "INSERT INTO debtortranstaxes (debtortransid,
taxauthid,
@@ -1694,7 +1736,7 @@
if ($_SESSION['CompanyRecord']['gllink_debtors']==1){
/*Post debtors transaction to GL debit debtors, credit freight re-charged and credit sales */
- if (($_SESSION['Items'.$identifier]->total + $TaxTotal) !=0) {
+ if (($_SESSION['Items'.$identifier]->total + $_POST['TaxTotal']) !=0) {
$SQL = "INSERT INTO gltrans ( type,
typeno,
trandate,
@@ -1708,7 +1750,7 @@
'" . $PeriodNo . "',
'" . $_SESSION['CompanyRecord']['debtorsact'] . "',
'" . $_SESSION['Items'.$identifier]->DebtorNo . "',
- '" . (($_SESSION['Items'.$identifier]->total + $TaxTotal)/$ExRate) . "')";
+ '" . (($_SESSION['Items'.$identifier]->total + $_POST['TaxTotal'])/$ExRate) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The total debtor GL posting could not be inserted because');
$DbgMsg = _('The following SQL to insert the total debtors control GLTrans record was used');
@@ -1716,7 +1758,7 @@
}
- foreach ( $TaxTotals as $TaxAuthID => $TaxAmount){
+ foreach ( $_SESSION['Items'.$identifier]->TaxTotals as $TaxAuthID => $TaxAmount){
if ($TaxAmount !=0 ){
$SQL = "INSERT INTO gltrans ( type,
typeno,
@@ -1729,7 +1771,7 @@
'" . $InvoiceNo . "',
'" . $DefaultDispatchDate . "',
'" . $PeriodNo . "',
- '" . $TaxGLCodes[$TaxAuthID] . "',
+ '" . $_SESSION['Items'.$identifier]->TaxGLCodes[$TaxAuthID] . "',
'" . $_SESSION['Items'.$identifier]->DebtorNo . "',
'" . (-$TaxAmount/$ExRate) . "')";
@@ -1996,7 +2038,7 @@
AND purchorders.status<>'Cancelled'
AND purchorders.status<>'Rejected'
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
-
+
$ErrMsg = _('The order details for this product cannot be retrieved because');
$PurchResult = db_query($sql,$db,$ErrMsg);
@@ -2143,7 +2185,7 @@
$QOHSql = "SELECT sum(quantity) AS QOH,
stockmaster.decimalplaces
FROM locstock INNER JOIN stockmaster
- WHERE locstock.stockid='" .$myrow['stockid'] . "'
+ WHERE locstock.stockid='" .$myrow['stockid'] . "'
AND loccode = '" . $_SESSION['Items'.$identifier]->Location . "'";
$QOHResult = DB_query($QOHSql,$db);
$QOHRow = DB_fetch_array($QOHResult);
@@ -2152,10 +2194,10 @@
// Find the quantity on outstanding sales orders
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
FROM salesorderdetails INNER JOIN salesorders
- ON salesorders.orderno = salesorderdetails.orderno
- WHERE salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
- AND salesorderdetails.completed=0
- AND salesorders.quotation=0
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0
AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The demand for this product from') . ' ' . $_SESSION['Items'.$identifier]->Location . ' ' . _('cannot be retrieved because');
@@ -2171,7 +2213,7 @@
// Find the quantity on purchase orders
$sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS QOO
FROM purchorderdetails INNER JOIN purchorders
- WHERE purchorderdetails.completed=0
+ WHERE purchorderdetails.completed=0
AND purchorders.status <>'Cancelled'
AND purchorders.status <>'Rejected'
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-01-20 13:19:22 UTC (rev 4350)
+++ trunk/includes/DefineCartClass.php 2011-01-20 16:24:22 UTC (rev 4351)
@@ -56,6 +56,8 @@
VAR $vtigerProductID;
Var $DefaultPOLine;
Var $DeliveryDays;
+ var $TaxTotals;
+ var $TaxGLCodes;
function Cart(){
/*Constructor function initialises a new shopping cart */
@@ -338,7 +340,7 @@
$ErrMsg = _('The taxes and rates for this item could not be retrieved because');
$GetTaxRatesResult = DB_query($SQL,$db,$ErrMsg);
-
+ unset($this->LineItems[$LineNumber]->Taxes);
while ($myrow = DB_fetch_array($GetTaxRatesResult)){
$this->LineItems[$LineNumber]->Taxes[$myrow['calculationorder']] = new Tax($myrow['calculationorder'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-01-20 17:31:56
|
Revision: 4352
http://weberp.svn.sourceforge.net/weberp/?rev=4352&view=rev
Author: tim_schofield
Date: 2011-01-20 17:31:46 +0000 (Thu, 20 Jan 2011)
Log Message:
-----------
Update language files and database files
Modified Paths:
--------------
trunk/includes/session.inc
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/da_DA.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VI.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VI.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2011-01-20 16:24:22 UTC (rev 4351)
+++ trunk/includes/session.inc 2011-01-20 17:31:46 UTC (rev 4352)
@@ -13,7 +13,7 @@
header('Location:' . $rootpath . '/install/index.php');
}
include($PathPrefix . 'config.php');
-$DBVersion=60;
+$DBVersion=61;
if (isset($SessionSavePath)){
session_save_path($SessionSavePath);
}
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo 2011-01-20 16:24:22 UTC (rev 4351)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo 2011-01-20 17:31:46 UTC (rev 4352)
@@ -2532,8 +2532,8 @@
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-X-Launchpad-Export-Date: 2011-01-18 17:28+0000
-X-Generator: Launchpad (build 12200)
+X-Launchpad-Export-Date: 2011-01-20 14:57+0000
+X-Generator: Launchpad (build 12214)
X-Poedit-Country: CZECH REPUBLIC
Language: cs
X-Poedit-Language: Czech
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-01-20 16:24:22 UTC (rev 4351)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-01-20 17:31:46 UTC (rev 4352)
@@ -7,17 +7,17 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-05 18:40+0000\n"
-"PO-Revision-Date: 2010-07-25 17:04+0000\n"
-"Last-Translator: Tim Schofield <ti...@we...>\n"
+"POT-Creation-Date: 2011-01-04 22:15+1200\n"
+"PO-Revision-Date: 2011-01-17 14:00+0000\n"
+"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
-"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-05 16:36+0000\n"
-"X-Generator: Launchpad (build 12138)\n"
+"X-Launchpad-Export-Date: 2011-01-20 14:45+0000\n"
+"X-Generator: Launchpad (build 12214)\n"
"X-Poedit-Country: CZECH REPUBLIC\n"
+"Language: cs\n"
"X-Poedit-Language: Czech\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -26,12 +26,20 @@
msgstr "Účetní skupiny"
#: AccountGroups.php:19
-msgid "An error occurred in retrieving the account groups of the parent account group during the check for recursion"
-msgstr "Při rekurzivní kontrole došlo k chybě při získávání účetních skupin rodičovské účetní skupiny"
+msgid ""
+"An error occurred in retrieving the account groups of the parent account "
+"group during the check for recursion"
+msgstr ""
+"Při rekurzivní kontrole došlo k chybě při získávání účetních skupin "
+"rodičovské účetní skupiny"
#: AccountGroups.php:20
-msgid "The SQL that was used to retrieve the account groups of the parent account group and that failed in the process was"
-msgstr "SQL příkaz použitý při získávání účetních skupin rodičovské účetní skupiny byl"
+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 příkaz použitý při získávání účetních skupin rodičovské účetní skupiny "
+"byl"
#: AccountGroups.php:57 AccountGroups.php:94 AccountGroups.php:177
#: AccountGroups.php:187
@@ -60,8 +68,14 @@
msgstr "Název účetní skupiny musí být dlouhý minimálně jeden znak"
#: AccountGroups.php:84
-msgid "The parent account group selected appears to result in a recursive account structure - select an alternative parent account group or make this group a top level account group"
-msgstr "Mateřské účet vybrané skupiny se objeví na výsledek v rekurzivní strukturu účtu - vyberte alternativní mateřské účet skupiny nebo tuto skupinu na nejvyšší úrovni účtové skupiny"
+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 ""
+"Mateřské účet vybrané skupiny se objeví na výsledek v rekurzivní strukturu "
+"účtu - vyberte alternativní mateřské účet skupiny nebo tuto skupinu na "
+"nejvyšší úrovni účtové skupiny"
#: AccountGroups.php:95
msgid "Could not check whether the group is recursive because"
@@ -104,23 +118,28 @@
msgstr "Záznam vložen"
#: AccountGroups.php:176
-msgid "An error occurred in retrieving the group information from chartmaster"
+msgid ""
+"An error occurred in retrieving the group information from chartmaster"
msgstr "Došlo k chybě při získávání informací od skupiny chartmaster"
#: AccountGroups.php:181
-msgid "Cannot delete this account group because general ledger accounts have been created using this group"
-msgstr "Nelze smazat tento účet skupiny, protože účtů hlavní knihy byly vytvořeny pomocí této skupině"
+msgid ""
+"Cannot delete this account group because general ledger accounts have been "
+"created using this group"
+msgstr ""
+"Nelze smazat tento účet skupiny, protože účtů hlavní knihy byly vytvořeny "
+"pomocí této skupině"
#: AccountGroups.php:182 AccountGroups.php:192 AccountSections.php:139
#: Areas.php:117 Areas.php:126 BankAccounts.php:163 CreditStatus.php:126
#: Currencies.php:144 Currencies.php:152 Currencies.php:159
-#: CustomerBranches.php:303 CustomerBranches.php:313 CustomerBranches.php:323
-#: CustomerBranches.php:333 Customers.php:317 Customers.php:326
+#: CustomerBranches.php:296 CustomerBranches.php:306 CustomerBranches.php:316
+#: CustomerBranches.php:326 Customers.php:317 Customers.php:326
#: Customers.php:334 Customers.php:342 CustomerTypes.php:149
#: CustomerTypes.php:159 Factors.php:136 FixedAssetCategories.php:132
-#: GLAccounts.php:95 GLAccounts.php:109 Locations.php:219 Locations.php:227
-#: Locations.php:236 Locations.php:244 Locations.php:252 Locations.php:260
-#: Locations.php:268 Locations.php:276 MRPDemandTypes.php:89
+#: GLAccounts.php:95 GLAccounts.php:109 Locations.php:247 Locations.php:255
+#: Locations.php:264 Locations.php:272 Locations.php:280 Locations.php:288
+#: Locations.php:296 Locations.php:304 MRPDemandTypes.php:89
#: PaymentMethods.php:146 PaymentTerms.php:147 PaymentTerms.php:154
#: PcExpenses.php:119 SalesCategories.php:127 SalesCategories.php:135
#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:147
@@ -143,12 +162,17 @@
msgstr "Došlo k chybě při načítání mateřské skupiny informací"
#: AccountGroups.php:191
-msgid "Cannot delete this account group because it is a parent account group of other account group(s)"
-msgstr "Nelze smazat tento účet skupiny, protože se jedná o mateřskou účet skupinou dalších účtové skupiny (y)"
+msgid ""
+"Cannot delete this account group because it is a parent account group of "
+"other account group(s)"
+msgstr ""
+"Nelze smazat tento účet skupiny, protože se jedná o mateřskou účet skupinou "
+"dalších účtové skupiny (y)"
#: AccountGroups.php:192
msgid "account groups that have this group as its/there parent account group"
-msgstr "účet skupiny, které mají tuto skupinu jako jeho / je skupina rodičů účet"
+msgstr ""
+"účet skupiny, které mají tuto skupinu jako jeho / je skupina rodičů účet"
#: AccountGroups.php:195
msgid "An error occurred in deleting the account group"
@@ -164,7 +188,7 @@
#: AccountGroups.php:223
msgid "The sql that was used to retrieve the account group information was "
-msgstr "Sql, který byl použit k načtení účtové skupiny informace"
+msgstr "Sql, který byl použit k načtení účtové skupiny informace "
#: AccountGroups.php:224
msgid "Could not get account groups because"
@@ -176,7 +200,7 @@
#: Areas.php:145 AuditTrail.php:13 BOMExtendedQty.php:286 BOMIndented.php:262
#: BOMIndentedReverse.php:257 BOMInquiry.php:165 BOMListing.php:128
#: BOMs.php:214 BOMs.php:793 COGSGLPostings.php:20 CompanyPreferences.php:158
-#: CounterSales.php:1942 CounterSales.php:2064 Credit_Invoice.php:257
+#: CounterSales.php:1940 CounterSales.php:2062 Credit_Invoice.php:257
#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:19
#: DailyBankTransactions.php:9 DebtorsAtPeriodEnd.php:138
#: DiscountCategories.php:12 DiscountCategories.php:122 DiscountMatrix.php:18
@@ -198,7 +222,7 @@
#: SelectCompletedOrder.php:13 SelectContract.php:81 SelectCreditItems.php:204
#: SelectCreditItems.php:272 SelectCustomer.php:315 SelectGLAccount.php:19
#: SelectGLAccount.php:79 SelectOrderItems.php:605 SelectOrderItems.php:1436
-#: SelectOrderItems.php:1556 SelectProduct.php:461 SelectSalesOrder.php:155
+#: SelectOrderItems.php:1556 SelectProduct.php:456 SelectSalesOrder.php:155
#: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:11
#: SelectWorkOrder.php:147 ShipmentCosting.php:13 Shipments.php:18
#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:10
@@ -208,7 +232,7 @@
#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:158
#: WorkOrderCosting.php:14 WorkOrderEntry.php:12 WorkOrderIssue.php:22
#: WorkOrderReceive.php:15 WorkOrderStatus.php:43 WWW_Access.php:13
-#: WWW_Users.php:38 Z_BottomUpCosts.php:51 Z_UpgradeDatabase.php:39
+#: WWW_Users.php:38 Z_BottomUpCosts.php:51
msgid "Search"
msgstr "Vyhledávání"
@@ -241,21 +265,21 @@
#: CompanyPreferences.php:451 CompanyPreferences.php:453
#: CompanyPreferences.php:463 CompanyPreferences.php:465
#: ContractCosting.php:174 CustLoginSetup.php:590 CustLoginSetup.php:592
-#: CustomerBranches.php:427 Customers.php:600 Customers.php:857
+#: CustomerBranches.php:420 Customers.php:600 Customers.php:857
#: Customers.php:864 Customers.php:867 DeliveryDetails.php:1034
#: DeliveryDetails.php:1074 DeliveryDetails.php:1077 GLTransInquiry.php:73
-#: Locations.php:345 MRPCalendar.php:222 MRP.php:530 MRP.php:534 MRP.php:538
+#: Locations.php:373 MRPCalendar.php:222 MRP.php:530 MRP.php:534 MRP.php:538
#: MRP.php:542 PaymentMethods.php:203 PaymentMethods.php:204
#: PaymentMethods.php:264 PaymentMethods.php:270 PDFChequeListing.php:63
#: PDFDeliveryDifferences.php:64 PDFDIFOT.php:67
#: PO_AuthorisationLevels.php:132 PO_AuthorisationLevels.php:137
-#: PO_Header.php:762 PO_PDFPurchOrder.php:367 PO_PDFPurchOrder.php:370
+#: PO_Header.php:758 PO_PDFPurchOrder.php:367 PO_PDFPurchOrder.php:370
#: PurchData.php:189 PurchData.php:469 PurchData.php:472
#: RecurringSalesOrders.php:479 RecurringSalesOrders.php:482
#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
#: SalesAnalReptCols.php:404 SalesAnalRepts.php:406 SalesAnalRepts.php:409
#: SalesAnalRepts.php:432 SalesAnalRepts.php:435 SalesAnalRepts.php:458
-#: SalesAnalRepts.php:461 SelectProduct.php:356 ShipmentCosting.php:622
+#: SalesAnalRepts.php:461 SelectProduct.php:351 ShipmentCosting.php:622
#: Stocks.php:867 Stocks.php:869 Stocks.php:887 Stocks.php:889
#: SuppContractChgs.php:83 SuppLoginSetup.php:511 SuppLoginSetup.php:513
#: SystemParameters.php:373 SystemParameters.php:405 SystemParameters.php:450
@@ -276,21 +300,21 @@
#: CompanyPreferences.php:450 CompanyPreferences.php:454
#: CompanyPreferences.php:462 CompanyPreferences.php:466
#: ContractCosting.php:172 CustLoginSetup.php:589 CustLoginSetup.php:593
-#: CustomerBranches.php:427 Customers.php:599 Customers.php:855
+#: CustomerBranches.php:420 Customers.php:599 Customers.php:855
#: Customers.php:863 Customers.php:866 DeliveryDetails.php:1035
#: DeliveryDetails.php:1075 DeliveryDetails.php:1078 GLTransInquiry.php:127
-#: Locations.php:347 MRPCalendar.php:224 MRP.php:528 MRP.php:532 MRP.php:536
+#: Locations.php:375 MRPCalendar.php:224 MRP.php:528 MRP.php:532 MRP.php:536
#: MRP.php:540 PaymentMethods.php:203 PaymentMethods.php:204
#: PaymentMethods.php:265 PaymentMethods.php:271 PDFChequeListing.php:62
#: PDFDeliveryDifferences.php:63 PDFDIFOT.php:66
#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:761 PO_PDFPurchOrder.php:368 PO_PDFPurchOrder.php:371
+#: PO_Header.php:757 PO_PDFPurchOrder.php:368 PO_PDFPurchOrder.php:371
#: PurchData.php:192 PurchData.php:470 PurchData.php:473
#: RecurringSalesOrders.php:478 RecurringSalesOrders.php:481
#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
#: SalesAnalReptCols.php:405 SalesAnalRepts.php:405 SalesAnalRepts.php:408
#: SalesAnalRepts.php:431 SalesAnalRepts.php:434 SalesAnalRepts.php:457
-#: SalesAnalRepts.php:460 SelectProduct.php:358 ShipmentCosting.php:623
+#: SalesAnalRepts.php:460 SelectProduct.php:353 ShipmentCosting.php:623
#: Stocks.php:862 Stocks.php:864 Stocks.php:882 Stocks.php:884
#: SuppContractChgs.php:85 SuppLoginSetup.php:510 SuppLoginSetup.php:514
#: SystemParameters.php:374 SystemParameters.php:406 SystemParameters.php:451
@@ -309,11 +333,11 @@
#: AddCustomerNotes.php:125 AddCustomerTypeNotes.php:123 Areas.php:165
#: BankAccounts.php:226 BOMs.php:150 COGSGLPostings.php:113
#: COGSGLPostings.php:218 CreditStatus.php:175 Currencies.php:239
-#: CustLoginSetup.php:312 CustomerBranches.php:431 Customers.php:909
+#: CustLoginSetup.php:312 CustomerBranches.php:424 Customers.php:909
#: Customers.php:941 CustomerTypes.php:205 EDIMessageFormat.php:152
#: Factors.php:208 FixedAssetCategories.php:182 FixedAssetLocations.php:102
#: FreightCosts.php:243 GeocodeSetup.php:169 GLAccounts.php:319 GLTags.php:62
-#: Labels.php:414 Locations.php:354 MRPDemands.php:304 MRPDemandTypes.php:122
+#: Labels.php:414 Locations.php:382 MRPDemands.php:304 MRPDemandTypes.php:122
#: PaymentMethods.php:205 PaymentTerms.php:203 PcAssignCashToTab.php:251
#: PcClaimExpensesFromTab.php:229 PcExpenses.php:176 PcTabs.php:188
#: PcTypeTabs.php:171 PO_AuthorisationLevels.php:148 Prices_Customer.php:283
@@ -322,7 +346,7 @@
#: SalesTypes.php:206 SelectCustomer.php:607 SelectCustomer.php:623
#: SelectCustomer.php:645 SelectCustomer.php:661 SelectCustomer.php:683
#: SelectCustomer.php:699 Shippers.php:144 StockCategories.php:244
-#: SupplierContacts.php:153 SupplierTypes.php:192 SuppLoginSetup.php:274
+#: SupplierContacts.php:156 SupplierTypes.php:192 SuppLoginSetup.php:274
#: TaxAuthorities.php:173 TaxCategories.php:184 TaxGroups.php:179
#: TaxProvinces.php:178 UnitsOfMeasure.php:201 WorkCentres.php:138
#: WWW_Access.php:127 WWW_Users.php:312 includes/InputSerialItems.php:88
@@ -334,17 +358,17 @@
#: AddCustomerNotes.php:126 AddCustomerTypeNotes.php:124 Areas.php:166
#: BankAccounts.php:227 BOMs.php:152 COGSGLPostings.php:114
#: COGSGLPostings.php:219 ContractBOM.php:272 ContractOtherReqts.php:121
-#: CounterSales.php:743 Credit_Invoice.php:386 CreditStatus.php:176
+#: CounterSales.php:741 Credit_Invoice.php:386 CreditStatus.php:176
#: Currencies.php:242 CustLoginSetup.php:313 CustomerReceipt.php:866
#: Customers.php:942 CustomerTypes.php:206 DiscountCategories.php:204
#: DiscountMatrix.php:178 EDIMessageFormat.php:153
#: FixedAssetCategories.php:183 FreightCosts.php:244 GeocodeSetup.php:170
-#: GLAccounts.php:320 GLJournal.php:403 Labels.php:414 Locations.php:355
+#: GLAccounts.php:320 GLJournal.php:403 Labels.php:414 Locations.php:383
#: MRPDemands.php:305 MRPDemandTypes.php:123 PaymentMethods.php:206
#: Payments.php:961 PaymentTerms.php:204 PcAssignCashToTab.php:255
#: PcClaimExpensesFromTab.php:230 PcExpenses.php:177 PcExpensesTypeTab.php:161
#: PcTabs.php:189 PcTypeTabs.php:172 PO_AuthorisationLevels.php:150
-#: PO_Items.php:978 Prices_Customer.php:284 Prices.php:228 PurchData.php:203
+#: PO_Items.php:976 Prices_Customer.php:284 Prices.php:228 PurchData.php:203
#: SalesAnalReptCols.php:294 SalesAnalRepts.php:305 SalesCategories.php:264
#: SalesGLPostings.php:136 SalesGLPostings.php:248 SalesPeople.php:211
#: SalesTypes.php:207 SelectCreditItems.php:747 SelectCustomer.php:608
@@ -353,7 +377,7 @@
#: Shipments.php:424 Shippers.php:145 SpecialOrder.php:590
#: StockCategories.php:245 StockCategories.php:539 SuppContractChgs.php:91
#: SuppCreditGRNs.php:93 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:135
-#: SupplierContacts.php:154 SupplierTypes.php:194 SuppLoginSetup.php:275
+#: SupplierContacts.php:157 SupplierTypes.php:194 SuppLoginSetup.php:275
#: SuppShiptChgs.php:86 SuppTransGLAnalysis.php:111 TaxAuthorities.php:174
#: TaxCategories.php:185 TaxGroups.php:180 TaxProvinces.php:179
#: UnitsOfMeasure.php:202 WorkCentres.php:139 WOSerialNos.php:300
@@ -371,8 +395,12 @@
msgstr "Došlo k chybě při načítání účtové skupiny informací"
#: AccountGroups.php:295
-msgid "The SQL that was used to retrieve the account group and that failed in the process was"
-msgstr "SQL, který byl použit k načtení účtové skupiny, a že se nepodařilo v tomto procesu bylo"
+msgid ""
+"The SQL that was used to retrieve the account group and that failed in the "
+"process was"
+msgstr ""
+"SQL, který byl použit k načtení účtové skupiny, a že se nepodařilo v tomto "
+"procesu bylo"
#: AccountGroups.php:298
msgid "The account group name does not exist in the database"
@@ -402,12 +430,12 @@
#: DiscountMatrix.php:141 EDIMessageFormat.php:249
#: FixedAssetCategories.php:328 FixedAssetLocations.php:148
#: FreightCosts.php:342 GeocodeSetup.php:266 GLAccounts.php:269
-#: Locations.php:522 MRPDemands.php:402 MRPDemandTypes.php:182
+#: Locations.php:553 MRPDemands.php:402 MRPDemandTypes.php:182
#: OffersReceived.php:52 OffersReceived.php:128 PaymentMethods.php:276
#: PaymentTerms.php:282 PO_AuthorisationLevels.php:217 Prices_Customer.php:372
#: SalesAnalReptCols.php:510 SalesAnalRepts.php:496 SalesGLPostings.php:415
#: SalesPeople.php:302 Shippers.php:196 StockCategories.php:561
-#: SupplierContacts.php:250 SuppLoginSetup.php:532 TaxAuthorities.php:313
+#: SupplierContacts.php:251 SuppLoginSetup.php:532 TaxAuthorities.php:313
#: TaxCategories.php:235 TaxProvinces.php:229 UnitsOfMeasure.php:253
#: WorkCentres.php:261 WWW_Users.php:643
msgid "Enter Information"
@@ -434,8 +462,12 @@
msgstr "Číslo sekce musí být celé kladné číslo"
#: AccountSections.php:138
-msgid "Cannot delete this account section because general ledger accounts groups have been created using this section"
-msgstr "Nelze smazat tento účet oddílu, protože účtů hlavní knihy skupiny byly vytvořeny pomocí této sekci"
+msgid ""
+"Cannot delete this account section because general ledger accounts groups "
+"have been created using this section"
+msgstr ""
+"Nelze smazat tento účet oddílu, protože účtů hlavní knihy skupiny byly "
+"vytvořeny pomocí této sekci"
#: AccountSections.php:139
msgid "general ledger accounts groups that refer to this account section"
@@ -503,9 +535,9 @@
#: AddCustomerTypeNotes.php:49 Areas.php:74 CustomerTypes.php:71
#: DeliveryDetails.php:748 Factors.php:117 FixedAssetItems.php:230
#: PcAssignCashToTab.php:73 PcClaimExpensesFromTab.php:61 PcExpenses.php:60
-#: PcTabs.php:60 PcTypeTabs.php:59 PO_Items.php:382 SalesAnalReptCols.php:129
+#: PcTabs.php:60 PcTypeTabs.php:59 PO_Items.php:381 SalesAnalReptCols.php:129
#: SalesPeople.php:94 SalesTypes.php:63 Stocks.php:355 Suppliers.php:514
-#: SupplierTypes.php:69 includes/UpgradeDB_mysql.inc:232
+#: SupplierTypes.php:69
msgid "has been updated"
msgstr "byla aktualizována"
@@ -518,9 +550,9 @@
msgstr "Kontakt záznam byl odstraněn"
#: AddCustomerContacts.php:112 CompanyPreferences.php:229
-#: CustomerBranches.php:384 Customers.php:899 Customers.php:905
+#: CustomerBranches.php:377 Customers.php:899 Customers.php:905
#: Customers.php:971 SalesPeople.php:185 SelectCustomer.php:603
-#: StockDispatch.php:186 StockDispatch.php:198 SupplierContacts.php:141
+#: StockDispatch.php:186 StockDispatch.php:198 SupplierContacts.php:144
#: SupplierCredit.php:433 SupplierInvoice.php:407 SuppTransGLAnalysis.php:96
#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
#: includes/PDFTaxPageHeader.inc:37
@@ -554,12 +586,12 @@
msgid "Contact Code"
msgstr "Kontakt kód"
-#: AddCustomerContacts.php:184 Factors.php:279 SupplierContacts.php:218
+#: AddCustomerContacts.php:184 Factors.php:279 SupplierContacts.php:219
msgid "Contact Name"
msgstr "Jméno kontaktní osoby"
#: AddCustomerContacts.php:196 Contracts.php:766 PDFRemittanceAdvice.php:247
-#: PO_Header.php:967 PO_Header.php:1037 SelectCreditItems.php:225
+#: PO_Header.php:958 PO_Header.php:1028 SelectCreditItems.php:225
#: SelectCustomer.php:461 SelectOrderItems.php:638
#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:113
#: includes/PDFTransPageHeaderPortrait.inc:105
@@ -622,9 +654,9 @@
msgstr "Datum"
#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:176
-#: Stocks.php:871 UpgradeDatabase.php:105 UpgradeDatabase.php:109
-#: UpgradeDatabase.php:113 UpgradeDatabase.php:117 UpgradeDatabase.php:121
-#: UpgradeDatabase.php:125 UpgradeDatabase.php:129 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:871 UpgradeDatabase.php:145 UpgradeDatabase.php:148
+#: UpgradeDatabase.php:151 UpgradeDatabase.php:154 UpgradeDatabase.php:157
+#: UpgradeDatabase.php:160 UpgradeDatabase.php:163 Z_Upgrade_3.10-3.11.php:62
#: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70
#: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78
#: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66
@@ -791,8 +823,8 @@
msgstr "Podrobnosti o nesplacených transakcí pro zákazníka"
#: AgedDebtors.php:367 AgedSuppliers.php:189 GLAccountCSV.php:169
-#: GLAccountInquiry.php:145 GLAccountReport.php:93 PO_Items.php:533
-#: PO_Items.php:564 PO_Items.php:642 PO_Items.php:805
+#: GLAccountInquiry.php:145 GLAccountReport.php:93 PO_Items.php:532
+#: PO_Items.php:562 PO_Items.php:640 PO_Items.php:803
#: SalesAnalReptCols.php:356 SpecialOrder.php:369
#: StockLocTransferReceive.php:373 StockQuantityByDate.php:106
#: includes/SelectOrderItems_IntoCart.inc:53
@@ -801,8 +833,8 @@
#: AgedDebtors.php:370 AgedSuppliers.php:192 Areas.php:96
#: ConfirmDispatch_Invoice.php:155 ConfirmDispatch_Invoice.php:962
-#: ConfirmDispatch_Invoice.php:976 Contracts.php:583 CounterSales.php:1282
-#: CounterSales.php:1296 Credit_Invoice.php:707 Credit_Invoice.php:729
+#: ConfirmDispatch_Invoice.php:976 Contracts.php:583 CounterSales.php:1280
+#: CounterSales.php:1294 Credit_Invoice.php:707 Credit_Invoice.php:729
#: CustomerReceipt.php:526 CustomerReceipt.php:658 CustomerReceipt.php:686
#: CustomerTransInquiry.php:79 DeliveryDetails.php:395 GLProfit_Loss.php:578
#: GLTagProfit_Loss.php:490 Payments.php:307 PDFRemittanceAdvice.php:86
@@ -974,8 +1006,7 @@
msgid "New area code"
msgstr "Nové předčíslí"
-#: Areas.php:88 includes/UpgradeDB_mysql.inc:31
-#: includes/UpgradeDB_mysql.inc:150
+#: Areas.php:88
msgid "has been inserted"
msgstr "byl vložen"
@@ -984,16 +1015,24 @@
msgstr "Tato oblast by neměla být přidány nebo aktualizovány, protože"
#: Areas.php:116
-msgid "Cannot delete this area because customer branches have been created using this area"
-msgstr "Nelze smazat tuto oblast, protože zákazník větve byly vytvořeny pomocí této oblasti"
+msgid ""
+"Cannot delete this area because customer branches have been created using "
+"this area"
+msgstr ""
+"Nelze smazat tuto oblast, protože zákazník větve byly vytvořeny pomocí této "
+"oblasti"
#: Areas.php:117
msgid "branches using this area code"
msgstr "poboček pomocí tohoto kódu oblasti"
#: Areas.php:125
-msgid "Cannot delete this area because sales analysis records exist that use this area"
-msgstr "Nelze odstranit, protože tato oblast prodeje analýzy existují záznamy, které používají tuto oblast"
+msgid ""
+"Cannot delete this area because sales analysis records exist that use this "
+"area"
+msgstr ""
+"Nelze odstranit, protože tato oblast prodeje analýzy existují záznamy, které "
+"používají tuto oblast"
#: Areas.php:126
msgid "sales analysis records referring this area code"
@@ -1004,7 +1043,7 @@
msgstr "Kód oblasti"
#: Areas.php:133 CustomerTypes.php:166 Factors.php:142
-#: FixedAssetCategories.php:137 GLAccounts.php:208 Locations.php:300
+#: FixedAssetCategories.php:137 GLAccounts.php:208 Locations.php:328
#: MRPDemands.php:248 PcAssignCashToTab.php:118 PcClaimExpensesFromTab.php:109
#: PcExpenses.php:127 PcExpensesTypeTab.php:83 PcTabs.php:124
#: PcTypeTabs.php:134 SalesAnalReptCols.php:215 SalesCategories.php:139
@@ -1051,10 +1090,10 @@
#: AuditTrail.php:56
msgid "Table "
-msgstr "Tabulka"
+msgstr "Tabulka "
#: AuditTrail.php:68 MRPReport.php:789 PO_SelectPurchOrder.php:357
-#: SelectContract.php:196 SelectProduct.php:715
+#: SelectContract.php:196 SelectProduct.php:710
msgid "View"
msgstr "Zobrazit"
@@ -1106,8 +1145,13 @@
msgstr "Banka"
#: BankAccounts.php:14
-msgid "Update Bank Account details. Account Code is for SWIFT or BSB type Bank Codes. Set Default for Invoices to \"yes\" to print Account details on Invoices (only one account can be set to \"yes\")."
-msgstr "Aktualizace Bankovní účet podrobnosti. Kód je účet pro SWIFT nebo BSB typ kód banky. Nastavit výchozí pro faktury \\"
+msgid ""
+"Update Bank Account details. Account Code is for SWIFT or BSB type Bank "
+"Codes. Set Default for Invoices to \"yes\" to print Account details on "
+"Invoices (only one account can be set to \"yes\")."
+msgstr ""
+"Aktualizace Bankovní účet podrobnosti. Kód je účet pro SWIFT nebo BSB typ "
+"kód banky. Nastavit výchozí pro faktury \\"
#: BankAccounts.php:46
msgid "The bank account code already exists in the database"
@@ -1134,8 +1178,11 @@
msgstr "Adresa banky je padesát znaků dlouhé"
#: BankAccounts.php:95
-msgid "Note that it is not possible to change the currency of the account once there are transactions against it"
-msgstr "Všimněte si, že není možné změnit měnu účtu, jakmile je operace proti"
+msgid ""
+"Note that it is not possible to change the currency of the account once "
+"there are transactions against it"
+msgstr ""
+"Všimněte si, že není možné změnit měnu účtu, jakmile je operace proti"
#: BankAccounts.php:108
msgid "The bank account details have been updated"
@@ -1154,8 +1201,12 @@
msgstr "SQL používá vložit / upravit údaje o bankovním účtu bylo"
#: BankAccounts.php:162
-msgid "Cannot delete this bank account because transactions have been created using this account"
-msgstr "Nelze smazat tento bankovní účet, protože transakce byly vytvořeny pomocí tohoto účtu"
+msgid ""
+"Cannot delete this bank account because transactions have been created using "
+"this account"
+msgstr ""
+"Nelze smazat tento bankovní účet, protože transakce byly vytvořeny pomocí "
+"tohoto účtu"
#: BankAccounts.php:163
msgid "transactions with this bank account code"
@@ -1197,7 +1248,7 @@
#: OffersReceived.php:98 PcReportTab.php:291 PcTabs.php:147 PcTabs.php:295
#: PDFPrintLabel.php:94 PO_AuthorisationLevels.php:125
#: PO_AuthorisationLevels.php:180 PO_AuthorisationLevels.php:183
-#: PO_AuthoriseMyOrders.php:107 PO_Header.php:538
+#: PO_AuthoriseMyOrders.php:107 PO_Header.php:534
#: PO_SelectOSPurchOrder.php:444 PO_SelectPurchOrder.php:359
#: PricesByCost.php:209 Prices.php:198 Prices.php:293 PurchData.php:168
#: PurchData.php:315 PurchData.php:428 SelectSupplier.php:251
@@ -1267,15 +1318,22 @@
#: BankMatching.php:58
msgid "Could not update the amount matched off this bank transaction because"
-msgstr "Nepodařilo se aktualizovat částku uzavřeno z této banky, protože transakce"
+msgstr ""
+"Nepodařilo se aktualizovat částku uzavřeno z této banky, protože transakce"
#: BankMatching.php:64
msgid "Could not unclear this bank transaction because"
msgstr "Nemohu nejasné tento bankovní transakci, protože"
#: BankMatching.php:72
-msgid "Use this screen to match webERP Receipts and Payments to your Bank Statement. Check your bank statement and click the check-box when you find the matching transaction."
-msgstr "Tato obrazovka slouží k zápasu webERP inkasa a platby do svého výpisu z účtu. Zkontrolujte, zda vaše bankovní výpis a klikněte na check-box, když zjistíte, odpovídající transakce."
+msgid ""
+"Use this screen to match webERP Receipts and Payments to your Bank "
+"Statement. Check your bank statement and click the check-box when you find "
+"the matching transaction."
+msgstr ""
+"Tato obrazovka slouží k zápasu webERP inkasa a platby do svého výpisu z "
+"účtu. Zkontrolujte, zda vaše bankovní výpis a klikněte na check-box, když "
+"zjistíte, odpovídající transakce."
#: BankMatching.php:80 BankReconciliation.php:97 CustomerReceipt.php:729
#: DailyBankTransactions.php:28 Payments.php:732 PDFChequeListing.php:46
@@ -1399,7 +1457,8 @@
msgstr "po"
#: BankMatching.php:218
-msgid "The payments with the selected criteria could not be retrieved because"
+msgid ""
+"The payments with the selected criteria could not be retrieved because"
msgstr "Platby podle zadaných kriterií se nepodařilo získat, protože"
#: BankMatching.php:221 ShipmentCosting.php:502 ShipmentCosting.php:573
@@ -1453,8 +1512,14 @@
msgstr "Banka usmíření"
#: BankReconciliation.php:20
-msgid "The entry in the bank statement balance is not numeric. The balance on the bank statement should be entered. The exchange difference has not been calculated and no general ledger journal has been created"
-msgstr "Záznam v bilanci banky tvrzení není číselná. Zůstatek na bankovním výpisu by měly být zaneseny. Kurzových rozdílů nebyla vypočtena žádná obecná a knihy časopis byl vytvořen"
+msgid ""
+"The entry in the bank statement balance is not numeric. The balance on the "
+"bank statement should be entered. The exchange difference has not been "
+"calculated and no general ledger journal has been created"
+msgstr ""
+"Záznam v bilanci banky tvrzení není číselná. Zůstatek na bankovním výpisu by "
+"měly být zaneseny. Kurzových rozdílů nebyla vypočtena žádná obecná a knihy "
+"časopis byl vytvořen"
#: BankReconciliation.php:29
msgid "Could not retrieve the exchange rate for the selected bank account"
@@ -1516,7 +1581,9 @@
msgstr "Bankovního účtu nemůže být vrácen, protože SQL"
#: BankReconciliation.php:147
-msgid "Could not retrieve the currency and exchange rate for the selected bank account"
+msgid ""
+"Could not retrieve the currency and exchange rate for the selected bank "
+"account"
msgstr "Nepodařilo se načíst měny a směnného kurzu pro zvolený bankovní účet"
#: BankReconciliation.php:155
@@ -1596,18 +1663,37 @@
msgstr "Vypočítat a příspěvek kurzových rozdílů"
#: BankReconciliation.php:311
-msgid "This will create a general ledger journal to write off the exchange difference in the current balance of the account. It is important that the exchange rate above reflects the current value of the bank account currency"
-msgstr "Tím se vytvoří hlavní knihy časopis o odpisu kurzový rozdíl v aktuální zůstatek na účtu. Je důležité, že směnný kurz výše odráží současnou hodnotu měny bankovního účtu"
+msgid ""
+"This will create a general ledger journal to write off the exchange "
+"difference in the current balance of the account. It is important that the "
+"exchange rate above reflects the current value of the bank account currency"
+msgstr ""
+"Tím se vytvoří hlavní knihy časopis o odpisu kurzový rozdíl v aktuální "
+"zůstatek na účtu. Je důležité, že směnný kurz výše odráží současnou hodnotu "
+"měny bankovního účtu"
-#: BankReconciliation.php:311 CounterSales.php:743 Customers.php:1014
+#: BankReconciliation.php:311 CounterSales.php:741 Customers.php:1014
#: SelectOrderItems.php:1374 Stocks.php:1029 WorkOrderCosting.php:512
#: WorkOrderEntry.php:549
msgid "Are You Sure?"
msgstr "Opravdu provést?"
#: BankReconciliation.php:320
-msgid "It is normal for foreign currency accounts to have exchange differences that need to be reflected as the exchange rate varies. This reconciliation is prepared using the exchange rate set up in the currencies table (see the set-up tab). This table must be maintained with the current exchange rate before running the reconciliation. If you wish to create a journal to reflect the exchange difference based on the current exchange rate to correct the reconciliation to the actual bank statement balance click below."
-msgstr "To je normální, devizových účtů, aby kurzové rozdíly, které musí být zohledněny jako směnný kurz se liší. Toto smíření se připravuje za použití směnného kurzu nastavit v měnách tabulce (viz set-až na kartu). Tato tabulka musí být zachována s aktuálního kurzu před spuštěním usmíření. Pokud chcete vytvořit časopis, aby odrážely kurzový rozdíl na základě aktuálního směnného kurzu k opravě k usmíření skutečného stavu bankovního výpisu klikněte níže."
+msgid ""
+"It is normal for foreign currency accounts to have exchange differences that "
+"need to be reflected as the exchange rate varies. This reconciliation is "
+"prepared using the exchange rate set up in the currencies table (see the set-"
+"up tab). This table must be maintained with the current exchange rate before "
+"running the reconciliation. If you wish to create a journal to reflect the "
+"exchange difference based on the current exchange rate to correct the "
+"reconciliation to the actual bank statement balance click below."
+msgstr ""
+"To je normální, devizových účtů, aby kurzové rozdíly, které musí být "
+"zohledněny jako směnný kurz se liší. Toto smíření se připravuje za použití "
+"směnného kurzu nastavit v měnách tabulce (viz set-až na kartu). Tato tabulka "
+"musí být zachována s aktuálního kurzu před spuštěním usmíření. Pokud chcete "
+"vytvořit časopis, aby odrážely kurzový rozdíl na základě aktuálního směnného "
+"kurzu k opravě k usmíření skutečného stavu bankovního výpisu klikněte níže."
#: BankReconciliation.php:326
msgid "Match off cleared payments"
@@ -1633,8 +1719,10 @@
msgstr "Vytvořit z tempbom se nezdařila, protože"
#: BOMExtendedQty.php:158
-msgid "The Quantiy Extended BOM Listing could not be retrieved by the SQL because"
-msgstr "Quantiy Rozšířená rozpisky Výpis se nepodařilo získat na SQL, protože"
+msgid ""
+"The Quantiy Extended BOM Listing could not be retrieved by the SQL because"
+msgstr ""
+"Quantiy Rozšířená rozpisky Výpis se nepodařilo získat na SQL, protože"
#: BOMExtendedQty.php:260 BOMIndented.php:235
msgid "Print Indented BOM Listing Error"
@@ -1653,8 +1741,8 @@
#: BOMIndentedReverse.php:304 BOMInquiry.php:173 BOMs.php:521 BOMs.php:678
#: ContractBOM.php:243 ContractBOM.php:347 ContractCosting.php:74
#: ContractCosting.php:80 ContractCosting.php:131 ContractOtherReqts.php:95
-#: Contracts.php:920 Contracts.php:944 CounterSales.php:664
-#: CounterSales.php:1953 CounterSales.php:2131 CounterSales.php:2272
+#: Contracts.php:920 Contracts.php:944 CounterSales.php:662
+#: CounterSales.php:1951 CounterSales.php:2129 CounterSales.php:2270
#: Credit_Invoice.php:275 DeliveryDetails.php:785 DeliveryDetails.php:850
#: GoodsReceived.php:83 GoodsReceived.php:86
#: InventoryPlanningPrefSupplier.php:83 InventoryQuantities.php:224
@@ -1662,7 +1750,7 @@
#: MRPPlannedWorkOrders.php:261 MRPPlannedWorkOrders.php:388 MRPReport.php:413
#: MRPReport.php:419 MRPReschedules.php:205 OffersReceived.php:94
#: OffersReceived.php:196 OffersReceived.php:245 OrderDetails.php:155
-#: PDFOrdersInvoiced.php:387 PO_Items.php:914 POReport.php:699
+#: PDFOrdersInvoiced.php:387 PO_Items.php:912 POReport.php:699
#: POReport.php:1365 PrintCustTrans.php:712 PrintCustTrans.php:775
#: PrintCustTrans.php:813 PrintCustTransPortrait.php:899
#: PrintCustTransPortrait.php:982 PrintCustTransPortrait.php:1026
@@ -1727,16 +1815,16 @@
#: BOMExtendedQty.php:322
msgid "Extended Quantity BOM Listing For "
-msgstr "Rozšířená Množství kusovníku výpis"
+msgstr "Rozšířená Množství kusovníku výpis "
#: BOMExtendedQty.php:324 BOMIndented.php:303 BOMIndentedReverse.php:291
#: GLAccountReport.php:353 InventoryPlanningPrefSupplier.php:63
#: InventoryQuantities.php:210 MRPPlannedPurchaseOrders.php:302
#: MRPPlannedWorkOrders.php:367 MRPReport.php:826 MRPReschedules.php:190
#: MRPShortages.php:286 PDFOrderStatus.php:299 PDFPriceList.php:331
-#: PDFReceipt.php:32 PO_PDFPurchOrder.php:42 PO_SelectOSPurchOrder.php:486
-#: ReorderLevel.php:251 StockDispatch.php:337 SuppPriceList.php:263
-#: Tax.php:252 includes/PDFAgedDebtorsPageHeader.inc:33
+#: PDFReceipt.php:32 PO_Header.php:792 PO_PDFPurchOrder.php:42
+#: PO_SelectOSPurchOrder.php:486 ReorderLevel.php:251 StockDispatch.php:337
+#: SuppPriceList.php:263 Tax.php:252 includes/PDFAgedDebtorsPageHeader.inc:33
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBalanceSheetPageHeader.inc:25
#: includes/PDFBOMListingPageHeader.inc:26
@@ -1821,14 +1909,14 @@
#: BOMExtendedQty.php:327
msgid "Build Quantity: "
-msgstr "Budovat Množství:"
+msgstr "Budovat Množství: "
#: BOMExtendedQty.php:334
msgid "Build"
msgstr "Stavět"
-#: BOMExtendedQty.php:335 BOMInquiry.php:94 BOMs.php:811 CounterSales.php:1949
-#: CounterSales.php:2127 PO_SelectOSPurchOrder.php:214
+#: BOMExtendedQty.php:335 BOMInquiry.php:94 BOMs.php:811 CounterSales.php:1947
+#: CounterSales.php:2125 PO_SelectOSPurchOrder.php:214
#: PO_SelectPurchOrder.php:174 ReorderLevelLocation.php:58
#: ReorderLevelLocation.php:59 SelectCompletedOrder.php:468
#: SelectOrderItems.php:1443 SelectOrderItems.php:1623
@@ -1903,11 +1991,11 @@
#: BOMIndented.php:313 BOMIndentedReverse.php:301 BOMInquiry.php:93
#: BOMInquiry.php:172 BOMs.php:518 BOMs.php:810 ContractBOM.php:242
-#: ContractBOM.php:344 ContractOtherReqts.php:94 CounterSales.php:1947
-#: CounterSales.php:2125 CreditStatus.php:153 CreditStatus.php:237
+#: ContractBOM.php:344 ContractOtherReqts.php:94 CounterSales.php:1945
+#: CounterSales.php:2123 CreditStatus.php:153 CreditStatus.php:237
#: FixedAssetCategories.php:160 FixedAssetDepreciation.php:83
#: FixedAssetList.php:30 FixedAssetRegister.php:78 FixedAssetRegister.php:348
-#: FixedAssetTransfer.php:50 FixedAssetTransfer.php:110 GLTags.php:39
+#: FixedAssetTransfer.php:50 FixedAssetTransfer.php:125 GLTags.php:39
#: GLTags.php:55 GLTransInquiry.php:50 GoodsReceived.php:82
#: InventoryQuantities.php:222 Labels.php:413 MRPDemands.php:92
#: MRPDemands.php:290 MRPDemandTypes.php:115 MRPPlannedWorkOrders.php:258
@@ -1915,13 +2003,13 @@
#: MRPShortages.php:302 PaymentTerms.php:180 PcExpenses.php:149
#: PcExpenses.php:238 PcExpensesTypeTab.php:145 PcReportTab.php:174
#: PcTypeTabs.php:155 PDFOrdersInvoiced.php:345 PDFOrderStatus.php:313
-#: PDFPrintLabel.php:239 PO_Items.php:913 PO_Items.php:1097
+#: PDFPrintLabel.php:239 PO_Items.php:911 PO_Items.php:1095
#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:173
#: PricesByCost.php:89 ReorderLevelLocation.php:55 ReorderLevel.php:266
#: ReverseGRN.php:377 SalesCategories.php:427 SelectAsset.php:223
#: SelectCompletedOrder.php:467 SelectContract.php:156
#: SelectCreditItems.php:958 SelectOrderItems.php:1441
-#: SelectOrderItems.php:1621 SelectProduct.php:481 SelectProduct.php:686
+#: SelectOrderItems.php:1621 SelectProduct.php:476 SelectProduct.php:681
#: SelectSalesOrder.php:196 SelectWorkOrder.php:185 Shipt_Select.php:184
#: StockCategories.php:218 StockDispatch.php:357 StockDispatch.php:364
#: StockLocStatus.php:149 StockQuantityByDate.php:92 SuppCreditGRNs.php:75
@@ -1957,7 +2045,7 @@
#: BOMIndented.php:329 BOMIndentedReverse.php:315
msgid " 12345678901234567890"
-msgstr "12345678901234567890"
+msgstr " 12345678901234567890"
#: BOMIndentedReverse.php:232
msgid "Print Reverse Indented BOM Listing Error"
@@ -2000,7 +2088,8 @@
msgstr "modifikace obrazovce jako vyrobené"
#: BOMInquiry.php:21 BOMs.php:798
-msgid "kits or assemblies to be available for construction of a bill of material"
+msgid ""
+"kits or assemblies to be available for construction of a bill of material"
msgstr "sady nebo sestavy musí být k dispozici pro výstavbu kusovníku"
#: BOMInquiry.php:22 BOMs.php:799 MRPDemands.php:328
@@ -2016,19 +2105,20 @@
msgstr "popis"
#: BOMInquiry.php:24 BOMs.php:801 ContractBOM.php:323 ContractBOM.php:328
-#: Contracts.php:747 Contracts.php:750 CounterSales.php:2095
+#: Contracts.php:747 Contracts.php:750 CounterSales.php:2093
#: CustomerReceipt.php:1030 CustomerReceipt.php:1033
#: DiscountCategories.php:103 DiscountCategories.php:106
-#: FixedAssetTransfer.php:61 MRPDemands.php:330 MRPDemands.php:333
-#: MRPReport.php:563 PO_Header.php:520 PO_Items.php:1075 PO_Items.php:1080
-#: PO_SelectOSPurchOrder.php:202 PO_SelectPurchOrder.php:165 PurchData.php:239
-#: SelectAsset.php:93 SelectCompletedOrder.php:450 SelectCreditItems.php:210
-#: SelectCreditItems.php:944 SelectCustomer.php:323 SelectCustomer.php:329
-#: SelectCustomer.php:341 SelectCustomer.php:349 SelectCustomer.php:393
-#: SelectGLAccount.php:92 SelectOrderItems.php:618 SelectOrderItems.php:621
-#: SelectOrderItems.php:1590 SelectProduct.php:488 SelectSalesOrder.php:184
-#: SelectSupplier.php:206 SelectWorkOrder.php:173 Shipt_Select.php:170
-#: SupplierTenders.php:358 WorkOrderEntry.php:583 WorkOrderIssue.php:638
+#: FixedAssetTransfer.php:61 FixedAssetTransfer.php:72 MRPDemands.php:330
+#: MRPDemands.php:333 MRPReport.php:563 PO_Header.php:516 PO_Items.php:1073
+#: PO_Items.php:1078 PO_SelectOSPurchOrder.php:202 PO_SelectPurchOrder.php:165
+#: PurchData.php:239 SelectAsset.php:93 SelectCompletedOrder.php:450
+#: SelectCreditItems.php:210 SelectCreditItems.php:944 SelectCustomer.php:323
+#: SelectCustomer.php:329 SelectCustomer.php:341 SelectCustomer.php:349
+#: SelectCustomer.php:393 SelectGLAccount.php:92 SelectOrderItems.php:618
+#: SelectOrderItems.php:621 SelectOrderItems.php:1590 SelectProduct.php:483
+#: SelectSalesOrder.php:184 SelectSupplier.php:206 SelectWorkOrder.php:173
+#: Shipt_Select.php:170 SupplierTenders.php:358 WorkOrderEntry.php:583
+#: WorkOrderIssue.php:638
msgid "OR"
msgstr "nebo"
@@ -2038,9 +2128,9 @@
msgid "Enter extract of the"
msgstr "Zadejte extrakt"
-#: BOMInquiry.php:25 BOMs.php:802 MRPDemands.php:331 MRPReport.php:563
-#: PO_SelectOSPurchOrder.php:202 PO_SelectPurchOrder.php:165
-#: SalesCategories.php:426 SelectProduct.php:488 Shipt_Select.php:170
+#: BOMInquiry.php:25 BOMs.php:802 FixedAssetTransfer.php:61 MRPDemands.php:331
+#: MRPReport.php:563 PO_SelectOSPurchOrder.php:202 PO_SelectPurchOrder.php:165
+#: SalesCategories.php:426 SelectProduct.php:483 Shipt_Select.php:170
#: StockAdjustments.php:65 StockAdjustments.php:320 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:38 StockReorderLevel.php:44
#: StockStatus.php:61 StockTransfers.php:28 StockTransfers.php:431
@@ -2051,28 +2141,36 @@
msgstr "Skladový kód"
#: BOMInquiry.php:26 BOMs.php:803 ContractBOM.php:331 Contracts.php:755
-#: CounterSales.php:2099 CustomerReceipt.php:1038 FixedAssetTransfer.php:72
-#: MRPDemands.php:335 MRPReport.php:571 PO_Header.php:525 PO_Items.php:1083
+#: CounterSales.php:2097 CustomerReceipt.php:1038 FixedAssetTransfer.php:83
+#: MRPDemands.php:335 MRPReport.php:571 PO_Header.php:521 PO_Items.php:1081
#: SelectAsset.php:101 SelectCreditItems.php:215 SelectCreditItems.php:949
#: SelectCustomer.php:416 SelectGLAccount.php:98 SelectOrderItems.php:626
-#: SelectOrderItems.php:1597 SelectProduct.php:496 SelectSupplier.php:212
+#: SelectOrderItems.php:1597 SelectProduct.php:491 SelectSupplier.php:212
#: SelectSupplier.php:245 SupplierTenders.php:366 WorkOrderEntry.php:587
#: WorkOrderIssue.php:642
msgid "Search Now"
msgstr "Vyhledat"
#: BOMInquiry.php:36 BOMs.php:738 ContractBOM.php:51 MRPDemands.php:57
-#: MRPReport.php:589 PO_Items.php:400 PO_SelectOSPurchOrder.php:64
+#: MRPReport.php:589 PO_Items.php:399 PO_SelectOSPurchOrder.php:64
#: PO_SelectPurchOrder.php:43 SelectCompletedOrder.php:87
-#: SelectCreditItems.php:278 SelectProduct.php:509 SelectSalesOrder.php:46
+#: SelectCreditItems.php:278 SelectProduct.php:504 SelectSalesOrder.php:46
#: SelectWorkOrder.php:35 Shipt_Select.php:62 SupplierTenders.php:378
#: WorkOrderEntry.php:64 WorkOrderIssue.php:380
-msgid "Stock description keywords have been used in preference to the Stock code extract entered"
-msgstr "Sklad popis klíčová slova byla použita v preferenci na kód Reklamní výpis vstoupila"
+msgid ""
+"Stock description keywords have been used in preference to the Stock code "
+"extract entered"
+msgstr ""
+"Sklad popis klíčová slova byla použita v preferenci na kód Reklamní výpis "
+"vstoupila"
#: BOMInquiry.php:39 BOMs.php:741 MRPDemands.php:60
-msgid "At least one stock description keyword or an extract of a stock code must be entered for the search"
-msgstr "Alespoň jedna fotografie popis klíčové slovo nebo výpis z populace kód musí být zadán k vyhledávání"
+msgid ""
+"At least one stock description keyword or an extract of a stock code must be "
+"entered for the search"
+msgstr ""
+"Alespoň jedna fotografie popis klíčové slovo nebo výpis z populace kód musí "
+"být zadán k vyhledávání"
#: BOMInquiry.php:83 BOMs.php:785 MRPCalendar.php:212 MRPDemands.php:81
#: MRPDemands.php:285 POReport.php:482 POReport.php:1172 SalesInquiry.php:734
@@ -2080,16 +2178,16 @@
msgstr "SQL najít vybrané části nepodařilo se zprávou"
#: BOMInquiry.php:92 BOMs.php:517 BOMs.php:809 ContractBOM.php:343
-#: CounterSales.php:1946 CounterSales.php:2124 CustomerBranches.php:383
+#: CounterSales.php:1944 CounterSales.php:2122 CustomerBranches.php:376
#: CustomerReceipt.php:1048 GLCodesInquiry.php:28 MRPDemands.php:91
#: MRPPlannedWorkOrders.php:257 MRPReport.php:759 PDFOrdersInvoiced.php:344
-#: PDFOrderStatus.php:312 PDFPrintLabel.php:239 PO_Header.php:535
-#: PO_Items.php:1096 PO_SelectOSPurchOrder.php:212 PO_SelectPurchOrder.php:172
+#: PDFOrderStatus.php:312 PDFPrintLabel.php:239 PO_Header.php:531
+#: PO_Items.php:1094 PO_SelectOSPurchOrder.php:212 PO_SelectPurchOrder.php:172
#: PricesByCost.php:88 PurchData.php:313 ReorderLevelLocation.php:54
#: ReorderLevelLocation.php:203 SalesPeople.php:184
#: SelectCompletedOrder.php:466 SelectCreditItems.php:222
#: SelectCreditItems.php:957 SelectCustomer.php:456 SelectGLAccount.php:105
-#: SelectOrderItems.php:1440 SelectOrderItems.php:1620 SelectProduct.php:685
+#: SelectOrderItems.php:1440 SelectOrderItems.php:1620 SelectProduct.php:680
#: SelectSalesOrder.php:195 SelectSupplier.php:249 SelectWorkOrder.php:184
#: Shipt_Select.php:183 SpecialOrder.php:134 SupplierTenders.php:488
#: SuppPriceList.php:281 TopItems.php:156 WorkOrderEntry.php:598
@@ -2099,12 +2197,12 @@
msgstr "Kód"
#: BOMInquiry.php:95 BOMs.php:812 ConfirmDispatch_Invoice.php:264
-#: ContractBOM.php:345 CounterSales.php:1948 CounterSales.php:2126
+#: ContractBOM.php:345 CounterSales.php:1946 CounterSales.php:2124
#: Credit_Invoice.php:274 GoodsReceived.php:84 MRPReport.php:762
-#: OffersReceived.php:95 PO_Items.php:1098 PO_SelectOSPurchOrder.php:216
+#: OffersReceived.php:95 PO_Items.php:1096 PO_SelectOSPurchOrder.php:216
#: PO_SelectPurchOrder.php:176 SelectCompletedOrder.php:471
#: SelectCreditItems.php:959 SelectOrderItems.php:1442
-#: SelectOrderItems.php:1622 SelectProduct.php:108 SelectProduct.php:688
+#: SelectOrderItems.php:1622 SelectProduct.php:108 SelectProduct.php:683
#: SelectSalesOrder.php:198 SelectWorkOrder.php:187 Shipments.php:387
#: Shipments.php:465 Shipt_Select.php:187 StockLocTransferReceive.php:435
#: SupplierTenders.php:490 TopItems.php:159 WorkOrderCosting.php:86
@@ -2178,7 +2276,8 @@
msgstr "Kusovník Výpis"
#: BOMListing.php:50
-msgid "The Bill of Material listing could not be retrieved by the SQL because"
+msgid ""
+"The Bill of Material listing could not be retrieved by the SQL because"
msgstr "Bill výpis materiálu se nepodařilo získat do SQL, protože"
#: BOMListing.php:61
@@ -2202,12 +2301,19 @@
msgstr "Maximálně 15 úrovní kusovníku jen mohou být zobrazeny"
#: BOMs.php:57
-msgid "An error occurred in retrieving the components of the BOM during the check for recursion"
-msgstr "Došlo k chybě při načítání složek kusovníku během kontroly pro rekurze"
+msgid ""
+"An error occurred in retrieving the components of the BOM during the check "
+"for recursion"
+msgstr ""
+"Došlo k chybě při načítání složek kusovníku během kontroly pro rekurze"
#: BOMs.php:58
-msgid "The SQL that was used to retrieve the components of the BOM and that failed in the process was"
-msgstr "SQL, který byl použit k načtení komponenty kusovníku a že se nepodařilo v tomto procesu bylo"
+msgid ""
+"The SQL that was used to retrieve the components of the BOM and that failed "
+"in the process was"
+msgstr ""
+"SQL, který byl použit k načtení komponenty kusovníku a že se nepodařilo v "
+"tomto procesu bylo"
#: BOMs.php:106
msgid "Could not retrieve the BOM components because"
@@ -2228,17 +2334,25 @@
#: BOMs.php:126 BOMs.php:132 BOMs.php:136 BOMs.php:828 OrderDetails.php:177
#: PaymentTerms.php:188 PaymentTerms.php:194 SalesAnalReptCols.php:280
#: SelectProduct.php:106 SelectProduct.php:144 SelectProduct.php:154
-#: SelectProduct.php:237 SelectProduct.php:238 SelectProduct.php:707
+#: SelectProduct.php:237 SelectProduct.php:238 SelectProduct.php:702
msgid "N/A"
msgstr "N / A"
#: BOMs.php:225
-msgid "The effective after date field must be a date in the format dd/mm/yy or dd/mm/yyyy or ddmmyy or ddmmyyyy or dd-mm-yy or dd-mm-yyyy"
-msgstr "Po datu účinnosti pole musí být data ve formátu dd / mm / rr nebo dd / mm / rrrr nebo ddmmrr nebo ddmmrrrr nebo dd-mm-rr nebo dd-mm-rrrr"
+msgid ""
+"The effective after date field must be a date in the format dd/mm/yy or "
+"dd/mm/yyyy or ddmmyy or ddmmyyyy or dd-mm-yy or dd-mm-yyyy"
+msgstr ""
+"Po datu účinnosti pole musí být data ve formátu dd / mm / rr nebo dd / mm / "
+"rrrr nebo ddmmrr nebo ddmmrrrr nebo dd-mm-rr nebo dd-mm-rrrr"
#: BOMs.php:231
-msgid "The effective to date field must be a date in the format dd/mm/yy or dd/mm/yyyy or ddmmyy or ddmmyyyy or dd-mm-yy or dd-mm-yyyy"
-msgstr "Účinné k dnešnímu dni pole musí být data ve formátu dd / mm / rr nebo dd / mm / rrrr nebo ddmmrr nebo ddmmrrrr nebo dd-mm-rr nebo dd-mm-rrrr"
+msgid ""
+"The effective to date field must be a date in the format dd/mm/yy or "
+"dd/mm/yyyy or ddmmyy or ddmmyyyy or dd-mm-yy or dd-mm-yyyy"
+msgstr ""
+"Účinné k dnešnímu dni pole musí být data ve formátu dd / mm / rr nebo dd / "
+"mm / rrrr nebo ddmmrr nebo ddmmrrrr nebo dd-mm-rr nebo dd-mm-rrrr"
#: BOMs.php:237 StockAdjustments.php:83 StockTransfers.php:130
#: WorkOrderEntry.php:262
@@ -2274,8 +2388,16 @@
msgstr "a efektivní, aby byla"
#: BOMs.php:260
-msgid "Only non-serialised or non-lot controlled items can be set to auto issue. These items require the lot/serial numbers of items issued to the works orders to be specified so autoissue is not an option. Auto issue has been automatically set to off for this component"
-msgstr "Jediné non-serializoval nebo non-lot kontrolovaných položek lze nastavit na auto problém. Tyto položky vyžadují hodně / sériová čísla položek vydaných děl objednávky bude upřesněno, takže autoissue není řešením. Auto otázka byla automaticky nastavena na vypnutí pro tuto složku"
+msgid ""
+"Only non-serialised or non-lot controlled items can be set to auto issue. "
+"These items require the lot/serial numbers of items issued to the works "
+"orders to be specified so autoissue is not an option. Auto issue has been "
+"automatically set to off for this component"
+msgstr ""
+"Jediné non-serializoval nebo non-lot kontrolovaných položek lze nastavit na "
+"auto problém. Tyto položky vyžadují hodně / sériová čísla položek vydaných "
+"děl objednávky bude upřesněno, takže autoissue není řešením. Auto otázka "
+"byla automaticky nastavena na vypnutí pro tuto složku"
#: BOMs.php:284
msgid "Could not update this BOM component because"
@@ -2298,8 +2420,12 @@
msgstr "Došlo k chybě při kontrole složka není již na kusovníku"
#: BOMs.php:308
-msgid "The SQL that was used to check the component was not already on the BOM and that failed in the process was"
-msgstr "SQL, který byl použit ke kontrole složka nebyla již na kusovník a které se nepodařilo v tomto procesu bylo"
+msgid ""
+"The SQL that was used to check the component was not already on the BOM and "
+"that failed in the process was"
+msgstr ""
+"SQL, který byl použit ke kontrole složka nebyla již na kusovník a které se "
+"nepodařilo v tomto procesu bylo"
#: BOMs.php:331
msgid "Could not insert the BOM component because"
@@ -2326,8 +2452,12 @@
msgstr "je již zaznamenána jako součást"
#: BOMs.php:344
-msgid "Whilst the quantity of the component required can be modified it is inappropriate for a component to appear more than once in a bill of material"
-msgstr "Zatímco množství požadovaných komponent může být upraven je nevhodné pro komponentu se objeví více než jednou v kusovníku"
+msgid ""
+"Whilst the quantity of the component required can be modified it is "
+"inappropriate for a component to appear more than once in a bill of material"
+msgstr ""
+"Zatímco množství požadovaných komponent může být upraven je nevhodné pro "
+"komponentu se objeví více než jednou v kusovníku"
#: BOMs.php:361
msgid "Could not delete this BOM components because"
@@ -2353,7 +2483,7 @@
msgid "The SQL used to retrieve description of the parent part was"
msgstr "SQL slouží k získání popisu mateřské část byla"
-#: BOMs.php:403 ConfirmDispatch_Invoice.php:1011 CounterSales.php:1331
+#: BOMs.php:403 ConfirmDispatch_Invoice.php:1011 CounterSales.php:1329
#: Credit_Invoice.php:765 Credit_Invoice.php:794 SelectCreditItems.php:1429
#: Stocks.php:799 Stocks.php:801
msgid "Assembly"
@@ -2396,7 +2526,7 @@
msgstr "Úroveň"
#: BOMs.php:519 BOMs.php:636 Contracts.php:856 FixedAssetRegister.php:80
-#: InventoryQuantities.php:223 Locations.php:300 MRP.php:549 MRP.php:563
+#: InventoryQuantities.php:223 Locations.php:328 MRP.php:549 MRP.php:563
#: PDFOrdersInvoiced.php:306 PDFOrderStatus.php:272
#: ReorderLevelLocation.php:173 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:49 StockSerialItemResearch.php:78
@@ -2440,7 +2570,8 @@
#: BOMs.php:580
msgid "Click on the Enter Information button to update the component details"
-msgstr "Klikněte na tlačítko Enter Informace k aktualizaci komponenty podrobnosti"
+msgstr ""
+"Klikněte na tlačítko Enter Informace k aktualizaci komponenty podrobnosti"
#: BOMs.php:594
msgid "Component code"
@@ -2495,11 +2626,15 @@
msgstr "Náklady na prodej vyslání kódu záznam byl odstraněn"
#: COGSGLPostings.php:91
-msgid "The following cost of sales posting records that do not have valid general ledger code specified - these records must be amended."
-msgstr "Následující náklady na prodej vysílání záznamů, které nemají platný hlavní knihy zadaný kód - tyto záznamy musí být změněna."
+msgid ""
+"The following cost of sales posting records that do not have valid general "
+"ledger code specified - these records must be amended."
+msgstr ""
+"Následující náklady na prodej vysílání záznamů, které nemají platný hlavní "
+"knihy zadaný kód - tyto záznamy musí být změněna."
#: COGSGLPostings.php:93 COGSGLPostings.php:197 COGSGLPostings.php:273
-#: CustomerBranches.php:387 SalesGLPostings.php:113 SalesGLPostings.php:224
+#: CustomerBranches.php:380 SalesGLPostings.php:113 SalesGLPostings.php:224
#: SalesGLPostings.php:308 SalesInquiry.php:814 SalesInquiry.php:832
msgid "Area"
msgstr "Plocha"
@@ -2758,8 +2893,12 @@
msgstr "Vyberte řádkové položky na faktuře"
#: ConfirmDispatchControlled_Invoice.php:22
-msgid "This page can only be opened if a line item on a sales order to be invoiced has been selected"
-msgstr "Tato stránka může být otevřen pouze v řádku o prodeji, aby bylo fakturováno byla vybrána"
+msgid ""
+"This page can only be opened if a line item on a sales order to be invoiced "
+"has been selected"
+msgstr ""
+"Tato stránka může být otevřen pouze v řádku o prodeji, aby bylo fakturováno "
+"byla vybrána"
#: ConfirmDispatchControlled_Invoice.php:22 CreditItemsControlled.php:33
#: CreditItemsControlled.php:44 GoodsReceivedControlled.php:19
@@ -2772,22 +2911,30 @@
msgstr "zvolit prodejní objednávku k fakturaci"
#: ConfirmDispatchControlled_Invoice.php:32
-msgid "This page can only be opened if a sales order and line item has been selected Please do that first"
-msgstr "Tato stránka může být otevřen pouze v prodejní objednávky a řádková položka byla vybrána prosím, že první"
+msgid ""
+"This page can only be opened if a sales order and line item has been "
+"selected Please do that first"
+msgstr ""
+"Tato stránka může být otevřen pouze v prodejní objednávky a řádková položka "
+"byla vybrána prosím, že první"
#: ConfirmDispatchControlled_Invoice.php:45
msgid "Back to the Sales Order"
msgstr "Zpět k prodejním objednávkám"
#: ConfirmDispatchControlled_Invoice.php:47
-msgid "The line item must be defined as controlled to require input of the batch numbers or serial numbers being sold"
-msgstr "Řádku musí být definován jako řízený vyžadovat zadání čísel šarží nebo sériových čísel jsou prodávány"
+msgid ""
+"The line item must be defined as controlled to require input of the batch "
+"numbers or serial numbers being sold"
+msgstr ""
+"Řádku musí být definován jako řízený vyžadovat zadání čísel šarží nebo "
+"sériových čísel jsou prodávány"
#: ConfirmDispatchControlled_Invoice.php:57
msgid "Back to Confirmation of Dispatch"
msgstr "Zpět na Potvrzení o odeslání"
-#: ConfirmDispatchControlled_Invoice.php:57 CounterSales.php:1166
+#: ConfirmDispatchControlled_Invoice.php:57 CounterSales.php:1164
#: DeliveryDetails.php:577 DeliveryDetails.php:752 EmailCustTrans.php:11
#: PaymentAllocations.php:33 SelectSalesOrder.php:418 SelectSalesOrder.php:478
#: Z_SalesIntegrityCheck.php:47
@@ -2813,8 +2960,12 @@
msgstr "Odeslání a potvrzení objednávky fakt...
[truncated message content] |
|
From: <tim...@us...> - 2011-01-24 12:54:52
|
Revision: 4397
http://weberp.svn.sourceforge.net/weberp/?rev=4397&view=rev
Author: tim_schofield
Date: 2011-01-24 12:54:41 +0000 (Mon, 24 Jan 2011)
Log Message:
-----------
Updated to correct version number i.e. 4.0
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/Contracts.php
trunk/CounterSales.php
trunk/CustomerReceipt.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetRegister.php
trunk/GLBudgets.php
trunk/PDFDIFOT.php
trunk/PDFDeliveryDifferences.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPriceList.php
trunk/PDFReceipt.php
trunk/PDFTopItems.php
trunk/PcReportTab.php
trunk/PricesBasedOnMarkUp.php
trunk/PricesByCost.php
trunk/PrintCustStatements.php
trunk/PurchData.php
trunk/SelectOrderItems.php
trunk/SuppPriceList.php
trunk/companies/weberpdemo/reportwriter/labels.xml
trunk/includes/DateFunctions.inc
trunk/includes/DefineCartClass.php
trunk/includes/SQL_CommonFunctions.inc
trunk/includes/class.pdf.php
trunk/includes/session.inc
trunk/index.php
trunk/install/index.php
trunk/install/save.php
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/da_DA.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VI.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VI.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/updates/34.php
trunk/sql/mysql/updates/58.php
trunk/sql/mysql/updates/60.php
trunk/sql/mysql/upgrade3.11.1-4.00.sql
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-01-29 16:18:09
|
Revision: 4513
http://weberp.svn.sourceforge.net/weberp/?rev=4513&view=rev
Author: tim_schofield
Date: 2011-01-29 16:18:02 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Corrections for adjusting a controlled item
Modified Paths:
--------------
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2011-01-29 11:52:31 UTC (rev 4512)
+++ trunk/StockAdjustments.php 2011-01-29 16:18:02 UTC (rev 4513)
@@ -26,10 +26,16 @@
if (isset($_GET['StockID'])){
$StockID = trim(strtoupper($_GET['StockID']));
$_SESSION['Adjustment']->StockID = trim(strtoupper($StockID));
- $_SESSION['Adjustment']->ItemDescription = trim(strtoupper($_GET['Description']));
- $result = DB_query("SELECT controlled FROM stockmaster WHERE stockid='" . $_SESSION['Adjustment']->StockID . "'",$db);
- $myrow = DB_fetch_row($result);
- $_SESSION['Adjustment']->Controlled = $myrow[0];
+ $result = DB_query("SELECT description, controlled, serialised, decimalplaces FROM stockmaster WHERE stockid='" . $_SESSION['Adjustment']->StockID . "'",$db);
+ $myrow = DB_fetch_array($result);
+ $_SESSION['Adjustment']->ItemDescription = $myrow['description'];
+ $_SESSION['Adjustment']->Controlled = $myrow['controlled'];
+ $_SESSION['Adjustment']->Serialised = $myrow['serialised'];
+ $_SESSION['Adjustment']->DecimalPlaces = $myrow['decimalplaces'];
+ $_SESSION['Adjustment']->SerialItems = array();
+ if (!isset($_SESSION['Adjustment']->Quantity)or !is_numeric($_SESSION['Adjustment']->Quantity)){
+ $_SESSION['Adjustment']->Quantity=0;
+ }
$NewAdjustment = true;
} elseif (isset($_POST['StockID'])){
if(isset($_POST['StockID']) and $_POST['StockID'] != $_SESSION['Adjustment']->StockID){
@@ -357,7 +363,7 @@
}
echo '</select></td></tr>';
-if (!isset($_SESSION['Adjustment']->Narrative)) {
+if (isset($_SESSION['Adjustment']) and !isset($_SESSION['Adjustment']->Narrative)) {
$_SESSION['Adjustment']->Narrative = '';
}
@@ -368,14 +374,13 @@
echo '<td>';
if ($Controlled==1){
- if ($_SESSION['Adjustment']->StockLocation != ''){
- echo '<input type="HIDDEN" name="Quantity" Value="' . $_SESSION['Adjustment']->Quantity . '">
+ if ($_SESSION['Adjustment']->StockLocation == ''){
+ $_SESSION['Adjustment']->StockLocation = $_SESSION['UserStockLocation'];
+ }
+ echo '<input type="HIDDEN" name="Quantity" Value="' . $_SESSION['Adjustment']->Quantity . '">
'.$_SESSION['Adjustment']->Quantity.'
[<a href="'.$rootpath.'/StockAdjustmentsControlled.php?AdjType=REMOVE&' . SID . '">'._('Remove').'</a>]
[<a href="'.$rootpath.'/StockAdjustmentsControlled.php?AdjType=ADD&' . SID . '">'._('Add').'</a>]';
- } else {
- prnMsg( _('Please select a location and press') . ' "' . _('Enter Stock Adjustment') . '" ' . _('below to enter Controlled Items'), 'info');
- }
} else {
echo '<input type=TEXT class="number" name="Quantity" size=12 maxlength=12 Value="' . $Quantity . '">';
}
Modified: trunk/StockAdjustmentsControlled.php
===================================================================
--- trunk/StockAdjustmentsControlled.php 2011-01-29 11:52:31 UTC (rev 4512)
+++ trunk/StockAdjustmentsControlled.php 2011-01-29 16:18:02 UTC (rev 4513)
@@ -26,7 +26,7 @@
}
/*Save some typing by referring to the line item class object in short form */
-$LineItem = &$_SESSION['Adjustment'];
+$LineItem = $_SESSION['Adjustment'];
//Make sure this item is really controlled
if ( $LineItem->Controlled != 1 ){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-01-29 20:26:42
|
Revision: 4515
http://weberp.svn.sourceforge.net/weberp/?rev=4515&view=rev
Author: tim_schofield
Date: 2011-01-29 20:26:35 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Corrections for controlled items where supplier units conversion factot not 1
Modified Paths:
--------------
trunk/GoodsReceived.php
trunk/PO_Header.php
trunk/StockSerialItems.php
trunk/StockStatus.php
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2011-01-29 16:22:39 UTC (rev 4514)
+++ trunk/GoodsReceived.php 2011-01-29 20:26:35 UTC (rev 4515)
@@ -518,7 +518,7 @@
if (trim($Item->BundleRef) != ""){
if ($AlreadyExistsRow[0]>0){
if ($OrderLine->Serialised == 1) {
- $SQL = "UPDATE stockserialitems SET quantity = '" . $Item->BundleQty . " ";
+ $SQL = "UPDATE stockserialitems SET quantity = '" . $Item->BundleQty*$OrderLine->ConversionFactor . " ";
} else {
$SQL = "UPDATE stockserialitems SET quantity = quantity + '" . $Item->BundleQty . "'";
}
@@ -535,7 +535,7 @@
'" . $_SESSION['PO']->Location . "',
'" . $Item->BundleRef . "',
'',
- '" . $Item->BundleQty . "')";
+ '" . $Item->BundleQty*$OrderLine->ConversionFactor . "')";
}
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be inserted because');
@@ -553,7 +553,7 @@
'" . $StkMoveNo . "',
'" . $OrderLine->StockID . "',
'" . $Item->BundleRef . "',
- '" . $Item->BundleQty . "'
+ '" . $Item->BundleQty*$OrderLine->ConversionFactor . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because');
$DbgMsg = _('The following SQL to insert the serial stock movement records was used');
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-01-29 16:22:39 UTC (rev 4514)
+++ trunk/PO_Header.php 2011-01-29 20:26:35 UTC (rev 4515)
@@ -152,7 +152,7 @@
$AllowPrint=0;
}
$SQL = "UPDATE purchorders SET status='" . $_POST['Status']. "',
- stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."',
+ stat_comment='" . $_SESSION['PO'.$identifier]->StatComments ."',
allowprint='".$AllowPrint."'
WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] ."'";
Modified: trunk/StockSerialItems.php
===================================================================
--- trunk/StockSerialItems.php 2011-01-29 16:22:39 UTC (rev 4514)
+++ trunk/StockSerialItems.php 2011-01-29 20:26:35 UTC (rev 4515)
@@ -69,11 +69,11 @@
if ($Serialised==1){
echo '<tr<th colspan=3><font color=navy size=2>' . _('Serialised items in') . ' ';
} else {
- echo '<tr<th colspan=3><font color=navy size=2>' . _('Controlled items in') . ' ';
+ echo '<tr<th colspan=6><font color=navy size=2>' . _('Controlled items in') . ' ';
}
echo $myrow[0]. '</font></th></tr>';
-echo "<tr><th colspan=3><font color=navy size=2>".$StockID ."-". $Description ."</b> (" . _('In units of') . ' ' . $UOM . ')</font></th></tr>';
+echo "<tr><th colspan=6><font color=navy size=2>".$StockID ."-". $Description ."</b> (" . _('In units of') . ' ' . $UOM . ')</font></th></tr>';
if ($Serialised == 1){
$tableheader = "<tr>
Modified: trunk/StockStatus.php
===================================================================
--- trunk/StockStatus.php 2011-01-29 16:22:39 UTC (rev 4514)
+++ trunk/StockStatus.php 2011-01-29 20:26:35 UTC (rev 4515)
@@ -171,26 +171,23 @@
if ($Its_A_KitSet_Assembly_Or_Dummy == False){
- $sql="SELECT SUM(purchorderdetails.quantityord*(CASE WHEN purchdata.conversionfactor IS NULL THEN 1 ELSE purchdata.conversionfactor END) -
- purchorderdetails.quantityrecd*(CASE WHEN purchdata.conversionfactor IS NULL THEN 1 ELSE purchdata.conversionfactor END))
- FROM purchorders
- LEFT JOIN purchorderdetails
+ $QOOSQL="SELECT SUM((purchorderdetails.quantityord*purchorderdetails.conversionfactor) -
+ (purchorderdetails.quantityrecd*purchorderdetails.conversionfactor))
+ FROM purchorders
+ LEFT JOIN purchorderdetails
ON purchorders.orderno=purchorderdetails.orderno
- LEFT JOIN purchdata
- ON purchorders.supplierno=purchdata.supplierno
- AND purchorderdetails.itemcode=purchdata.stockid
- WHERE purchorderdetails.itemcode='" . $StockID . "'
+ WHERE purchorderdetails.itemcode='" . $StockID . "'
+ AND purchorderdetails.completed =0
AND purchorders.intostocklocation='" . $myrow['loccode'] . "'
- AND (purchorders.status<>'Cancelled'
- AND purchorders.status<>'Pending')";
- $ErrMsg = _('The quantity on order for this product to be received into') . ' ' . $myrow['loccode'] . ' ' . _('cannot be retrieved because');
- $QOOResult = DB_query($sql,$db,$ErrMsg, $DbgMsg);
-
- if (DB_num_rows($QOOResult)==1){
- $QOORow = DB_fetch_row($QOOResult);
- $QOO = $QOORow[0];
- } else {
+ AND purchorders.status<>'Cancelled'
+ AND purchorders.status<>'Pending'
+ AND purchorders.status<>'Rejected'";
+ $QOOResult = DB_query($QOOSQL, $db);
+ if (DB_num_rows($QOOResult) == 0) {
$QOO = 0;
+ } else {
+ $QOORow = DB_fetch_row($QOOResult);
+ $QOO = $QOORow[0];
}
//Also the on work order quantities
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-01-31 22:16:25
|
Revision: 4524
http://weberp.svn.sourceforge.net/weberp/?rev=4524&view=rev
Author: tim_schofield
Date: 2011-01-31 22:16:17 +0000 (Mon, 31 Jan 2011)
Log Message:
-----------
Update to ensure the form designs folder is copied across on upgrade
Modified Paths:
--------------
trunk/includes/header.inc
trunk/includes/session.inc
trunk/index.php
Added Paths:
-----------
trunk/sql/mysql/updates/62.php
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2011-01-30 19:32:32 UTC (rev 4523)
+++ trunk/includes/header.inc 2011-01-31 22:16:17 UTC (rev 4524)
@@ -49,26 +49,26 @@
echo '<td align="left" style="width:100%;" class="quick_menu_left">';
// Use icons for company and user data, saves screen realestate, use ALT tag in case theme icon not avail.
echo '<img src="'.$rootpath.'/css/'.$theme.'/images/company.png" TITLE="' . _('Company') . '" ALT="' . _('Company') . '"></img>';
- echo ' ' . stripslashes($_SESSION['CompanyRecord']['coyname']) . ' <a href="' . $rootpath . '/UserSettings.php?' . SID . '"><img src="'.$rootpath.'/css/'.$theme.'/images/user.png" TITLE="User" ALT="' . _('User') . '"> </img>' . stripslashes($_SESSION['UsersRealName']) . '</a>';
+ echo ' ' . stripslashes($_SESSION['CompanyRecord']['coyname']) . ' <a href="' . $rootpath . '/UserSettings.php?' . sid . '"><img src="'.$rootpath.'/css/'.$theme.'/images/user.png" TITLE="User" ALT="' . _('User') . '"> </img>' . stripslashes($_SESSION['UsersRealName']) . '</a>';
// Make the title text a class, can be set to display:none is some themes
echo '<br /><font class="header_title"> ' . $title . '</font></td>';
echo '<td class="quick_menu_tabs">';
echo '<table cellpadding="0" cellspacing="0" class="quick_menu_tabs"><tr>';
- echo '<td class="quick_menu_tab" align="center"><a accesskey="1" href="' . $rootpath . '/index.php?' . SID . '"><span style="text-decoration:underline;">1</span> ' . _('Main Menu') . '</a></td>';
+ echo '<td class="quick_menu_tab" align="center"><a accesskey="1" href="' . $rootpath . '/index.php?' . sid . '"><span style="text-decoration:underline;">1</span> ' . _('Main Menu') . '</a></td>';
if (count($_SESSION['AllowedPageSecurityTokens'])>1){
- echo '<td class="quick_menu_tab" align="center"><a accesskey="2" href="' . $rootpath . '/SelectCustomer.php?' . SID . '"><span style="text-decoration:underline;">2</span> ' . _('Customers') . '</a></td>';
+ echo '<td class="quick_menu_tab" align="center"><a accesskey="2" href="' . $rootpath . '/SelectCustomer.php?' . sid . '"><span style="text-decoration:underline;">2</span> ' . _('Customers') . '</a></td>';
- echo '<td class="quick_menu_tab" align="center"><a accesskey="3" href="' . $rootpath . '/SelectProduct.php?' . SID . '"><span style="text-decoration:underline;">3</span> ' . _('Items') . '</a></td>';
+ echo '<td class="quick_menu_tab" align="center"><a accesskey="3" href="' . $rootpath . '/SelectProduct.php?' . sid . '"><span style="text-decoration:underline;">3</span> ' . _('Items') . '</a></td>';
- echo '<td class="quick_menu_tab" align="center"><a accesskey="4" href="' . $rootpath . '/SelectSupplier.php?' . SID . '"><span style="text-decoration:underline;">4</span> ' . _('Suppliers') . '</a></td>';
+ echo '<td class="quick_menu_tab" align="center"><a accesskey="4" href="' . $rootpath . '/SelectSupplier.php?' . sid . '"><span style="text-decoration:underline;">4</span> ' . _('Suppliers') . '</a></td>';
- $DefaultManualLink = '<td class="quick_menu_tab" align="center"><a rel="external" accesskey="8" href="' . $rootpath . '/doc/Manual/ManualContents.php?' . SID . '"><span style="text-decoration:underline;">8</span> ' . _('Manual') . '</a></td>';
+ $DefaultManualLink = '<td class="quick_menu_tab" align="center"><a rel="external" accesskey="8" href="' . $rootpath . '/doc/Manual/ManualContents.php?' . sid . '"><span style="text-decoration:underline;">8</span> ' . _('Manual') . '</a></td>';
if (substr($_SESSION['Language'],0,2) !='en'){
if (file_exists('locale/' . $_SESSION['Language'] . '/Manual/ManualContents.php')){
- echo '<td class="quick_menu_tab" align="center"><a target="_blank" accesskey="8" href="' . $rootpath . '/locale/' . $_SESSION['Language'] . '/Manual/ManualContents.php' . SID . '"><span style="text-decoration:underline;">8</span> ' . _('Manual') . '</a></td>';
+ echo '<td class="quick_menu_tab" align="center"><a target="_blank" accesskey="8" href="' . $rootpath . '/locale/' . $_SESSION['Language'] . '/Manual/ManualContents.php' . sid . '"><span style="text-decoration:underline;">8</span> ' . _('Manual') . '</a></td>';
} else {
echo $DefaultManualLink;
}
@@ -77,7 +77,7 @@
}
}
- echo '<td class="quick_menu_tab" align="center"><a accesskey="0" href="' . $rootpath . '/Logout.php?' . SID . '" onclick="return confirm(\'' . _('Are you sure you wish to logout?') . '\');"><span style="text-decoration:underline;">0</span> ' . _('Logout') . '</a></td>';
+ echo '<td class="quick_menu_tab" align="center"><a accesskey="0" href="' . $rootpath . '/Logout.php?' . sid . '" onclick="return confirm(\'' . _('Are you sure you wish to logout?') . '\');"><span style="text-decoration:underline;">0</span> ' . _('Logout') . '</a></td>';
echo '</tr></table>';
echo '</td></tr></table>';
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2011-01-30 19:32:32 UTC (rev 4523)
+++ trunk/includes/session.inc 2011-01-31 22:16:17 UTC (rev 4524)
@@ -13,7 +13,7 @@
header('Location:' . $rootpath . '/install/index.php');
}
include($PathPrefix . 'config.php');
-$DBVersion=60;
+$DBVersion=62;
if (isset($SessionSavePath)){
session_save_path($SessionSavePath);
}
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2011-01-30 19:32:32 UTC (rev 4523)
+++ trunk/index.php 2011-01-31 22:16:17 UTC (rev 4524)
@@ -39,17 +39,17 @@
<table class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerInquiry.php?' . SID . '&CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Account Status') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerInquiry.php?' . sid . '&CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Account Status') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectOrderItems.php?' . SID . '&NewOrder=Yes">' . _('Place An Order') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectOrderItems.php?' . sid . '&NewOrder=Yes">' . _('Place An Order') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectCompletedOrder.php?' . SID . '&SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Status') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectCompletedOrder.php?' . sid . '&SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Status') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -65,7 +65,7 @@
<table class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SupplierTenders.php?' . SID . '">' . _('Supplier Tenders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SupplierTenders.php?' . sid . '">' . _('Supplier Tenders') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -93,9 +93,9 @@
$_SESSION['Module']=$ModuleLink[$i];
}
if ($ModuleLink[$i] == $_SESSION['Module']){
- echo '<tr><td class="main_menu_selected"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td></tr>';
+ echo '<tr><td class="main_menu_selected"><a href="' . $_SERVER['PHP_SELF'] . '?' . sid . '&Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td></tr>';
} else {
- echo '<tr><td class="main_menu_unselected"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td></tr>';
+ echo '<tr><td class="main_menu_unselected"><a href="' . $_SERVER['PHP_SELF'] . '?' . sid . '&Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td></tr>';
}
}
$i++;
@@ -141,7 +141,7 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '">' . _('Outstanding Sales Orders/Quotations') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php?' . sid . '">' . _('Outstanding Sales Orders/Quotations') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -165,52 +165,52 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectCompletedOrder.php?' . SID . '">' . _('Order Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectCompletedOrder.php?' . sid . '">' . _('Order Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFPriceList.php?' . SID . '">' . _('Print Price Lists') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFPriceList.php?' . sid . '">' . _('Print Price Lists') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFOrderStatus.php?' . SID . '">' . _('Order Status Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFOrderStatus.php?' . sid . '">' . _('Order Status Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFOrdersInvoiced.php?' . SID . '">' . _('Orders Invoiced Reports') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFOrdersInvoiced.php?' . sid . '">' . _('Orders Invoiced Reports') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/DailySalesInquiry.php?' . SID . '">' . _('Daily Sales Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/DailySalesInquiry.php?' . sid . '">' . _('Daily Sales Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFDeliveryDifferences.php?' . SID . '">' . _('Order Delivery Differences Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFDeliveryDifferences.php?' . sid . '">' . _('Order Delivery Differences Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFDIFOT.php?' . SID . '">' . _('Delivery In Full On Time (DIFOT) Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFDIFOT.php?' . sid . '">' . _('Delivery In Full On Time (DIFOT) Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesInquiry.php?' . SID . '">' . _('Sales Order Detail Or Summary Inquiries') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesInquiry.php?' . sid . '">' . _('Sales Order Detail Or Summary Inquiries') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TopItems.php?' . SID . '">' . _('Top Sales Items Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TopItems.php?' . sid . '">' . _('Top Sales Items Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFLowGP.php?' . SID . '">' . _('Sales With Low Gross Profit Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFLowGP.php?' . sid . '">' . _('Sales With Low Gross Profit Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -228,12 +228,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectContract.php?' . SID . '">' . _('Select Contract') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectContract.php?' . sid . '">' . _('Select Contract') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Contracts.php?' . SID . '">' . _('Create Contract') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Contracts.php?' . sid . '">' . _('Create Contract') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -266,7 +266,7 @@
<table width="100%"class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '">' . _('Select Order to Invoice') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectSalesOrder.php?' . sid . '">' . _('Select Order to Invoice') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -276,13 +276,13 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerReceipt.php?' . SID . '&NewReceipt=Yes&Type=Customer">' . _('Enter Receipts') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerReceipt.php?' . sid . '&NewReceipt=Yes&Type=Customer">' . _('Enter Receipts') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerAllocations.php?' . SID . '">' . _('Allocate Receipts or Credit Notes') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerAllocations.php?' . sid . '">' . _('Allocate Receipts or Credit Notes') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -291,63 +291,63 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustWhereAlloc.php?' . SID . '">' . _('Where Allocated Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustWhereAlloc.php?' . sid . '">' . _('Where Allocated Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
<?php
if ($_SESSION['InvoicePortraitFormat']==0){
- echo '<p>• <a href="' . $rootpath . '/PrintCustTrans.php?' . SID . '">' . _('Print Invoices or Credit Notes') . '</a></p>';
+ echo '<p>• <a href="' . $rootpath . '/PrintCustTrans.php?' . sid . '">' . _('Print Invoices or Credit Notes') . '</a></p>';
} else {
- echo '<p>• <a href="' . $rootpath . '/PrintCustTransPortrait.php?' . SID . '">' . _('Print Invoices or Credit Notes') . '</a></p>';
+ echo '<p>• <a href="' . $rootpath . '/PrintCustTransPortrait.php?' . sid . '">' . _('Print Invoices or Credit Notes') . '</a></p>';
}
?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PrintCustStatements.php?' . SID . '">' . _('Print Statements') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PrintCustStatements.php?' . sid . '">' . _('Print Statements') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesAnalRepts.php?' . SID . '">' . _('Sales Analysis Reports') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesAnalRepts.php?' . sid . '">' . _('Sales Analysis Reports') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/AgedDebtors.php?' . SID . '">' . _('Aged Customer Balances/Overdues Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/AgedDebtors.php?' . sid . '">' . _('Aged Customer Balances/Overdues Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFBankingSummary.php?' . SID . '">' . _('Re-Print A Deposit Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFBankingSummary.php?' . sid . '">' . _('Re-Print A Deposit Listing') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/DebtorsAtPeriodEnd.php?' . SID . '">' . _('Debtor Balances At A Prior Month End') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/DebtorsAtPeriodEnd.php?' . sid . '">' . _('Debtor Balances At A Prior Month End') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFCustomerList.php?' . SID . '">' . _('Customer Listing By Area/Salesperson') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFCustomerList.php?' . sid . '">' . _('Customer Listing By Area/Salesperson') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesGraph.php?' . SID . '">' . _('Sales Graphs') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesGraph.php?' . sid . '">' . _('Sales Graphs') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFCustTransListing.php?' . SID . '">' . _('List Daily Transactions') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFCustTransListing.php?' . sid . '">' . _('List Daily Transactions') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerTransInquiry.php?' . SID . '">' . _('Customer Transaction Inquiries') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerTransInquiry.php?' . sid . '">' . _('Customer Transaction Inquiries') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -361,12 +361,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Customers.php?' . SID . '">' . _('Add Customer') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Customers.php?' . sid . '">' . _('Add Customer') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectCustomer.php?' . SID . '">' . _('Customers') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectCustomer.php?' . sid . '">' . _('Customers') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -396,12 +396,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectSupplier.php?' . SID . '">' . _('Select Supplier') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectSupplier.php?' . sid . '">' . _('Select Supplier') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . "/SupplierAllocations.php?" . SID . '">' . _('Supplier Allocations') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . "/SupplierAllocations.php?" . sid . '">' . _('Supplier Allocations') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -410,37 +410,37 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/AgedSuppliers.php?' . SID . '">' . _('Aged Supplier Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/AgedSuppliers.php?' . sid . '">' . _('Aged Supplier Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SuppPaymentRun.php?' . SID . '">' . _('Payment Run Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SuppPaymentRun.php?' . sid . '">' . _('Payment Run Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFRemittanceAdvice.php?' . SID . '">' . _('Remittance Advices') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFRemittanceAdvice.php?' . sid . '">' . _('Remittance Advices') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/OutstandingGRNs.php?' . SID . '">' . _('Outstanding GRNs Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/OutstandingGRNs.php?' . sid . '">' . _('Outstanding GRNs Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SupplierBalsAtPeriodEnd.php?' . SID . '">' . _('Supplier Balances At A Prior Month End') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SupplierBalsAtPeriodEnd.php?' . sid . '">' . _('Supplier Balances At A Prior Month End') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFSuppTransListing.php?' . SID . '">' . _('List Daily Transactions') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFSuppTransListing.php?' . sid . '">' . _('List Daily Transactions') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SupplierTransInquiry.php?' . SID . '">' . _('Supplier Transaction Inquiries') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SupplierTransInquiry.php?' . sid . '">' . _('Supplier Transaction Inquiries') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -454,12 +454,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Suppliers.php?' . SID . '">' . _('Add Supplier') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Suppliers.php?' . sid . '">' . _('Add Supplier') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Factors.php?' . SID . '">' . _('Maintain Factor Companies') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Factors.php?' . sid . '">' . _('Maintain Factor Companies') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -487,32 +487,32 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">' . _('Purchase Orders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . sid . '">' . _('Purchase Orders') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_Header.php?&NewOrder=Yes' . SID . '">' . _('Add Purchase Order') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_Header.php?&NewOrder=Yes' . sid . '">' . _('Add Purchase Order') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/OffersReceived.php?' . SID . '">' . _('Process Tenders and Offers') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/OffersReceived.php?' . sid . '">' . _('Process Tenders and Offers') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_AuthoriseMyOrders.php?' . SID . '">' . _('Orders to Authorise') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_AuthoriseMyOrders.php?' . sid . '">' . _('Orders to Authorise') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectSupplier.php?' . SID . '">' . _('Shipment Entry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectSupplier.php?' . sid . '">' . _('Shipment Entry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Shipt_Select.php?' . SID . '">' . _('Select A Shipment') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Shipt_Select.php?' . sid . '">' . _('Select A Shipment') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -521,12 +521,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectPurchOrder.php?' . SID . '">' . _('Purchase Order Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectPurchOrder.php?' . sid . '">' . _('Purchase Order Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/POReport.php?' . SID . '">' . _('Purchase Order Detail Or Summary Inquiries') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/POReport.php?' . sid . '">' . _('Purchase Order Detail Or Summary Inquiries') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -566,37 +566,37 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '">' . _('Receive Purchase Orders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . sid . '">' . _('Receive Purchase Orders') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockLocTransfer.php' . SID . '">' . _('Bulk Inventory Transfer') . ' - ' . _('Dispatch') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockLocTransfer.php' . sid . '">' . _('Bulk Inventory Transfer') . ' - ' . _('Dispatch') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockLocTransferReceive.php?' . SID . '">' . _('Bulk Inventory Transfer') . ' - ' . _('Receive') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockLocTransferReceive.php?' . sid . '">' . _('Bulk Inventory Transfer') . ' - ' . _('Receive') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockTransfers.php?' . SID . '">' . _('Inventory Location Transfers') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockTransfers.php?' . sid . '">' . _('Inventory Location Transfers') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockAdjustments.php?NewAdjustment=Yes' . SID . '">' . _('Inventory Adjustments') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockAdjustments.php?NewAdjustment=Yes' . sid . '">' . _('Inventory Adjustments') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/ReverseGRN.php?' . SID . '">' . _('Reverse Goods Received') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/ReverseGRN.php?' . sid . '">' . _('Reverse Goods Received') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockCounts.php?' . SID . '">' . _('Enter Stock Counts') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockCounts.php?' . sid . '">' . _('Enter Stock Counts') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -605,98 +605,98 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . "/StockSerialItemResearch.php?" . SID . '">' . _('Serial Item Research Tool') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . "/StockSerialItemResearch.php?" . sid . '">' . _('Serial Item Research Tool') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . "/PDFPrintLabel.php?" . SID . '">' . _('Print Price Labels') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . "/PDFPrintLabel.php?" . sid . '">' . _('Print Price Labels') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . "/StockMovements.php?" . SID . '">' . _('Inventory Item Movements') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . "/StockMovements.php?" . sid . '">' . _('Inventory Item Movements') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockStatus.php?' . SID . '">' . _('Inventory Item Status') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockStatus.php?' . sid . '">' . _('Inventory Item Status') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockUsage.php?' . SID . '">' . _('Inventory Item Usage') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockUsage.php?' . sid . '">' . _('Inventory Item Usage') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/InventoryQuantities.php?' . SID . '">' . _('Inventory Quantities') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/InventoryQuantities.php?' . sid . '">' . _('Inventory Quantities') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/ReorderLevel.php?' . SID . '">' . _('Reorder Level') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/ReorderLevel.php?' . sid . '">' . _('Reorder Level') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockDispatch.php?' . SID . '">' . _('Stock Dispatch') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockDispatch.php?' . sid . '">' . _('Stock Dispatch') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/InventoryValuation.php?' . SID . '">' . _('Inventory Valuation Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/InventoryValuation.php?' . sid . '">' . _('Inventory Valuation Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/InventoryPlanning.php?' . SID . '">' . _('Inventory Planning Report') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/InventoryPlanning.php?' . sid . '">' . _('Inventory Planning Report') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/InventoryPlanningPrefSupplier.php?' . SID . '">' . _('Inventory Planning Based On Preferred Supplier Data') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/InventoryPlanningPrefSupplier.php?' . sid . '">' . _('Inventory Planning Based On Preferred Supplier Data') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockCheck.php?' . SID . '">' . _('Inventory Stock Check Sheets') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockCheck.php?' . sid . '">' . _('Inventory Stock Check Sheets') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockQties_csv.php?' . SID . '">' . _('Make Inventory Quantities CSV') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockQties_csv.php?' . sid . '">' . _('Make Inventory Quantities CSV') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFStockCheckComparison.php?' . SID . '">' . _('Compare Counts Vs Stock Check Data') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFStockCheckComparison.php?' . sid . '">' . _('Compare Counts Vs Stock Check Data') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockLocMovements.php?' . SID . '">' . _('All Inventory Movements By Location/Date') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockLocMovements.php?' . sid . '">' . _('All Inventory Movements By Location/Date') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockLocStatus.php?' . SID . '">' . _('List Inventory Status By Location/Category') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockLocStatus.php?' . sid . '">' . _('List Inventory Status By Location/Category') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockQuantityByDate.php?' . SID . '">' . _('Historical Stock Quantity By Location/Category') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockQuantityByDate.php?' . sid . '">' . _('Historical Stock Quantity By Location/Category') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFStockNegatives.php?' . SID . '">' . _('List Negative Stocks') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFStockNegatives.php?' . sid . '">' . _('List Negative Stocks') . '</a></p>'; ?>
</td>
</tr>
<tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFStockTransListing.php?' . SID . '">' . _('Daily Stock Transaction Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFStockTransListing.php?' . sid . '">' . _('Daily Stock Transaction Listing') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -710,32 +710,32 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Stocks.php?' . SID . '">' . _('Add A New Item') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Stocks.php?' . sid . '">' . _('Add A New Item') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectProduct.php?' . SID . '">' . _('Select An Item') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectProduct.php?' . sid . '">' . _('Select An Item') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesCategories.php?' . SID . '">' . _('Sales Category Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesCategories.php?' . sid . '">' . _('Sales Category Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PricesBasedOnMarkUp.php?' . SID . '">' . _('Add or Update Prices Based On Costs') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PricesBasedOnMarkUp.php?' . sid . '">' . _('Add or Update Prices Based On Costs') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PricesByCost.php?' . SID . '">' . _('View or Update Prices Based On Costs') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PricesByCost.php?' . sid . '">' . _('View or Update Prices Based On Costs') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/ReorderLevelLocation.php?' . SID . '">' . _('Reorder Level By Category/Location') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/ReorderLevelLocation.php?' . sid . '">' . _('Reorder Level By Category/Location') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -765,12 +765,12 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WorkOrderEntry.php?' . SID . '">' . _('Work Order Entry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WorkOrderEntry.php?' . sid . '">' . _('Work Order Entry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectWorkOrder.php?' . SID . '">' . _('Select A Work Order') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectWorkOrder.php?' . sid . '">' . _('Select A Work Order') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -779,57 +779,57 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectWorkOrder.php?' . SID . '">' . _('Select A Work Order') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectWorkOrder.php?' . sid . '">' . _('Select A Work Order') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMInquiry.php?' . SID . '">' . _('Costed Bill Of Material Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMInquiry.php?' . sid . '">' . _('Costed Bill Of Material Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WhereUsedInquiry.php?' . SID . '">' . _('Where Used Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WhereUsedInquiry.php?' . sid . '">' . _('Where Used Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMIndented.php?' . SID . '">' . _('Indented Bill Of Material Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMIndented.php?' . sid . '">' . _('Indented Bill Of Material Listing') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMExtendedQty.php?' . SID . '">' . _('List Components Required') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMExtendedQty.php?' . sid . '">' . _('List Components Required') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMIndentedReverse.php?' . SID . '">' . _('Indented Where Used Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMIndentedReverse.php?' . sid . '">' . _('Indented Where Used Listing') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPReport.php?' . SID . '">' . _('MRP') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPReport.php?' . sid . '">' . _('MRP') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPShortages.php?' . SID . '">' . _('MRP Shortages') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPShortages.php?' . sid . '">' . _('MRP Shortages') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPPlannedPurchaseOrders.php?' . SID . '">' . _('MRP Suggested Purchase Orders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPPlannedPurchaseOrders.php?' . sid . '">' . _('MRP Suggested Purchase Orders') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPPlannedWorkOrders.php?' . SID . '">' . _('MRP Suggested Work Orders') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPPlannedWorkOrders.php?' . sid . '">' . _('MRP Suggested Work Orders') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPReschedules.php?' . SID . '">' . _('MRP Reschedules Required') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPReschedules.php?' . sid . '">' . _('MRP Reschedules Required') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -843,28 +843,28 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WorkCentres.php?' . SID . '">' . _('Work Centre') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WorkCentres.php?' . sid . '">' . _('Work Centre') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BOMs.php?' . SID . '">' . _('Bills Of Material') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BOMs.php?' . sid . '">' . _('Bills Of Material') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPDemands.php?' . SID . '">' . _('Master Schedule') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPDemands.php?' . sid . '">' . _('Master Schedule') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPCreateDemands.php?' . SID . '">' . _('Auto Create Master Schedule') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPCreateDemands.php?' . sid . '">' . _('Auto Create Master Schedule') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRP.php?' . SID . '">' . _('MRP Calculation') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRP.php?' . sid . '">' . _('MRP Calculation') . '</a></p>'; ?>
</td>
</tr>
@@ -932,62 +932,62 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CompanyPreferences.php?' . SID . '">' . _('Company Preferences') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CompanyPreferences.php?' . sid . '">' . _('Company Preferences') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SystemParameters.php?' . SID . '">' . _('Configuration Settings') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SystemParameters.php?' . sid . '">' . _('Configuration Settings') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WWW_Users.php?' . SID . '">' . _('User Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WWW_Users.php?' . sid . '">' . _('User Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/WWW_Access.php?' . SID . '">' . _('Role Permissions') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/WWW_Access.php?' . sid . '">' . _('Role Permissions') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PageSecurity.php?' . SID . '">' . _('Page Security Settings') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PageSecurity.php?' . sid . '">' . _('Page Security Settings') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BankAccounts.php?' . SID . '">' . _('Bank Accounts') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BankAccounts.php?' . sid . '">' . _('Bank Accounts') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Currencies.php?' . SID . '">' . _('Currency Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Currencies.php?' . sid . '">' . _('Currency Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TaxAuthorities.php?' . SID . '">' . _('Tax Authorities and Rates Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TaxAuthorities.php?' . sid . '">' . _('Tax Authorities and Rates Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TaxGroups.php?' . SID . '">' . _('Tax Group Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TaxGroups.php?' . sid . '">' . _('Tax Group Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TaxProvinces.php?' . SID . '">' . _('Dispatch Tax Province Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TaxProvinces.php?' . sid . '">' . _('Dispatch Tax Province Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/TaxCategories.php?' . SID . '">' . _('Tax Category Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/TaxCategories.php?' . sid . '">' . _('Tax Category Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PeriodsInquiry.php?' . SID . '">' . _('List Periods Defined') . ' <span style="font-size: 9px;">(' . _('Periods are automatically maintained') . ')</span></a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PeriodsInquiry.php?' . sid . '">' . _('List Periods Defined') . ' <span style="font-size: 9px;">(' . _('Periods are automatically maintained') . ')</span></a></p>'; ?>
</td>
</tr>
<tr>
@@ -1032,72 +1032,72 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesTypes.php?' . SID . '">' . _('Sales Types') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesTypes.php?' . sid . '">' . _('Sales Types') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerTypes.php?' . SID . '">' . _('Customer Types') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerTypes.php?' . sid . '">' . _('Customer Types') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SupplierTypes.php?' . SID . '">' . _('Supplier Types') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SupplierTypes.php?' . sid . '">' . _('Supplier Types') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CreditStatus.php?' . SID . '">' . _('Credit Status') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CreditStatus.php?' . sid . '">' . _('Credit Status') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PaymentTerms.php?' . SID . '">' . _('Payment Terms') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PaymentTerms.php?' . sid . '">' . _('Payment Terms') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PO_AuthorisationLevels.php?' . SID . '">' . _('Set Purchase Order Authorisation levels') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PO_AuthorisationLevels.php?' . sid . '">' . _('Set Purchase Order Authorisation levels') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PaymentMethods.php?' . SID . '">' . _('Payment Methods') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PaymentMethods.php?' . sid . '">' . _('Payment Methods') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesPeople.php?' . SID . '">' . _('Sales People') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesPeople.php?' . sid . '">' . _('Sales People') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Areas.php?' . SID . '">' . _('Sales Areas') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Areas.php?' . sid . '">' . _('Sales Areas') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Shippers.php?' . SID . '">' . _('Shippers') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Shippers.php?' . sid . '">' . _('Shippers') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SalesGLPostings.php?' . SID . '">' . _('Sales GL Interface Postings') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesGLPostings.php?' . sid . '">' . _('Sales GL Interface Postings') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/COGSGLPostings.php?' . SID . '">' . _('COGS GL Interface Postings') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/COGSGLPostings.php?' . sid . '">' . _('COGS GL Interface Postings') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/FreightCosts.php?' . SID . '">' . _('Freight Costs Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/FreightCosts.php?' . sid . '">' . _('Freight Costs Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/DiscountMatrix.php?' . SID . '">' . _('Discount Matrix') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/DiscountMatrix.php?' . sid . '">' . _('Discount Matrix') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -1107,34 +1107,34 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/StockCategories.php?' . SID . '">' . _('Inventory Categories Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/StockCategories.php?' . sid . '">' . _('Inventory Categories Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/Locations.php?' . SID . '">' . _('Inventory Locations Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/Locations.php?' . sid . '">' . _('Inventory Locations Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/DiscountCategories.php?' . SID . '">' . _('Discount Category Maintenance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/DiscountCategories.php?' . sid . '">' . _('Discount Category Maintenance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/UnitsOfMeasure.php?' . SID . '">' . _('Units of Measure') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/UnitsOfMeasure.php?' . sid . '">' . _('Units of Measure') . '</a></p>'; ?>
</td>
</tr>
<tr></tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPCalendar.php?' . SID . '">' . _('MRP Available Production Days') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPCalendar.php?' . sid . '">' . _('MRP Available Production Days') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/MRPDemandTypes.php?' . SID . '">' . _('MRP Demand Types') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/MRPDemandTypes.php?' . sid . '">' . _('MRP Demand Types') . '</a></p>'; ?>
</td>
</tr>
</table>
@@ -1167,7 +1167,7 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/CustomerReceipt.php?' . SID . '&NewReceipt=Yes&Type=GL">' . _('Bank Account Receipts Entry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/CustomerReceipt.php?' . sid . '&NewReceipt=Yes&Type=GL">' . _('Bank Account Receipts Entry') . '</a></p>'; ?>
</td>
</tr>
<tr>
@@ -1191,57 +1191,57 @@
<table width="100%" class="table_index">
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/GLTrialBalance.php?' . SID . '">' . _('Trial Balance') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/GLTrialBalance.php?' . sid . '">' . _('Trial Balance') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectGLAccount.php?' . SID . '">' . _('Account Inquiry') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectGLAccount.php?' . sid . '">' . _('Account Inquiry') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/GLAccountReport.php?' . SID . '">' . _('Account Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/GLAccountReport.php?' . sid . '">' . _('Account Listing') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/GLAccountCSV.php?' . SID . '">' . _('Account Listing to CSV File') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/GLAccountCSV.php?' . sid . '">' . _('Account Listing to CSV File') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/BankReconciliation.php?' . SID . '">' . _('Bank Account Reconciliation Statement') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/BankReconciliation.php?' . sid . '">' . _('Bank Account Reconciliation Statement') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFChequeListing.php?' . SID . '">' . _('Cheque Payments Listing') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFChequeListing.php?' . sid . '">' . _('Cheque Payments Listing') . '</a></p>'; ?>
</td>
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/DailyBankTransactions.php?' . SID . '">' . _('Daily Bank Transactions') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/DailyBankTransactions.php?' . sid . '">' . _('Daily Bank Transactions') . '</a></p>'; ?>
</td>
...
[truncated message content] |
|
From: <tim...@us...> - 2011-02-04 12:47:18
|
Revision: 4528
http://weberp.svn.sourceforge.net/weberp/?rev=4528&view=rev
Author: tim_schofield
Date: 2011-02-04 12:47:07 +0000 (Fri, 04 Feb 2011)
Log Message:
-----------
xmlrpc library for api
Added Paths:
-----------
trunk/xmlrpc/
trunk/xmlrpc/Changelog
trunk/xmlrpc/Makefile
trunk/xmlrpc/NEWS
trunk/xmlrpc/README
trunk/xmlrpc/debugger/
trunk/xmlrpc/debugger/action.php
trunk/xmlrpc/debugger/common.php
trunk/xmlrpc/debugger/controller.php
trunk/xmlrpc/debugger/index.php
trunk/xmlrpc/demo/
trunk/xmlrpc/demo/client/
trunk/xmlrpc/demo/client/agesort.php
trunk/xmlrpc/demo/client/client.php
trunk/xmlrpc/demo/client/comment.php
trunk/xmlrpc/demo/client/introspect.php
trunk/xmlrpc/demo/client/mail.php
trunk/xmlrpc/demo/client/simple_call.php
trunk/xmlrpc/demo/client/which.php
trunk/xmlrpc/demo/client/wrap.php
trunk/xmlrpc/demo/client/zopetest.php
trunk/xmlrpc/demo/demo1.txt
trunk/xmlrpc/demo/demo2.txt
trunk/xmlrpc/demo/demo3.txt
trunk/xmlrpc/demo/server/
trunk/xmlrpc/demo/server/discuss.php
trunk/xmlrpc/demo/server/proxy.php
trunk/xmlrpc/demo/server/server.php
trunk/xmlrpc/demo/vardemo.php
trunk/xmlrpc/doc/
trunk/xmlrpc/doc/Makefile
trunk/xmlrpc/doc/apa.html
trunk/xmlrpc/doc/apb.html
trunk/xmlrpc/doc/apc.html
trunk/xmlrpc/doc/apd.html
trunk/xmlrpc/doc/ch01.html
trunk/xmlrpc/doc/ch02.html
trunk/xmlrpc/doc/ch02s02.html
trunk/xmlrpc/doc/ch02s03.html
trunk/xmlrpc/doc/ch02s04.html
trunk/xmlrpc/doc/ch02s05.html
trunk/xmlrpc/doc/ch02s06.html
trunk/xmlrpc/doc/ch02s07.html
trunk/xmlrpc/doc/ch02s08.html
trunk/xmlrpc/doc/ch02s09.html
trunk/xmlrpc/doc/ch03.html
trunk/xmlrpc/doc/ch04.html
trunk/xmlrpc/doc/ch05.html
trunk/xmlrpc/doc/ch06.html
trunk/xmlrpc/doc/ch06s02.html
trunk/xmlrpc/doc/ch07.html
trunk/xmlrpc/doc/ch07s02.html
trunk/xmlrpc/doc/ch07s03.html
trunk/xmlrpc/doc/ch07s04.html
trunk/xmlrpc/doc/ch07s05.html
trunk/xmlrpc/doc/ch08.html
trunk/xmlrpc/doc/ch08s02.html
trunk/xmlrpc/doc/ch09.html
trunk/xmlrpc/doc/ch09s02.html
trunk/xmlrpc/doc/ch09s03.html
trunk/xmlrpc/doc/ch09s04.html
trunk/xmlrpc/doc/ch09s05.html
trunk/xmlrpc/doc/ch10.html
trunk/xmlrpc/doc/ch10s02.html
trunk/xmlrpc/doc/ch10s03.html
trunk/xmlrpc/doc/ch10s04.html
trunk/xmlrpc/doc/ch10s05.html
trunk/xmlrpc/doc/ch11.html
trunk/xmlrpc/doc/ch11s02.html
trunk/xmlrpc/doc/ch12.html
trunk/xmlrpc/doc/ch12s02.html
trunk/xmlrpc/doc/ch12s03.html
trunk/xmlrpc/doc/ch12s04.html
trunk/xmlrpc/doc/ch12s05.html
trunk/xmlrpc/doc/ch12s06.html
trunk/xmlrpc/doc/ch12s07.html
trunk/xmlrpc/doc/ch12s08.html
trunk/xmlrpc/doc/index.html
trunk/xmlrpc/doc/xmlrpc_php.pdf
trunk/xmlrpc/doc/xmlrpc_php.xml
trunk/xmlrpc/extras/
trunk/xmlrpc/extras/rsakey.pem
trunk/xmlrpc/extras/test.pl
trunk/xmlrpc/extras/test.py
trunk/xmlrpc/extras/workspace.testPhpServer.fttb
trunk/xmlrpc/lib/
trunk/xmlrpc/lib/xmlrpc.inc
trunk/xmlrpc/lib/xmlrpc_wrappers.inc
trunk/xmlrpc/lib/xmlrpcs.inc
trunk/xmlrpc/test/
trunk/xmlrpc/test/PHPUnit/
trunk/xmlrpc/test/PHPUnit/Assert.php
trunk/xmlrpc/test/PHPUnit/TestCase.php
trunk/xmlrpc/test/PHPUnit/TestDecorator.php
trunk/xmlrpc/test/PHPUnit/TestFailure.php
trunk/xmlrpc/test/PHPUnit/TestListener.php
trunk/xmlrpc/test/PHPUnit/TestResult.php
trunk/xmlrpc/test/PHPUnit/TestSuite.php
trunk/xmlrpc/test/benchmark.php
trunk/xmlrpc/test/parse_args.php
trunk/xmlrpc/test/phpunit.php
trunk/xmlrpc/test/testsuite.php
trunk/xmlrpc/test/verify_compat.php
Added: trunk/xmlrpc/Changelog
===================================================================
--- trunk/xmlrpc/Changelog (rev 0)
+++ trunk/xmlrpc/Changelog 2011-02-04 12:47:07 UTC (rev 4528)
@@ -0,0 +1,1573 @@
+2009-09-05 - G. Giunta (giu...@gm...)
+
+ * xmlrpcs.inc, xmlrpcs.inc: remove code that was left for compatibility
+ with php 4; use __METHOD__ constant for error messages instead of hardcoded
+ values
+
+ * xmlrpcs.inc: catch exceptions thrown during execution of invoked methods;
+ check for $_SERVER having been disabled via php.ini and log an error if so
+
+ * server.php, testsuite.php: add a new test and server method for exception
+ catching in the server
+
+ * xmlrpc.inc: added new method SetUserAgent to client to allow having different
+ user-agent http headers
+
+ * tagged and released as 3.0.0 beta
+
+2009-08-05 - G. Giunta (giu...@gm...)
+
+ * xmlrpc_wrappers.inc: improve compatibility with php 5.0 when registering
+ class/object methods
+
+2009-08-02 - G. Giunta (giu...@gm...) thanks Laurens
+
+ * xmlrpcs.inc: add a new member var in server class to allow fine-tuning
+ of the encoding of returned values when the server is in 'phpvals' mode;
+ allow servers in 'xmlrpcvals' mode to also register plain php functions by
+ defining them in the dispatch map with an added option:
+ 'parameters_type' => 'phpvals' (feature request #2806628)
+
+ * xmlrpc.inc: added new method xmrlpc_client::SetCurlOptions($array) to
+ allow extra flexibility in tweaking http config, such as explicitly
+ binding to an ip address (feature request #2787468); fix bad encoding if
+ same object is encoded twice using php_xmlrpc_encode; removed some by-ref
+ assignments and declarations
+
+2009-07-31 - G. Giunta (giu...@gm...)
+
+ * xmlrpc.inc: add support for dateTime objects in both in php_xmlrpc_encode
+ and as parameter for constructor of xmlrpcvals; add support for timestamps
+ as parameter for constructor of xmlrpcvals; add option 'dates_as_objects' to
+ php_xmlrpc_decode to return dateTime objects for xmlrpc datetimes
+
+ * benchmark.php, xmlrpc_wrappers.inc: remove usage of split(), deprecated in
+ php 5.3
+
+ * benchmark.php: fixed url of server page used for testing; improved
+ verification of correspondence of test results; added more variants for
+ http options comparison
+
+ * verify_compat.php: check for php version 5 for client side too
+
+ * makefile: remove from build the compat directory
+
+2009-07-26 - G. Giunta (giu...@gm...)
+
+ * server.php: remove usage of ereg*(), deprecated in php 5.3
+
+2009-07-16 - G. Giunta (giu...@gm...) thanks Jean-Jacques Sarton
+
+ * xmlrpc.inc: add support for the <ex:nil/> from the apache library, both
+ in input and output (feature request #...)
+
+ * xmlrpc.inc, testsuite.php: remove usage of split(), deprecated in php 5.3
+
+ * testsuite.php: flush better results with output_buffering on
+
+ * server: php: avoid one warning about static function calls
+
+2009-07-02 - G. Giunta (giu...@gm...) thanks Heiko Stuebner
+
+ * xmlrpc.inc: fix: when checking the parameters against the signatures xmlrpc
+ checks for "array" but PHP returns "Array" resulting in a not matches signature
+
+2009-05-07 - G. Giunta (giu...@gm...)
+
+ * replace all usage of '= & new' with '= new', as this is deprecated in php 5
+ and has been shown to cause problems too
+
+2009-05-06 - G. Giunta (giu...@gm...)
+
+ * create php4 branch, rename trunk to 3.0.0beta - it will be the php5-only version
+
+ * xmlrpc.inc: removed test for php version and inclusion of compat patches for really
+ really old versions of php 4
+
+2009-03-16 - G. Giunta (giu...@gm...) thanks Tommaso Trani
+
+ * move from CVS to SVN on sf.net; file layout now is the same as in packaged lib
+
+ * xmlrpc.inc: fix php warning when receiving 'false' in a bool value
+
+ * Makefile, doc/Makefile: alter to follow new file layout
+
+ * tagged and released as 2.2.2
+
+2009-02-03 - G. Giunta (giu...@gm...)
+
+ * debugger/action.php: improve code robustness when parsing system.listmethods
+ and system.describemethods call
+
+ * xmlrpc.inc: format floating point values using the correct decimal separator
+ even when php locale is set to one that uses comma (bug #2517579);
+ use feof() to test if socket connections are to be closed instead of the
+ number of bytes read (bug #2556209)
+
+2008-10-29 - G. Giunta (giu...@gm...)
+
+ * xmlrpcs.inc: allow add_to_map server method to add docs for single params, too
+
+2008-09-20 - G. Giunta (giu...@gm...)
+
+ * xmlrpc_wrappers.inc: added the possibility to wrap for exposure as xmlrpc
+ methods plain php class methods, object methods and even whole classes
+
+ * testsuite.php, server.php: added test cases for the new code
+
+2008-09-07 - G. Giunta (giu...@gm...) thanks Bruno Zanetti Melotti
+
+ * xmlrpc.inc: be more tolerant in detection of charset in http headers (fix for bug #2058158)
+
+2008-04-05 - G. Giunta (giu...@gm...)
+
+ * xmlrpc.inc: fix encoding of UTF8 chars outside of the BMP
+
+ * xmlrpcs.inc: fix detection of zlib.output_compression (thanks xbert)
+
+2008-03-06 - G. Giunta (giu...@gm...)
+
+ * tagged and released as 2.2.1
+
+ * Makefile: improve usage on windows xp despite cmd's broken mkdir
+
+2007-10-26 - G. Giunta (giu...@gm...) thanks sajo_raftman
+
+ * xmlrpc.inc: remove one warning in xmlrpc_client creator
+
+2007-10-26 - G. Giunta (giu...@gm...)
+
+ * xmlrpc.inc: improve support for windows cp1252 character set (still
+ commented in the code)
+
+2007-09-05 - G. Giunta (giu...@gm...)
+
+ * xmlrpc.inc, xmlrps.inc: do not try to set invalid charsets as output for
+ xml parser, even if user set them up for internal_encoding (helps encoding
+ to exotic charsets, while decoding to UTF8)
+
+2007-09-05 - G. Giunta (giu...@gm...)
+
+ * xmlrpc.inc: fix parsing of '1e+1' as valid float
+
+2007-09-01 - G. Giunta (giu...@gm...), thanks Frederic Lecointre
+
+ * xmlrpcs.inc: allow errorlevel 3 to work when prev. error handler was a static method
+
+ * testsuite.php: fix test on setCookie()
+
+2007-08-31 - G. Giunta (giu...@gm...)
+
+ * xmlrpc.inc: minor fix in cookie parsing
+
+2007-07-31 - G. Giunta (giu...@gm...)
+
+ * xmlrpc.inc: Fix usage of client::setcookie() for multiple cookies in non-ssl mode
+
+2007-07-26 - G. Giunta (giu...@gm...) thanks Mark Olive
+
+ * xmlrpc.inc: Fix for bug # 1756274 (usage of cookies in ssl mode)
+
+2007-04-28 - G. Giunta (giu...@gm...)
+
+ * xmlrpc.inc: give more detailed curl information when DEBUG = 2; fix handling
+ of case where curl w. keepalive is used and one connection of many fails
+
+ * testsuite improvements: add one testcase; give feedbcak while tests are
+ running
+
+2007-04-01 - G. Giunta (giu...@gm...)
+
+ * doc/makefile, doc/custom.fo.xsl: improve pdf rendering of php source code
+
+ * makefile: recover version number from source instead of having it hardcoded
+
+2007-03-10 - G. Giunta (giu...@gm...)
+
+ * doc/makefile, doc/convert.php, doc/*.xsl: created customizations xslt to
+ produce a documentation more in line with the php manual, esp. with regards
+ to functions synopsis; added jellyfish book cover as local resource and a
+ screenshot of the debugger too; various updates to the manual source; added
+ a php script to highlight examples inside html docs
+
+2007-03-09 - G. Giunta (giu...@gm...)
+
+ * debugger/action.php: css tweak for IE
+
+ * added phpunit license file in the phpunit directory
+
+ * added link to license (on sf.net site) to many files
+
+2007-03-04 - G. Giunta (giu...@gm...)
+
+ * Makefile, doc/makefile: assorted improvements
+
+2007-03-03 - G. Giunta (giu...@gm...)
+
+ * xmlrpc.inc: micro-optimization in declaration of global vars xmlrpcerr, xmlrpcstr
+
+2007-02-25 Gaetano Giunta <giu...@gm...>
+
+ * removed a couple of warnings emitted in testsuite.php
+
+ * doc/makefile: added command for invocation of xxe to generate docs
+
+ * better rendering of docs in xml+css format for function prototypes
+
+ * updated documentation
+
+ * tagged and released as 2.2
+
+2007-02-22 Gaetano Giunta <giu...@gm...>
+
+ * debugger: workaround for case of magic_quotes_gpc being set (properly
+ unescape user input); fix case of user not setting msg id in jsonrpc case
+ when executing a remote method; allow strings, false, true and null as msg id
+
+2007-02-13 Gaetano Giunta <giu...@gm...>
+
+ * testsuite.php: added one test for automatic encoding/decoding case
+
+2007-02-05 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: slightly faster encoding of UTF8 data to ascii
+
+2007-01-11 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: when calling client::multicall() with an unspecified http version,
+ use the client default rather than the fixed 'http 1.0'
+
+2006-09-17 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc, xmlrpcs.inc, testsuite.php: added support for <NIL/> and
+ system.getCapabilities, and one more testcase to go with it
+
+2006-09-05 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fix support for https through proxies; client parses debug
+ messages sent by client even for compressed responses;
+
+ * testsuite.php, parse_args.php: added 3 test cases for proxy connections
+
+2006-09-01 Gaetano Giunta <giu...@gm...>
+
+ xmlrpc_wrappers.inc: add two more options in wrap_xmlrpc_method and fix
+ typo to allow obj encoding
+
+2006-08-28 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc_wrappers.inc: more options added to wrap_php_function and
+ wrap_xmlrpc_method
+
+ * xmlrpc.inc: pave the way to support for <nil/>
+
+ * doc/xmlrpc_php.xml documentation updated
+
+ * tagged and released as 2.1
+
+2006-08-25 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: stricter parsing of incoming messages: detect two DATA elements
+ inside an ARRAY, a STRUCT or SCALAR inside an already filled VALUE
+
+ * testsuite.php: added two testcases to check for the above cases
+
+2006-08-24 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: more code optimization in xmlrpcval::serialize() and
+ php_xmlrpc_encode(); fixed bug where struct elements with non-ascii chars
+ in their name would not be properly encoded
+
+ * testsuite.php: added a testcase for the new bug
+
+2006-08-23 Gaetano Giunta <giu...@gm...>
+
+ * remove old code left in comments across many files; many more javadoc
+ comments added
+
+ * xmlrpc.inc: a bit of code optimization: reorder switch() statements of
+ xml parsing element handlers; inline code for xmlrpcval() - this breaks
+ new xmlrpcval('true') and changes error msgs on new xmlrpcval($x, 'invalid_type')
+
+ * testsuite.php: change according to above
+
+ * benchmark.php: basic support for xdebug 2 profiling
+
+2006-08-22 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: addscalar() and addstruct() where not returning 1 when adding
+ data to an already formed value
+
+2006-08-21 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.inc, xmlrpc.inc: added support for emulating the xmlrpc-extension
+ API (the full emulation layer is part of the extras package);
+ fix support for the HTTP 'deflate' encoding
+
+ * xmlrpc.inc: better support for http compression with and without CURL;
+ a minor decoding speedup; added a new function: php_xmlrpc_decode_xml(),
+ that will convert into the appropriate object the xml representation of
+ either a request, response or a single value; log reception of invalid
+ datetime values
+
+ * xmlrpcs.inc: add a new parameter and return type to server->service();
+ let server->add_to_map() accept method definitions without parameter types
+
+ * xmlrpc_wrappers.inc: more logging of errors; wrap_php_functions now takes
+ more options; better support for jsonrpc; escape quote chars when wrapping
+ remothe servers / remote methods
+
+ * added cvs Id tag to files that missed it; speling fixes; updated NEWS files
+
+2006-08-07 Gaetano Giunta <giu...@gm...>
+
+ * assorted fixes to make the suite more compatible with php 4.0.5 and 5.x
+
+2006-07-02 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc_warppers.inc: added new function to wrap entire remote server into
+ a local php class; changed default calling synopsis of wrap_remote_method,
+ to ease passing multiple options at a time (but old syntax still works!)
+
+ * updated makefile, debugger/action.php in accord with the above
+
+2006-06-30 Gaetano Giunta <giu...@gm...>
+
+ * added to debugger capability to generate json-rpc code stubs
+
+ * added to debugger capability to load and launch self correctly if
+ controller.php is called directly from outside processes (single url access)
+
+2006-06-26 Gaetano Giunta <giu...@gm...>
+
+ * moved wrap_php_functions and wrap_xmlrpc_method into a file of their own.
+ This will let us add further stub functionality without the base lib growing too much.
+ All of the files that reference this functionality have been modified accordingly.
+
+ * made wrap_xmlrpc_method generate better code (with php type juggling), and
+ some phpdoc for the generated function, too
+
+ * added to debugger an option to produce for the user the generated php code
+ for wrapping a call to a remote method into a php function
+
+2006-06-22 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.inc: added description of parameters for system.xxx methods (useful with
+ html-self-documenting servers);
+ server->service() now returns response object, in case user has need for it...
+
+ * xmlrpc.inc: save full response payload into xmlrpcresp obj for better debugging
+
+2006-06-15 Gaetano Giunta <giu...@gm...>
+
+ * verify_compat.php: more tests
+
+2006-06-09 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.inc: fixed sending of compressed responses when output compression
+ is already enabled in php.ini
+
+ * verify_compat.php: split tests between server and client cases
+
+2006-05-29 Gaetano Giunta <giu...@gm...>
+
+ * added new file: verify_compat.php, to help troubleshooting platform
+ support for the library; added it to makefile, too
+
+2006-05-24 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: removed residual usage of regexp in favour of pregexps; fixed
+ a bug in specifying Host http header with non std ports
+
+2006-05-23 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: improvements to wrap_php_function: let it deal correctly
+ with php functions returning xmlrpcresp objs; make it generate also
+ docs for single parameters (useful for documenting_xmlrpc_server class)
+
+2006-05-22 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc, xmlrpcs.inc: minor performance tuning updates: replaced
+ some explode vs. split, ereg vs. preg, single vs. double quotes
+
+ * xmlrpc.inc: fix wrap_xmlrpc_method to NOT rebuild php objects received
+ from the server by default, as it might pose a security risk
+
+2006-04-24 Gaetano Giunta <giu...@gm...>
+
+ * minor fixes makefiles. Tagged and released as 2.0 final
+
+2006-04-22 Gaetano Giunta <giu...@gm...>
+
+ * debugger/*: added option to set cainfo; improve web layout
+
+ * xmlrpc.inc: set sslverifypeer to TRUE instaed of 1 by default
+
+ * doc/php_xmlrpc.xml: documentation updates
+
+2006-04-21 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: added option to set ca certs dir instead of single cert
+ (used to validate server in https connetions)
+
+2006-04-18 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fixed bug in xmlrpcval::structmemexists()
+
+ * testsuite.php: added test case for xmlrpcval::structmemexists()
+
+2006-04-03 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: add support for Digest and NTLM authentication, both to server
+ and to proxies (note: must use CURL for this to work)
+
+ * debugger/*: add support for Digest/NTLM auth to remote servers
+
+2006-03-19 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fix a bug parsing of 'true' bool values;
+ added a new method to the client class: SetCaCertificate;
+ add column number in xml parsing error messages;
+ fix serialization of messages to ISO-8859-1 charset with php 5 (by adding
+ encoding to the xml prologue of generated messages)
+
+ * xmlrpcs.inc: correct detection of charset in http headers;
+ add column number in xml parsing error messages;
+ fix serialization of responses to ISO-8859-1 charset with php 5 (by adding
+ encoding to the xml prologue of generated responses)
+
+ * testsuite.php: added two more tests on charset encoding
+
+ * NEWS: update info for impending release
+
+2006-03-23 Gaetano Giunta <giu...@gm...>
+
+ * added a new demo file: simple_call.php
+
+2006-02-20 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.inc: more error checking and logging with regard to user-coded
+ method handler functions not being well behaved;
+ fix a case where error handler would not be reset upon user function
+ returning not valid xmlrpresp
+
+ * xmlrpc.inc: fix bug in detection of php 4.3.0
+
+ * Makefile: fix uppercase filenames
+
+2006-02-15
+
+ * xmlrpc.inc: parse 'true' and 'false' as valid booleans, even though the
+ spec is quite clear on that; fix small bug w. internal_encoding = utf8; add
+ definition of $GLOBALS['xmlrpcNull'] for extensibility, e.g. json or
+ extensions to the xmlrpc spec
+
+2006-02-05 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fix bug in wrap_xmlrpc_method if client passed to function has
+ return_type=phpvals
+
+ * all demo files: review code, add more comments and information
+
+ * added 2 demo files: proxy.php (implementing an xmlrpc proxy server) and
+ wrap.php (showing usage of wrap_method_call)
+
+2006-02-04 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fix bug in multicall in case of no fallback and server error
+
+2006-01-30 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fix recursive serialization of xmlrpcvals loosing UTF8 charset;
+ correctly set type field of xmlrpcvals returned by send() calls
+
+ * xmlrpcs.inc: add to server checks for correct return type of user-coded
+ method handling function; tolerate xmlrpcval instead of xmlrpcresp
+
+ * minor change in xmlrpcresp internals, to ease subclassing (store payload
+ in an internal var on serialize(), same as xmlrpcclient does)
+
+2006-01-22 Gaetano Giunta <giu...@gm...>
+
+ * benchmark.php: do not run http 1.1 tests if CURL notfound
+
+ * Released as 2.0 Rc3
+
+2006-01-19 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: make xmlrpc_client::setDebug() accept int values instead of
+ boolean. At level 2, the request payload is printed to screen before being
+ sent; fix bug with repeated sending of the same msg object and using request
+ compression w. php 5.1.2 (objects passed by ref by default!!!)
+
+ * xmlrpcs.inc: fix detection of clients accepting compressed responses
+
+ * comment.php: remove warnings due to liberal usage of $HTTP_POST/GET_VARS
+
+ * benchmark.php: add a test using http compression of both requests and
+ responses
+
+ * testsuite.php: added test for fix in xmlrpc.inc
+
+2006-01-17 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.php: minor fix: do not raise a PHP warning when std server is
+ called via GET (global HTTP_RAW_POST_DATA undefined). Some might have called
+ it a security breach (path disclosure)...
+
+2006-01-15 Gaetano Giunta <giu...@gm...>
+
+ * testsuite.php: minor fix to expected date format in http cookie hedaer
+ to cope with PHP 5.1.2
+
+2006-01-05 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.inc: merge code from the 'extras' subclass that allows server
+ to register plain php functions in dispatch map instead of functions
+ accepting a single xmlrpcmgs obj parameter.
+ One step closer to the kitchen sink!!!
+
+2005-12-31 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.inc: let the server accept 'class::method' syntax in the dispatch
+ map
+
+ * testsuite.php, server.php: added new tests for the recent charset encoding
+ capabilities
+
+2005-12-24 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: correctly serialize() string xmlrpcvals that have been
+ created out of non-string php variables, when internal encoding is UTF8;
+ serialize to '0' int and double values created out of non-string php
+ variables, eg. 'hello', instead of creating invalid xmlrpc;
+ extend the php_xmlrpc_encode function to allow serializing string values
+ to charsets other tha US-ASCII;
+ minor tweak to xml parsing to allow correct parsing of empty strings when
+ in 'direct to php values' mode
+
+ * xmlrpcs.inc: advances in system.multicall with plain php values
+
+2005-12-17 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.inc: let the functions implementing the system.* methods work
+ fine when called with plain php values as parameters instead of xmlrpcmsg
+ objects (multicall not quite finished yet...);
+ encode level 3 debug info as base64 data, to avoid charset encoding hell
+
+ * xmlrpc.inc: added a new xmlrpc_2_php_type function, to get the name of
+ php types corresponding to xmlrpc types;
+ in debug mode, when detecting base64 server debug info, print it out fine
+
+ * server.php: cosmetic fixes
+
+2005-12-09 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: remove one warning emitted when received xml contains an
+ unknown tag; remove warnings emitted when custom error handler is set
+ and user calls php_xmlrpc_encode/decode without the 2nd parameter
+
+ * xmlrpcs.inc: added a param to service(), to allow the server to parse
+ data other than the POST body (useful for subclassing and debugging);
+ reworked the implementation of server debug messages at debug level 2:
+ since the debug info generated has no known charset, and putting it back
+ into the response's xml would most likely break it, send it back to the
+ client as a base64 encoded comment. Clients can decode it if they need it...
+ Add some more javadocs
+
+ * testsuite.php: modified the string test, to see if the server can echo
+ back to the client the received data without breaking the response's xml
+
+2005-12-05 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc, xmlrpcs.inc: let server and client objects decide if they
+ want to use some charset encoding other than US-ASCII for serialized data:
+ add a new var to both objects, and lots of parameters to function calls
+ that took none up to now;
+ refactored server method service() and parseRequest(), implementing a
+ new parserequestHeaders() method to explicitly deal with HTTP
+
+2005-12-01 Gaetano Giunta <giu...@gm...>
+
+ * moved the jsonrpc implementation and the new wsdl stuff to a separate
+ CVS module; updated the makefile to reflect it
+
+2005-11-24 Gaetano Giunta <giu...@gm...>
+
+ * modified php_xmlrpc_decode() to work on xmlrpcmessages too, besides
+ xmlrpcvals. To achieve this, added a new method: xmlrpcmsg::kindOf()
+
+2005-11-22 Gaetano Giunta <giu...@gm...>
+
+ * released as 2.0 RC2
+
+2005-11-21 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fix warnings about references for PHP 4.1.X
+
+ * Whitespace cleanup on all the lib
+
+2005-11-16 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: rewritten xmlrpc_encode_entitites adding two extra parameters
+ that specify input and output charset encodings. This corrects the bug that
+ prevented native UTF-8 strings to be correctly serialized (to have them
+ encoded the user must set $xmlrpc_internalencoing appropriately).
+
+ * xmlrpc.inc: added new method xmlrpcmsg::parseResponseHeaders(), refactoring
+ parseResponse(). This makes the code more modular and eases subclassing.
+
+ * xmlrpc.inc: set cookies and http headers to xmlrpcresp objs even when calls
+ to send() do not complete correctly
+
+ * added new file: jsonrpcs.inc, to accomodate server jsonrpc objects in the future
+
+ * jsonrpc.inc: slow progress...
+
+2005-11-10 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fixed the xmlrpc_client send and sendpayloadhttps methods
+ to fix errors in calling https servers;
+ added a new xmlrpc_client->setkey method to allow usage of client-side ssl
+ certs in recent php builds;
+ added to xmlrpcresp objects a content_type var, to be used in HTTP headers
+
+ * xmlrpcs.inc: separate generation of content-type http header and xml prologue
+ from the service() method, to ease subclassing
+
+2005-11-03 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: moved the 'text/xml' mimetype string as class var of the xmlrpcmsg
+ object instead of having it cabled into xmlrpc_client->send(): this allows to
+ create subclasses of xmlrpcmsg that use a different mimetype
+
+ * jsonrpc.inc: added a new file, with an extremely experimental set of classes,
+ designed to implement a json-rpc client and server, taking advantage of the
+ existing xml-rpc infrastructure
+
+2005-10-28 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: changed constructor method for xmlrpcresp, making it smarter in
+ case user does not declare the type of value it is passing to it;
+ minor changes in serialization of xmlrpcresp with error codes, so that it
+ utputs LF instead of CRLF on windows boxes after an FTP transfer of the code, too
+
+2005-10-26 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: added a new var of class xmlrpc_client, indicating what kind of
+ object will be stored in the value() of xmlrpcresp's gotten from the send()
+ method: xmlrpxc objects, plain php variables or raw xml. This allow the coder
+ to make use of xmlrpc_decode for better performances if he wishes so.
+ Modified creator of xmlrpcresp class to allow it to distinguish between being
+ created out of raw xml or a plain php string (in the former case, serialization
+ is still possible, opening a new world of opportunity for server-side programming:
+ the php function implementing a web service has to provide the xml for the
+ return value on its own).
+ Modified xmlrpc_client::multicall() to suit; also added a new parameter which
+ allows calls to multicall without automatic fallback to many-calls in case of
+ error (speeding up the process of doing a failed multicall() call quite a bit)
+ Fixed two bugs in guess_encoding.
+ Audited all regexps and fixed some.
+ xmlrpc_client::send() does not call xmlrpcmsg::parseresponsefile() anymore.
+ Shuffled parseresponse() a little bit
+
+ * testsuite.php: added a new testcase for the modifications to multicall():
+ now we test the case where xmlrpc_client returns php values, too
+
+2005-10-24 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fixed guess_encoding() to always return uppercase chars
+
+ * added new file: benchmark.php. It contains a few tests used to evaluate
+ speed of the lib in common use cases
+
+ * added file parse_args.php, containing common code for benchmark and
+ testsuite, and modified testsuite.php accordingly
+
+ * modified makefile adding new files
+
+ * testsuite.php: added a couple of new test cases; fixed one warning
+ emitted in php 5 E_STRICT mode
+
+2005-10-20 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: modify 3d param of ParseResponse(), allowing the function to
+ return the raw xml received as value of the xmlrpcresponse object.
+ This allows eg. to have epi-xmlrpc decode the xml for faster execution.
+
+2005-10-09 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fixed error that prevented usage of HTTPS (the client
+ always determined that ssl support was not present)
+
+2005-10-03 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc, xmlrpcs.inc: revert direction of stack growth during xml
+ parsing for faster execution time; add support for detecting charset
+ encoding of received xml; add support for cookies; better parsing of
+ javadoc when building stub code in wrap_php_function; add a lot of
+ javadoc comments everywhere; rewrite most error messages
+
+ * testsuite.php: add many tests for newly introduced features
+
+ * server.php: add a couple of new functions to support debugging new
+ features
+
+ * debugger: add switches to enable all the latest lib features; minor
+ improvements to layout
+
+ * synch included phpunit with latest PEAR release
+
+ * reorganize files included in the distribution in a new hierarchy of folders
+
+ * bump revision number to 2.0RC1 and release
+
+2005-8-14 Miles Lott <mi...@gr...>
+
+ * xmlrpc.inc, xmlrpcs.inc: Remove all use of eval() to avoid potential
+ security hole.
+
+ * As of this release we are no longer php3-compatible.
+
+2005-8-10 Miles Lott <mi...@gr...>
+
+ * xmlrpc.inc, xmlrpcs.inc: Switched to using $GLOBALS instead of calling
+ global $varname
+
+2005-07-22 Miles Lott <mi...@gr...>
+
+ * Removed: bug_* files
+
+2005-07-14 Gaetano Giunta <giu...@gm...>
+
+ * debugger: added a workaround to disable using the debugger for attacking
+ older versions of the lib
+
+ * testsuite.php: added code to test wrap_xmlrpc_method;
+ use different wording for failed tests
+
+ * xmlrpcs.inc: change for() with foreach() in system.* methods implementations;
+ remove a possible cause of php warning;
+
+ * xmlrpc.inc: let wrap_php_function and wrap_xmlrpc_method find suitable
+ function names if default function names are already in use;
+ correct wrap_xmlrpc_method to not set http protocol to 1.0 when not asked to;
+ detect curl compiles without SSL
+
+2005-07-14 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: more auto-fix of xmlrpc_client path: '' -> '/';
+ change to the method used for detecting failed evals (php 4.0.x compatibility);
+ complete rework of return-by-ref functions to comply with php 4.4.0
+
+ * xmlrpcs.inc: change to the method used for detecting failed evals (php 4.0.x
+ compatibility)
+
+ * testsuite.php: major rewrite of the multi- tests, to give better feedback on
+ number of failed tests;
+ flush html page title to screen before starting tests;
+
+2005-07-13 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: let xmlrpcmsg creator be forgiving of target paths that miss the
+ starting '/' char;
+ completely reworked assign-by-ref to be compliant with php 4.4.0 stricter
+ warnings
+
+ * testsuite.php: added ability to be run from cli: (really dumb) separation of
+ html and plain text outputs + parsing of argv parameters
+
+2005-07-12 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: compatibility fixes with PHP versions 4.0.x (and remove some for
+ PHP 3)
+
+ * xmlrpcs.inc: compatibility fixes for PHP 4.0.x versions
+
+ * testsuite.php: better support for running with php versions 4.0.x;
+ do not generate runtime errors but finish tests anyway if some calls to
+ localhost fail;
+ correctly detect a localhost port different from 80 for running tests against
+
+2005-07-11 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: preliminary building of method signature and docs in
+ wrap_php_function;
+ fix a bug in extracting function description from javadoc block in
+ wrap_php_function;
+ small fix for better compatibility with php < 4.2.0
+
+ * added compat subdir with extra code, taken form PEAR package Compat, to let
+ the lib run fine with php 4 versions < 4.1
+
+2005-07-10 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: some nazi whitespace corrections;
+ declared global $xmlrpcBoolean too (was the only one missing);
+ used @eval inside getval() to have less path disclosure security reports filed
+ in the future;
+ added new global var: $xmlrpcValue, to be used in server dispatch maps as
+ placeholder for a param which can be of any kind;
+ big chunks (but still incomplete) of javadoc parsing in wrap_php_function
+ + changed type of return val - now it is the complete array to be put in the
+ dispatch map
+
+ * xmlrpcs.inc: let previous error handler be called by server to handle errors
+ even if in debug level 3;
+ default to compress responses if zlib installed;
+ added a new val useful for only checking number (not type) of params in method
+ calls;
+ let user use object methods in dispatch map using the
+ array($obj, 'fmethodname') format
+
+ * server.php: Added code called by testsuite.php to exercise registration of
+ object methods as xmlrpc methods and auto-registration of php functions as xmlrpc
+ methods
+
+ * testsuite.php: added tests to exercice server registering object methods as
+ xmlrpc methods and automatic registration of php functions as server methods;
+ added a hint to enable debug if some test goes wrong;
+ renamed https test for better clarity
+
+2005-07-07 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: added function to be used for 'guestimating' charset encoding of
+ received xml (not activated yet)
+
+ * server.php: Let server compress content by default if user asks so: it allows
+ testsuite to check for compressed responses
+
+ * testsuite.php: added suite of tests for compressed responses; test CURL
+ (http1.1) with all possible compression combinations too
+
+2005-07-06 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: Enable setting usage of keepalives on/off (for CURL cases);
+ implement compression of xmlrpc requests; enable new syntax of xmlrpclient
+ constructor: 1 - allow preferred http method to be set at creation time,
+ 2 - allow user to insert a single complete URL as only parameter and parse it;
+ try to detect if curl is present whether it has been compiled w. zlib to enable
+ automatically the reception of compressed responses
+
+ * xmlrpcs.inc: do not add into logs the content of the request, if it was
+ received gzipped/deflated, to avoid breaking the xml sent back as response
+ (NB: might be investigated further: is the problem caused by windows chars in
+ the range 128-160 ?)
+
+ * testsuite.php: run all localhost tests 2 more times, to stress request
+ compression;
+ run all localhost tests in a row using keepalives, to test keepalive
+ functionality
+
+2005-07-05 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: let CURL pass back to caller function the complete PHP headers
+ as it did before: it enables better logging / debugging of communication;
+ small change to the way CURL declares its ability to receive compressed
+ messages (fix for the case where zlib is compiled in PHP but not in curl);
+ added Keep-alive (ON BY DEFAULT) for http 1.1 and https messages (had to modify
+ a lot of functions for that);
+ always make sure a 'Connection: close' header is sent with curl connections if
+ keep-alive is not wanted
+
+ * phpunit.php: switched to PEAR PHPUnit (rel 1.2.3), since it is maintained a
+ lot more than the old version we were using
+
+ * added new folder with code of phpunit classes
+
+ * testsuite.php: added a new run of tests to check for compliance of client
+ when using http 1.1;
+ switched to PEAR PHPUnit classes;
+ divided test for client ability to do multicall() into 2 separate tests
+
+2005-06-30 Gaetano Giunta <giu...@gm...>
+
+ tagged and released version 1.1.1, backporting security fixes from HEAD
+
+2005-06-28 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.inc: fix changes introuced yesterday in a rush;
+ do not list system.* methods for a server that has them explicitly disabled
+
+ * bug_inject.xml: new test case used to check for code injection vulnerability
+
+ * testsuite.php: added a test case for zero parameters method calls;
+ added two test cases for recently found code injection vulnerabilities
+
+2005-06-27 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: (tentative) fix for security problem reported by
+ sec...@gu...: we were not properly php-escaping xml received for
+ BASE64 and NAME tags;
+ some more patching related to junk received in xml messages/responses: if the
+ PHP code built from the parsed xml is broken, catch any generated errors
+ without echoing it to screen but take note of the error and propagate to user
+ code
+
+ * xmlrpcs.inc: some more patching related to junk received in xml messages/
+ responses: if the PHP code built from the parsed xml is broken, catch any
+ generated errors without echoing it to screen but take note of the error and
+ propagate to user code
+
+2005-06-24 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fixed php_xmlrpc_encode detection of php arrays (again!);
+ removed from wrap_php_function the part about setting a custom error handler
+ (it can be activated using the more general $server->setdebug(3) anyway)
+
+ * xmlrpcs.inc: added to server the capability to trap all processing errors
+ during execution of user functions and add them to debug info inside responses;
+ return a (new) xmlrpcerr response instead of raising some obscure php execution
+ error if there is an undefined function in the dispatch map
+
+ * testsuite.php: Added new testcases for recently implemented stuff
+
+2005-06-23 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: added new method: xmlrpcval->structmemexists, to check for
+ presence of a wanted struct member without having to loop through all members;
+ fix wrap_php_functions: correctly return false for php internal functions,
+ whose param list is unknown;
+ let addscalar fail as it should if called on struct vals;
+ fix addstruct: do not fail when called for adding stuff to initialized structs;
+ removed a warning generated when calling addscalar with inexistent type;
+ massive code review for speed: replaced each() loops with foreach(), removed
+ lots of useless assignments and duplications of data;
+ added 'http11' as valid method param for xmlrpclient->send: makes use of curl
+ for sending http 1.1 requests;
+ changed a couple '=' into '=&' where objects are returned;
+ fixed wrap_php_function() to better detect php errors while processing wrapped
+ function
+
+ * xmlrpcs.inc: Fix php warnings generated when clients requested method
+ signature / description for a method that had none in its dispatch map;
+ turned server->debug into an integer value that will change the amount of
+ logging going as comments into xmlrpc responses
+
+ * server.php: set default server debug level to 2
+
+ * testsuite.php: removed calls to deleted functions (xmlrpc_encode,
+ xmlrpc_decode);
+ added html page title describing target servers used for tests;
+ added an assign-by-ref
+
+ * phpunit.php: Do not consider as failures PHP 5 E_STRICT errors (arbitrary
+ choice, but lib is targeted at PHP 4)
+
+2005-06-22 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: removed lottsa old code that had been left in commented
+
+ * xmlrpc.inc: fixed setting of proxy port
+
+ * xmlrpc.inc: removed one warning when trying to decompress junk sent as
+ deflated response
+
+ * xmlrpc.inc: changed the error messages (but not the code) that will be found
+ in xmlrpcresponses when there are socket errors, to differentiate from HTTP
+ errors
+
+ * xmlrpc.inc: refactored xmlrpcclient->sendpayloadHTTPS: now it calls a new
+ method (sendpayloadCURL) that could be used also for generating HTTP 1.1
+ requests
+
+ * xmlrpc.inc: added two new methods: wrap_php_function and wrap_xmlrpc_method:
+ designed to let the lazy programmer automagically convert php functions to
+ xmlrpc methods and vice versa. Details are in the code
+
+ * debugger/*: added initial revision of a 'universal xmlrpc debugger'
+
+2005-06-20 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: replace usage of 'echo' with error_log when errors arise
+ in manipulation of xmlrpcval objects
+
+ * xmlrpc.inc: replaced <br> with <br /> in dump function
+
+ * xmlrpc.inc: added method structsize to xmlrpcval class (alias for arraysize)
+
+ * xmlrpc.inc: addarray() now will add extra members to an xmlrpcval object
+ of array type; addstruct() can be used to add members to an xmlrpcval object
+ of struct type
+
+ * xmlrpcs.inc: Added member allow_system_funcs to server: controls whether the
+ server accepts or not calls to system.* functions
+
+2005-05-10 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fix regression in php_xmlrpc_encode when encoding php hashes;
+ fix decompression of gzip/deflated xmlrpc responses;
+ set user agent string correctly in SSL mode (was forgetting lib name);
+ add allowed encoding http headers in requests;
+ do not pass http headers back from curl to parseresponse, to avoid re-decoding
+ compressed xml or http 100 headers
+
+ * xmlrpcs.inc: added method setDebug;
+ renamed compress_output to compress_response;
+ do not try to set http headers if they have already been sent, because trying
+ to do so will raise a PHP error, and if headers have been sent something has
+ gone wrong already (shall we send a meaningful error response instead?)
+
+2005-05-08 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.inc, xmlrpcs.inc: reverted to usage of '=& new' for better
+ performance on (some) php4 installs.
+ NB: PHP 3 compatibility is deprecated from now on!
+
+ * xmlrpc.inc: decode xmlrpc boolean type to native php boolean
+
+ * xmlrpcs.inc, xmlrpcs.inc: switched $_xh[$parser] to $_xh, since indexing
+ an array by object will give a warning in php 5 (and we were resetting the
+ array of _xh elements on every call anyway)
+
+ * xmlrpc.inc: commented unused code used originally for escaping content
+
+ * xmlrpc.inc: commented deprecated methods xmlrpc_encode and xmlrpc_decode
+
+ * xmlrpc.inc: php_xmlrpc_encode: encode integer-indexed php arrays as xmlrpc
+ arrays instead of structs; if object given to encode is an xmlrpcval return it
+ instead of reencoding (makes easier calling encode on an array of xmlrpcvals)
+
+ * xmlrpcs.inc: added $debug field to server class; if false will prevent
+ the server from echoing debug info back to the client as xml comment
+
+ * xmlrpcs.inc: let the server add to the debug messages the complete request
+ payload received and (if php installed as apache module) http headers, so that
+ the client in debug mode can echo a complete fingerprint of the communication
+
+ * xmlrpcs.inc: changed API of ParseRequest method: now it cannot be called
+ without a 'data' parameter; added 2nd parameter (http encoding); changed the
+ call to this method from inside service() method
+
+ * xmlrpc.inc, xmlrpcs.inc: enable both server and client to parse compressed xml
+ (if php is compiled with zlib); client should also be able to decode chunked
+ http encoding
+
+ * xmlrpc.inc: add support for proxies (only basic auth supported); default port
+ is 8080 (if left unspecified)
+
+ * xmlrpc.inc: use lowercase for names of http headers received (makes using
+ them much simpler, since servers can use any upper/lowercase combination)
+
+ * xmlrpc.inc: bumped version number to '2.0 beta'
+
+2005-05-08 Gaetano Giunta <giu...@gm...>
+
+ * release of version 1.1
+
+2005-04-24 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.inc: removed charset declaration from xml prologue of responses,
+ since we are now escaping all non-ascii chars in an encoding-independent way
+
+ * bug_http.xml: modified to exercise some extra functonality of the lib
+ (it should now be failed by the current PEAR implementation of the lib)
+
+ * xmlrpc.inc: bumped up rev. number to 1.1
+
+ * doc/xmlrpc_php.xml, doc/announce1_1.txt: documentation updates
+
+ * Makefile: updated to reflect new xml doc source, modified filelist
+
+2005-04-17 Gaetano Giunta <giu...@gm...>
+
+ * client.php, agesort.php, introspect.php, introspect_demo.php,
+ which.php, test.pl, test.py: use as default target the server.php page hosted
+ on phpxmlrpc.sf.net
+
+ * server.php: fix for register_globals off; refer to docs on phpxmlrpc.sf.net
+
+2005-04-15 Miles Lott <mi...@gr...>
+
+ code formatting and comments
+
+2005-04-03 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: make use of global var $xmlrpcName in building User_Agent HTTP
+ header (in conjunction with $xmlrpcVersion)
+
+ * agesort.php, client.php, comment.php, dicuss.php, mail.php, server.php,
+ which.php: various janitorial fixes
+ + always html escape content received from xmlrpc server or from user input
+ + make the scripts run fine with register_globals off an register_long_arrays off
+ + always use the functions php_xmlrpc_en(de)code, even if the EPI extension
+ is not installed
+ + in mail.php, allow user to see script source even if support for .phps files
+ is not configured in the local web server
+
+ * testsuite.php: better detection of local webserver hostname for running tests
+ against (if the user did not supply a webserver name)
+
+2005-03-21 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.inc: revert to a PHP3 compatible script (change '=& new' to '= new')
+
+ * xmlrpc.inc: revert to a PHP3 compatible script (lottsa fixes)
+
+ * testsuite.php: default to using local server as test target if no user
+ provided values are available instead of heddley.com server
+
+ * testsuite.php: play nice to PHP3 in retrieving user-passed values
+
+ * testsuite.php: fix constructor method name for a type of tests
+
+ * phpunit.php: fix all cases of call-time-pass-by-ref
+
+ * phpunit.php: rename Exception class to _Exception if the script is run with
+ PHP 5 (exception is a reserverd word)
+
+2005-03-19 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fixed bug in new http header parsing code in case there is
+ no correct separator between response headers and body
+
+ * xmlrpc.inc: added recognizing and stripping of HTTP/1.1 100 response headers
+
+ * xmlrpc.inc: strip extra whitespace from response body, as well as any junk
+ that comes after the last </MethodResponse> tag. It allows the server code to
+ be put on public providers that add e.g. javascript advertising to served pages
+
+ * xmlrpc.inc: removed unused parts of code, trailing whitespace
+
+ * xmlrpc.inc: fix possible bug (?) in xmlrpc_ee for BOOLEAN values: true was
+ being handled differently than false
+
+ * testsuite.php: added a new file-based test to stress the response parsing
+ modifications recently introduced; enabled debugging for file based tests
+
+2005-03-15 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: fixed missing declaration of global vars in xmlrpc_dh,
+ sendpayloadhttps and sendpayloadhttp10
+
+ * xmlrpc.inc: changed error message for invalid responses: 'enable debugging'
+ is more clear that 'enabling debugging' (the user is being encouraged to do it)
+
+ * xmlrpc.inc: rewrote HTTP response header parsing. It should be more tolerant
+ of invalid headers, give more accurate error messages and be marginally faster,
+ too.
+
+ * xmlrpc.inc: cosmetic whitespace fixes and remove useless one-liners
+
+ * xmlrpc.inc: build a shorter PHP command line to be evaluated for rebuilding
+ values from parsed xml: use '$val =& nex xmlrpcval("value")' for string values
+ instead of '$val =& nex xmlrpcval("value", $xmlrpcString)'
+
+ * xmlrpc.inc: fix change introduced 2005/01/30 moving call to curl_close()
+ too early: it did not work on error situations
+
+ * testsuite.php: fix name of testAddingTest method, renamed testErrosString
+ into testErrorString and removed useless warning for register_globals=off case
+
+2005-02-27 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: do not echo XML parsing error to screen (it is already dumped
+ into error log)
+
+ * xmlrpc.inc: set hdrs field into response object in case of XML parsing error
+ (uniform behaviour with other responses)
+
+2005-02-26 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: use global var $xmlrpcVersion as number for user agent string
+
+ * xmlrpcs.inc: eliminate server side PHP warning and give back to caller
+ a better error msg in case the called method exists but no signature matches
+ the number of parameters
+
+2005-02-20 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: accept a + sign in front of floats / integers, since the spec
+ clearly mentions it
+
+ * xmlrpc.inc, xmlrpcs.inc: renamed function XmlEntities to xmlrpc_encode_entitites,
+ to avoid using the same name as an array already defined
+
+ * xmlrpc.inc: fix bug introduced with escaping of UTF8 chars in xmlrpc error
+ responses: correct behaviour is to escape chars inside serialize(), not when
+ calling the xmlrpcresp creator
+
+ * testsuite.php: made test suite more friendly to modern PHP configs, allowing
+ register_globals to be off and to set in the URL all testing parameters;
+ added tests for newly introduced fixes; renamed existing tests acording to the
+ docs inside phpunit.php (e.g. no subclass of TestCase should have a name
+ starting with test...)
+
+2005-02-19 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: accept patch 683153 by mah0: if timeout is set, allow all socket
+ operations to timeout at the given time, not only the socket connection
+
+2005-02-13 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: be tolerant to double values received in exponential notation:
+ even though the spec forbids their usage PHP is fine with them
+
+ * xmlrpc.inc: fix bug: new xmlrpcval('-1') was creating an empty value instead
+ of a string value!
+
+ * xmlrpc.inc, xmlrpcs.inc: fix the payload encoding changes introduced by
+ Andres Salomon on 2004-03-17: sending named html entities inside an xml chunk
+ makes it invalid, and thus renders the lib absolutely non-interoperable with
+ any other xmlrpc implementation; moreover the current implementation only ever
+ worked for non-ascii requests, while breaking client-parsing of responses
+ containing non-ascii chars.
+ The principle of using entities is preserved though, because it allows the
+ client to send correct xml regardless of php internal charset encoding vs.
+ xml request charset encoding, but using 'character references' instead.
+
+ * xmlrpc.inc: encode (non-ascii) chars into charset entities also for error
+ strings
+
+ * xmlrpcs.inc: encode (non-ascii) chars into charset entities also for debug
+ messages
+
+ * xmlrpcs.inc: added 'Accept-Charset' header in http request to let the server
+ know what kind of charset encoding we do expect to be used for responses
+
+ * xmlrpc.inc, xmlrpcs.inc: explicitly tell the xml parser what charset the
+ application expects to receive content in (notably strings). A new variable,
+ $xmlrpc_internalencoding, (defaulting to ISO-8859-1) defines what charset the
+ parser will use for passing back string xmlrpcvals to the PHP application
+ (both server-side and client-side).
+ This allows transparent usage of e.g. UTF-8 for encoding xml messages between
+ server and client and ISO-8859-1 for internal string handling.
+ ISO-8859-1 is, AFAIK, PHP internal encoding for all installs except
+ mbstring-enabled ones.
+
+2005-02-12 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpcs.inc: use '$var =& new(' construct to assign objects: on older versions
+ of PHP objects are first built then copied over if the ampersand is omitted.
+ Using it should make the code a little bit faster...
+
+ * doc/xmlrpc.php: update lib version number, release date in preparation for
+ next release
+
+ * makefile: update lib version number in preparation for next release
+
+ * xmlrpc.inc: split up parsing of xmlrpc INT and DOUBLE values. This allows
+ finer-grained control over valid values: now the '.' char is not allowed
+ any more inside int values.
+
+ * xmlrpc.inc: fix for bug #560303: ints and doubles starting with '0' chars are
+ no more parsed as octal values
+
+2005-01-30 Gaetano Giunta <giu...@gm...>
+
+ * xmlrpc.inc: Modifed last change by Miles: the functions php_xmlrpc_encode
+ and php_xmlrpc_decode are now always defined, regardless of the existence of
+ XMLRPC-EPI. This allows users to start using these functions as the 'default'
+ functions, and pave the way for future deprecation of xmlrpc_encode/encode
+ while maintaining a stable API.
+
+ * xmlrpc.inc: use '$var =& new(' construct to assign objects: on older versions
+ of PHP objects are first built then copied over if the ampersand is omitted.
+ Using it should make the code a little bit faster...
+
+ * xmlrpc.inc: close curl connection as soon as possible for https requests:
+ it could save some memory / resources.
+
+ * xmlrpc.inc: added some extra info in the PHP error log message generated
+ when an invalid xmlrpc integer/float value is encountered and we try to
+ deserialize it.
+
+ * xmlrpc.inc: added @ char before fsockopen to avoid echoing useless warnings
+ when connection to server fails; added the same to avoid echoing warnings when
+ deserializing data of an unknown type
+
+ * xmlrpc.inc: reset the _xh array on each xmlrpc call: otherwise a new array
+ member is created for each consecutive call and never destroyed, thus making it
+ impossible to build an xmlrpc-client daemon beacuse of memory leaking.
+
+ * xmlrpc.inc: declare global the variables that are used as 'constants',
+ so that xmlrpc.inc will work even if it is included from within a function
+
+2004-12-27 Miles Lott <mi...@gr...>
+ * xmlrpc.inc: A new constant, XMLRPC_EPI_ENABLED, is defined depending on
+ the existence of the function, xmlrpc_decode. This function will exist in
+ PHP if the extension, XMLRPC-EPI (http://xmlrpc-epi.sourceforge.net), is
+ loaded. It defines the functions xmlrpc_encode and xmlrpc_decode, which
+ will conflict with functions of the same name in xmlrpc.inc. If this
+ extension is loaded, we instead use the names php_xmlrpc_encode and
+ php_xmlrpc_decode. Please look at server.php, testsuite.php, etc., for
+ how this should be handled if using these functions.
+
+2003-04-17 Andres Salomon <dil...@vo...>
+ * xmlrpc.inc: encode strings using htmlentities() instead of
+ htmlspecialchars(), and add xmlrpc_html_entity_xlate(). This
+ should fix longstanding issues with sending weird chars (from
+ non-USASCII codesets like UTF-8, ISO-8859-1, etc) that caused
+ the xml parser to choke. Multi-byte chars are now changed to
+ entities before sending, so that the xmlrpc server doesn't need
+ to know the encoding type of the POST data.
+ * xmlrpcs.inc: call xmlrpc_html_entity_xlate before parsing
+ request packet. The parser chokes on unknown entities (the
+ entities created by htmlentities() are exactly that; html
+ entities, not xml entities), so they must be converted from
+ name form (é) to numerical form (é).
+
+2003-01-12 Andres Salomon <dil...@vo...>
+
+ * released 1.0.99.2.
+ * Makefile: separate doc/Makefile a bit more from Makefile,
+ and add clean rules.
+
+2003-01-10 Andres Salomon <dil...@vo...>
+
+ * xmlrpc.inc: xmlrpcresp and parseResponse cleanups; variable
+ name renames ('xv' to 'val', for example), type checking, and
+ stricter default values.
+ * xmlrpc.inc: fix xmlrpcresp's faultcode; return -1 for FAULT
+ responses from the server whose faultcodes don't reflect any
+ errors.
+
+2003-01-08 Andres Salomon <dil...@vo...>
+
+ * xmlrpc.inc: rename $_xh[$parser]['ha'] to
+ $_xh[$parser]['headers'].
+ * xmlrpc.inc: fix bugs related to $_xh[$parser]['headers];
+ some places treated this as an array, others as a scalar.
+ Treat unconditionally as an array. Also wrap header debugging
+ output in PRE tags.
+
+2002-12-17 Andres Salomon <dil...@vo...>
+
+ * released 1.0.99.
+ * Makefile: changed the tarball format/dist rule to a more
+ conventional form, as well as normal release updates.
+ * xmlrpc.inc: added setSSLVerifyPeer and setSSLVerifyHost; as
+ of curl 7.10, various certificate checks are done (by default).
+ The default for CURLOPT_SSL_VERIFYHOST is to ensure the common
+ name on the cert matches the provided hostname. This breaks a
+ lot of stuff, so allow users to override it.
+ * doc/xmlrpc_php.sgml: updated documentation accordingly.
+
+2002-09-06 Geoffrey T. Dairiki <da...@da...>
+
+ Add support for system.multicall() to both the client
+ and the server.
+
+ * testsuite.php: Add new tests 'testServerMulticall',
+ and 'testClientMulticall'.
+
+ * xmlrpc.inc: Added new error messages for system.multicall().
+ * xmlrpcs.inc: Added new procedure call system.multicall().
+ See http://www.xmlrpc.com/discuss/msgReader$1208 for details.
+
+ * xmlrpc.inc: Added system.multicall functionality to
+ xmlrpc_client. xmlrpc_client::send can now take an array of
+ xmlrpcmsg's as an argument. In that case it will attempt
+ to execute the whole array of procure calls in a single
+ HTTP request...
[truncated message content] |
|
From: <sot...@us...> - 2011-02-06 09:43:06
|
Revision: 4539
http://weberp.svn.sourceforge.net/weberp/?rev=4539&view=rev
Author: sotandeka
Date: 2011-02-06 09:43:00 +0000 (Sun, 06 Feb 2011)
Log Message:
-----------
Minor editing changes
Modified Paths:
--------------
trunk/PDFQuotation.php
trunk/PO_Items.php
Modified: trunk/PDFQuotation.php
===================================================================
--- trunk/PDFQuotation.php 2011-02-06 09:35:07 UTC (rev 4538)
+++ trunk/PDFQuotation.php 2011-02-06 09:43:00 UTC (rev 4539)
@@ -251,4 +251,4 @@
$pdf->OutputI($_SESSION['DatabaseName'] . '_Quotation_' . date('Y-m-d') . '.pdf');//UldisN
$pdf->__destruct(); //UldisN
}
-?>
\ No newline at end of file
+?>
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-02-06 09:35:07 UTC (rev 4538)
+++ trunk/PO_Items.php 2011-02-06 09:43:00 UTC (rev 4539)
@@ -1156,4 +1156,4 @@
echo '</form>';
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: <tim...@us...> - 2011-02-07 11:15:33
|
Revision: 4567
http://weberp.svn.sourceforge.net/weberp/?rev=4567&view=rev
Author: tim_schofield
Date: 2011-02-07 11:15:24 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
Fix javascript error when manually selecting an account code
Modified Paths:
--------------
trunk/Payments.php
trunk/javascripts/MiscFunctions.js
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2011-02-06 18:08:34 UTC (rev 4566)
+++ trunk/Payments.php 2011-02-07 11:15:24 UTC (rev 4567)
@@ -870,7 +870,7 @@
ORDER BY tagref";
$result=DB_query($SQL,$db);
- echo '<option value=0></option';
+ echo '<option value=0></option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow["tagref"]){
echo '<option selected value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'];
@@ -884,12 +884,12 @@
/*now set up a GLCode field to select from avaialble GL accounts */
if (isset($_POST['GLManualCode'])) {
echo '<tr><td>' . _('Enter GL Account Manually') . ':</td>
- <td><input type=Text class="number" Name="GLManualCode" Maxlength=12 size=12 onChange="return inArray(this, this.value, GLCode.options,'.
+ <td><input type=Text class="number" Name="GLManualCode" Maxlength=12 size=12 onChange="inArray(this, GLCode.options,'.
"'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')"' .
' value='. $_POST['GLManualCode'] .' ></td></tr>';
} else {
echo '<tr><td>' . _('Enter GL Account Manually') . ':</td>
- <td><input type=Text class="number" Name="GLManualCode" Maxlength=12 size=12 onChange="return inArray(this, this.value, GLCode.options,'.
+ <td><input type=Text class="number" Name="GLManualCode" Maxlength=12 size=12 onChange="inArray(this, GLCode.options,'.
"'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')"></td></tr>';
}
echo '<tr><td>' . _('Select GL Account') . ':</td>
Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js 2011-02-06 18:08:34 UTC (rev 4566)
+++ trunk/javascripts/MiscFunctions.js 2011-02-07 11:15:24 UTC (rev 4567)
@@ -18,7 +18,11 @@
i.value=c.value;
}
function inArray(v,tA,m){
- for (i=0;i<tA.length;i++) if (v==tA[i].value) return true;
+ for (i=0;i<tA.length;i++) {
+ if (v.value==tA[i].value) {
+ return true;
+ }
+ }
alert(m);
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-02-09 17:18:47
|
Revision: 4575
http://weberp.svn.sourceforge.net/weberp/?rev=4575&view=rev
Author: tim_schofield
Date: 2011-02-09 17:18:40 +0000 (Wed, 09 Feb 2011)
Log Message:
-----------
Phil - Ricards multi-line issue on PDFQuotation narrative
Modified Paths:
--------------
trunk/PDFQuotation.php
trunk/includes/PDFQuotationPageHeader.inc
Modified: trunk/PDFQuotation.php
===================================================================
--- trunk/PDFQuotation.php 2011-02-08 16:21:45 UTC (rev 4574)
+++ trunk/PDFQuotation.php 2011-02-09 17:18:40 UTC (rev 4575)
@@ -86,7 +86,7 @@
$pdf->addInfo('Subject', _('Quotation') . ' ' . $_GET['QuotationNo']);
$FontSize=12;
$PageNumber = 1;
-$line_height=24;
+$line_height=15;
// $pdf->selectFont('./fonts/Helvetica.afm');
/* Now ... Has the order got any line items still outstanding to be invoiced */
@@ -171,11 +171,11 @@
$LeftOvers = $pdf->addTextWrap(650,$YPos,85,$FontSize,$DisplayTaxAmount,'right');
$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,$DisplayTotal,'right');
if (strlen($myrow2['narrative'])>1){
- $YPos -= 10;
- $LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,750,10,$myrow2['narrative']);
- if (strlen($LeftOvers>1)){
- $YPos -= 10;
- $LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,750,10,$LeftOvers);
+ $YPos -= ($line_height);
+ $LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,800,$FontSize,$myrow2['narrative']);
+ if (strlen($LeftOvers) >1){
+ $YPos -= 11;
+ $LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,800,$FontSize,$LeftOvers);
}
}
$QuotationTotal +=$LineTotal;
@@ -186,13 +186,13 @@
$YPos -= ($line_height);
} //end while there are line items to print out
+
if ((strlen($myrow['comments']) >200 AND $YPos-$line_height <= 75)
OR (strlen($myrow['comments']) >1 AND $YPos-$line_height <= 62)
OR $YPos-$line_height <= 50){
- /* We reached the end of the page so finsih off the page and start a newy */
+ /* We reached the end of the page so finish off the page and start a newy */
$PageNumber++;
include ('includes/PDFQuotationPageHeader.inc');
-
} //end if need a new page headed up
$LeftOvers = $pdf->addTextWrap($XPos,$YPos-80,200,10,_('Notes:'));
Modified: trunk/includes/PDFQuotationPageHeader.inc
===================================================================
--- trunk/includes/PDFQuotationPageHeader.inc 2011-02-08 16:21:45 UTC (rev 4574)
+++ trunk/includes/PDFQuotationPageHeader.inc 2011-02-09 17:18:40 UTC (rev 4575)
@@ -14,7 +14,7 @@
$FontSize=18;
$pdf->addText($XPos, 500,$FontSize, _('Quotation'));
$FontSize=14;
-$YPos = 480;
+$YPos = 482;
$pdf->addText($XPos, $YPos,$FontSize, $_SESSION['CompanyRecord']['coyname']);
$FontSize =10;
$pdf->addText($XPos, $YPos-12,$FontSize, $_SESSION['CompanyRecord']['regoffice1']);
@@ -44,7 +44,7 @@
$XPos= 50;
-$YPos += 25;
+$YPos += 12;
/*draw a nice curved corner box around the delivery details */
/*from the top right */
$pdf->partEllipse($XPos+225,$YPos+60,0,90,10,10);
@@ -106,32 +106,28 @@
$LeftOvers = $pdf->addTextWrap(650,$YPos,85,$FontSize, _('Tax Amount'),'right');
$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize, _('Total'),'right');
-
/*draw a box with nice round corner for entering line items */
/*90 degree arc at top right of box 0 degrees starts a bottom */
-$pdf->partEllipse($Page_Width-$Right_Margin-10, $Bottom_Margin+370,0,90,10,10);
+$pdf->partEllipse($Page_Width-$Right_Margin-10, $Bottom_Margin+350,0,90,10,10);
/*line to the top left */
-$pdf->line($Page_Width-$Right_Margin-10, $Bottom_Margin+380,$Left_Margin+10, $Bottom_Margin+380);
+$pdf->line($Page_Width-$Right_Margin-10, $Bottom_Margin+360,$Left_Margin+10, $Bottom_Margin+360);
/*line under headings to top left */
-$pdf->line($Page_Width-$Right_Margin, $Bottom_Margin+355,$Left_Margin, $Bottom_Margin+355);
+$pdf->line($Page_Width-$Right_Margin, $Bottom_Margin+335,$Left_Margin, $Bottom_Margin+335);
/*Dow top left corner */
-$pdf->partEllipse($Left_Margin+10, $Bottom_Margin+370,90,180,10,10);
+$pdf->partEllipse($Left_Margin+10, $Bottom_Margin+350,90,180,10,10);
/*Do a line to the bottom left corner */
-$pdf->line($Left_Margin, $Bottom_Margin+370,$Left_Margin, $Bottom_Margin+10);
+$pdf->line($Left_Margin, $Bottom_Margin+350,$Left_Margin, $Bottom_Margin+10);
/*Now do the bottom left corner 180 - 270 coming back west*/
$pdf->partEllipse($Left_Margin+10, $Bottom_Margin+10,180,270,10,10);
/*Now a line to the bottom right */
$pdf->line($Left_Margin+10, $Bottom_Margin,$Page_Width-$Right_Margin-10, $Bottom_Margin);
/*Now do the bottom right corner */
-$pdf->partEllipse($Page_Width-$Right_Margin-10, $Bottom_Margin+10,270,360,10,10);
+$pdf->partEllipse($Page_Width-$Right_Margin-10, $Bottom_Margin+10,270,350,10,10);
/*Finally join up to the top right corner where started */
-$pdf->line($Page_Width-$Right_Margin, $Bottom_Margin+10,$Page_Width-$Right_Margin, $Bottom_Margin+370);
+$pdf->line($Page_Width-$Right_Margin, $Bottom_Margin+10,$Page_Width-$Right_Margin, $Bottom_Margin+350);
-$YPos -= $line_height;
-
-$FontSize =12;
-
+$YPos -= (2*$line_height);
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-02-09 20:06:27
|
Revision: 4579
http://weberp.svn.sourceforge.net/weberp/?rev=4579&view=rev
Author: tim_schofield
Date: 2011-02-09 20:06:20 +0000 (Wed, 09 Feb 2011)
Log Message:
-----------
Phil - InventoryPlanning and InventoryPlanningPrefSupplier now excludes quotation sales order demand
Modified Paths:
--------------
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2011-02-09 17:25:27 UTC (rev 4578)
+++ trunk/InventoryPlanning.php 2011-02-09 20:06:20 UTC (rev 4579)
@@ -187,19 +187,19 @@
if ($_POST['Location']=='All'){
$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
- FROM salesorderdetails,
- salesorders
- WHERE salesorderdetails.orderno=salesorders.orderno
- AND salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "'
- AND salesorderdetails.completed = 0";
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorderdetails.orderno=salesorders.orderno
+ WHERE salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "'
+ AND salesorderdetails.completed = 0
+ AND salesorders.quotation=0";
} else {
$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
- FROM salesorderdetails,
- salesorders
- WHERE salesorderdetails.orderno=salesorders.orderno
- AND salesorders.fromstkloc ='" . $_POST['Location'] . "'
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorderdetails.orderno=salesorders.orderno
+ WHERE salesorders.fromstkloc ='" . $_POST['Location'] . "'
AND salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "'
- AND salesorderdetails.completed = 0";
+ AND salesorderdetails.completed = 0
+ AND salesorders.quotation=0";
}
$DemandResult = DB_query($SQL, $db, '', '', false , false);
@@ -221,29 +221,34 @@
if ($_POST['Location']=='All'){
$SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
- FROM salesorderdetails,
- bom,
- stockmaster
- WHERE salesorderdetails.stkcode=bom.parent
+ FROM salesorderdetails INNER JOIN bom
+ ON salesorderdetails.stkcode=bom.parent
+ INNER JOIN stockmaster
+ ON stockmaster.stockid=bom.parent
+ INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
AND bom.component='" . $InventoryPlan['stockid'] . "'
- AND stockmaster.stockid=bom.parent
AND stockmaster.mbflag='A'
- AND salesorderdetails.completed=0";
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0";
} else {
$SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
- FROM salesorderdetails,
- salesorders,
- bom,
- stockmaster
- WHERE salesorderdetails.orderno=salesorders.orderno
- AND salesorderdetails.stkcode=bom.parent
+ FROM salesorderdetails INNER JOIN bom
+ ON salesorderdetails.stkcode=bom.parent
+ INNER JOIN stockmaster
+ ON stockmaster.stockid=bom.parent
+ INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
AND bom.component='" . $InventoryPlan['stockid'] . "'
AND stockmaster.stockid=bom.parent
AND salesorders.fromstkloc ='" . $_POST['Location'] . "'
AND stockmaster.mbflag='A'
- AND salesorderdetails.completed=0";
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0";
}
$BOMDemandResult = DB_query($SQL,$db,'','',false,false);
Modified: trunk/InventoryPlanningPrefSupplier.php
===================================================================
--- trunk/InventoryPlanningPrefSupplier.php 2011-02-09 17:25:27 UTC (rev 4578)
+++ trunk/InventoryPlanningPrefSupplier.php 2011-02-09 20:06:20 UTC (rev 4579)
@@ -288,19 +288,19 @@
if ($_POST['Location']=='All'){
$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
- FROM salesorderdetails,
- salesorders
- WHERE salesorderdetails.orderno=salesorders.orderno
- AND salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "'
- AND salesorderdetails.completed = 0";
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorderdetails.orderno=salesorders.orderno
+ WHERE salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "'
+ AND salesorderdetails.completed = 0
+ AND salesorders.quotation=0";
} else {
$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
- FROM salesorderdetails,
- salesorders
- WHERE salesorderdetails.orderno=salesorders.orderno
- AND salesorders.fromstkloc ='" . $_POST['Location'] . "'
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorderdetails.orderno=salesorders.orderno
+ WHERE salesorders.fromstkloc ='" . $_POST['Location'] . "'
AND salesorderdetails.stkcode = '" . $InventoryPlan['stockid'] . "'
- AND salesorderdetails.completed = 0";
+ AND salesorderdetails.completed = 0
+ AND salesorders.quotation=0";
}
$DemandResult = DB_query($SQL, $db, '', '', false, false);
@@ -322,29 +322,31 @@
if ($_POST['Location']=='All'){
$SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
- FROM salesorderdetails,
- bom,
- stockmaster
- WHERE salesorderdetails.stkcode=bom.parent
- AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
+ FROM salesorderdetails INNER JOIN bom
+ ON salesorderdetails.stkcode=bom.parent
+ INNER JOIN stockmaster
+ ON stockmaster.stockid=bom.parent
+ INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
AND bom.component='" . $InventoryPlan['stockid'] . "'
- AND stockmaster.stockid=bom.parent
AND stockmaster.mbflag='A'
- AND salesorderdetails.completed=0";
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0";
} else {
$SQL = "SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
- FROM salesorderdetails,
- salesorders,
- bom,
- stockmaster
- WHERE salesorderdetails.orderno=salesorders.orderno
- AND salesorderdetails.stkcode=bom.parent
- AND salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
+ FROM salesorderdetails INNER JOIN bom
+ ON salesorderdetails.stkcode=bom.parent
+ INNER JOIN stockmaster
+ ON stockmaster.stockid=bom.parent
+ INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
AND bom.component='" . $InventoryPlan['stockid'] . "'
- AND stockmaster.stockid=bom.parent
AND salesorders.fromstkloc ='" . $_POST['Location'] . "'
AND stockmaster.mbflag='A'
- AND salesorderdetails.completed=0";
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0";
}
$BOMDemandResult = DB_query($SQL,$db,'','',false,false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-02-23 07:11:34
|
Revision: 4612
http://weberp.svn.sourceforge.net/weberp/?rev=4612&view=rev
Author: tim_schofield
Date: 2011-02-23 07:11:28 +0000 (Wed, 23 Feb 2011)
Log Message:
-----------
Add in facility to provide an expiry date for Perishable controlled items
Modified Paths:
--------------
trunk/GoodsReceived.php
trunk/GoodsReceivedControlled.php
trunk/StockSerialItems.php
trunk/includes/Add_SerialItems.php
trunk/includes/DefineSerialItems.php
trunk/includes/InputSerialItems.php
trunk/includes/InputSerialItemsKeyed.php
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2011-02-21 13:25:31 UTC (rev 4611)
+++ trunk/GoodsReceived.php 2011-02-23 07:11:28 UTC (rev 4612)
@@ -530,11 +530,13 @@
loccode,
serialno,
qualitytext,
+ expirationdate,
quantity)
VALUES ('" . $OrderLine->StockID . "',
'" . $_SESSION['PO']->Location . "',
'" . $Item->BundleRef . "',
'',
+ '" . FormatDateForSQL($Item->ExpiryDate) . "',
'" . $Item->BundleQty*$OrderLine->ConversionFactor . "')";
}
Modified: trunk/GoodsReceivedControlled.php
===================================================================
--- trunk/GoodsReceivedControlled.php 2011-02-21 13:25:31 UTC (rev 4611)
+++ trunk/GoodsReceivedControlled.php 2011-02-23 07:11:28 UTC (rev 4612)
@@ -21,7 +21,7 @@
exit;
}
-if ($_GET['LineNo']>0){
+if (isset($_GET['LineNo']) and $_GET['LineNo']>0){
$LineNo = $_GET['LineNo'];
} else if ($_POST['LineNo']>0){
$LineNo = $_POST['LineNo'];
Modified: trunk/StockSerialItems.php
===================================================================
--- trunk/StockSerialItems.php 2011-02-21 13:25:31 UTC (rev 4611)
+++ trunk/StockSerialItems.php 2011-02-23 07:11:28 UTC (rev 4612)
@@ -23,21 +23,23 @@
mbflag,
decimalplaces,
serialised,
- controlled
+ controlled,
+ perishable
FROM stockmaster
WHERE stockid='".$StockID."'",
$db,
_('Could not retrieve the requested item because'));
-$myrow = DB_fetch_row($result);
+$myrow = DB_fetch_array($result);
-$Description = $myrow[0];
-$UOM = $myrow[1];
-$DecimalPlaces = $myrow[3];
-$Serialised = $myrow[4];
-$Controlled = $myrow[5];
+$Description = $myrow['description'];
+$UOM = $myrow['units'];
+$DecimalPlaces = $myrow['decimalplaces'];
+$Serialised = $myrow['serialised'];
+$Controlled = $myrow['controlled'];
+$Perishable = $myrow['perishable'];
-if ($myrow[2]=='K' OR $myrow[2]=='A' OR $myrow[2]=='D'){
+if ($myrow['mbflag']=='K' OR $myrow['mbflag']=='A' OR $myrow['mbflag']=='D'){
prnMsg(_('This item is either a kitset or assembly or a dummy part and cannot have a stock holding') . '. ' . _('This page cannot be displayed') . '. ' . _('Only serialised or controlled items can be displayed in this page'),'error');
include('includes/footer.inc');
@@ -54,7 +56,8 @@
$myrow = DB_fetch_row($result);
$sql = "SELECT serialno,
- quantity
+ quantity,
+ expirationdate
FROM stockserialitems
WHERE loccode='" . $_GET['Location'] . "'
AND stockid = '" . $StockID . "'
@@ -67,30 +70,49 @@
echo '<table cellpadding=2 class=selection>';
if ($Serialised==1){
- echo '<tr<th colspan=3><font color=navy size=2>' . _('Serialised items in') . ' ';
+ echo '<tr<th colspan=5><font color=navy size=2>' . _('Serialised items in') . ' ';
} else {
- echo '<tr<th colspan=6><font color=navy size=2>' . _('Controlled items in') . ' ';
+ echo '<tr<th colspan=11><font color=navy size=2>' . _('Controlled items in') . ' ';
}
echo $myrow[0]. '</font></th></tr>';
-echo "<tr><th colspan=6><font color=navy size=2>".$StockID ."-". $Description ."</b> (" . _('In units of') . ' ' . $UOM . ')</font></th></tr>';
+echo "<tr><th colspan=11><font color=navy size=2>".$StockID ."-". $Description ."</b> (" . _('In units of') . ' ' . $UOM . ')</font></th></tr>';
if ($Serialised == 1){
$tableheader = "<tr>
<th>" . _('Serial Number') . "</th>
+ <th></th>
<th>" . _('Serial Number') . "</th>
+ <th></th>
<th>" . _('Serial Number') . "</th>
</tr>";
-} else {
+} else if ($Serialised == 0 and $Perishable==0){
$tableheader = "<tr>
<th>" . _('Batch/Bundle Ref') . "</th>
<th>" . _('Quantity On Hand') . "</th>
+ <th></th>
<th>" . _('Batch/Bundle Ref') . "</th>
<th>" . _('Quantity On Hand') . "</th>
+ <th></th>
<th>" . _('Batch/Bundle Ref') . "</th>
<th>" . _('Quantity On Hand') . "</th>
</tr>";
+} else if ($Serialised == 0 and $Perishable==1){
+ $tableheader = "<tr>
+ <th>" . _('Batch/Bundle Ref') . "</th>
+ <th>" . _('Quantity On Hand') . "</th>
+ <th>" . _('Expiry Date') . "</th>
+ <th></th>
+ <th>" . _('Batch/Bundle Ref') . "</th>
+ <th>" . _('Quantity On Hand') . "</th>
+ <th>" . _('Expiry Date') . "</th>
+ <th></th>
+ <th>" . _('Batch/Bundle Ref') . "</th>
+ <th>" . _('Quantity On Hand') . "</th>
+ <th>" . _('Expiry Date') . "</th>
+
+ </tr>";
}
echo $tableheader;
$TotalQuantity =0;
@@ -110,15 +132,17 @@
$TotalQuantity += $myrow['quantity'];
if ($Serialised == 1){
- printf('<td>%s</td>',
- $myrow['serialno']
- );
- } else {
- printf("<td>%s</td>
- <td class=number>%s</td>",
- $myrow['serialno'],
- number_format($myrow['quantity'],$DecimalPlaces)
- );
+ echo '<td>'.$myrow['serialno'].'/td>';
+ echo '<th></th>';
+ } else if ($Serialised == 0 and $Perishable==0) {
+ echo "<td>".$myrow['serialno']."</td>
+ <td class=number>".number_format($myrow['quantity'],$DecimalPlaces)."</td>";
+ echo '<th></th>';
+ } else if ($Serialised == 0 and $Perishable==1){
+ echo "<td>".$myrow['serialno']."</td>
+ <td class=number>".number_format($myrow['quantity'],$DecimalPlaces)."</td>
+ <td>".ConvertSQLDate($myrow['expirationdate'])."</td>";
+ echo '<th></th>';
}
$j++;
If ($j == 36){
Modified: trunk/includes/Add_SerialItems.php
===================================================================
--- trunk/includes/Add_SerialItems.php 2011-02-21 13:25:31 UTC (rev 4611)
+++ trunk/includes/Add_SerialItems.php 2011-02-23 07:11:28 UTC (rev 4612)
@@ -66,7 +66,7 @@
}
if (!$SerialError){
- $LineItem->SerialItems[$NewSerialNo] = new SerialItem ($_POST['SerialNo' . $i], $NewQty);
+ $LineItem->SerialItems[$NewSerialNo] = new SerialItem ($_POST['SerialNo' . $i], $NewQty, $_POST['ExpiryDate' . $i]);
}
}
} /* end if posted Serialno . i is not blank */
@@ -75,7 +75,8 @@
if (!isset($_POST['Bundles'])) {
$_POST['Bundles']=0;
}
- for ($i=0;$i < count($_POST['Bundles']);$i++){ /*there is an entry in the multi select list box */
+ echo count($_POST['Bundles']);
+ for ($i=0;$i < count($_POST['Bundles'])-1;$i++){ /*there is an entry in the multi select list box */
if ($LineItem->Serialised==1){ /*only if the item is serialised */
$LineItem->SerialItems[$_POST['Bundles'][$i]] = new SerialItem ($_POST['Bundles'][$i], ($InOutModifier>0?1:-1) );
} else {
Modified: trunk/includes/DefineSerialItems.php
===================================================================
--- trunk/includes/DefineSerialItems.php 2011-02-21 13:25:31 UTC (rev 4611)
+++ trunk/includes/DefineSerialItems.php 2011-02-23 07:11:28 UTC (rev 4612)
@@ -4,10 +4,10 @@
function ValidBundleRef ($StockID, $LocCode, $BundleRef){
global $db;
- $SQL = "SELECT quantity
- FROM stockserialitems
- WHERE stockid='" . $StockID . "'
- AND loccode ='" . $LocCode . "'
+ $SQL = "SELECT quantity
+ FROM stockserialitems
+ WHERE stockid='" . $StockID . "'
+ AND loccode ='" . $LocCode . "'
AND serialno='" . $BundleRef . "'";
$Result = DB_query($SQL, $db);
if (DB_num_rows($Result)==0){
@@ -22,12 +22,14 @@
var $BundleRef;
var $BundleQty;
+ var $ExpiryDate;
//Constructor
- function SerialItem($BundleRef, $BundleQty){
+ function SerialItem($BundleRef, $BundleQty, $ExpiryDate='0000-00-00'){
$this->BundleRef = $BundleRef;
$this->BundleQty = $BundleQty;
+ $this->ExpiryDate = $ExpiryDate;
}
}//class SerialItem
?>
\ No newline at end of file
Modified: trunk/includes/InputSerialItems.php
===================================================================
--- trunk/includes/InputSerialItems.php 2011-02-21 13:25:31 UTC (rev 4611)
+++ trunk/includes/InputSerialItems.php 2011-02-23 07:11:28 UTC (rev 4612)
@@ -88,15 +88,27 @@
'&LineNo=' . $LineNo .'">'. _('Edit'). '</a> | ';
$RemoveLink = '<a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&DELETEALL=YES&StockID=' . $LineItem->StockID .
'&LineNo=' . $LineNo .'">'. _('Remove All'). '</a><br></div>';
+$sql="SELECT perishable
+ FROM stockmaster
+ WHERE stockid='".$StockID."'";
+$result=DB_query($sql, $db);
+$myrow=DB_fetch_array($result);
+$Perishable=$myrow['perishable'];
if ($LineItem->Serialised==1){
$tableheader .= '<tr>
<th>'. _('Serial No').'</th>
- </Tr>';
+ </tr>';
+} else if ($LineItem->Serialised==0 and $Perishable==1){
+ $tableheader = '<tr>
+ <th>'. _('Batch/Roll/Bundle'). ' #</th>
+ <th>'. _('Quantity'). '</th>
+ <th>'. _('Expiry Date'). '</th>
+ </tr>';
} else {
- $tableheader = '<TR>
+ $tableheader = '<tr>
<th>'. _('Batch/Roll/Bundle'). ' #</th>
- <th class=tableheader>'. _('Quantity'). '</th>
- </tr>';
+ <th>'. _('Quantity'). '</th>
+ </tr>';
}
echo $EditLink . $RemoveLink;
Modified: trunk/includes/InputSerialItemsKeyed.php
===================================================================
--- trunk/includes/InputSerialItemsKeyed.php 2011-02-21 13:25:31 UTC (rev 4611)
+++ trunk/includes/InputSerialItemsKeyed.php 2011-02-23 07:11:28 UTC (rev 4612)
@@ -47,8 +47,11 @@
echo '<td>' . $Bundle->BundleRef . '</td>';
- if ($LineItem->Serialised==0){
+ if ($LineItem->Serialised==0 and $Perishable==0){
echo '<td class=number>' . number_format($Bundle->BundleQty, $LineItem->DecimalPlaces) . '</td>';
+ } else if ($LineItem->Serialised==0 and $Perishable==1){
+ echo '<td class=number>' . number_format($Bundle->BundleQty, $LineItem->DecimalPlaces) . '</td>';
+ echo '<td class=number>' . $Bundle->ExpiryDate . '</td>';
}
echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . 'Delete=' . $Bundle->BundleRef . '&StockID=' . $LineItem->StockID . '&LineNo=' . $LineNo .'">'. _('Delete'). '</a></td></tr>';
@@ -80,7 +83,7 @@
<input type=hidden name=LineNo value="' . $LineNo . '">
<input type=hidden name=StockID value="' . $StockID . '">
<input type=hidden name=EntryType value="KEYED">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if ( isset($_GET['EditControlled']) ) {
$EditControlled = isset($_GET['EditControlled'])?$_GET['EditControlled']:false;
} elseif ( isset($_POST['EditControlled']) ){
@@ -101,6 +104,9 @@
if ($LineItem->Serialised==1){
echo '<input type=hidden name="Qty' . $StartAddingAt .'" Value=1></TR>';
+ } else if ($LineItem->Serialised==0 and $Perishable==1) {
+ echo '<td><input type=text class="number" name="Qty' . $StartAddingAt .'" size=11
+ value="'. number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength=10></tr>';
} else {
echo '<td><input type=text class="number" name="Qty' . $StartAddingAt .'" size=11
value="'. number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength=10></tr>';
@@ -119,6 +125,10 @@
if ($LineItem->Serialised==1){
echo '<input type=hidden name="Qty' . ($StartAddingAt+$i) .'" Value=1></tr>';
+ } else if ($LineItem->Serialised==0 and $Perishable==1) {
+ echo '<td><input type=text class="number" name="Qty' . ($StartAddingAt+$i) .'" size=11 maxlength=10></td>';
+ echo '<td><input type=text class="date" name="ExpiryDate' . ($StartAddingAt+$i) .'" size=11
+ value="" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength=10></td></tr>';
} else {
echo '<td><input type=text class="number" name="Qty' . ($StartAddingAt+$i) .'" size=11 maxlength=10></tr>';
}
@@ -135,4 +145,4 @@
document.Ga6uF5Wa.SerialNo0.focus();
//]]>
</script>'; /*end of nested table */
-?>
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-02-25 08:16:30
|
Revision: 4614
http://weberp.svn.sourceforge.net/weberp/?rev=4614&view=rev
Author: tim_schofield
Date: 2011-02-25 08:16:23 +0000 (Fri, 25 Feb 2011)
Log Message:
-----------
Improve serial item out code, and include expiry date for batches
Modified Paths:
--------------
trunk/ConfirmDispatchControlled_Invoice.php
trunk/ConfirmDispatch_Invoice.php
trunk/includes/Add_SerialItemsOut.php
Added Paths:
-----------
trunk/includes/OutputSerialItems.php
Modified: trunk/ConfirmDispatchControlled_Invoice.php
===================================================================
--- trunk/ConfirmDispatchControlled_Invoice.php 2011-02-23 07:11:55 UTC (rev 4613)
+++ trunk/ConfirmDispatchControlled_Invoice.php 2011-02-25 08:16:23 UTC (rev 4614)
@@ -66,7 +66,7 @@
$InOutModifier=1;
$ShowExisting=false;
-include ('includes/InputSerialItems.php');
+include ('includes/OutputSerialItems.php');
/*TotalQuantity set inside this include file from the sum of the bundles
of the item selected for dispatch */
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2011-02-23 07:11:55 UTC (rev 4613)
+++ trunk/ConfirmDispatch_Invoice.php 2011-02-25 08:16:23 UTC (rev 4614)
@@ -219,7 +219,11 @@
}
foreach ($_SESSION['Items']->LineItems as $Itm) {
- if (is_numeric($_POST[$Itm->LineNumber . '_QtyDispatched' ])AND $_POST[$Itm->LineNumber . '_QtyDispatched'] <= ($_SESSION['Items']->LineItems[$Itm->LineNumber]->Quantity - $_SESSION['Items']->LineItems[$Itm->LineNumber]->QtyInv)){
+ if (sizeOf($Itm->SerialItems) > 0) {
+ foreach ($Itm->SerialItems as $SerialItem) {
+ $_SESSION['Items']->LineItems[$Itm->LineNumber]->QtyDispatched += $SerialItem->BundleQty;
+ }
+ } else if (is_numeric($_POST[$Itm->LineNumber . '_QtyDispatched' ])AND $_POST[$Itm->LineNumber . '_QtyDispatched'] <= ($_SESSION['Items']->LineItems[$Itm->LineNumber]->Quantity - $_SESSION['Items']->LineItems[$Itm->LineNumber]->QtyInv)){
$_SESSION['Items']->LineItems[$Itm->LineNumber]->QtyDispatched = $_POST[$Itm->LineNumber . '_QtyDispatched'];
}
Modified: trunk/includes/Add_SerialItemsOut.php
===================================================================
--- trunk/includes/Add_SerialItemsOut.php 2011-02-23 07:11:55 UTC (rev 4613)
+++ trunk/includes/Add_SerialItemsOut.php 2011-02-25 08:16:23 UTC (rev 4614)
@@ -3,11 +3,10 @@
/*ProcessSerialItems.php takes the posted variables and adds to the SerialItems array
in either the cartclass->LineItems->SerialItems or the POClass->LineItems->SerialItems */
-
if (isset($_POST['AddBatches'])){
for ($i=0;$i < 10;$i++){
- if(strlen($_POST['SerialNo' . $i])>0){
+ if(isset($_POST['SerialNo' . $i]) and strlen($_POST['SerialNo' . $i])>0){
$ExistingBundleQty = ValidBundleRef($StockID, $LocationOut, $_POST['SerialNo' . $i]);
if ($ExistingBundleQty >0){
$AddThisBundle = true;
@@ -15,30 +14,31 @@
the first entered one - no warning given though ? */
if ($_POST['Qty' . $i] > $ExistingBundleQty){
if ($LineItem->Serialised ==1){
- echo "<BR>" . $_POST['SerialNo' . $i] . " " . _('has already been sold');
+ echo "<br />" . $_POST['SerialNo' . $i] . " " . _('has already been sold');
$AddThisBundle = false;
} elseif ($ExistingBundleQty==0) { /* and its a batch */
- echo "<BR>There is none of " . $_POST['SerialNo' . $i] . " left.";
+ echo "<br />There is none of " . $_POST['SerialNo' . $i] . " left.";
$AddThisBundle = false;
} else {
- echo '<BR>' . _('There is only') . ' ' . $ExistingBundleQty . ' ' . _('of') . ' ' . $_POST['SerialNo' . $i] . ' ' . _('remaining') . '. ' . _('The entered quantity will be reduced to the remaining amount left of this batch/bundle/roll');
+ echo '<br />' . _('There is only') . ' ' . $ExistingBundleQty . ' ' . _('of') . ' ' . $_POST['SerialNo' . $i] .
+ ' ' . _('remaining') . '. ' . _('The entered quantity will be reduced to the remaining amount left of this batch/bundle/roll');
$_POST['Qty' . $i] = $ExistingBundleQty;
$AddThisBundle = true;
}
}
- if ($AddThisBundle==true){
- $LineItem->SerialItems[$_POST['SerialNo' . $i]] = new SerialItem ($_POST['SerialNo' . $i], $_POST['Qty' . $i]);
+ if ($AddThisBundle==true and $_POST['Qty' . $i]>0){
+ $LineItem->SerialItems[$_POST['SerialNo' . $i]] = new SerialItem ($_POST['SerialNo' . $i], $_POST['Qty' . $i], $_POST['ExpiryDate' . $i]);
}
} /*end if ExistingBundleQty >0 */
} /* end if posted Serialno . i is not blank */
} /* end of the loop aroung the form input fields */
- for ($i=0;$i < count($_POST['Bundles']);$i++){ /*there is an entry in the multi select list box */
- if ($LineItem->Serialised==1){ /*only if the item is serialised */
- $LineItem->SerialItems[$_POST['Bundles'][$i]] = new SerialItem ($_POST['Bundles'][$i], 1);
- }
- }
+// for ($i=0;$i < count($_POST['Bundles']);$i++){ /*there is an entry in the multi select list box */
+// if ($LineItem->Serialised==1){ /*only if the item is serialised */
+// $LineItem->SerialItems[$_POST['Bundles'][$i]] = new SerialItem ($_POST['Bundles'][$i], 1);
+// }
+// }
} /*end if the user hit the enter button */
@@ -47,4 +47,8 @@
unset($LineItem->SerialItems[$_GET['Delete']]);
}
+if (isset($_GET['DELETEALL'])){
+ $LineItem->SerialItems=array();
+}
+
?>
Added: trunk/includes/OutputSerialItems.php
===================================================================
--- trunk/includes/OutputSerialItems.php (rev 0)
+++ trunk/includes/OutputSerialItems.php 2011-02-25 08:16:23 UTC (rev 4614)
@@ -0,0 +1,210 @@
+<?php
+/* $Id$*/
+/*Input Serial Items - used for inputing serial numbers or batch/roll/bundle references
+for controlled items - used in:
+- ConfirmDispatchControlledInvoice.php
+- GoodsReceivedControlled.php
+- StockAdjustments.php
+- StockTransfers.php
+- CreditItemsControlled.php
+
+*/
+
+//we start with a batch or serial no header and need to display something for verification...
+global $tableheader;
+
+include ('includes/Add_SerialItemsOut.php');
+
+global $tableheader;
+/* Link to clear the list and start from scratch */
+$EditLink = '<br><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&EditControlled=true&StockID=' . $LineItem->StockID .
+ '&LineNo=' . $LineNo .'">'. _('Edit'). '</a> | ';
+$RemoveLink = '<a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&DELETEALL=YES&StockID=' . $LineItem->StockID .
+ '&LineNo=' . $LineNo .'">'. _('Remove All'). '</a><br></div>';
+$sql="SELECT perishable
+ FROM stockmaster
+ WHERE stockid='".$StockID."'";
+$result=DB_query($sql, $db);
+$myrow=DB_fetch_array($result);
+$Perishable=$myrow['perishable'];
+if ($LineItem->Serialised==1){
+ $tableheader .= '<tr>
+ <th>'. _('Serial No').'</th>
+ </tr>';
+ $listtableheader=$tableheader;
+} else if ($LineItem->Serialised==0 and $Perishable==1){
+ $tableheader = '<tr>
+ <th>'. _('Batch/Roll/Bundle'). ' #</th>
+ <th>'. _('Available'). '</th>
+ <th>'. _('Quantity'). '</th>
+ <th>'. _('Expiry Date'). '</th>
+ </tr>';
+ $listtableheader = '<tr>
+ <th>'. _('Batch/Roll/Bundle'). ' #</th>
+ <th>'. _('Quantity'). '</th>
+ <th>'. _('Expiry Date'). '</th>
+ </tr>';
+} else {
+ $tableheader = '<tr>
+ <th>'. _('Batch/Roll/Bundle'). ' #</th>
+ <th>'. _('Quantity'). '</th>
+ </tr>';
+ $listtableheader=$tableheader;
+}
+
+echo $EditLink . $RemoveLink;
+
+if (isset($_GET['LineNo'])){
+ $LineNo = $_GET['LineNo'];
+} elseif (isset($_POST['LineNo'])){
+ $LineNo = $_POST['LineNo'];
+}
+
+/*Display the batches already entered with quantities if not serialised */
+
+echo '<table class=selection><tr><td valign=top><table class=selection>';
+echo $listtableheader;
+
+$TotalQuantity = 0; /*Variable to accumulate total quantity received */
+$RowCounter =0;
+
+$k=0;
+foreach ($LineItem->SerialItems as $Bundle){
+
+ if ($RowCounter == 10){
+ echo $listtableheader;
+ $RowCounter =0;
+ } else {
+ $RowCounter++;
+ }
+
+ if ($k==1){
+ echo '<tr bgcolor="#CCCCCC">';
+ $k=0;
+ } else {
+ echo '<tr bgcolor="#EEEEEE">';
+ $k=1;
+ }
+
+ echo '<td>' . $Bundle->BundleRef . '</td>';
+
+ if ($LineItem->Serialised==0 and $Perishable==0){
+ echo '<td class=number>' . number_format($Bundle->BundleQty, $LineItem->DecimalPlaces) . '</td>';
+ } else if ($LineItem->Serialised==0 and $Perishable==1){
+ echo '<td class=number>' . number_format($Bundle->BundleQty, $LineItem->DecimalPlaces) . '</td>';
+ echo '<td class=number>' . $Bundle->ExpiryDate . '</td>';
+ }
+
+ echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . 'Delete=' . $Bundle->BundleRef . '&StockID=' . $LineItem->StockID . '&LineNo=' . $LineNo .'">'. _('Delete'). '</a></td></tr>';
+
+ $TotalQuantity += $Bundle->BundleQty;
+}
+
+
+/*Display the totals and rule off before allowing new entries */
+if ($LineItem->Serialised==1){
+ echo '<tr><td class=number><B>'. _('Total Quantity'). ': ' . number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
+} else {
+ echo '<tr><td class=number><B>'. _('Total Quantity'). ':</b></td><td class=number><b>' . number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
+}
+
+/*Close off old table */
+echo '</table></td><td valign=top>';
+
+/*Start a new table for the Serial/Batch ref input in one column (as a sub table
+then the multi select box for selection of existing bundle/serial nos for dispatch if applicable*/
+//echo '<TABLE><TR><TD valign=TOP>';
+
+/*in the first column add a table for the input of newies */
+echo '<table class=selection>';
+echo $tableheader;
+
+
+echo '<form action="' . $_SERVER['PHP_SELF'] . '?=' . SID . '" name="Ga6uF5Wa" method="post">
+ <input type=hidden name=LineNo value="' . $LineNo . '">
+ <input type=hidden name=StockID value="' . $StockID . '">
+ <input type=hidden name=EntryType value="KEYED">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+if ( isset($_GET['EditControlled']) ) {
+ $EditControlled = isset($_GET['EditControlled'])?$_GET['EditControlled']:false;
+} elseif ( isset($_POST['EditControlled']) ){
+ $EditControlled = isset($_POST['EditControlled'])?$_POST['EditControlled']:false;
+} else {
+ $EditControlled=false;
+}
+$TotalQuantity = 0; /*Variable to accumulate total quantity received */
+$RowCounter =0;
+
+$k=0;
+
+$StartAddingAt = 0;
+if ($EditControlled){
+ foreach ($LineItem->SerialItems as $Bundle){
+
+ echo '<tr><td valign=top><input type=text name="SerialNo'. $StartAddingAt .'"
+ value="'.$Bundle->BundleRef.'" size=21 maxlength=20></td>';
+
+ /*if the item is controlled not serialised - batch quantity required so just enter bundle refs
+ into the form for entry of quantities manually */
+
+ if ($LineItem->Serialised==1){
+ echo '<input type=hidden name="Qty' . $StartAddingAt .'" Value=1></TR>';
+ } else if ($LineItem->Serialised==0 and $Perishable==1) {
+ echo '<td><input type=text class="number" name="Qty' . $StartAddingAt .'" size=11
+ value="'. number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength=10></tr>';
+ } else {
+ echo '<td><input type=text class="number" name="Qty' . $StartAddingAt .'" size=11
+ value="'. number_format($Bundle->BundleQty, $LineItem->DecimalPlaces). '" maxlength=10></tr>';
+ }
+
+ $StartAddingAt++;
+ }
+}
+
+$sql="SELECT serialno,
+ quantity,
+ expirationdate
+ FROM stockserialitems
+ WHERE stockid='".$StockID."'
+ AND loccode='".$_SESSION['Items']->Location."'";
+$result=DB_query($sql, $db);
+
+$RowNumber=0;
+while ($myrow=DB_fetch_array($result)){
+
+ echo '<tr><td valign=top>'.$myrow['serialno'].'<input type=hidden name="SerialNo'. ($RowNumber) .'" size=21 value="'.$myrow['serialno'].'" maxlength=20></td>';
+
+ /*if the item is controlled not serialised - batch quantity required so just enter bundle refs
+ into the form for entry of quantities manually */
+
+ if ($LineItem->Serialised==1){
+ echo '<input type=hidden name="Qty' . ($StartAddingAt+$RowNumber) .'" Value=1></tr>';
+ } else if ($LineItem->Serialised==0 and $Perishable==1) {
+ if (isset($LineItem->SerialItems[$myrow['serialno']])) {
+ echo '<td class=number>'.number_format($myrow['quantity']-$LineItem->SerialItems[$myrow['serialno']]->BundleQty,$LineItem->DecimalPlaces).'</td>';
+ } else {
+ echo '<td class=number>'.number_format($myrow['quantity'],$LineItem->DecimalPlaces).'</td>';
+ }
+ echo '<td><input type=text class="number" name="Qty' . ($StartAddingAt+$RowNumber) .'" size=11 value="0" maxlength=10></td>';
+ echo '<td><input type=hidden class="date" name="ExpiryDate' . ($StartAddingAt+$RowNumber) .'" size=11
+ value="'.ConvertSQLDate($myrow['expirationdate']).'" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength=10>'.ConvertSQLDate($myrow['expirationdate']).'</td></tr>';
+ } else {
+ echo '<td><input type=text class="number" name="Qty' . ($StartAddingAt+$RowNumber) .'" size=11 value="'.$myrow['quantity'].'" maxlength=10></tr>';
+ }
+ $RowNumber++;
+}
+
+echo '</table>';
+echo '<br><div class=centre><input type=submit name="AddBatches" value="'. _('Enter'). '"></div>';
+echo '</form></td><td valign=top>';
+$ShowExisting=True;
+$_POST['EntryType']='Sequential';
+if ($ShowExisting){
+ include('includes/InputSerialItemsExisting.php');
+}
+echo '</td></tr></table><script type="text/javascript">
+//<![CDATA[
+document.Ga6uF5Wa.SerialNo0.focus();
+//]]>
+</script>'; /*end of nested table */
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-03-01 11:13:28
|
Revision: 4634
http://weberp.svn.sourceforge.net/weberp/?rev=4634&view=rev
Author: tim_schofield
Date: 2011-03-01 11:13:22 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
Add headings to stock check sheet if quantities are not shown
Modified Paths:
--------------
trunk/StockCheck.php
trunk/includes/PDFStockCheckPageHeader.inc
Modified: trunk/StockCheck.php
===================================================================
--- trunk/StockCheck.php 2011-03-01 06:05:45 UTC (rev 4633)
+++ trunk/StockCheck.php 2011-03-01 11:13:22 UTC (rev 4634)
@@ -175,7 +175,7 @@
$FontSize=10;
$YPos -=$line_height;
- if ($_POST['ShowInfo']==true){
+ if (isset($_POST['ShowInfo']) and $_POST['ShowInfo']==true){
$SQL = "SELECT SUM(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) AS qtydemand
FROM salesorderdetails,
Modified: trunk/includes/PDFStockCheckPageHeader.inc
===================================================================
--- trunk/includes/PDFStockCheckPageHeader.inc 2011-03-01 06:05:45 UTC (rev 4633)
+++ trunk/includes/PDFStockCheckPageHeader.inc 2011-03-01 11:13:22 UTC (rev 4634)
@@ -28,16 +28,22 @@
$Xpos = $Left_Margin+1;
/*draw vertical lines */
-$pdf->line(350, $YPos-$line_height,350, $Bottom_Margin+24);
-$pdf->line(415, $YPos-$line_height,415, $Bottom_Margin+24);
-$pdf->line(475, $YPos-$line_height,475, $Bottom_Margin+24);
+$pdf->line(370, $YPos+$BoxHeight,370, $Bottom_Margin+24);
$LeftOvers = $pdf->addTextWrap($Xpos,$YPos,300-$Left_Margin,$FontSize,_('Item'), 'centre');
-if ($_POST['ShowInfo']==true){
+if (isset($_POST['ShowInfo']) and $_POST['ShowInfo']==true){
+ /*draw vertical lines */
+ $pdf->line(415, $YPos-$line_height,415, $Bottom_Margin+24);
+ $pdf->line(475, $YPos-$line_height,475, $Bottom_Margin+24);
$LeftOvers = $pdf->addTextWrap(341,$YPos,60,$FontSize,_('QOH'), 'centre');
$LeftOvers = $pdf->addTextWrap(341+61,$YPos,80,$FontSize,_('Cust Ords'), 'centre');
$LeftOvers = $pdf->addTextWrap(341+61+61,$YPos,80,$FontSize,_('Available'), 'centre');
- }
+} else {
+ /*draw vertical lines */
+ $pdf->line(435, $YPos+$BoxHeight,435, $Bottom_Margin+24);
+ $LeftOvers = $pdf->addTextWrap(371,$YPos,60,$FontSize,_('Quantity'), 'centre');
+ $LeftOvers = $pdf->addTextWrap(341+61+61,$YPos,80,$FontSize,_('Remarks'), 'centre');
+}
$FontSize=10;
$YPos -=($line_height);
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-03-01 11:14:16
|
Revision: 4635
http://weberp.svn.sourceforge.net/weberp/?rev=4635&view=rev
Author: tim_schofield
Date: 2011-03-01 11:14:10 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
Make sure credit note session variable is unset if it is a new credit note
Modified Paths:
--------------
trunk/SelectSupplier.php
trunk/SupplierCredit.php
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2011-03-01 11:13:22 UTC (rev 4634)
+++ trunk/SelectSupplier.php 2011-03-01 11:14:10 UTC (rev 4635)
@@ -166,7 +166,7 @@
echo '</td><td valign=top class="select">'; /* Supplier Transactions */
echo "<a href=\"$rootpath/PO_Header.php?" . SID . '&NewOrder=Yes&SupplierID=' . $_SESSION['SupplierID'] . "\">" . _('Enter a Purchase Order for This Supplier') . '</a><br>';
echo "<a href=\"$rootpath/SupplierInvoice.php?" . SID . '&SupplierID=' . $_SESSION['SupplierID'] . "\">" . _('Enter a Suppliers Invoice') . '</a><br>';
- echo "<a href=\"$rootpath/SupplierCredit.php?" . SID . '&SupplierID=' . $_SESSION['SupplierID'] . "\">" . _('Enter a Suppliers Credit Note') . '</a><br>';
+ echo "<a href=\"$rootpath/SupplierCredit.php?" . SID . '&SupplierID=' . $_SESSION['SupplierID'] . '&New=True' . "\">" . _('Enter a Suppliers Credit Note') . '</a><br>';
echo "<a href=\"$rootpath/Payments.php?" . SID . '&SupplierID=' . $_SESSION['SupplierID'] . "\">" . _('Enter a Payment to, or Receipt from the Supplier') . '</a><br>';
echo '<br>';
echo "<br><a href='$rootpath/ReverseGRN.php?" . SID . '&SupplierID=' . $_SESSION['SupplierID'] . "'>" . _('Reverse an Outstanding Goods Received Note (GRN)') . '</a>';
Modified: trunk/SupplierCredit.php
===================================================================
--- trunk/SupplierCredit.php 2011-03-01 11:13:22 UTC (rev 4634)
+++ trunk/SupplierCredit.php 2011-03-01 11:14:10 UTC (rev 4635)
@@ -35,6 +35,10 @@
//this is available from the menu on this page already
//echo "<a href='" . $rootpath . '/SelectSupplier.php?' . SID . "'>" . _('Back to Suppliers') . '</a><br>';
+if (isset($_GET['New'])) {
+ unset($_SESSION['SuppTrans']);
+}
+
if (!isset($_SESSION['SuppTrans']->SupplierName)) {
$sql="SELECT suppname FROM suppliers WHERE supplierid='".$_GET['SupplierID']."'";
$result = DB_query($sql,$db);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-03-01 14:07:25
|
Revision: 4639
http://weberp.svn.sourceforge.net/weberp/?rev=4639&view=rev
Author: tim_schofield
Date: 2011-03-01 14:07:19 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
Add new database field for sales unit of measure
Modified Paths:
--------------
trunk/includes/session.inc
Added Paths:
-----------
trunk/sql/mysql/updates/64.php
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2011-03-01 12:49:38 UTC (rev 4638)
+++ trunk/includes/session.inc 2011-03-01 14:07:19 UTC (rev 4639)
@@ -13,7 +13,7 @@
header('Location:' . $rootpath . '/install/index.php');
}
include($PathPrefix . 'config.php');
-$DBVersion=63;
+$DBVersion=64;
if (isset($SessionSavePath)){
session_save_path($SessionSavePath);
}
Added: trunk/sql/mysql/updates/64.php
===================================================================
--- trunk/sql/mysql/updates/64.php (rev 0)
+++ trunk/sql/mysql/updates/64.php 2011-03-01 14:07:19 UTC (rev 4639)
@@ -0,0 +1,13 @@
+<?php
+
+/* Add extra field into prices table for unit of measure
+ */
+
+AddColumn('units', 'prices', 'varchar(20)', 'NOT NULL', 'each', 'price', $db);
+
+$sql="UPDATE prices SET units=(SELECT units FROM stockmaster WHERE prices.stockid=stockmaster.stockid)";
+$result=DB_query($sql, $db);
+
+UpdateDBNo(64, $db);
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-03-01 19:11:09
|
Revision: 4641
http://weberp.svn.sourceforge.net/weberp/?rev=4641&view=rev
Author: tim_schofield
Date: 2011-03-01 19:11:02 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
Create new database field for sales unit conversion factor
Modified Paths:
--------------
trunk/Prices.php
trunk/includes/session.inc
Added Paths:
-----------
trunk/sql/mysql/updates/65.php
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2011-03-01 15:34:34 UTC (rev 4640)
+++ trunk/Prices.php 2011-03-01 19:11:02 UTC (rev 4641)
@@ -141,7 +141,7 @@
startdate,
enddate,
price)
- VALUES ('$Item',
+ valueS ('$Item',
'" . $_POST['TypeAbbrev'] . "',
'" . $_POST['CurrAbrev'] . "',
'" . $_POST['Units'] . "',
@@ -177,7 +177,7 @@
//Always do this stuff
if ($InputError ==0){
$sql = "SELECT currencies.currency,
- salestypes.sales_type,
+ salestypes.sales_type,
prices.units,
prices.price,
prices.stockid,
@@ -202,7 +202,7 @@
echo '<table class=selection>';
echo '<tr><th colspan=7><form method="post" action=' . $_SERVER['PHP_SELF'] . '?' . SID . '>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo _('Pricing for part') . ':<input type=text name="Item" MAXSIZEe=22 VALUE="' . $Item . '" maxlength=20><input type=submit name=NewPart Value="' . _('Review Prices') . '">';
+ echo _('Pricing for part') . ':<input type=text name="Item" MAXSIZEe=22 value="' . $Item . '" maxlength=20><input type=submit name=NewPart Value="' . _('Review Prices') . '">';
echo '</th></tr></form>';
echo '<tr><th>' . _('Currency') .
@@ -285,10 +285,10 @@
echo '<form method="post" action=' . $_SERVER['PHP_SELF'] . '?' . SID . '>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['Edit'])){
- echo '<input type=hidden name="OldTypeAbbrev" VALUE="' . $_GET['TypeAbbrev'] .'">';
- echo '<input type=hidden name="OldCurrAbrev" VALUE="' . $_GET['CurrAbrev'] . '">';
- echo '<input type=hidden name="OldStartDate" VALUE="' . $_GET['StartDate'] . '">';
- echo '<input type=hidden name="OldEndDate" VALUE="' . $_GET['EndDate'] . '">';
+ echo '<input type=hidden name="OldTypeAbbrev" value="' . $_GET['TypeAbbrev'] .'">';
+ echo '<input type=hidden name="OldCurrAbrev" value="' . $_GET['CurrAbrev'] . '">';
+ echo '<input type=hidden name="OldStartDate" value="' . $_GET['StartDate'] . '">';
+ echo '<input type=hidden name="OldEndDate" value="' . $_GET['EndDate'] . '">';
$_POST['CurrAbrev'] = $_GET['CurrAbrev'];
$_POST['TypeAbbrev'] = $_GET['TypeAbbrev'];
$_POST['Price'] = $_GET['Price'];
@@ -308,9 +308,9 @@
echo '<tr><td>' . _('Currency') . ':</td><td><select name="CurrAbrev">';
while ($myrow = DB_fetch_array($result)) {
if ($myrow['currabrev']==$_POST['CurrAbrev']) {
- echo '<option selected VALUE="';
+ echo '<option selected value="';
} else {
- echo '<option VALUE="';
+ echo '<option value="';
}
echo $myrow['currabrev'] . '">' . $myrow['currency'];
} //end while loop
@@ -324,9 +324,9 @@
while ($myrow = DB_fetch_array($result)) {
if ($myrow['typeabbrev']==$_POST['TypeAbbrev']) {
- echo '<option selected VALUE="';
+ echo '<option selected value="';
} else {
- echo '<option VALUE="';
+ echo '<option value="';
}
echo $myrow['typeabbrev'] . '">' . $myrow['sales_type'];
@@ -345,20 +345,20 @@
<td><input type="Text" class=date alt="'.$_SESSION['DefaultDateFormat'].'" name="StartDate" size=10 maxlength=10 value="' . $_POST['StartDate'] . '"></td></tr>';
echo '<tr><td>' . _('Price Effective To Date') . ':</td>
<td><input type="Text" class=date alt="'.$_SESSION['DefaultDateFormat'].'" name="EndDate" size=10 maxlength=10 value="' . $_POST['EndDate'] . '"></td></tr>';
- echo '<tr><td>' . _('Unit of Measure') . ':</td>';
- echo '<td><select name="Units">';
- $sql = "SELECT unitname FROM unitsofmeasure";
- $result = DB_query($sql, $db);
- while ($myrow = DB_fetch_array($result)) {
- if ($_POST['Units'] == $myrow['unitname']) {
- echo '<option selected value="' . $myrow['unitname'] . '">' . $myrow['unitname'] . '</option>';
- } else if ($DefaultUOM == $myrow['unitname'] and ($_POST['Units'] == $myrow['unitname'])) {
- echo '<option selected value="' . $myrow['unitname'] . '">' . $myrow['unitname'] . '</option>';
- } else {
- echo '<option value="' . $myrow['unitname'] . '">' . $myrow['unitname'] . '</option>';
- }
- }
- echo '</td></tr>';
+ echo '<tr><td>' . _('Unit of Measure') . ':</td>';
+ echo '<td><select name="Units">';
+ $sql = "SELECT unitname FROM unitsofmeasure";
+ $result = DB_query($sql, $db);
+ while ($myrow = DB_fetch_array($result)) {
+ if ($_POST['Units'] == $myrow['unitname']) {
+ echo '<option selected value="' . $myrow['unitname'] . '">' . $myrow['unitname'] . '</option>';
+ } else if ($DefaultUOM == $myrow['unitname'] and ($_POST['Units'] == $myrow['unitname'])) {
+ echo '<option selected value="' . $myrow['unitname'] . '">' . $myrow['unitname'] . '</option>';
+ } else {
+ echo '<option value="' . $myrow['unitname'] . '">' . $myrow['unitname'] . '</option>';
+ }
+ }
+ echo '</td></tr>';
echo '<input type=hidden name=Item value='.$Item.'>';
?>
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2011-03-01 15:34:34 UTC (rev 4640)
+++ trunk/includes/session.inc 2011-03-01 19:11:02 UTC (rev 4641)
@@ -13,7 +13,7 @@
header('Location:' . $rootpath . '/install/index.php');
}
include($PathPrefix . 'config.php');
-$DBVersion=64;
+$DBVersion=65;
if (isset($SessionSavePath)){
session_save_path($SessionSavePath);
}
Added: trunk/sql/mysql/updates/65.php
===================================================================
--- trunk/sql/mysql/updates/65.php (rev 0)
+++ trunk/sql/mysql/updates/65.php 2011-03-01 19:11:02 UTC (rev 4641)
@@ -0,0 +1,13 @@
+<?php
+
+/* Add extra field into prices table for unit of measure
+ */
+
+AddColumn('conversionfactor', 'prices', 'double', 'NOT NULL', '1', 'units', $db);
+
+$sql="UPDATE prices SET conversionfactor=1";
+$result=DB_query($sql, $db);
+
+UpdateDBNo(65, $db);
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-03-02 11:07:33
|
Revision: 4644
http://weberp.svn.sourceforge.net/weberp/?rev=4644&view=rev
Author: tim_schofield
Date: 2011-03-02 11:07:27 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
New database fields for conversion factor and unit of measure in the sales order details table
Modified Paths:
--------------
trunk/includes/session.inc
Added Paths:
-----------
trunk/sql/mysql/updates/66.php
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2011-03-02 10:32:15 UTC (rev 4643)
+++ trunk/includes/session.inc 2011-03-02 11:07:27 UTC (rev 4644)
@@ -13,7 +13,7 @@
header('Location:' . $rootpath . '/install/index.php');
}
include($PathPrefix . 'config.php');
-$DBVersion=65;
+$DBVersion=66;
if (isset($SessionSavePath)){
session_save_path($SessionSavePath);
}
Added: trunk/sql/mysql/updates/66.php
===================================================================
--- trunk/sql/mysql/updates/66.php (rev 0)
+++ trunk/sql/mysql/updates/66.php 2011-03-02 11:07:27 UTC (rev 4644)
@@ -0,0 +1,17 @@
+<?php
+
+/* Add extra field into prices table for unit of measure
+ */
+
+AddColumn('units', 'salesorderdetails', 'varchar(20)', 'NOT NULL', 'each', 'unitprice', $db);
+AddColumn('conversionfactor', 'salesorderdetails', 'double', 'NOT NULL', '1', 'units', $db);
+
+$sql="UPDATE salesorderdetails SET conversionfactor=1";
+$result=DB_query($sql, $db);
+
+$sql="UPDATE salesorderdetails SET units=(SELECT units FROM stockmaster WHERE salesorderdetails.stkcode=stockmaster.stockid)";
+$result=DB_query($sql, $db);
+
+UpdateDBNo(66, $db);
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-03-05 21:52:04
|
Revision: 4666
http://weberp.svn.sourceforge.net/weberp/?rev=4666&view=rev
Author: tim_schofield
Date: 2011-03-05 21:51:58 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
Remove ability to have plain text passwords as this makes a nonsense of encrypting them
Modified Paths:
--------------
trunk/config.distrib.php
trunk/includes/UserLogin.php
trunk/includes/session.inc
Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php 2011-03-05 16:25:09 UTC (rev 4665)
+++ trunk/config.distrib.php 2011-03-05 21:51:58 UTC (rev 4666)
@@ -58,7 +58,6 @@
// which encryption function should be used
//$CryptFunction = "md5"; // MD5 Hash
$CryptFunction = "sha1"; // SHA1 Hash
-//$CryptFunction = ""; // Plain Text
//Setting to 12 or 24 determines the format of the clock display at the end of all screens
$DefaultClock = 12;
Modified: trunk/includes/UserLogin.php
===================================================================
--- trunk/includes/UserLogin.php 2011-03-05 16:25:09 UTC (rev 4665)
+++ trunk/includes/UserLogin.php 2011-03-05 21:51:58 UTC (rev 4666)
@@ -36,11 +36,19 @@
if (!isset($Name) or $Name == '') {
return UL_SHOWLOGIN;
}
+
+ /* Temporary fix for old unencrypted password */
+ $sql="UPDATE www_users
+ SET password='".CryptPass($Password)."'
+ WHERE password='weberp'";
+ $ErrMsg = _('Could not reset password');
+ $Result = DB_query($sql, $db,$ErrMsg);
+ /* End temporary fix */
+
$sql = "SELECT *
FROM www_users
WHERE www_users.userid='" . $Name . "'
- AND (www_users.password='" . CryptPass($Password) . "'
- OR www_users.password='" . $Password . "')";
+ AND (www_users.password='" . CryptPass($Password) . "')";
$ErrMsg = _('Could not retrieve user details on login because');
$debug =1;
$Auth_Result = DB_query($sql, $db,$ErrMsg);
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2011-03-05 16:25:09 UTC (rev 4665)
+++ trunk/includes/session.inc 2011-03-05 21:51:58 UTC (rev 4666)
@@ -303,14 +303,14 @@
$debug = 0; //don't allow debug messages
}
function CryptPass( $Password ) {
- global $CryptFunction;
- if ( $CryptFunction == 'sha1' ) {
- return sha1($Password);
- } elseif ( $CryptFunction == 'md5' ) {
- return md5($Password);
+ global $CryptFunction;
+ if ( $CryptFunction == 'sha1' ) {
+ return sha1($Password);
+ } elseif ( $CryptFunction == 'md5' ) {
+ return md5($Password);
} else {
- return $Password;
- }
+ return false;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-03-13 13:54:19
|
Revision: 4779
http://weberp.svn.sourceforge.net/weberp/?rev=4779&view=rev
Author: tim_schofield
Date: 2011-03-13 13:54:13 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
Marcos Garcia: Script to change a supplier code throughout the database
Modified Paths:
--------------
trunk/includes/session.inc
Added Paths:
-----------
trunk/Z_ChangeSupplierCode.php
trunk/sql/mysql/updates/67.php
Added: trunk/Z_ChangeSupplierCode.php
===================================================================
--- trunk/Z_ChangeSupplierCode.php (rev 0)
+++ trunk/Z_ChangeSupplierCode.php 2011-03-13 13:54:13 UTC (rev 4779)
@@ -0,0 +1,120 @@
+<?php
+/* $Id: Z_ChangeSupplierCode.php 4466 2011-01-13 09:33:59Z daintree $*/
+/*Script to Delete all sales transactions*/
+
+$PageSecurity=15;
+include ('includes/session.inc');
+$title = _('UTILITY PAGE To Changes A Supplier Code In All Tables');
+include('includes/header.inc');
+
+if (isset($_POST['ProcessSupplierChange']))
+ ProcessSupplier($_POST['OldSupplierNo'], $_POST['NewSupplierNo']);
+
+echo "<form action='" . $_SERVER['PHP_SELF'] . "?=" . $SID . "' method=post>";
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+echo '
+ <div class="centre">
+ <table>
+ <tr><td>' . _('Existing Supplier Code') . ':</td>
+ <td><input type="Text" name="OldSupplierNo" size=20 maxlength=20></td>
+ </tr>
+ <tr><td> ' . _('New Supplier Code') . ':</td>
+ <td><input type=Text name="NewSupplierNo" size=20 maxlength=20></td>
+ </tr>
+ </table>
+ <input type=submit name="ProcessSupplierChange" VALUE="' . _('Process') . '">
+ <div>
+ </form>';
+
+include('includes/footer.inc');
+exit();
+
+
+function ProcessSupplier($oldCode, $newCode) {
+ global $db;
+ $table_key= array (
+ 'grns' => 'supplierid',
+ 'offers'=>'supplierid',
+ 'purchdata'=>'supplierno',
+ 'purchorders'=>'supplierno',
+ 'shipments'=>'supplierid',
+ 'suppliercontacts'=>'supplierid',
+ 'supptrans'=>'supplierno',
+ 'www_users'=>'supplierid');
+
+ // First check the Supplier code exists
+ if (!checkSupplierExist($oldCode)) {
+ prnMsg ('<br><br>' . _('The Supplier code') . ': ' . $oldCode . ' ' .
+ _('does not currently exist as a Supplier code in the system'),'error');
+ return;
+ }
+ $newCode = trim($newCode);
+ if (checkNewCode($newCode)) {
+ // Now check that the new code doesn't already exist
+ if (checkSupplierExist($newCode)) {
+ prnMsg(_('The replacement Supplier code') .': ' .
+ $newCode . ' ' . _('already exists as a Supplier code in the system') . ' - ' . _('a unique Supplier code must be entered for the new code'),'error');
+ return;
+ }
+ } else {
+ return;
+ }
+
+ $result = DB_Txn_Begin($db);
+
+ prnMsg(_('Inserting the new supplier record'),'info');
+ $sql = "INSERT INTO suppliers (`supplierid`,
+ `suppname`, `address1`, `address2`, `address3`,
+ `address4`, `address5`, `address6`, `supptype`, `lat`, `lng`,
+ `currcode`, `suppliersince`, `paymentterms`, `lastpaid`,
+ `lastpaiddate`, `bankact`, `bankref`, `bankpartics`,
+ `remittance`, `taxgroupid`, `factorcompanyid`, `taxref`,
+ `phn`, `port`, `email`, `fax`, `telephone`)
+ SELECT '" . $newCode . "',
+ `suppname`, `address1`, `address2`, `address3`,
+ `address4`, `address5`, `address6`, `supptype`, `lat`, `lng`,
+ `currcode`, `suppliersince`, `paymentterms`, `lastpaid`,
+ `lastpaiddate`, `bankact`, `bankref`, `bankpartics`,
+ `remittance`, `taxgroupid`, `factorcompanyid`, `taxref`,
+ `phn`, `port`, `email`, `fax`, `telephone`
+ FROM suppliers WHERE supplierid='" . $oldCode . "'";
+
+ $DbgMsg =_('The SQL that failed was');
+ $ErrMsg = _('The SQL to insert the new debtors master record failed') . ', ' . _('the SQL statement was');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+
+ foreach ($table_key as $table=>$key) {
+ prnMsg(_('Changing').' '. $table.' ' . _('records'),'info');
+ $sql = "UPDATE $table SET $key='" . $newCode . "' WHERE $key='" . $oldCode . "'";
+ $ErrMsg = _("The SQL to update $table records failed");
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ }
+
+ prnMsg(_('Deleting the Supplier code from the DebtorsMaster table'),'info');
+ $sql = "DELETE FROM suppliers WHERE supplierid='" . $oldCode . "'";
+
+ $ErrMsg = _('The SQL to delete the old debtor record failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+
+ $result = DB_Txn_Commit($db);
+}
+
+function checkSupplierExist($codeSupplier) {
+ global $db;
+ $result=DB_query("SELECT supplierid FROM suppliers WHERE supplierid='" .
+ $codeSupplier . "'",$db);
+ if (DB_num_rows($result)==0) return false;
+ return true;
+}
+
+function checkNewCode($code) {
+ $tmp = str_replace(' ','',$code);
+ if ($tmp != $code) {
+ prnMsg ('<br><br>' . _('The New supplier code') . ': ' . $code . ' ' .
+ _('must be not empty nor with spaces'),'error');
+ return false;
+ }
+ return true;
+}
+?>
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2011-03-13 11:08:08 UTC (rev 4778)
+++ trunk/includes/session.inc 2011-03-13 13:54:13 UTC (rev 4779)
@@ -13,7 +13,7 @@
header('Location:' . $rootpath . '/install/index.php');
}
include($PathPrefix . 'config.php');
-$DBVersion=66;
+$DBVersion=67;
if (isset($SessionSavePath)){
session_save_path($SessionSavePath);
}
Added: trunk/sql/mysql/updates/67.php
===================================================================
--- trunk/sql/mysql/updates/67.php (rev 0)
+++ trunk/sql/mysql/updates/67.php 2011-03-13 13:54:13 UTC (rev 4779)
@@ -0,0 +1,10 @@
+<?php
+
+/* Include the new script for printing quotations in Portrait
+ */
+
+InsertRecord('pagesecurity', array('script', 'security'), array('Z_ChangeSupplierCode.php',15), array('script', 'security'), array('Z_ChangeSupplierCode.php',15), $db);
+
+UpdateDBNo(67, $db);
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-03-22 20:11:33
|
Revision: 4780
http://weberp.svn.sourceforge.net/weberp/?rev=4780&view=rev
Author: tim_schofield
Date: 2011-03-22 20:11:26 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
Extra work on sales unit of measure
Modified Paths:
--------------
trunk/SelectOrderItems.php
trunk/includes/ConnectDB_mysqli.inc
trunk/includes/DefineCartClass.php
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-03-13 13:54:13 UTC (rev 4779)
+++ trunk/SelectOrderItems.php 2011-03-22 20:11:26 UTC (rev 4780)
@@ -763,26 +763,51 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
- stockmaster.units
- FROM stockmaster,
- stockcategory
+ stockmaster.units as stockunits,
+ prices.units as customerunits,
+ prices.conversionfactor,
+ prices.price,
+ prices.currabrev
+ FROM stockmaster
+ LEFT JOIN prices
+ ON stockmaster.stockid=prices.stockid,
+ stockcategory
WHERE stockmaster.categoryid=stockcategory.categoryid
AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.mbflag <>'G'
AND stockmaster.description " . LIKE . " '$SearchString'
AND stockmaster.discontinued=0
+ AND ((prices.debtorno='".$_SESSION['Items'.$identifier]->DebtorNo."')
+ OR (prices.debtorno='' AND (SELECT COUNT(stockid) from prices where debtorno='".$_SESSION['Items'.$identifier]->DebtorNo.
+ "' AND stockid=stockmaster.stockid)=0 AND prices.currabrev='".$_SESSION['Items'.$identifier]->DefaultCurrency."')
+ OR (prices.debtorno is NULL OR (prices.debtorno='' AND prices.currabrev<>'".$_SESSION['Items'.$identifier]->DefaultCurrency."')
+ AND (SELECT COUNT(stockid) from prices where debtorno='".$_SESSION['Items'.$identifier]->DebtorNo.
+ "' AND stockid=stockmaster.stockid)=0))
ORDER BY stockmaster.stockid";
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
- stockmaster.units
- FROM stockmaster, stockcategory
+ stockmaster.units as stockunits,
+ prices.units as customerunits,
+ prices.conversionfactor,
+ prices.price,
+ prices.currabrev
+ FROM stockmaster
+ LEFT JOIN prices
+ ON stockmaster.stockid=prices.stockid,
+ stockcategory
WHERE stockmaster.categoryid=stockcategory.categoryid
AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
AND stockmaster.description " . LIKE . " '" . $SearchString . "'
AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ AND ((prices.debtorno='".$_SESSION['Items'.$identifier]->DebtorNo."')
+ OR (prices.debtorno='' AND (SELECT COUNT(stockid) from prices where debtorno='".$_SESSION['Items'.$identifier]->DebtorNo.
+ "' AND stockid=stockmaster.stockid)=0 AND prices.currabrev='".$_SESSION['Items'.$identifier]->DefaultCurrency."')
+ OR (prices.debtorno is NULL OR (prices.debtorno='' AND prices.currabrev<>'".$_SESSION['Items'.$identifier]->DefaultCurrency."')
+ AND (SELECT COUNT(stockid) from prices where debtorno='".$_SESSION['Items'.$identifier]->DebtorNo.
+ "' AND stockid=stockmaster.stockid)=0))
ORDER BY stockmaster.stockid";
}
@@ -794,25 +819,51 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
- stockmaster.units
- FROM stockmaster, stockcategory
+ stockmaster.units as stockunits,
+ prices.units as customerunits,
+ prices.conversionfactor,
+ prices.price,
+ prices.currabrev
+ FROM stockmaster
+ LEFT JOIN prices
+ ON stockmaster.stockid=prices.stockid,
+ stockcategory
WHERE stockmaster.categoryid=stockcategory.categoryid
AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
+ AND ((prices.debtorno='".$_SESSION['Items'.$identifier]->DebtorNo."')
+ OR (prices.debtorno='' AND (SELECT COUNT(stockid) from prices where debtorno='".$_SESSION['Items'.$identifier]->DebtorNo.
+ "' AND stockid=stockmaster.stockid)=0 AND prices.currabrev='".$_SESSION['Items'.$identifier]->DefaultCurrency."')
+ OR (prices.debtorno is NULL OR (prices.debtorno='' AND prices.currabrev<>'".$_SESSION['Items'.$identifier]->DefaultCurrency."')
+ AND (SELECT COUNT(stockid) from prices where debtorno='".$_SESSION['Items'.$identifier]->DebtorNo.
+ "' AND stockid=stockmaster.stockid)=0))
ORDER BY stockmaster.stockid";
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
- stockmaster.units
- FROM stockmaster, stockcategory
+ stockmaster.units as stockunits,
+ prices.units as customerunits,
+ prices.conversionfactor,
+ prices.price,
+ prices.currabrev
+ FROM stockmaster
+ LEFT JOIN prices
+ ON stockmaster.stockid=prices.stockid,
+ stockcategory
WHERE stockmaster.categoryid=stockcategory.categoryid
AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ AND ((prices.debtorno='".$_SESSION['Items'.$identifier]->DebtorNo."')
+ OR (prices.debtorno='' AND (SELECT COUNT(stockid) from prices where debtorno='".$_SESSION['Items'.$identifier]->DebtorNo.
+ "' AND stockid=stockmaster.stockid)=0 AND prices.currabrev='".$_SESSION['Items'.$identifier]->DefaultCurrency."')
+ OR (prices.debtorno is NULL OR (prices.debtorno='' AND prices.currabrev<>'".$_SESSION['Items'.$identifier]->DefaultCurrency."')
+ AND (SELECT COUNT(stockid) from prices where debtorno='".$_SESSION['Items'.$identifier]->DebtorNo.
+ "' AND stockid=stockmaster.stockid)=0))
ORDER BY stockmaster.stockid";
}
@@ -820,23 +871,50 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
- stockmaster.units
- FROM stockmaster, stockcategory
+ stockmaster.units as stockunits,
+ prices.debtorno,
+ prices.units as customerunits,
+ prices.conversionfactor,
+ prices.price,
+ prices.currabrev
+ FROM stockmaster
+ LEFT JOIN prices
+ ON stockmaster.stockid=prices.stockid,
+ stockcategory
WHERE stockmaster.categoryid=stockcategory.categoryid
AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
+ AND ((prices.debtorno='".$_SESSION['Items'.$identifier]->DebtorNo."')
+ OR (prices.debtorno='' AND (SELECT COUNT(stockid) from prices where debtorno='".$_SESSION['Items'.$identifier]->DebtorNo.
+ "' AND stockid=stockmaster.stockid)=0 AND prices.currabrev='".$_SESSION['Items'.$identifier]->DefaultCurrency."')
+ OR (prices.debtorno is NULL OR (prices.debtorno='' AND prices.currabrev<>'".$_SESSION['Items'.$identifier]->DefaultCurrency."')
+ AND (SELECT COUNT(stockid) from prices where debtorno='".$_SESSION['Items'.$identifier]->DebtorNo.
+ "' AND stockid=stockmaster.stockid)=0))
ORDER BY stockmaster.stockid";
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
- stockmaster.units
- FROM stockmaster, stockcategory
+ stockmaster.units as stockunits,
+ prices.units as customerunits,
+ prices.conversionfactor,
+ prices.price,
+ prices.currabrev
+ FROM stockmaster
+ LEFT JOIN prices
+ ON stockmaster.stockid=prices.stockid,
+ stockcategory
WHERE stockmaster.categoryid=stockcategory.categoryid
AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ AND ((prices.debtorno='".$_SESSION['Items'.$identifier]->DebtorNo."')
+ OR (prices.debtorno='' AND (SELECT COUNT(stockid) from prices where debtorno='".$_SESSION['Items'.$identifier]->DebtorNo.
+ "' AND stockid=stockmaster.stockid)=0 AND prices.currabrev='".$_SESSION['Items'.$identifier]->DefaultCurrency."')
+ OR (prices.debtorno is NULL OR (prices.debtorno='' AND prices.currabrev<>'".$_SESSION['Items'.$identifier]->DefaultCurrency."')
+ AND (SELECT COUNT(stockid) from prices where debtorno='".$_SESSION['Items'.$identifier]->DebtorNo.
+ "' AND stockid=stockmaster.stockid)=0))
ORDER BY stockmaster.stockid";
}
}
@@ -1438,7 +1516,8 @@
<th>' . _('On Demand') . '</th>
<th>' . _('On Order') . '</th>
<th>' . _('Available') . '</th>
- <th>' . _('Quantity') . '</th></tr>';
+ <th>' . _('Quantity') . '</th>
+ <th>' . _('Price') . '</th></tr>';
echo $TableHeader;
$j = 1;
$k=0; //row colour counter
@@ -1447,15 +1526,20 @@
// This code needs sorting out, but until then :
$ImageSource = _('No Image');
// Find the quantity in stock at location
- $QOHSQL = "SELECT sum(locstock.quantity) AS qoh,
- stockmaster.decimalplaces
- FROM locstock INNER JOIN stockmaster
- ON locstock.stockid=stockmaster.stockid
+ $DecimalPlacesSQL="SELECT decimalplaces
+ FROM stockmaster
+ WHERE stockid='" .$myrow['stockid'] . "'";
+ $DecimalPlacesResult = DB_query($DecimalPlacesSQL, $db);
+ $DecimalPlacesRow = DB_fetch_array($DecimalPlacesResult);
+ $DecimalPlaces = $DecimalPlacesRow['decimalplaces'];
+
+ $QOHSQL = "SELECT sum(locstock.quantity) AS qoh
+ FROM locstock
WHERE locstock.stockid='" .$myrow['stockid'] . "' AND
loccode = '" . $_SESSION['Items'.$identifier]->Location . "'";
$QOHResult = DB_query($QOHSQL,$db);
$QOHRow = DB_fetch_array($QOHResult);
- $QOH = $QOHRow['qoh'];
+ $QOH = $QOHRow['qoh']*$myrow['conversionfactor'];
// Find the quantity on outstanding sales orders
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
@@ -1532,10 +1616,10 @@
$myrow['stockid'],
$myrow['description'],
$myrow['units'],
- number_format($QOH, $QOHRow['decimalplaces']),
- number_format($DemandQty, $QOHRow['decimalplaces']),
- number_format($OnOrder, $QOHRow['decimalplaces']),
- number_format($Available, $QOHRow['decimalplaces']),
+ number_format($QOH, $DecimalPlaces),
+ number_format($DemandQty, $DecimalPlaces),
+ number_format($OnOrder, $DecimalPlaces),
+ number_format($Available, $DecimalPlaces),
$ImageSource,
$rootpath,
SID,
@@ -1622,24 +1706,32 @@
<th>' . _('On Demand') . '</th>
<th>' . _('On Order') . '</th>
<th>' . _('Available') . '</th>
- <th>' . _('Quantity') . '</th></tr>';
+ <th>' . _('Quantity') . '</th>
+ <th>' . _('Price') . '</th></tr>';
echo $TableHeader;
$ImageSource = _('No Image');
$k=0; //row colour counter
while ($myrow=DB_fetch_array($SearchResult)) {
+ if ($myrow['conversionfactor']=='') {
+ $myrow['conversionfactor']=1;
+ }
+ // Find the quantity in stock at location
+ $DecimalPlacesSQL="SELECT decimalplaces
+ FROM stockmaster
+ WHERE stockid='" .$myrow['stockid'] . "'";
+ $DecimalPlacesResult = DB_query($DecimalPlacesSQL, $db);
+ $DecimalPlacesRow = DB_fetch_array($DecimalPlacesResult);
+ $DecimalPlaces = $DecimalPlacesRow['decimalplaces'];
- // Find the quantity in stock at location
- $QOHSQL = "SELECT sum(quantity) AS qoh,
- stockmaster.decimalplaces
- FROM locstock INNER JOIN stockmaster
- ON locstock.stockid = stockmaster.stockid
+ $QOHSQL = "SELECT sum(locstock.quantity) AS qoh
+ FROM locstock
WHERE locstock.stockid='" .$myrow['stockid'] . "' AND
loccode = '" . $_SESSION['Items'.$identifier]->Location . "'";
$QOHResult = DB_query($QOHSQL,$db);
$QOHRow = DB_fetch_array($QOHResult);
- $QOH = $QOHRow['qoh'];
+ $QOH = $QOHRow['qoh']*$myrow['conversionfactor'];
// Find the quantity on outstanding sales orders
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
@@ -1663,7 +1755,8 @@
// Find the quantity on purchase orders
$sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS dem
- FROM purchorderdetails INNER JOIN purchorders
+ FROM purchorderdetails LEFT JOIN purchorders
+ ON purchorderdetails.orderno=purchorders.orderno
WHERE purchorderdetails.completed=0
AND purchorders.status<>'Cancelled'
AND purchorders.status<>'Rejected'
@@ -1701,29 +1794,26 @@
$k=1;
}
$OnOrder = $PurchQty + $WoQty;
- $Available = $QOH - $DemandQty + $OnOrder;
-
- printf('<td>%s</font></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</td>
+ $Available = $QOH - $DemandQty + $OnOrder*$myrow['conversionfactor'];
+ if ($myrow['customerunits']=='') {
+ $myrow['units']=$myrow['stockunits'];
+ } else {
+ $myrow['units']=$myrow['customerunits'];
+ }
+ if ($myrow['currabrev']<>$_SESSION['Items'.$identifier]->DefaultCurrency) {
+ $myrow['price']=0;
+ }
+ echo '<td>'.$myrow['stockid'].'</font></td>
+ <td>'.$myrow['description'].'</td>
+ <td>'.$myrow['units'].'</td>
+ <td class="number">'.number_format($QOH,$DecimalPlaces).'</td>
+ <td class="number">'.number_format($DemandQty,$DecimalPlaces).'</td>
+ <td class="number">'.number_format($OnOrder*$myrow['conversionfactor'],$DecimalPlaces).'</td>
+ <td class="number">'.number_format($Available,$DecimalPlaces).'</td>
<td><font size=1><input class="number" tabindex='.number_format($j+7).' type="textbox" size=6 name="itm'.$myrow['stockid'].'" value=0>
+ <td class="number">'.number_format($myrow['price'],2).'</td>
</td>
- </tr>',
- $myrow['stockid'],
- $myrow['description'],
- $myrow['units'],
- number_format($QOH,$QOHRow['decimalplaces']),
- number_format($DemandQty,$QOHRow['decimalplaces']),
- number_format($OnOrder,$QOHRow['decimalplaces']),
- number_format($Available,$QOHRow['decimalplaces']),
- $ImageSource,
- $rootpath,
- SID,
- $myrow['stockid']);
+ </tr>';
if ($j==1) {
$jsCall = '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.itm'.$myrow['stockid'].');}</script>';
}
Modified: trunk/includes/ConnectDB_mysqli.inc
===================================================================
--- trunk/includes/ConnectDB_mysqli.inc 2011-03-13 13:54:13 UTC (rev 4779)
+++ trunk/includes/ConnectDB_mysqli.inc 2011-03-22 20:11:26 UTC (rev 4780)
@@ -14,7 +14,7 @@
$mysqlport = 3306;
}
$db = mysqli_connect($host , $dbuser, $dbpassword,$_SESSION['DatabaseName'], $mysqlport);
-
+//$result=DB_query("SET sql_mode = ONLY_FULL_GROUP_BY", $db);
//printf("tried making mysql-i Connection.\n");
//$varabc = mysqli_client_encoding($db);
//printf("client encoding is %s\n", $varabc);
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-03-13 13:54:13 UTC (rev 4779)
+++ trunk/includes/DefineCartClass.php 2011-03-22 20:11:26 UTC (rev 4780)
@@ -75,7 +75,8 @@
$Descr,
$Price,
$Disc=0,
- $UOM,
+ $Units,
+ $ConversionFactor=1,
$Volume,
$Weight,
$QOHatLoc=0,
@@ -114,7 +115,8 @@
$Qty,
$Price,
$Disc,
- $UOM,
+ $Units,
+ $ConversionFactor,
$Volume,
$Weight,
$QOHatLoc,
@@ -150,17 +152,21 @@
stkcode,
quantity,
unitprice,
+ units,
+ conversionfactor,
discountpercent,
itemdue,
poline)
- VALUES(" . $this->LineCounter . ",
- " . $_SESSION['ExistingOrder'] . ",
+ VALUES('" . $this->LineCounter . "',
+ '" . $_SESSION['ExistingOrder'] . "',
'" . trim(strtoupper($StockID)) ."',
- " . $Qty . ",
- " . $Price . ",
- " . $Disc . ",'
- " . $ItemDue . "',
- " . $POLine . ")";
+ '" . $Qty . "',
+ '" . $Price . "',
+ '" . $Units . "',
+ '" . $ConversionFactor . "',
+ '" . $Disc . "',
+ '" . $ItemDue . "',
+ '" . $POLine . "')";
$result = DB_query($sql,
$db ,
_('The order line for') . ' ' . strtoupper($StockID) . ' ' ._('could not be inserted'));
@@ -175,6 +181,8 @@
function update_cart_item( $UpdateLineNumber,
$Qty,
$Price,
+ $Units,
+ $ConversionFactor=1,
$Disc,
$Narrative,
$UpdateDB='No',
@@ -186,6 +194,8 @@
$this->LineItems[$UpdateLineNumber]->Quantity = $Qty;
}
$this->LineItems[$UpdateLineNumber]->Price = $Price;
+ $this->LineItems[$UpdateLineNumber]->Units = $Units;
+ $this->LineItems[$UpdateLineNumber]->ConversionFactor = $ConversionFactor;
$this->LineItems[$UpdateLineNumber]->DiscountPercent = $Disc;
$this->LineItems[$UpdateLineNumber]->Narrative = $Narrative;
$this->LineItems[$UpdateLineNumber]->ItemDue = $ItemDue;
@@ -193,14 +203,16 @@
$this->LineItems[$UpdateLineNumber]->GPPercent = $GPPercent;
if ($UpdateDB=='Yes'){
global $db;
- $result = DB_query("UPDATE salesorderdetails SET quantity=" . $Qty . ",
- unitprice=" . $Price . ",
- discountpercent=" . $Disc . ",
+ $result = DB_query("UPDATE salesorderdetails SET quantity='" . $Qty . "',
+ unitprice='" . $Price . "',
+ units='" . $Units . "',
+ conversionfactor='" . $ConversionFactor . "',
+ discountpercent='" . $Disc . "',
narrative ='" . DB_escape_string($Narrative) . "',
itemdue = '" . FormatDateForSQL($ItemDue) . "',
poline = '" . DB_escape_string($POLine) . "'
- WHERE orderno=" . $_SESSION['ExistingOrder'] . "
- AND orderlineno=" . $UpdateLineNumber
+ WHERE orderno='" . $_SESSION['ExistingOrder'] . "'
+ AND orderlineno='" . $UpdateLineNumber . "'"
, $db
, _('The order line number') . ' ' . $UpdateLineNumber . ' ' . _('could not be updated'));
}
@@ -413,6 +425,7 @@
Var $Price;
Var $DiscountPercent;
Var $Units;
+ var $ConversionFactor;
Var $Volume;
Var $Weight;
Var $ActDispDate;
@@ -442,7 +455,8 @@
$Qty,
$Prc,
$DiscPercent,
- $UOM,
+ $Units,
+ $ConversionFactor,
$Volume,
$Weight,
$QOHatLoc,
@@ -469,7 +483,8 @@
$this->Quantity = $Qty;
$this->Price = $Prc;
$this->DiscountPercent = $DiscPercent;
- $this->Units = $UOM;
+ $this->Units = $Units;
+ $this->ConversionFactor = $ConversionFactor;
$this->Volume = $Volume;
$this->Weight = $Weight;
$this->ActDispDate = $ActDispatchDate;
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2011-03-13 13:54:13 UTC (rev 4779)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2011-03-22 20:11:26 UTC (rev 4780)
@@ -24,13 +24,13 @@
if (strcasecmp($OrderItem->StockID, $NewItem)==0) {
$AlreadyOnThisOrder = 1;
prnMsg(_('The item') . ' ' . $NewItem . ' ' . _('is already on this order the system is set up to prevent the same item being on the order more than once. However you can change the quantity ordered of the existing line if necessary'));
- }
+ }
} /* end of the foreach loop to look for preexisting items of the same code */
}
if ($AlreadyOnThisOrder!=1){
- $sql = "SELECT stockmaster.description,
+ $sql = "SELECT stockmaster.description,
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
@@ -50,16 +50,16 @@
WHERE locstock.loccode='" . $_SESSION['Items'.$identifier]->Location . "'
AND stockmaster.stockid = '". $NewItem . "'";
- $ErrMsg = _('The details for') . ' ' . $NewItem . ' ' . _('could not be retrieved because');
- $DbgMsg = _('The SQL used to retrieve the pricing details but failed was');
- $result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg);
+ $ErrMsg = _('The details for') . ' ' . $NewItem . ' ' . _('could not be retrieved because');
+ $DbgMsg = _('The SQL used to retrieve the pricing details but failed was');
+ $result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- if (DB_num_rows($result1)==0){
+ if (DB_num_rows($result1)==0){
prnMsg(_('The item code') . ' ' . $NewItem . ' ' . _('could not be found in the database') . ' - ' . _('it has not been added to the order'),'warn',_('Item Does Not Exist'));
- } elseif ($myItemRow = DB_fetch_array($result1)){
+ } elseif ($myItemRow = DB_fetch_array($result1)){
- if ($myItemRow['discontinued']==1){
+ if ($myItemRow['discontinued']==1){
prnMsg(_('The item') . ' ' . $NewItem . ' ' . _('could not be added to the order because it has been flagged as obsolete'),'error',_('Obsolete Item'));
} elseif (($_SESSION['AllowSalesOfZeroCostItems'] == false
@@ -113,8 +113,8 @@
if (!isset($_SESSION['WarnOnce']) and $_SESSION['Items'.$identifier]->SpecialInstructions) {
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'warn');
- $WarnOnce=1;
- }
+ $WarnOnce=1;
+ }
if ($_SESSION['CheckCreditLimits'] > 0){ /*Check credit limits is 1 for warn
and 2 for prohibit sales */
$_SESSION['Items'.$identifier]->CreditAvailable -= round(($NewItemQty * $Price * (1- $Discount)),2);
@@ -158,9 +158,9 @@
$ExRate);
}
- } else {
+ } else {
prnMsg(_('The item code') . ' ' . $NewItem . ' ' . _('does not have a cost set up and order entry is set up to prohibit sales of items with no cost data entered'),'warn');
- }
+ }
}
} /* end of if not already on the order */
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-03-22 20:18:58
|
Revision: 4803
http://weberp.svn.sourceforge.net/weberp/?rev=4803&view=rev
Author: tim_schofield
Date: 2011-03-22 20:18:49 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
New tendering system, initial upload
Modified Paths:
--------------
trunk/PO_Header.php
trunk/PO_Items.php
trunk/SelectProduct.php
trunk/Stocks.php
trunk/SupplierTenders.php
trunk/includes/DefineOfferClass.php
trunk/includes/DefinePOClass.php
trunk/includes/footer.inc
trunk/includes/session.inc
trunk/index.php
trunk/sql/mysql/updates/65.php
Added Paths:
-----------
trunk/Manufacturers.php
trunk/SupplierTenderCreate.php
trunk/companies/weberpdemo/
trunk/companies/weberpdemo/EDI_Incoming_Orders/
trunk/companies/weberpdemo/EDI_Incoming_Orders/Order1.edi
trunk/companies/weberpdemo/EDI_MsgPending/
trunk/companies/weberpdemo/EDI_Sent/
trunk/companies/weberpdemo/EDI_Sent/EDI_INV_67.edi
trunk/companies/weberpdemo/EDI_Sent/EDI_INV_68.edi
trunk/companies/weberpdemo/FormDesigns/
trunk/companies/weberpdemo/FormDesigns/GoodsReceived.xml
trunk/companies/weberpdemo/FormDesigns/PickingList.xml
trunk/companies/weberpdemo/FormDesigns/PurchaseOrder.xml
trunk/companies/weberpdemo/FormDesigns/SalesInvoice.xml
trunk/companies/weberpdemo/logo.jpg
trunk/companies/weberpdemo/logo.png
trunk/companies/weberpdemo/logo1.jpg
trunk/companies/weberpdemo/logo2.jpg
trunk/companies/weberpdemo/logo4.jpg
trunk/companies/weberpdemo/logo5.jpg
trunk/companies/weberpdemo/logo6.jpg
trunk/companies/weberpdemo/logo7.jpg
trunk/companies/weberpdemo/part_pics/
trunk/companies/weberpdemo/part_pics/HON90021.jpg
trunk/companies/weberpdemo/part_pics/HON90022.jpg
trunk/companies/weberpdemo/part_pics/PHIS01.jpg
trunk/companies/weberpdemo/part_pics/webERPsmall.png
trunk/companies/weberpdemo/pdf_append/
trunk/companies/weberpdemo/reports/
trunk/companies/weberpdemo/reportwriter/
trunk/companies/weberpdemo/reportwriter/labels.xml
trunk/includes/DefineTenderClass.php
trunk/sql/mysql/updates/67.php
trunk/sql/mysql/updates/68.php
trunk/sql/mysql/updates/69.php
trunk/sql/mysql/updates/70.php
trunk/sql/mysql/updates/71.php
trunk/sql/mysql/updates/72.php
Removed Paths:
-------------
trunk/companies/weberpdemo/
trunk/sql/mysql/updates/67.php
Added: trunk/Manufacturers.php
===================================================================
--- trunk/Manufacturers.php (rev 0)
+++ trunk/Manufacturers.php 2011-03-22 20:18:49 UTC (rev 4803)
@@ -0,0 +1,297 @@
+<?php
+
+//$PageSecurity = 5;
+
+include('includes/session.inc');
+
+$title = _('Manufacturing Company Maintenance');
+
+include('includes/header.inc');
+
+if (isset($_GET['ManufacturerID'])){
+ $ManufacturerID = strtoupper($_GET['ManufacturerID']);
+ $_POST['amend']=True;
+} elseif (isset($_POST['ManufacturerID'])){
+ $ManufacturerID = strtoupper($_POST['ManufacturerID']);
+} else {
+ unset($ManufacturerID);
+}
+
+if (isset($_POST['Create'])) {
+ $ManufacturerID = 0;
+ $_POST['New'] = "Yes";
+};
+
+echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="'
+ . _('Manufacturing Companies') . '" alt="" />' . ' ' .$title . '</p></div>';
+
+/* This section has been reached because the user has pressed either the insert/update buttons on the
+ form hopefully with input in the correct fields, which we check for firsrt. */
+
+//initialise no input errors assumed initially before we test
+$InputError = 0;
+
+if (isset($_POST['submit']) or isset($_POST['update']) or isset($_POST['delete'])) {
+
+ if (strlen($_POST['ManufacturerName']) > 40 or strlen($_POST['ManufacturerName']) == 0 or $_POST['ManufacturerName'] == '') {
+ $InputError = 1;
+ prnMsg(_('The manufacturing company name must be entered and be forty characters or less long'),'error');
+ }
+
+ // But if errors were found in the input
+ if ($InputError>0) {
+ prnMsg(_('Validation failed') . _('no updates or deletes took place'),'warn');
+ include('includes/footer.inc');
+ exit;
+ }
+
+ /* If no input errors have been recieved */
+ if ($InputError == 0 and isset($_POST['submit'])){
+ //And if its not a new part then update existing one
+
+ $sql = "INSERT INTO manufacturers (id,
+ coyname,
+ address1,
+ address2,
+ address3,
+ address4,
+ address5,
+ address6,
+ contact,
+ telephone,
+ fax,
+ email)
+ VALUES (null,
+ '" .$_POST['ManufacturerName'] . "',
+ '" . $_POST['Address1'] . "',
+ '" . $_POST['Address2'] . "',
+ '" . $_POST['Address3'] . "',
+ '" . $_POST['Address4'] . "',
+ '" . $_POST['Address5'] . "',
+ '" . $_POST['Address6'] . "',
+ '" . $_POST['ContactName'] . "',
+ '" . $_POST['Telephone'] . "',
+ '" . $_POST['Fax'] . "',
+ '" . $_POST['Email'] . "')";
+
+ $ErrMsg = _('The manufacturing company') . ' ' . $_POST['ManufacturerName'] . ' ' . _('could not be added because');
+ $DbgMsg = _('The SQL that was used to insert the manufacturer but failed was');
+
+ $result = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+
+ prnMsg(_('A new manufacturing company for') . ' ' . $_POST['ManufacturerName'] . ' ' . _('has been added to the database'),'success');
+
+ unset ($ManufacturerID);
+ unset($_POST['ManufacturerName']);
+ unset($_POST['Address1']);
+ unset($_POST['Address2']);
+ unset($_POST['Address3']);
+ unset($_POST['Address4']);
+ unset($_POST['Address5']);
+ unset($_POST['Address6']);
+ unset($_POST['ContactName']);
+ unset($_POST['Telephone']);
+ unset($_POST['Fax']);
+ unset($_POST['Email']);
+
+ }
+
+ if ($InputError == 0 and isset($_POST['update'])) {
+ $sql = "UPDATE manufacturers SET coyname='" . $_POST['ManufacturerName'] . "',
+ address1='" . $_POST['Address1'] . "',
+ address2='" . $_POST['Address2'] . "',
+ address3='" . $_POST['Address3'] . "',
+ address4='" . $_POST['Address4'] . "',
+ address5='" . $_POST['Address5'] . "',
+ address6='" . $_POST['Address6'] . "',
+ contact='" . $_POST['ContactName'] . "',
+ telephone='" . $_POST['Telephone'] . "',
+ fax='" . $_POST['Fax'] . "',
+ email='" . $_POST['Email'] . "'
+ WHERE id = '" .$ManufacturerID."'";
+
+ $ErrMsg = _('The manufacturing company could not be updated because');
+ $DbgMsg = _('The SQL that was used to update the manufacturer but failed was');
+ $result = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+
+ prnMsg(_('The manufacturing company record for') . ' ' . $_POST['ManufacturerName'] . ' ' . _('has been updated'),'success');
+
+ //If it is a new part then insert it
+ }
+
+ /* If neither the Update or Insert buttons were pushed was it the delete button? */
+
+ if (isset($_POST['delete'])) {
+
+ $CancelDelete = 0;
+
+ // PREVENT DELETES IF DEPENDENT RECORDS IN 'SuppTrans' , PurchOrders, SupplierContacts
+
+ $sql= "SELECT COUNT(*) FROM suppliers WHERE manufacturerid='".$ManufacturerID."'";
+ $result = DB_query($sql, $db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0] > 0) {
+ $CancelDelete = 1;
+ prnMsg(_('Cannot delete this manufacturer because there are suppliers using them'),'warn');
+ echo '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('suppliers using this manufacturer');
+ }
+
+ if ($CancelDelete == 0) {
+ $sql="DELETE FROM manufacturers WHERE id='".$ManufacturerID."'";
+ $result = DB_query($sql, $db);
+ prnMsg(_('Manufacturing company record record for') . ' ' . $_POST['ManufacturerName'] . ' ' . _('has been deleted'),'success');
+ echo '<br>';
+ unset($_SESSION['ManufacturerID']);
+ } //end if Delete
+ }
+ unset($ManufacturerID);
+}
+/* So the page hasn't called itself with the input/update/delete/buttons */
+
+/* If it didn't come with a $ManufacturerID it must be a completely fresh start, so choose a new $ManufacturerID or give the
+ option to create a new one*/
+
+if (!isset($ManufacturerID)) {
+
+ echo "<form method='post' action='" . $_SERVER['PHP_SELF'] . "?" . SID . "'>";
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ echo "<input type='hidden' name='New' VALUE='No'>";
+ echo '<table class=selection><tr>';
+ echo '<th>' . _('ID') . '</th>';
+ echo '<th>' . _('Company Name').'</th>';
+ echo '<th>' . _('Address 1').'</th>';
+ echo '<th>' . _('Address 2').'</th>';
+ echo '<th>' . _('Address 3').'</th>';
+ echo '<th>' . _('Address 4').'</th>';
+ echo '<th>' . _('Address 5').'</th>';
+ echo '<th>' . _('Address 6').'</th>';
+ echo '<th>' . _('Contact').'</th>';
+ echo '<th>' . _('Telephone').'</th>';
+ echo '<th>' . _('Fax Number').'</th>';
+ echo '<th>' . _('Email').'</th></tr>';
+ $sql = "SELECT id,
+ coyname,
+ address1,
+ address2,
+ address3,
+ address4,
+ address5,
+ address6,
+ contact,
+ telephone,
+ fax,
+ email
+ FROM manufacturers";
+ $result=DB_query($sql, $db);
+ $j=1;
+ while ($myrow = DB_fetch_array($result)) {
+ if ($j==1) {
+ echo '<tr class="OddTableRows">';
+ $j=0;
+ } else {
+ echo '<tr class="EvenTableRows">';
+ $j++;
+ }
+ echo '<td>' . $myrow['id'] . '</td>';
+ echo '<td>' . $myrow['coyname'].'</td>';
+ echo '<td>' . $myrow['address1'].'</td>';
+ echo '<td>' . $myrow['address2'].'</td>';
+ echo '<td>' . $myrow['address3'].'</td>';
+ echo '<td>' . $myrow['address4'].'</td>';
+ echo '<td>' . $myrow['address5'].'</td>';
+ echo '<td>' . $myrow['address6'].'</td>';
+ echo '<td>' . $myrow['contact'].'</td>';
+ echo '<td>' . $myrow['telephone'].'</td>';
+ echo '<td>' . $myrow['fax'].'</td>';
+ echo '<td>' . $myrow['email'].'</td>';
+ echo '<td><a href="'.$rootpath . '/Manufacturers.php?' . SID . '&ManufacturerID='.$myrow['id'].'">'._('Edit').'</a></td></tr>';
+ }
+ echo "</table><p><div class='centre'>";
+ echo "<br><input tabindex=3 type='Submit' name='Create' value='" . _('Create New Manufacturer') . "'>";
+ echo '</div></form>';
+ include('includes/footer.inc');
+ exit;
+
+}
+
+if (isset($ManufacturerID) and isset($_POST['amend'])) {
+
+ $sql = "SELECT id,
+ coyname,
+ address1,
+ address2,
+ address3,
+ address4,
+ address5,
+ address6,
+ contact,
+ telephone,
+ fax,
+ email
+ FROM manufacturers
+ WHERE id = '".$ManufacturerID."'";
+
+ $result = DB_query($sql, $db);
+ $myrow = DB_fetch_array($result);
+
+ $_POST['ManufacturerName'] = $myrow['coyname'];
+ $_POST['Address1'] = $myrow['address1'];
+ $_POST['Address2'] = $myrow['address2'];
+ $_POST['Address3'] = $myrow['address3'];
+ $_POST['Address4'] = $myrow['address4'];
+ $_POST['Address5'] = $myrow['address5'];
+ $_POST['Address6'] = $myrow['address6'];
+ $_POST['ContactName'] = $myrow['contact'];
+ $_POST['Telephone'] = $myrow['telephone'];
+ $_POST['Fax'] = $myrow['fax'];
+ $_POST['Email'] = $myrow['email'];
+
+} else {
+ $_POST['ManufacturerName'] = '';
+ $_POST['Address1'] = '';
+ $_POST['Address2'] = '';
+ $_POST['Address3'] = '';
+ $_POST['Address4'] = '';
+ $_POST['Address5'] = '';
+ $_POST['Address6'] = '';
+ $_POST['ContactName'] = '';
+ $_POST['Telephone'] = '';
+ $_POST['Fax'] = '';
+ $_POST['Email'] = '';
+}
+
+if (isset($_POST['amend']) or isset($_POST['Create'])) {
+ // its a new manufacturer being added
+
+ echo "<form method='post' action='" . $_SERVER['PHP_SELF'] . "?" . SID . "'>";
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo "<input type=hidden name='ManufacturerID' value='".$ManufacturerID."'>";
+ echo '<table class=selection>';
+ echo "<input type=hidden name='New' value='Yes'>";
+ echo '<tr><td>' . _('Manufacturer Name') . ":</td><td><input tabindex=1 type='text' name='ManufacturerName' size=42 maxlength=40 value='".$_POST['ManufacturerName']."'></td></tr>";
+ echo '<tr><td>' . _('Address Line 1') . ":</td><td><input tabindex=2 type='text' name='Address1' size=42 maxlength=40 value='".$_POST['Address1']."'></td></tr>";
+ echo '<tr><td>' . _('Address Line 2') . ":</td><td><input tabindex=3 type='text' name='Address2' size=42 maxlength=40 value='".$_POST['Address2']."'></td></tr>";
+ echo '<tr><td>' . _('Address Line 3') . ":</td><td><input tabindex=4 type='text' name='Address3' size=42 maxlength=40 value='".$_POST['Address3']."'></td></tr>";
+ echo '<tr><td>' . _('Address Line 4') . ":</td><td><input tabindex=5 type='text' name='Address4' size=42 maxlength=40 value='".$_POST['Address4']."'></td></tr>";
+ echo '<tr><td>' . _('Address Line 5') . ":</td><td><input tabindex=6 type='text' name='Address5' size=42 maxlength=40 value='".$_POST['Address5']."'></td></tr>";
+ echo '<tr><td>' . _('Address Line 6') . ":</td><td><input tabindex=7 type='text' name='Address6' size=42 maxlength=40 value='".$_POST['Address6']."'></td></tr>";
+ echo '<tr><td>' . _('Contact Name') . ":</td><td><input tabindex=8 type='text' name='ContactName' size=13 maxlength=25 value='".$_POST['ContactName']."'></td></tr>";
+ echo '<tr><td>' . _('Telephone') . ":</td><td><input tabindex=9 type='text' name='Telephone' size=13 maxlength=25 value='".$_POST['Telephone']."'></td></tr>";
+ echo '<tr><td>' . _('Fax') . ":</td><td><input tabindex=10 type='text' name='Fax' VALUE=0 size=13 maxlength=25 value='".$_POST['Fax']."'></td></tr>";
+ echo '<tr><td>' . _('Email') . ":</td><td><input tabindex=11 type='text' name='Email' size=55 maxlength=55 value='".$_POST['Email']."'></td></tr>";
+ echo '</form>';
+}
+
+
+if (isset($_POST['Create'])) {
+ echo "</table><p><div class='centre'><input tabindex=12 type='Submit' name='submit' VALUE='" . _('Insert New Manufacturer') . "'></div>";
+} else if (isset($_POST['amend'])) {
+ echo "</table><p><div class='centre'><input tabindex=13 type='Submit' name='update' VALUE='" . _('Update Manufacturer') . "'><p>";
+ prnMsg ( _('There is no second warning if you hit the delete button below') . '. ' . _('However checks will be made to ensure there are no suppliers are using this manufacturer before the deletion is processed'), 'warn');
+ echo "<p><input tabindex=14 type='Submit' name='delete' VALUE='" . _('Delete Manufacturer') . "' onclick=\"return confirm('" . _('Are you sure you wish to delete this manufacturer?') . "');\"></form></div>";
+}
+
+
+include('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-03-22 20:17:41 UTC (rev 4802)
+++ trunk/PO_Header.php 2011-03-22 20:18:49 UTC (rev 4803)
@@ -609,10 +609,10 @@
$sql="SELECT stockmaster.controlled,
stockmaster.serialised,
stockmaster.description,
- stockmaster.units ,
+ stockmaster.units as stockunits,
stockmaster.decimalplaces,
purchdata.price,
- purchdata.suppliersuom,
+ unitsofmeasure.unitname as supplierunits,
purchdata.suppliers_partno,
purchdata.conversionfactor,
stockcategory.stockact
@@ -620,11 +620,17 @@
ON stockmaster.categoryid=stockcategory.categoryid
LEFT JOIN purchdata
ON stockmaster.stockid = purchdata.stockid
+ LEFT JOIN unitsofmeasure
+ ON purchdata.suppliersuom=unitsofmeasure.unitid
WHERE stockmaster.stockid='".$Purch_Item. "'
AND purchdata.supplierno ='" . $_GET['SelectedSupplier'] . "'";
$result=DB_query($sql, $db);
$PurchItemRow=DB_fetch_array($result);
-
+ if ($PurchItemRow['supplierunits'] != '') {
+ $PurchItemRow['units'] = $PurchItemRow['supplierunits'];
+ } else {
+ $PurchItemRow['units'] = $PurchItemRow['stocksunits'];
+ }
if (!isset($PurchItemRow['conversionfactor'])) {
$PurchItemRow['conversionfactor']=1;
}
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-03-22 20:17:41 UTC (rev 4802)
+++ trunk/PO_Items.php 2011-03-22 20:18:49 UTC (rev 4803)
@@ -41,6 +41,7 @@
purchdata.suppliers_partno,
purchdata.conversionfactor,
purchdata.suppliersuom,
+ purchdata.minorderqty,
stockmaster.pkg_type,
stockmaster.units,
stockmaster.netweight,
@@ -65,6 +66,7 @@
$_POST['nw'] = $myrow['netweight'];
$_POST['gw'] = $myrow['kgs'];
$_POST['CuFt'] = $myrow['volume'];
+ $_POST['MinimumOrderQty'] = $myrow['minorderqty'];
} // end if (isset($_POST['StockID2']) && $_GET['Edit']=='')
if (isset($_POST['UpdateLines']) OR isset($_POST['Commit'])) {
@@ -131,8 +133,8 @@
suppdeladdress4,
suppdeladdress5,
suppdeladdress6,
+ supptel,
contact,
- supptel,
version,
revised,
deliveryby,
@@ -165,7 +167,7 @@
'" . $_SESSION['PO'.$identifier]->Contact . "',
'" . $_SESSION['PO'.$identifier]->Version . "',
'" . Date('Y-m-d') . "',
- '" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
+ '" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryBy) . "',
'Pending',
'" . $StatusComment . "',
'" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
@@ -532,7 +534,8 @@
if (isset($_POST['LookupPrice']) and isset($_POST['StockID2'])){
$sql = "SELECT purchdata.price,
purchdata.conversionfactor,
- purchdata.supplierdescription
+ purchdata.supplierdescription,
+ purchdata.minorderqty
FROM purchdata
WHERE purchdata.supplierno = '" . $_SESSION['PO'.$identifier]->SupplierID . "'
AND purchdata.stockid = '". strtoupper($_POST['StockID2']) . "'";
@@ -545,6 +548,7 @@
$myrow = DB_fetch_array($LookupResult);
$_POST['Price'] = $myrow['price']/$myrow['conversionfactor'];
$_POST['ConversionFactor'] = $myrow['conversionfactor'];
+ $_POST['MinimumOrderQty'] = $myrow['minorderqty'];
} else {
prnMsg(_('Sorry') . ' ... ' . _('there is no purchasing data set up for this supplier') . ' - ' . $_SESSION['PO'.$identifier]->SupplierID . ' ' . _('and item') . ' ' . strtoupper($_POST['StockID']),'warn');
}
@@ -776,6 +780,7 @@
purchdata.suppliersuom,
unitsofmeasure.unitname,
purchdata.suppliers_partno,
+ purchdata.minorderqty,
purchdata.leadtime
FROM stockcategory,
chartmaster,
@@ -783,8 +788,8 @@
ON stockmaster.stockid = purchdata.stockid
LEFT JOIN unitsofmeasure
ON purchdata.suppliersuom=unitsofmeasure.unitid
+ WHERE chartmaster.accountcode = stockcategory.stockact
AND purchdata.supplierno = '" . $_SESSION['PO'.$identifier]->SupplierID . "'
- WHERE chartmaster.accountcode = stockcategory.stockact
AND stockcategory.categoryid = stockmaster.categoryid
AND stockmaster.stockid = '". $ItemCode . "'
AND purchdata.effectivefrom =
@@ -814,8 +819,15 @@
$result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg);
if ($myrow = DB_fetch_array($result1)){
+
if (isset($myrow['price']) and is_numeric($myrow['price'])){
-
+ if ($Quantity < $myrow['minorderqty']) {
+ prnMsg( _('The quantity ordered is less than the minimum order quantity for this supplier.') .
+ '<br />' . _('Are you sure you wish to continue?'), 'warn');
+ } else if ($Quantity % $myrow['minorderqty']) {
+ prnMsg( _('The quantity ordered should be a multiple of the minimum order quantity for this supplier.') .
+ '<br />' . _('Are you sure you wish to continue?'), 'warn');
+ }
$_SESSION['PO'.$identifier]->add_to_order ($_SESSION['PO'.$identifier]->LinesOnOrder+1,
$ItemCode,
0, /*Serialised */
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-03-22 20:17:41 UTC (rev 4802)
+++ trunk/SelectProduct.php 2011-03-22 20:18:49 UTC (rev 4803)
@@ -175,6 +175,17 @@
echo '</table>'; //end of first nested table
// Item Category Property mod: display the item properties
echo '<table align="left">';
+ if (isset($_POST['UpdateProps'])) {
+ $PropertyCounter=0;
+ while (isset($_POST['PropValue' . $PropertyCounter])) {
+ $UpdateSql="UPDATE stockitemproperties
+ SET value='".$_POST['PropValue' . $PropertyCounter] . "'
+ WHERE stockid='" . $StockID . "'
+ AND stkcatpropid ='" . $_POST['CatPropID']."'";
+ $UpdateResult=DB_query($UpdateSql, $db);;
+ $PropertyCounter++;
+ }
+ }
$CatValResult = DB_query("SELECT categoryid
FROM stockmaster
WHERE stockid='" . $StockID . "'", $db);
@@ -198,53 +209,67 @@
AND stkcatpropid ='" . $PropertyRow['stkcatpropid']."'", $db);
$PropValRow = DB_fetch_row($PropValResult);
$PropertyValue = $PropValRow[0];
+ echo '<form name="CatPropForm" enctype="multipart/form-data" method="post" action="' . $_SERVER['PHP_SELF'] . '?' .SID .'">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<tr><th align="right">' . $PropertyRow['label'] . ':</th>';
switch ($PropertyRow['controltype']) {
case 0; //textbox
- echo '<td class="select" width="60"><input type="text" name="PropValue' . $PropertyCounter . '" value="' . $PropertyValue . '" />';
- break;
- case 1; //select box
- $OptionValues = explode(',', $PropertyRow['defaultvalue']);
- echo '<td align="left" width="60"><select name="PropValue' . $PropertyCounter . '">';
- foreach($OptionValues as $PropertyOptionValue) {
- if ($PropertyOptionValue == $PropertyValue) {
- echo '<option selected="True" value="' . $PropertyOptionValue . '">' . $PropertyOptionValue . '</option>';
- } else {
- echo '<option value="' . $PropertyOptionValue . '">' . $PropertyOptionValue . '</option>';
- }
- }
- echo '</select>';
- break;
- case 2; //checkbox
- echo '<td align="left" width="60"><input type="checkbox" name="PropValue' . $PropertyCounter . '"';
- if ($PropertyValue == 1) {
- echo ' checked';
- }
- echo ' />';
-break;
-} //end switch
-echo '</td></tr>';
-$PropertyCounter++;
-} //end loop round properties for the item category
-echo '</table>'; //end of Item Category Property mod
-echo '<td style="width: 15%; vertical-align: top">
+ echo '<td class="select" width="60"><input type="text" name="PropValue' . $PropertyCounter . '" value="' . $PropertyValue . '" />';
+ break;
+ case 1; //select box
+ $OptionValues = array();
+ if ($PropertyRow['label']='Manufacturers') {
+ $sql="SELECT coyname from manufacturers";
+ $ManufacturerResult=DB_query($sql, $db);
+ while ($ManufacturerRow=DB_fetch_array($ManufacturerResult)) {
+ $OptionValues[]=$ManufacturerRow['coyname'];
+ }
+ } else {
+ $OptionValues = explode(',',$PropertyRow['defaultvalue']);
+ }
+ echo '<input type="hidden" name="CatPropID" value="'.$PropertyRow['stkcatpropid'].'" />';
+ echo '<td align="left" width="60"><select name="PropValue' . $PropertyCounter . '" onChange="ReloadForm(UpdateProps)" >';
+ foreach ($OptionValues as $PropertyOptionValue){
+ if ($PropertyOptionValue == $PropertyValue){
+ echo '<option selected value="' . $PropertyOptionValue . '">' . $PropertyOptionValue . '</option>';
+ } else {
+ echo '<option value="' . $PropertyOptionValue . '">' . $PropertyOptionValue . '</option>';
+ }
+ }
+ echo '</select>';
+ break;
+ case 2; //checkbox
+ echo '<td align="left" width="60"><input type="checkbox" name="PropValue' . $PropertyCounter . '"';
+ if ($PropertyValue == 1) {
+ echo ' checked';
+ }
+ echo ' />';
+ break;
+ } //end switch
+ echo '</td></tr>';
+ $PropertyCounter++;
+ } //end loop round properties for the item category
+ echo '<input type="submit" name="UpdateProps" style="visibility:hidden;width:1px" value="' . _('Categories') . '">';
+ echo '</form>';
+ echo '</table>'; //end of Item Category Property mod
+ echo '<td style="width: 15%; vertical-align: top">
<table>'; //nested table to show QOH/orders
-$QOH = 0;
-switch ($myrow['mbflag']) {
- case 'A':
- case 'D':
- case 'K':
- $QOH = _('N/A');
- $QOO = _('N/A');
- break;
- case 'M':
- case 'B':
- $QOHResult = DB_query("SELECT sum(quantity)
+ $QOH = 0;
+ switch ($myrow['mbflag']) {
+ case 'A':
+ case 'D':
+ case 'K':
+ $QOH = _('N/A');
+ $QOO = _('N/A');
+ break;
+ case 'M':
+ case 'B':
+ $QOHResult = DB_query("SELECT sum(quantity)
FROM locstock
WHERE stockid = '" . $StockID . "'", $db);
- $QOHRow = DB_fetch_row($QOHResult);
- $QOH = number_format($QOHRow[0], $myrow['decimalplaces']);
- $QOOSQL="SELECT SUM((purchorderdetails.quantityord*purchorderdetails.conversionfactor) -
+ $QOHRow = DB_fetch_row($QOHResult);
+ $QOH = number_format($QOHRow[0], $myrow['decimalplaces']);
+ $QOOSQL="SELECT SUM((purchorderdetails.quantityord*purchorderdetails.conversionfactor) -
(purchorderdetails.quantityrecd*purchorderdetails.conversionfactor))
FROM purchorders
LEFT JOIN purchorderdetails
@@ -254,38 +279,38 @@
AND purchorders.status<>'Cancelled'
AND purchorders.status<>'Pending'
AND purchorders.status<>'Rejected'";
- $QOOResult = DB_query($QOOSQL, $db);
- if (DB_num_rows($QOOResult) == 0) {
- $QOO = 0;
- } else {
- $QOORow = DB_fetch_row($QOOResult);
- $QOO = $QOORow[0];
- }
- //Also the on work order quantities
- $sql = "SELECT SUM(woitems.qtyreqd-woitems.qtyrecd) AS qtywo
+ $QOOResult = DB_query($QOOSQL, $db);
+ if (DB_num_rows($QOOResult) == 0) {
+ $QOO = 0;
+ } else {
+ $QOORow = DB_fetch_row($QOOResult);
+ $QOO = $QOORow[0];
+ }
+ //Also the on work order quantities
+ $sql = "SELECT SUM(woitems.qtyreqd-woitems.qtyrecd) AS qtywo
FROM woitems INNER JOIN workorders
ON woitems.wo=workorders.wo
WHERE workorders.closed=0
AND woitems.stockid='" . $StockID . "'";
- $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) {
- $QOORow = DB_fetch_row($QOOResult);
- $QOO+= $QOORow[0];
- }
- $QOO = number_format($QOO, $myrow['decimalplaces']);
- break;
-}
-$Demand = 0;
-$DemResult = DB_query("SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
+ $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) {
+ $QOORow = DB_fetch_row($QOOResult);
+ $QOO+= $QOORow[0];
+ }
+ $QOO = number_format($QOO, $myrow['decimalplaces']);
+ break;
+ }
+ $Demand = 0;
+ $DemResult = DB_query("SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
FROM salesorderdetails INNER JOIN salesorders
ON salesorders.orderno = salesorderdetails.orderno
WHERE salesorderdetails.completed=0
AND salesorders.quotation=0
AND salesorderdetails.stkcode='" . $StockID . "'", $db);
-$DemRow = DB_fetch_row($DemResult);
-$Demand = $DemRow[0];
-$DemAsComponentResult = DB_query("SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
+ $DemRow = DB_fetch_row($DemResult);
+ $Demand = $DemRow[0];
+ $DemAsComponentResult = DB_query("SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
FROM salesorderdetails,
salesorders,
bom,
@@ -297,10 +322,10 @@
AND stockmaster.stockid=bom.parent
AND stockmaster.mbflag='A'
AND salesorders.quotation=0", $db);
-$DemAsComponentRow = DB_fetch_row($DemAsComponentResult);
-$Demand+= $DemAsComponentRow[0];
-//Also the demand for the item as a component of works orders
-$sql = "SELECT SUM(qtypu*(woitems.qtyreqd - woitems.qtyrecd)) AS woqtydemo
+ $DemAsComponentRow = DB_fetch_row($DemAsComponentResult);
+ $Demand+= $DemAsComponentRow[0];
+ //Also the demand for the item as a component of works orders
+ $sql = "SELECT SUM(qtypu*(woitems.qtyreqd - woitems.qtyrecd)) AS woqtydemo
FROM woitems INNER JOIN worequirements
ON woitems.stockid=worequirements.parentstockid
INNER JOIN workorders
@@ -308,19 +333,19 @@
AND woitems.wo=worequirements.wo
WHERE worequirements.stockid='" . $StockID . "'
AND workorders.closed=0";
-$ErrMsg = _('The workorder component demand for this product cannot be retrieved because');
-$DemandResult = DB_query($sql, $db, $ErrMsg);
-if (DB_num_rows($DemandResult) == 1) {
- $DemandRow = DB_fetch_row($DemandResult);
- $Demand+= $DemandRow[0];
-}
-echo '<tr><th class="number" width="15%">' . _('Quantity On Hand') . ':</th><td width="17%" class="select">' . $QOH . '</td></tr>';
-echo '<tr><th class="number" width="15%">' . _('Quantity Demand') . ':</th><td width="17%" class="select">' . number_format($Demand, $myrow['decimalplaces']) . '</td></tr>';
-echo '<tr><th class="number" width="15%">' . _('Quantity On Order') . ':</th><td width="17%" class="select">' . $QOO . '</td></tr>
+ $ErrMsg = _('The workorder component demand for this product cannot be retrieved because');
+ $DemandResult = DB_query($sql, $db, $ErrMsg);
+ if (DB_num_rows($DemandResult) == 1) {
+ $DemandRow = DB_fetch_row($DemandResult);
+ $Demand+= $DemandRow[0];
+ }
+ echo '<tr><th class="number" width="15%">' . _('Quantity On Hand') . ':</th><td width="17%" class="select">' . $QOH . '</td></tr>';
+ echo '<tr><th class="number" width="15%">' . _('Quantity Demand') . ':</th><td width="17%" class="select">' . number_format($Demand, $myrow['decimalplaces']) . '</td></tr>';
+ echo '<tr><th class="number" width="15%">' . _('Quantity On Order') . ':</th><td width="17%" class="select">' . $QOO . '</td></tr>
</table>'; //end of nested table
-echo '</td>'; //end cell of master table
-if ($myrow['mbflag'] == 'B' or ($myrow['mbflag'] == 'M')) {
- echo '<td width="50%" valign="top"><table>
+ echo '</td>'; //end cell of master table
+ if ($myrow['mbflag'] == 'B' or ($myrow['mbflag'] == 'M')) {
+ echo '<td width="50%" valign="top"><table>
<tr><th width="50%">' . _('Supplier') . '</th>
<th width="15%">' . _('Cost') . '</th>
<th width="5%">' . _('Curr') . '</th>
@@ -328,7 +353,7 @@
<th width="10%">' . _('Lead Time') . '</th>
<th width="10%">' . _('Min Order Qty') . '</th>
<th width="5%">' . _('Prefer') . '</th></tr>';
- $SuppResult = DB_query("SELECT suppliers.suppname,
+ $SuppResult = DB_query("SELECT suppliers.suppname,
suppliers.currcode,
suppliers.supplierid,
purchdata.price,
@@ -341,100 +366,100 @@
ON purchdata.supplierno=suppliers.supplierid
WHERE purchdata.stockid = '" . $StockID . "'
ORDER BY purchdata.preferred DESC, purchdata.effectivefrom DESC", $db);
- while ($SuppRow = DB_fetch_array($SuppResult)) {
- echo '<tr><td class="select">' . $SuppRow['suppname'] . '</td>
+ while ($SuppRow = DB_fetch_array($SuppResult)) {
+ echo '<tr><td class="select">' . $SuppRow['suppname'] . '</td>
<td class="select">' . number_format($SuppRow['price'] / $SuppRow['conversionfactor'], 2) . '</td>
<td class="select">' . $SuppRow['currcode'] . '</td>
<td class="select">' . ConvertSQLDate($SuppRow['effectivefrom']) . '</td>
<td class="select">' . $SuppRow['leadtime'] . '</td>
<td class="select">' . $SuppRow['minorderqty'] . '</td>';
- if ($SuppRow['preferred']==1) { //then this is the preferred supplier
- echo '<td class="select">' . _('Yes') . '</td>';
- } else {
- echo '<td class="select">' . _('No') . '</td>';
+ if ($SuppRow['preferred']==1) { //then this is the preferred supplier
+ echo '<td class="select">' . _('Yes') . '</td>';
+ } else {
+ echo '<td class="select">' . _('No') . '</td>';
+ }
+ echo '<td class="select"><a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' .
+ $SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity='.$SuppRow['minorderqty'].'">' . _('Order') . ' </a></td>';
+ echo '</tr>';
}
- echo '<td class="select"><a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' .
- $SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity='.$SuppRow['minorderqty'].'">' . _('Order') . ' </a></td>';
- echo '</tr>';
+ echo '</table></td>';
+ DB_data_seek($result, 0);
}
- echo '</table></td>';
- DB_data_seek($result, 0);
-}
-echo '</td></tr></table><br />'; // end first item details table
-echo '<table width="90%"><tr>
+ echo '</td></tr></table><br />'; // end first item details table
+ echo '<table width="90%"><tr>
<th width="33%">' . _('Item Inquiries') . '</th>
<th width="33%">' . _('Item Transactions') . '</th>
<th width="33%">' . _('Item Maintenance') . '</th>
</tr>';
-echo '<tr><td valign="top" class="select">';
-/*Stock Inquiry Options */
-echo '<a href="' . $rootpath . '/StockMovements.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Movements') . '</a><br />';
-if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $rootpath . '/StockStatus.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Status') . '</a><br />';
- echo '<a href="' . $rootpath . '/StockUsage.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Usage') . '</a><br />';
-}
-echo '<a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a><br />';
-echo '<a href="' . $rootpath . '/SelectCompletedOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a><br />';
-if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
- echo '<a href="' . $rootpath . '/PO_SelectPurchOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search All Purchase Orders') . '</a><br />';
- echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg?' . SID . '">' . _('Show Part Picture (if available)') . '</a><br />';
-}
-if ($Its_A_Dummy == False) {
- echo '<a href="' . $rootpath . '/BOMInquiry.php?' . SID . '&StockID=' . $StockID . '">' . _('View Costed Bill Of Material') . '</a><br />';
- echo '<a href="' . $rootpath . '/WhereUsedInquiry.php?' . SID . '&StockID=' . $StockID . '">' . _('Where This Item Is Used') . '</a><br />';
-}
-if ($Its_A_Labour_Item == True) {
- echo '<a href="' . $rootpath . '/WhereUsedInquiry.php?' . SID . '&StockID=' . $StockID . '">' . _('Where This Labour Item Is Used') . '</a><br />';
-}
-wikiLink('Product', $StockID);
-echo '</td><td valign="top" class="select">';
-/* Stock Transactions */
-if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $rootpath . '/StockAdjustments.php?' . SID . '&StockID=' . $StockID . '">' . _('Quantity Adjustments') . '</a><br />';
- echo '<a href="' . $rootpath . '/StockTransfers.php?' . SID . '&StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
- if ($myrow['mbflag'] == 'B') {
+ echo '<tr><td valign="top" class="select">';
+ /*Stock Inquiry Options */
+ echo '<a href="' . $rootpath . '/StockMovements.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Movements') . '</a><br />';
+ if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
+ echo '<a href="' . $rootpath . '/StockStatus.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Status') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockUsage.php?' . SID . '&StockID=' . $StockID . '">' . _('Show Stock Usage') . '</a><br />';
+ }
+ echo '<a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a><br />';
+ echo '<a href="' . $rootpath . '/SelectCompletedOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a><br />';
+ if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
+ echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
+ echo '<a href="' . $rootpath . '/PO_SelectPurchOrder.php?' . SID . '&SelectedStockItem=' . $StockID . '">' . _('Search All Purchase Orders') . '</a><br />';
+ echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg?' . SID . '">' . _('Show Part Picture (if available)') . '</a><br />';
+ }
+ if ($Its_A_Dummy == False) {
+ echo '<a href="' . $rootpath . '/BOMInquiry.php?' . SID . '&StockID=' . $StockID . '">' . _('View Costed Bill Of Material') . '</a><br />';
+ echo '<a href="' . $rootpath . '/WhereUsedInquiry.php?' . SID . '&StockID=' . $StockID . '">' . _('Where This Item Is Used') . '</a><br />';
+ }
+ if ($Its_A_Labour_Item == True) {
+ echo '<a href="' . $rootpath . '/WhereUsedInquiry.php?' . SID . '&StockID=' . $StockID . '">' . _('Where This Labour Item Is Used') . '</a><br />';
+ }
+ wikiLink('Product', $StockID);
+ echo '</td><td valign="top" class="select">';
+ /* Stock Transactions */
+ if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
+ echo '<a href="' . $rootpath . '/StockAdjustments.php?' . SID . '&StockID=' . $StockID . '">' . _('Quantity Adjustments') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockTransfers.php?' . SID . '&StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
+ if ($myrow['mbflag'] == 'B') {
echo '<br />';
- $SuppResult = DB_query("SELECT suppliers.suppname,
+ $SuppResult = DB_query("SELECT suppliers.suppname,
suppliers.supplierid,
purchdata.preferred,
purchdata.minorderqty
FROM purchdata INNER JOIN suppliers
ON purchdata.supplierno=suppliers.supplierid
WHERE purchdata.stockid = '" . $StockID . "'", $db);
- while ($SuppRow = DB_fetch_array($SuppResult)) {
- if ($myrow['eoq'] == 0) {
- $EOQ = $SuppRow['minorderqty'];
- } else {
- $EOQ = $myrow['eoq'];
- }
- echo '<a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] .
- '&StockID=' . $StockID . '&Quantity=' . $EOQ . '">' . _('Purchase this Item from') . ' ' . $SuppRow['suppname'] . ' (' . _('default') . ')</a><br />';
- /**/
- } /* end of while */
- } /* end of $myrow['mbflag'] == 'B' */
-} /* end of ($Its_A_Kitset_Assembly_Or_Dummy == False) */
-echo '</td><td valign="top" class="select">';
-/* Stock Maintenance Options */
-echo '<a href="' . $rootpath . '/Stocks.php?">' . _('Add Inventory Items') . '</a><br />';
-echo '<a href="' . $rootpath . '/Stocks.php?' . SID . '&StockID=' . $StockID . '">' . _('Modify Item Details') . '</a><br />';
-if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $rootpath . '/StockReorderLevel.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Reorder Levels') . '</a><br />';
- echo '<a href="' . $rootpath . '/StockCostUpdate.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
- echo '<a href="' . $rootpath . '/PurchData.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Purchasing Data') . '</a><br />';
-}
-if ($Its_A_Labour_Item == True) {
- echo '<a href="' . $rootpath . '/StockCostUpdate.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
-}
-if (!$Its_A_Kitset) {
- echo '<a href="' . $rootpath . '/Prices.php?' . SID . '&Item=' . $StockID . '">' . _('Maintain Pricing') . '</a><br />';
- if (isset($_SESSION['CustomerID']) AND $_SESSION['CustomerID'] != "" AND Strlen($_SESSION['CustomerID']) > 0) {
- echo '<a href="' . $rootpath . '/Prices_Customer.php?' . SID . '&Item=' . $StockID . '">' . _('Special Prices for customer') . ' - ' . $_SESSION['CustomerID'] . '</a><br />';
+ while ($SuppRow = DB_fetch_array($SuppResult)) {
+ if ($myrow['eoq'] == 0) {
+ $EOQ = $SuppRow['minorderqty'];
+ } else {
+ $EOQ = $myrow['eoq'];
+ }
+ echo '<a href="' . $rootpath . '/PO_Header.php?' . SID . '&NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] .
+ '&StockID=' . $StockID . '&Quantity=' . $EOQ . '">' . _('Purchase this Item from') . ' ' . $SuppRow['suppname'] . ' (' . _('default') . ')</a><br />';
+ /**/
+ } /* end of while */
+ } /* end of $myrow['mbflag'] == 'B' */
+ } /* end of ($Its_A_Kitset_Assembly_Or_Dummy == False) */
+ echo '</td><td valign="top" class="select">';
+ /* Stock Maintenance Options */
+ echo '<a href="' . $rootpath . '/Stocks.php?">' . _('Add Inventory Items') . '</a><br />';
+ echo '<a href="' . $rootpath . '/Stocks.php?' . SID . '&StockID=' . $StockID . '">' . _('Modify Item Details') . '</a><br />';
+ if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
+ echo '<a href="' . $rootpath . '/StockReorderLevel.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Reorder Levels') . '</a><br />';
+ echo '<a href="' . $rootpath . '/StockCostUpdate.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
+ echo '<a href="' . $rootpath . '/PurchData.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Purchasing Data') . '</a><br />';
}
- echo '<a href="' . $rootpath . '/DiscountCategories.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Discount Category') . '</a><br />';
-}
-echo '</td></tr></table>';
+ if ($Its_A_Labour_Item == True) {
+ echo '<a href="' . $rootpath . '/StockCostUpdate.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
+ }
+ if (!$Its_A_Kitset) {
+ echo '<a href="' . $rootpath . '/Prices.php?' . SID . '&Item=' . $StockID . '">' . _('Maintain Pricing') . '</a><br />';
+ if (isset($_SESSION['CustomerID']) AND $_SESSION['CustomerID'] != "" AND Strlen($_SESSION['CustomerID']) > 0) {
+ echo '<a href="' . $rootpath . '/Prices_Customer.php?' . SID . '&Item=' . $StockID . '">' . _('Special Prices for customer') . ' - ' . $_SESSION['CustomerID'] . '</a><br />';
+ }
+ echo '<a href="' . $rootpath . '/DiscountCategories.php?' . SID . '&StockID=' . $StockID . '">' . _('Maintain Discount Category') . '</a><br />';
+ }
+ echo '</td></tr></table>';
} else {
// options (links) to pages. This requires stock id also to be passed.
echo '<table width="90%" colspan="2" cellpadding="4">';
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2011-03-22 20:17:41 UTC (rev 4802)
+++ trunk/Stocks.php 2011-03-22 20:18:49 UTC (rev 4803)
@@ -991,7 +991,16 @@
}
break;
case 1; //select box
- $OptionValues = explode(',',$PropertyRow['defaultvalue']);
+ $OptionValues = array();
+ if ($PropertyRow['label']='Manufacturers') {
+ $sql="SELECT coyname from manufacturers";
+ $result=DB_query($sql, $db);
+ while ($myrow=DB_fetch_array($result)) {
+ $OptionValues[]=$myrow['coyname'];
+ }
+ } else {
+ $OptionValues = explode(',',$PropertyRow['defaultvalue']);
+ }
echo '<select name="PropValue' . $PropertyCounter . '">';
foreach ($OptionValues as $PropertyOptionValue){
if ($PropertyOptionValue == $PropertyValue){
@@ -1018,7 +1027,7 @@
echo '</table><br>';
echo '<input type="hidden" name="PropertyCounter" value=' . $PropertyCounter . '>';
-if (isset($New)) {
+if (true) {
echo '<input type="Submit" name="submit" value="' . _('Insert New Item') . '">';
echo '<input type="submit" name="UpdateCategories" style="visibility:hidden;width:1px" value="' . _('Categories') . '">';
Added: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php (rev 0)
+++ trunk/SupplierTenderCreate.php 2011-03-22 20:18:49 UTC (rev 4803)
@@ -0,0 +1,803 @@
+<?php
+/* $Id$*/
+
+//$PageSecurity = 9;
+
+include('includes/DefineTenderClass.php');
+include('includes/SQL_CommonFunctions.inc');
+include('includes/session.inc');
+
+$Maximum_Number_Of_Parts_To_Show=50;
+
+if (isset($_GET['New']) and isset($_SESSION['tender'])) {
+ unset($_SESSION['tender']);
+}
+
+$ShowTender = 0;
+
+if (isset($_GET['ID'])) {
+ $sql="SELECT tenderid,
+ location,
+ address1,
+ address2,
+ address3,
+ address4,
+ address5,
+ address6,
+ telephone
+ FROM tenders
+ WHERE tenderid='" . $_GET['ID'] . "'";
+ $result=DB_query($sql, $db);
+ $myrow=DB_fetch_array($result);
+ if (isset($_SESSION['tender'])) {
+ unset($_SESSION['tender']);
+ }
+ $_SESSION['tender'] = new Tender();
+ $_SESSION['tender']->TenderId = $myrow['tenderid'];
+ $_SESSION['tender']->Location = $myrow['location'];
+ $_SESSION['tender']->DelAdd1 = $myrow['address1'];
+ $_SESSION['tender']->DelAdd2 = $myrow['address2'];
+ $_SESSION['tender']->DelAdd3 = $myrow['address3'];
+ $_SESSION['tender']->DelAdd4 = $myrow['address4'];
+ $_SESSION['tender']->DelAdd5 = $myrow['address5'];
+ $_SESSION['tender']->DelAdd6 = $myrow['address6'];
+
+ $sql="SELECT tenderid,
+ tendersuppliers.supplierid,
+ suppliers.suppname,
+ tendersuppliers.email
+ FROM tendersuppliers
+ LEFT JOIN suppliers
+ ON tendersuppliers.supplierid=suppliers.supplierid
+ WHERE tenderid='" . $_GET['ID'] . "'";
+ $result=DB_query($sql, $db);
+ while ($myrow=DB_fetch_array($result)) {
+ $_SESSION['tender']->add_supplier_to_tender(
+ $myrow['supplierid'],
+ $myrow['suppname'],
+ $myrow['email']);
+ }
+
+ $sql="SELECT tenderid,
+ tenderitems.stockid,
+ tenderitems.quantity,
+ stockmaster.description,
+ tenderitems.units,
+ stockmaster.decimalplaces
+ FROM tenderitems
+ LEFT JOIN stockmaster
+ ON tenderitems.stockid=stockmaster.stockid
+ WHERE tenderid='" . $_GET['ID'] . "'";
+ $result=DB_query($sql, $db);
+ while ($myrow=DB_fetch_array($result)) {
+ $_SESSION['tender']->add_item_to_tender(
+ $_SESSION['tender']->LinesOnTender,
+ $myrow['stockid'],
+ $myrow['quantity'],
+ $myrow['description'],
+ $myrow['units'],
+ $myrow['decimalplaces'],
+ DateAdd(date($_SESSION['DefaultDateFormat']),'m',3));
+ }
+ $ShowTender = 1;
+}
+
+if (isset($_GET['Edit'])) {
+ $title = _('Edit an Existing Supplier Tender Request');
+ include('includes/header.inc');
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' .
+ _('Purchase Order Tendering') . '" alt=""> '.$title . '</p>';
+ $sql="SELECT tenderid,
+ location,
+ address1,
+ address2,
+ address3,
+ address4,
+ address5,
+ address6,
+ telephone
+ FROM tenders
+ WHERE closed=0";
+ $result=DB_query($sql, $db);
+ echo '<table class="selection">';
+ echo '<tr><th>' . _('Tender ID') . '</th>';
+ echo '<th>' . _('Location') . '</th>';
+ echo '<th>' . _('Address 1') . '</th>';
+ echo '<th>' . _('Address 2') . '</th>';
+ echo '<th>' . _('Address 3') . '</th>';
+ echo '<th>' . _('Address 4') . '</th>';
+ echo '<th>' . _('Address 5') . '</th>';
+ echo '<th>' . _('Address 6') . '</th>';
+ echo '<th>' . _('Telephone') . '</th></tr>';
+ while ($myrow=DB_fetch_array($result)) {
+ echo '<tr><td>' . $myrow['tenderid'] . '</td>';
+ echo '<td>' . $myrow['location'] . '</td>';
+ echo '<td>' . $myrow['address1'] . '</td>';
+ echo '<td>' . $myrow['address2'] . '</td>';
+ echo '<td>' . $myrow['address3'] . '</td>';
+ echo '<td>' . $myrow['address4'] . '</td>';
+ echo '<td>' . $myrow['address5'] . '</td>';
+ echo '<td>' . $myrow['address6'] . '</td>';
+ echo '<td>' . $myrow['telephone'] . '</td>';
+ echo '<td><a href="'.$_SERVER['PHP_SELF'] . '?' . SID . '&ID='.$myrow['tenderid'].'">'. _('Edit') .'</a></td>';
+ }
+ echo '</table>';
+ include('includes/footer.inc');
+ exit;
+} else if (isset($_GET['ID']) or (isset($_SESSION['tender']->TenderId))) {
+ $title = _('Edit an Existing Supplier Tender Request');
+ include('includes/header.inc');
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' .
+ _('Purchase Order Tendering') . '" alt=""> '.$title . '</p>';
+} else {
+ $title = _('Create a New Supplier Tender Request');
+ include('includes/header.inc');
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' .
+ _('Purchase Order Tendering') . '" alt=""> '.$title . '</p>';
+}
+
+if (isset($_POST['Save'])) {
+ $_SESSION['tender']->RequiredByDate=$_POST['RequiredByDate'];
+ $_SESSION['tender']->save($db);
+ $_SESSION['tender']->EmailSuppliers();
+ prnMsg( _('The tender has been successfully saved'), 'success');
+ include('includes/footer.inc');
+ exit;
+}
+
+if (isset($_GET['DeleteSupplier'])) {
+ $_SESSION['tender']->remove_supplier_from_tender($_GET['DeleteSupplier']);
+ $ShowTender = 1;
+}
+
+if (isset($_GET['DeleteItem'])) {
+ $_SESSION['tender']->remove_item_from_tender($_GET['DeleteItem']);
+ $ShowTender = 1;
+}
+
+if (isset($_POST['SelectedSupplier'])) {
+ $sql = "SELECT suppname,
+ email
+ FROM suppliers
+ WHERE supplierid='" . $_POST['SelectedSupplier'] . "'";
+ $result = DB_query($sql, $db);
+ $myrow = DB_fetch_array($result);
+ if (strlen($myrow['email'])>0) {
+ $_SESSION['tender']->add_supplier_to_tender(
+ $_POST['SelectedSupplier'],
+ $myrow['suppname'],
+ $myrow['email']);
+ } else {
+ prnMsg( _('The supplier must have an email set up or they cannot be part of a tender'), 'warn');
+ }
+ $ShowTender = 1;
+}
+
+if (isset($_POST['NewItem']) and !isset($_POST['Refresh'])) {
+ foreach ($_POST as $key => $value) {
+ if (substr($key,0,3)=='qty') {
+ $StockID=substr($key,3);
+ $Quantity=$value;
+ }
+ if (substr($key,0,5)=='price') {
+ $Price=$value;
+ }
+ if (substr($key,0,3)=='uom') {
+ $UOM=$value;
+ }
+ if (isset($UOM)) {
+ $sql="SELECT description, decimalplaces FROM stockmaster WHERE stockid='".$StockID."'";
+ $result=DB_query($sql, $db);
+ $myrow=DB_fetch_array($result);
+ $_SESSION['tender']->add_item_to_tender(
+ $_SESSION['tender']->LinesOnTender,
+ $StockID,
+ $Quantity,
+ $myrow['description'],
+ $UOM,
+ $myrow['decimalplaces'],
+ DateAdd(date($_SESSION['DefaultDateFormat']),'m',3));
+ unset($UOM);
+ }
+ }
+ $ShowTender = 1;
+}
+
+if (!isset($_SESSION['tender']) or isset($_POST['LookupDeliveryAddress']) or $ShowTender==1) {
+ /* Show Tender header screen */
+ if (!isset($_SESSION['tender'])) {
+ $_SESSION['tender']=new Tender();
+ }
+ echo '<form name="form1" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method=post>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<table class=selection>';
+ echo '<tr><th colspan="4"><font size="3" color="navy">' . _('Tender header details') . '</font></th></tr>';
+ echo '<tr><td>' . _('Delivery Must Be Made Before') . '</td>';
+ echo '<td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] . '" name="RequiredByDate" size="11" value="' .
+ date($_SESSION['DefaultDateFormat']) . '" /></td></tr>';
+
+ if (!isset($_POST['StkLocation']) OR $_POST['StkLocation']==''){
+ /* If this is the first time
+ * the form loaded set up defaults */
+
+ $_POST['StkLocation'] = $_SESSION['UserStockLocation'];
+
+ $sql = "SELECT deladd1,
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ contact
+ FROM locations
+ WHERE loccode='" . $_POST['StkLocation'] . "'";
+
+ $LocnAddrResult = DB_query($sql,$db);
+ if (DB_num_rows($LocnAddrResult)==1){
+ $LocnRow = DB_fetch_array($LocnAddrResult);
+ $_POST['DelAdd1'] = $LocnRow['deladd1'];
+ $_POST['DelAdd2'] = $LocnRow['deladd2'];
+ $_POST['DelAdd3'] = $LocnRow['deladd3'];
+ $_POST['DelAdd4'] = $LocnRow['deladd4'];
+ $_POST['DelAdd5'] = $LocnRow['deladd5'];
+ $_POST['DelAdd6'] = $LocnRow['deladd6'];
+ $_POST['Tel'] = $LocnRow['tel'];
+ $_POST['Contact'] = $LocnRow['contact'];
+
+ $_SESSION['tender']->Location= $_POST['StkLocation'];
+ $_SESSION['tender']->DelAdd1 = $_POST['DelAdd1'];
+ $_SESSION['tender']->DelAdd2 = $_POST['DelAdd2'];
+ $_SESSION['tender']->DelAdd3 = $_POST['DelAdd3'];
+ $_SESSION['tender']->DelAdd4 = $_POST['DelAdd4'];
+ $_SESSION['tender']->DelAdd5 = $_POST['DelAdd5'];
+ $_SESSION['tender']->DelAdd6 = $_POST['DelAdd6'];
+ $_SESSION['tender']->Telephone = $_POST['Tel'];
+ $_SESSION['tender']->Contact = $_POST['Contact'];
+
+ } else {
+ /*The default location of the user is crook */
+ prnMsg(_('The default stock location set up for this user is not a currently defined stock location') .
+ '. ' . _('Your system administrator needs to amend your user record'),'error');
+ }
+
+
+ } elseif (isset($_POST['LookupDeliveryAddress'])){
+
+ $sql = "SELECT deladd1,
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ contact
+ FROM locations
+ WHERE loccode='" . $_POST['StkLocation'] . "'";
+
+ $LocnAddrResult = DB_query($sql,$db);
+ if (DB_num_rows($LocnAddrResult)==1){
+ $LocnRow = DB_fetch_array($LocnAddrResult);
+ $_POST['DelAdd1'] = $LocnRow['deladd1'];
+ $_POST['DelAdd2'] = $LocnRow['deladd2'];
+ $_POST['DelAdd3'] = $LocnRow['deladd3'];
+ $_POST['DelAdd4'] = $LocnRow['deladd4'];
+ $_POST['DelAdd5'] = $LocnRow['deladd5'];
+ $_POST['DelAdd6'] = $LocnRow['deladd6'];
+ $_POST['Tel'] = $LocnRow['tel'];
+ $_POST['Contact'] = $LocnRow['contact'];
+
+ $_SESSION['tender']->Location= $_POST['StkLocation'];
+ $_SESSION['tender']->DelAdd1 = $_POST['DelAdd1'];
+ $_SESSION['tender']->DelAdd2 = $_POST['DelAdd2'];
+ $_SESSION['tender']->DelAdd3 = $_POST['DelAdd3'];
+ $_SESSION['tender']->DelAdd4 = $_POST['DelAdd4'];
+ $_SESSION['tender']->DelAdd5 = $_POST['DelAdd5'];
+ $_SESSION['tender']->DelAdd6 = $_POST['DelAdd6'];
+ $_SESSION['tender']->Telephone = $_POST['Tel'];
+ $_SESSION['tender']->Contact = $_POST['Contact'];
+ }
+ }
+ echo '<tr><td>' . _('Warehouse') . ':</td>
+ <td><select name=StkLocation onChange="ReloadForm(form1.LookupDeliveryAddress)">';
+
+ $sql = "SELECT loccode,
+ locationname
+ FROM locations";
+ $LocnResult = DB_query($sql,$db);
+
+ while ($LocnRow=DB_fetch_array($LocnResult)){
+ if ((isset($_SESSION['tender']->Location) and $_SESSION['tender']->Location == $LocnRow['loccode'])){
+ echo '<option selected value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
+ } else {
+ echo '<option value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
+ }
+ }
+
+ echo '</select>
+ <input type="submit" name="LookupDeliveryAddress" value="' ._('Select') . '"></td>
+ </tr>';
+
+ /* Display the details of the delivery location
+ */
+ echo '<tr><td>' . _('Delivery Contact') . ':</td>
+ <td><input type="text" name="Contact" size="41" value="' . $_SESSION['tender']->Contact . '"></td>
+ </tr>';
+ echo '<tr><td>' . _('Address') . ' 1 :</td>
+ <td><input type="text" name="DelAdd1" size="41" maxlength="40" value="' . $_POST['DelAdd1'] . '"></td>
+ </tr>';
+ echo '<tr><td>' . _('Address') . ' 2 :</td>
+ <td><input type="text" name="DelAdd2" size="41" maxlength="40" value="' . $_POST['DelAdd2'] . '"></td>
+ </tr>';
+ echo '<tr><td>' . _('Address') . ' 3 :</td>
+ <td><input type="text" name="DelAdd3" size="41" maxlength="40" value="' . $_POST['DelAdd3'] . '"></td>
+ </tr>';
+ echo '<tr><td>' . _('Address') . ' 4 :</td>
+ <td><input type="text" name="DelAdd4" size="21" maxlength="20" value="' . $_POST['DelAdd4'] . '"></td>
+ </tr>';
+ echo '<tr><td>' . _('Address') . ' 5 :</td>
+ <td><input type="text" name="DelAdd5" size="16" maxlength="15" value="' . $_POST['DelAdd5'] . '"></td>
+ </tr>';
+ echo '<tr><td>' . _('Address') . ' 6 :</td>
+ <td><input type="text" name="DelAdd6" size="16" maxlength=15 value="' . $_POST['DelAdd6'] . '"></td>
+ </tr>';
+ echo '<tr><td>' . _('Phone') . ':</td>
+ <td><input type="text" name="Tel" size="31" maxlength="30" value="' . $_SESSION['tender']->Telephone . '"></td>
+ </tr>';
+ echo '</table><br />';
+
+ /* Display the supplier/item details
+ */
+ echo '<table>';
+
+ /* Supplier Details
+ */
+ echo '<tr><td valign="top"><table class="selection">';
+ echo '<tr><th colspan="4"><font size="3" color="navy">' . _('Suppliers To Send Tender') . '</font></th></tr>';
+ echo '<tr><th>'. _('Supplier Code') . '</th><th>' ._('Supplier Name') . '</th><th>' ._('Email Address') . '</th></tr>';
+ foreach ($_SESSION['tender']->Suppliers as $Supplier) {
+ echo '<tr><td>' . $Supplier->SupplierCode . '</td>';
+ echo '<td>' . $Supplier->SupplierName . '</td>';
+ echo '<td>' . $Supplier->EmailAddress . '</td>';
+ echo "<td><a href='" . $_SERVER['PHP_SELF'] . "?" . SID . "DeleteSupplier=" . $Supplier->SupplierCode . "'>" . _('Delete') . "</a></td></tr>";
+ }
+ echo '</table></td>';
+ /* Item Details
+ */
+ echo '<td valign="top"><table class="selection">';
+ echo '<tr><th colspan="6"><font size="3" color="navy">' . _('Items in Tender') . '</font></th></tr>';
+ echo '<tr>';
+ echo '<th>'._('Stock ID').'</th>';
+ echo '<th>'._('Description').'</th>';
+ echo '<th>'._('Quantity').'</th>';
+ echo '<th>'._('UOM').'</th>';
+ echo '</tr>';
+ $k=0;
+ foreach ($_SESSION['tender']->LineItems as $LineItems) {
+ if ($LineItems->Deleted==False) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+ echo '<td>'.$LineItems->StockID.'</td>';
+ echo '<td>'.$LineItems->ItemDescription.'</td>';
+ echo '<td class="number">' . number_format($LineItems->Quantity,$LineItems->DecimalPlaces).'</td>';
+ echo '<td>'.$LineItems->Units.'</td>';
+ echo "<td><a href='" . $_SERVER['PHP_SELF'] . "?" . SID . "DeleteItem=" . $LineItems->LineNo . "'>" . _('Delete') . "</a></td></tr>";
+ echo '</tr>';
+ }
+ }
+ echo '</table></td></tr></table><br />';
+
+ echo '<div class="centre"><input type="submit" name="Suppliers" value="' . _('Select Suppliers') . '" />';
+ echo '<input type="submit" name="Items" value="' . _('Select Item Details') . '" /></div><br />';
+ if ($_SESSION['tender']->LinesOnTender > 0 and $_SESSION['tender']->SuppliersOnTender > 0) {
+ echo '<div class="centre"><input type="submit" name="Save" value="' . _('Save Tender') . '" /></div>';
+ }
+ echo '</form>';
+ include('includes/footer.inc');
+ exit;
+}
+
+if (isset($_POST['SearchSupplier']) OR isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
+ if (strlen($_POST['Keywords']) > 0 AND strlen($_POST['SupplierCode']) > 0) {
+ prnMsg( '<br>' . _('Supplier name keywords have been used in preference to the Supplier code extract entered'), 'info' );
+ }
+ if ($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') {
+ $SQL = "SELECT supplierid,
+ suppname,
+ currcode,
+ address1,
+ address2,
+ address3,
+ address4
+ FROM suppliers
+ ORDER BY suppname";
+ } else {
+ if (strlen($_POST['Keywords']) > 0) {
+ $_POST['Keywords'] = strtoupper($_POST['Keywords']);
+ //insert wildcard characters in spaces
+ $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
+ $SQL = "SELECT supplierid,
+ suppname,
+ currcode,
+ address1,
+ address2,
+ address3,
+ address4
+ FROM suppliers
+ WHERE suppname " . LIKE . " '$SearchString'
+ ORDER BY suppname";
+ } elseif (strlen($_POST['SupplierCode']) > 0) {
+ $_POST['SupplierCode'] = strtoupper($_POST['SupplierCode']);
+ $SQL = "SELECT supplierid,
+ suppname,
+ currcode,
+ address1,
+ address2,
+ address3,
+ address4
+ FROM suppliers
+ WHERE supplierid " . LIKE . " '%" . $_POST['SupplierCode'] . "%'
+ ORDER BY supplierid";
+ }
+ } //one of keywords or SupplierCode was more than a zero length string
+ $result = DB_query($SQL, $db);
+ if (DB_num_rows($result) == 1) {
+ $myrow = DB_fetch_row($result);
+ $SingleSupplierReturned = $myrow[0];
+ }
+} //end of if search
+if (isset($SingleSupplierReturned)) { /*there was only one supplier returned *...
[truncated message content] |
|
From: <tim...@us...> - 2011-03-23 12:19:23
|
Revision: 4804
http://weberp.svn.sourceforge.net/weberp/?rev=4804&view=rev
Author: tim_schofield
Date: 2011-03-23 12:19:17 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
Correctly store the conversion factor and the units in the sales order line
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/SelectOrderItems.php
trunk/includes/DefineCartClass.php
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-03-22 20:18:49 UTC (rev 4803)
+++ trunk/DeliveryDetails.php 2011-03-23 12:19:17 UTC (rev 4804)
@@ -386,6 +386,8 @@
orderno,
stkcode,
unitprice,
+ units,
+ conversionfactor,
quantity,
discountpercent,
narrative,
@@ -400,6 +402,8 @@
'" . $OrderNo . "',
'" . $StockItem->StockID . "',
'" . $StockItem->Price . "',
+ '" . $StockItem->Units . "',
+ '" . $StockItem->ConversionFactor . "',
'" . $StockItem->Quantity . "',
'" . floatval($StockItem->DiscountPercent) . "',
'" . DB_escape_string($StockItem->Narrative) . "',
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-03-22 20:18:49 UTC (rev 4803)
+++ trunk/SelectOrderItems.php 2011-03-23 12:19:17 UTC (rev 4804)
@@ -1207,6 +1207,8 @@
$_SESSION['Items'.$identifier]->update_cart_item($OrderLine->LineNumber,
$Quantity,
$Price,
+ $_POST['Units_' . $OrderLine->LineNumber],
+ $_POST['ConversionFactor_' . $OrderLine->LineNumber],
($DiscountPercentage/100),
$Narrative,
'Yes', /*Update DB */
@@ -1419,6 +1421,8 @@
echo '</td>
<td class="number">' . $OrderLine->QOHatLoc . '</td>
<td>' . $OrderLine->Units . '</td>';
+ echo '<input type="hidden" name="Units_'.$OrderLine->LineNumber.'" value="' . $OrderLine->Units . '" />';
+ echo '<input type="hidden" name="ConversionFactor_'.$OrderLine->LineNumber.'" value="' . $OrderLine->ConversionFactor . '" />';
if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
/*OK to display with discount if it is an internal user with appropriate permissions */
@@ -1814,6 +1818,8 @@
<td class="number">'.number_format($myrow['price'],2).'</td>
</td>
</tr>';
+ echo '<input type="hidden" name="ConversionFactor'.$myrow['stockid'].'" value="' . $myrow['conversionfactor'] . '" />';
+ echo '<input type="hidden" name="Units'.$myrow['stockid'].'" value="' . $myrow['units'] . '" />';
if ($j==1) {
$jsCall = '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.itm'.$myrow['stockid'].');}</script>';
}
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-03-22 20:18:49 UTC (rev 4803)
+++ trunk/includes/DefineCartClass.php 2011-03-23 12:19:17 UTC (rev 4804)
@@ -76,7 +76,6 @@
$Price,
$Disc=0,
$Units,
- $ConversionFactor=1,
$Volume,
$Weight,
$QOHatLoc=0,
@@ -97,7 +96,8 @@
$StandardCost=0,
$EOQ=1,
$NextSerialNo=0,
- $ExRate=1){
+ $ExRate=1,
+ $ConversionFactor=1){
if (isset($StockID) AND $StockID!="" AND $Qty>0 AND isset($Qty)){
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2011-03-22 20:18:49 UTC (rev 4803)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2011-03-23 12:19:17 UTC (rev 4804)
@@ -45,8 +45,9 @@
stockmaster.eoq,
stockmaster.nextserialno,
stockmaster.taxcatid
- FROM stockmaster INNER JOIN locstock
- ON stockmaster.stockid=locstock.stockid
+ FROM stockmaster
+ INNER JOIN locstock
+ ON stockmaster.stockid=locstock.stockid
WHERE locstock.loccode='" . $_SESSION['Items'.$identifier]->Location . "'
AND stockmaster.stockid = '". $NewItem . "'";
@@ -134,7 +135,7 @@
$myItemRow['description'],
$Price,
$Discount,
- $myItemRow['units'],
+ $_POST['Units'.$NewItem],
$myItemRow['volume'],
$myItemRow['kgs'],
$myItemRow['quantity'],
@@ -155,7 +156,8 @@
$myItemRow['standardcost'],
$myItemRow['eoq'],
$myItemRow['nextserialno'],
- $ExRate);
+ $ExRate,
+ $_POST['ConversionFactor'.$NewItem]);
}
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-03-23 13:28:47
|
Revision: 4805
http://weberp.svn.sourceforge.net/weberp/?rev=4805&view=rev
Author: tim_schofield
Date: 2011-03-23 13:28:41 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
Create new field for the number of decimal places to show the quantity in at the customer UOM
Modified Paths:
--------------
trunk/Prices.php
trunk/includes/session.inc
Added Paths:
-----------
trunk/sql/mysql/updates/73.php
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2011-03-23 12:19:17 UTC (rev 4804)
+++ trunk/Prices.php 2011-03-23 13:28:41 UTC (rev 4805)
@@ -111,6 +111,7 @@
price='" . $_POST['Price'] . "',
units='" . $_POST['Units'] . "',
conversionfactor='" . $_POST['ConversionFactor'] . "',
+ decimalplaces='" . $_POST['DecimalPlaces'] . "',
startdate='" . FormatDateForSQL($_POST['StartDate']) . "',
enddate='" . $SQLEndDate . "'
WHERE prices.stockid='".$Item."'
@@ -136,6 +137,7 @@
currabrev,
units,
conversionfactor,
+ decimalplaces,
startdate,
enddate,
price)
@@ -144,6 +146,7 @@
'" . $_POST['CurrAbrev'] . "',
'" . $_POST['Units'] . "',
'" . $_POST['ConversionFactor'] . "',
+ '" . $_POST['DecimalPlaces'] . "',
'" . FormatDateForSQL($_POST['StartDate']) . "',
'" . $SQLEndDate. "',
'" . $_POST['Price'] . "')";
@@ -158,6 +161,7 @@
unset($_POST['EndDate']);
unset($_POST['Units']);
unset($_POST['ConversionFactor']);
+ unset($_POST['DecimalPlaces']);
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
@@ -182,6 +186,7 @@
prices.units,
prices.price,
prices.conversionfactor,
+ prices.decimalplaces,
prices.stockid,
prices.typeabbrev,
prices.currabrev,
@@ -202,7 +207,7 @@
if (DB_num_rows($result) > 0) {
echo '<table class=selection>';
- echo '<tr><th colspan=7><form method="post" action=' . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+ echo '<tr><th colspan=8><form method="post" action=' . $_SERVER['PHP_SELF'] . '?' . SID . '>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo _('Pricing for part') . ':<input type=text name="Item" MAXSIZEe=22 value="' . $Item . '" maxlength=20><input type=submit name=NewPart Value="' . _('Review Prices') . '">';
echo '</th></tr></form>';
@@ -211,6 +216,7 @@
'</th><th>' . _('Sales Type') .
'</th><th>' . _('UOM') .
'</th><th>' . _('Conversion') . '<br />' . _('Factor') .
+ '</th><th>' . _('Decimal') . '<br />' . _('Places') .
'</th><th>' . _('Price') .
'</th><th>' . _('Start Date') . ' </th>
<th>' . _('End Date') . '</th></tr>';
@@ -238,6 +244,7 @@
<td>".$myrow['sales_type']."</td>
<td>".$myrow['units']."</td>
<td class=number>".$myrow['conversionfactor']."</td>
+ <td class=number>".$myrow['decimalplaces']."</td>
<td class=number>".number_format($myrow['price'],2)."</td>
<td>".ConvertSQLDate($myrow['startdate'])."</td>
<td>".$EndDateDisplay."</td>
@@ -251,6 +258,7 @@
<td>".$myrow['sales_type']."</td>
<td>".$myrow['units']."</td>
<td class=number>".$myrow['conversionfactor']."</td>
+ <td class=number>".$myrow['decimalplaces']."</td>
<td class=number>".number_format($myrow['price'],2)."</td>
<td>".ConvertSQLDate($myrow['startdate'])."</td>
<td>".$EndDateDisplay."</td>
@@ -273,6 +281,7 @@
prices.units,
prices.price,
prices.conversionfactor,
+ prices.decimalplaces,
prices.stockid,
prices.typeabbrev,
prices.currabrev,
@@ -304,6 +313,7 @@
$_POST['Price'] = $myrow['price'];
$_POST['Units'] = $myrow['units'];
$_POST['ConversionFactor'] = $myrow['conversionfactor'];
+ $_POST['DecimalPlaces'] = $myrow['decimalplaces'];
$_POST['StartDate'] = ConvertSQLDate($myrow['startdate']);
if ($_GET['EndDate']=='' OR $_GET['EndDate']=='0000-00-00'){
$_POST['EndDate'] = '';
@@ -316,7 +326,7 @@
$result = DB_query($SQL,$db);
echo '<br><table class=selection>';
- echo '<tr><th colspan=5><font color=BLUE size=3><b>' . $Item . ' - ' . $PartDescription . '</b></font></th></tr>';
+ echo '<tr><th colspan=5><font color="blue" size=3><b>' . $Item . ' - ' . $PartDescription . '</b></font></th></tr>';
echo '<tr><td>' . _('Currency') . ':</td><td><select name="CurrAbrev">';
while ($myrow = DB_fetch_array($result)) {
if ($myrow['currabrev']==$_POST['CurrAbrev']) {
@@ -375,6 +385,16 @@
echo '</select></td></tr>';
+ echo '<tr><td>'. _('Decimal Places') . '<br />'._('to display').'</td>';
+ echo '<td><input type="text" class=number name="DecimalPlaces" size=8 maxlength=8 value="';
+ if(isset($_POST['DecimalPlaces'])) {
+ echo $_POST['DecimalPlaces'];
+ } else {
+ echo '0';
+ }
+ echo '">';
+
+ echo '</td></tr>';
echo '<tr><td>'. _('Conversion Factor') . '<br />'._('to stock units').'</td>';
echo '<td><input type="text" class=number name="ConversionFactor" size=8 maxlength=8 value="';
if(isset($_POST['ConversionFactor'])) {
@@ -384,6 +404,7 @@
}
echo '">';
+
echo '</td></tr>';
echo '<tr><td>'. _('Price') . ':</td>';
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2011-03-23 12:19:17 UTC (rev 4804)
+++ trunk/includes/session.inc 2011-03-23 13:28:41 UTC (rev 4805)
@@ -13,7 +13,7 @@
header('Location:' . $rootpath . '/install/index.php');
}
include($PathPrefix . 'config.php');
-$DBVersion=72;
+$DBVersion=73;
if (isset($SessionSavePath)){
session_save_path($SessionSavePath);
}
Added: trunk/sql/mysql/updates/73.php
===================================================================
--- trunk/sql/mysql/updates/73.php (rev 0)
+++ trunk/sql/mysql/updates/73.php 2011-03-23 13:28:41 UTC (rev 4805)
@@ -0,0 +1,17 @@
+<?php
+
+/* Add extra field into prices table for unit of measure
+ */
+
+AddColumn('decimalplaces', 'prices', 'int(11)', 'NOT NULL', '0', 'conversionfactor', $db);
+AddColumn('decimalplaces', 'salesorderdetails', 'int(11)', 'NOT NULL', '1', 'conversionfactor', $db);
+
+$sql="UPDATE prices SET decimalplaces=(SELECT decimalplaces FROM stockmaster WHERE prices.stockid=stockmaster.stockid)";
+$result=DB_query($sql, $db);
+
+$sql="UPDATE salesorderdetails SET decimalplaces=(SELECT decimalplaces FROM stockmaster WHERE salesorderdetails.stkcode=stockmaster.stockid)";
+$result=DB_query($sql, $db);
+
+UpdateDBNo(73, $db);
+
+?>
\ No newline at end of file
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