Menu
▾
▴
web-erp-svn — SVN commits
This list is closed, nobody may subscribe to it.
| 2011 |
Jan
(14) |
Feb
(42) |
Mar
(56) |
Apr
(60) |
May
(54) |
Jun
(48) |
Jul
(74) |
Aug
(52) |
Sep
(68) |
Oct
(64) |
Nov
(42) |
Dec
(62) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(142) |
Feb
(270) |
Mar
(374) |
Apr
(230) |
May
(214) |
Jun
(116) |
Jul
(234) |
Aug
(66) |
Sep
(120) |
Oct
(16) |
Nov
(17) |
Dec
(41) |
| 2013 |
Jan
(19) |
Feb
(18) |
Mar
(8) |
Apr
(40) |
May
(121) |
Jun
(42) |
Jul
(127) |
Aug
(145) |
Sep
(27) |
Oct
(38) |
Nov
(83) |
Dec
(61) |
| 2014 |
Jan
(33) |
Feb
(35) |
Mar
(59) |
Apr
(41) |
May
(38) |
Jun
(45) |
Jul
(17) |
Aug
(58) |
Sep
(46) |
Oct
(51) |
Nov
(55) |
Dec
(36) |
| 2015 |
Jan
(57) |
Feb
(67) |
Mar
(70) |
Apr
(34) |
May
(32) |
Jun
(11) |
Jul
(3) |
Aug
(17) |
Sep
(16) |
Oct
(13) |
Nov
(30) |
Dec
(30) |
| 2016 |
Jan
(17) |
Feb
(12) |
Mar
(17) |
Apr
(20) |
May
(47) |
Jun
(15) |
Jul
(13) |
Aug
(30) |
Sep
(32) |
Oct
(20) |
Nov
(32) |
Dec
(24) |
| 2017 |
Jan
(16) |
Feb
|
Mar
(11) |
Apr
(11) |
May
(5) |
Jun
(42) |
Jul
(9) |
Aug
(10) |
Sep
(14) |
Oct
(15) |
Nov
(2) |
Dec
(29) |
| 2018 |
Jan
(28) |
Feb
(49) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <dai...@us...> - 2011-12-27 21:47:45
|
Revision: 4788
http://web-erp.svn.sourceforge.net/web-erp/?rev=4788&view=rev
Author: daintree
Date: 2011-12-27 21:47:35 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/CounterSales.php
trunk/DeliveryDetails.php
trunk/SelectCreditItems.php
trunk/SelectOrderItems.php
trunk/StockLocTransfer.php
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/includes/DefineCartClass.php
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
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/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.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.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_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.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/upgrade4.05-4.06.sql
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/CounterSales.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -535,7 +535,8 @@
'Yes', /*Update DB */
$_POST['ItemDue_' . $OrderLine->LineNumber],
$_POST['POLine_' . $OrderLine->LineNumber],
- filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]));
+ filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]),
+ $identifier);
}
} //page not called from itself - POST variables not set
}
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/DeliveryDetails.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -517,7 +517,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){
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/SelectCreditItems.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -574,7 +574,8 @@
'No',
$LineItem->ItemDue,
$LineItem->POLine,
- 0);
+ 0,
+ $identifier);
}
}
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/SelectOrderItems.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -1024,8 +1024,8 @@
/*not forgetting the location records too */
$InsertStkLocRecsResult = DB_query("INSERT INTO locstock (loccode,
stockid)
- SELECT loccode, '" . $AssetStockID . "'
- FROM locations",$db);
+ SELECT loccode, '" . $AssetStockID . "'
+ FROM locations",$db);
/*Now the asset has been added to the stock master we can add it to the sales order */
$NewItemDue = date($_SESSION['DefaultDateFormat']);
if (isset($_POST['POLine'])){
@@ -1138,7 +1138,8 @@
'Yes', /*Update DB */
$_POST['ItemDue_' . $OrderLine->LineNumber],
$_POST['POLine_' . $OrderLine->LineNumber],
- filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]));
+ filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]),
+ $identifier);
} //within credit limit so make changes
} //there are changes to the order line to process
} //page not called from itself - POST variables not set
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/StockLocTransfer.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -88,6 +88,7 @@
} //end if there is a CSV file to import
else { // process the manually input lines
$ErrorMessage='';
+
if (isset($_POST['ClearAll'])){
unset($_POST['EnterMoreItems']);
for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
@@ -96,7 +97,7 @@
}
}
for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
- if (isset($_POST['Delete' . $i])){
+ if (isset($_POST['Delete' . $i])){ //check box to delete the item is set
unset($_POST['StockID' . $i]);
unset($_POST['StockQTY' . $i]);
}
@@ -303,23 +304,23 @@
$j++;
}
}else {
- $i = 0;
+ $j = 0;
}
// $i is incremented an extra time, so 9 to get 10...
- $z=($i + 9);
+ $z=($j + 9);
- while($i < $z) {
- if (!isset($_POST['StockID' . $i])) {
- $_POST['StockID' . $i]='';
+ while($j < $z) {
+ if (!isset($_POST['StockID' . $j])) {
+ $_POST['StockID' . $j]='';
}
- if (!isset($_POST['StockQTY' . $i])) {
- $_POST['StockQTY' . $i]=0;
+ if (!isset($_POST['StockQTY' . $j])) {
+ $_POST['StockQTY' . $j]=0;
}
echo '<tr>
- <td><input type="text" name="StockID' . $i .'" size="21" maxlength="20" value="' . $_POST['StockID' . $i] . '" /></td>
- <td><input type="text" name="StockQTY' . $i .'" size="10" maxlength="10" class="number" value="' . locale_number_format($_POST['StockQTY' . $i]) . '" /></td>
+ <td><input type="text" name="StockID' . $j .'" size="21" maxlength="20" value="' . $_POST['StockID' . $j] . '" /></td>
+ <td><input type="text" name="StockQTY' . $j .'" size="10" maxlength="10" class="number" value="' . locale_number_format($_POST['StockQTY' . $j]) . '" /></td>
</tr>';
- $i++;
+ $j++;
}
echo '</table>
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/UpgradeDatabase.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -127,8 +127,9 @@
case '4.06':
case '4.06.1':
case '4.06.2':
+ case '4.06.3':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.3':
+ case '4.06.4':
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/doc/Change.log 2011-12-27 21:47:35 UTC (rev 4788)
@@ -1,7 +1,10 @@
webERP Change Log
-27/12/11 Phil: PDFStockLocTransfer.php now has include('includes/session.inc') above the title.
+28/12/11 Release 4.06.4
+28/12/11 Phil: SelectCreditItems.php SelectOrderItems.php CounterSales.php includes/DefineCartClass.php fixes for ExistingOrder . $identifier
+27/12/11 Phil: PDFStockLocTransfer.php now has include('includes/session.inc') above the title. Fixes to allow manual entry.
+
22/12/11 Release 4.06.3
22/12/11 Phil: Fix to install/save.php to use mysqli_connect_error to report the connection error
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/includes/ConnectDB.inc 2011-12-27 21:47:35 UTC (rev 4788)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.06.3'; //must update manually every time there is a DB change
+$Version='4.06.4'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/includes/DefineCartClass.php 2011-12-27 21:47:35 UTC (rev 4788)
@@ -184,7 +184,8 @@
$UpdateDB='No',
$ItemDue,
$POLine,
- $GPPercent){
+ $GPPercent,
+ $identifier){
if ($Qty>0){
$this->LineItems[$UpdateLineNumber]->Quantity = $Qty;
@@ -200,10 +201,10 @@
$result = DB_query("UPDATE salesorderdetails SET quantity=" . $Qty . ",
unitprice=" . $Price . ",
discountpercent=" . $Disc . ",
- narrative ='" . DB_escape_string($Narrative) . "',
+ narrative ='" . $Narrative . "',
itemdue = '" . FormatDateForSQL($ItemDue) . "',
- poline = '" . DB_escape_string($POLine) . "'
- WHERE orderno=" . $_SESSION['ExistingOrder'] . "
+ poline = '" . $POLine . "'
+ WHERE orderno=" . $_SESSION['ExistingOrder'.$identifier] . "
AND orderlineno=" . $UpdateLineNumber
, $db
, _('The order line number') . ' ' . $UpdateLineNumber . ' ' . _('could not be updated'));
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-27 20:27:16 UTC (rev 4787)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-27 21:47:35 UTC (rev 4788)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-22 22:36+1300\n"
+"POT-Creation-Date: 2011-12-28 10:44+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -206,8 +206,8 @@
#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:13
#: BOMExtendedQty.php:261 BOMIndented.php:246 BOMIndentedReverse.php:235
#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:213 BOMs.php:832
-#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2025
-#: CounterSales.php:2151 Credit_Invoice.php:255 CreditStatus.php:21
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2026
+#: CounterSales.php:2152 Credit_Invoice.php:255 CreditStatus.php:21
#: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:11
#: DebtorsAtPeriodEnd.php:125 DiscountCategories.php:10
#: DiscountCategories.php:131 DiscountMatrix.php:16 EDIMessageFormat.php:104
@@ -218,7 +218,7 @@
#: Labels.php:115 Labels.php:270 MRPReport.php:515 OutstandingGRNs.php:160
#: PcAssignCashToTab.php:56 PcAssignCashToTab.php:130
#: PcAssignCashToTab.php:146 PcAssignCashToTab.php:187 PDFPickingList.php:28
-#: PDFPrintLabel.php:140 PDFStockLocTransfer.php:17
+#: PDFPrintLabel.php:140 PDFStockLocTransfer.php:16
#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64
#: POReport.php:68 PO_SelectOSPurchOrder.php:139 PricesBasedOnMarkUp.php:8
#: Prices_Customer.php:35 Prices.php:30 PurchData.php:137 PurchData.php:258
@@ -227,8 +227,8 @@
#: SalesGraph.php:34 SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:45
#: SelectCompletedOrder.php:11 SelectContract.php:78 SelectCreditItems.php:215
#: SelectCreditItems.php:286 SelectCustomer.php:260 SelectGLAccount.php:17
-#: SelectGLAccount.php:77 SelectOrderItems.php:577 SelectOrderItems.php:1479
-#: SelectOrderItems.php:1603 SelectProduct.php:496 SelectSalesOrder.php:533
+#: SelectGLAccount.php:77 SelectOrderItems.php:577 SelectOrderItems.php:1480
+#: SelectOrderItems.php:1604 SelectProduct.php:496 SelectSalesOrder.php:533
#: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:9
#: SelectWorkOrder.php:151 ShipmentCosting.php:11 Shipments.php:17
#: Shippers.php:122 Shippers.php:158 Shipt_Select.php:8
@@ -369,7 +369,7 @@
#: AddCustomerNotes.php:142 AddCustomerTypeNotes.php:129 Areas.php:165
#: BankAccounts.php:224 BOMs.php:151 COGSGLPostings.php:109
#: COGSGLPostings.php:207 ContractBOM.php:266 ContractOtherReqts.php:119
-#: CounterSales.php:821 Credit_Invoice.php:381 CreditStatus.php:175
+#: CounterSales.php:822 Credit_Invoice.php:381 CreditStatus.php:175
#: Currencies.php:275 CustomerReceipt.php:918 Customers.php:1062
#: CustomerTypes.php:203 DiscountCategories.php:219 DiscountMatrix.php:182
#: EDIMessageFormat.php:151 FixedAssetCategories.php:187 FreightCosts.php:241
@@ -382,11 +382,11 @@
#: Prices.php:252 PurchData.php:205 SalesAnalReptCols.php:299
#: SalesAnalRepts.php:303 SalesCategories.php:257 SalesGLPostings.php:133
#: SalesGLPostings.php:246 SalesPeople.php:233 SalesTypes.php:207
-#: SecurityTokens.php:129 SelectCreditItems.php:764 SelectCustomer.php:613
+#: SecurityTokens.php:129 SelectCreditItems.php:765 SelectCustomer.php:613
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
-#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398
+#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1399
#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
-#: StockCategories.php:243 StockCategories.php:557 StockLocTransfer.php:301
+#: StockCategories.php:243 StockCategories.php:557 StockLocTransfer.php:302
#: SuppContractChgs.php:99 SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87
#: SuppInvGRNs.php:147 SupplierContacts.php:164 SupplierTypes.php:191
#: SuppShiptChgs.php:90 SuppTransGLAnalysis.php:121 TaxAuthorities.php:175
@@ -699,10 +699,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: Stocks.php:1019 UpgradeDatabase.php:181 UpgradeDatabase.php:184
-#: UpgradeDatabase.php:187 UpgradeDatabase.php:190 UpgradeDatabase.php:193
-#: UpgradeDatabase.php:196 UpgradeDatabase.php:199 UpgradeDatabase.php:202
-#: UpgradeDatabase.php:205 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:182 UpgradeDatabase.php:185
+#: UpgradeDatabase.php:188 UpgradeDatabase.php:191 UpgradeDatabase.php:194
+#: UpgradeDatabase.php:197 UpgradeDatabase.php:200 UpgradeDatabase.php:203
+#: UpgradeDatabase.php:206 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
@@ -888,14 +888,14 @@
#: AgedDebtors.php:373 AgedSuppliers.php:201 Areas.php:95
#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:974
-#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1365
-#: CounterSales.php:1379 Credit_Invoice.php:697 Credit_Invoice.php:718
+#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1366
+#: CounterSales.php:1380 Credit_Invoice.php:697 Credit_Invoice.php:718
#: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709
#: CustomerTransInquiry.php:91 DeliveryDetails.php:393 GLProfit_Loss.php:596
#: GLTagProfit_Loss.php:511 Payments.php:334 PDFRemittanceAdvice.php:85
#: PurchData.php:86 PurchData.php:104 PurchData.php:245
#: RecurringSalesOrders.php:256 ReverseGRN.php:191 ReverseGRN.php:205
-#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
+#: ReverseGRN.php:374 SelectCreditItems.php:1409 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
@@ -1157,7 +1157,7 @@
msgstr "ID uživatele"
#: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298
-#: CounterSales.php:2157 CounterSales.php:2160 CustomerTransInquiry.php:31
+#: CounterSales.php:2158 CounterSales.php:2161 CustomerTransInquiry.php:31
#: DailySalesInquiry.php:48 DailySalesInquiry.php:50 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:167
#: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585
@@ -1167,8 +1167,8 @@
#: ReorderLevel.php:181 ReorderLevel.php:183 ReorderLevel.php:213
#: ReorderLevel.php:215 SalesGraph.php:97 SalesGraph.php:99 SalesGraph.php:119
#: SalesGraph.php:121 SalesGraph.php:143 SalesGraph.php:145 SalesGraph.php:179
-#: SalesInquiry.php:1078 SalesInquiry.php:1141 SelectCreditItems.php:952
-#: SelectOrderItems.php:1609 SelectOrderItems.php:1612 SelectProduct.php:504
+#: SalesInquiry.php:1078 SalesInquiry.php:1141 SelectCreditItems.php:953
+#: SelectOrderItems.php:1610 SelectOrderItems.php:1613 SelectProduct.php:504
#: SelectProduct.php:506 StockDispatch.php:298 StockDispatch.php:300
#: StockLocStatus.php:69 StockLocStatus.php:71 StockLocStatus.php:89
#: StockLocStatus.php:93 StockLocStatus.php:97 StockQuantityByDate.php:24
@@ -1648,7 +1648,7 @@
#: Payments.php:1046 PcAssignCashToTab.php:222 PcAssignCashToTab.php:345
#: PcAuthorizeExpenses.php:90 PcClaimExpensesFromTab.php:212
#: PcClaimExpensesFromTab.php:365 PcReportTab.php:172 PcReportTab.php:326
-#: PrintCheque.php:77 PrintCheque.php:91 SelectCreditItems.php:681
+#: PrintCheque.php:77 PrintCheque.php:91 SelectCreditItems.php:682
#: SuppContractChgs.php:79 SuppContractChgs.php:163 SuppFixedAssetChgs.php:76
#: SuppFixedAssetChgs.php:149 SupplierAllocations.php:457
#: SupplierCredit.php:352 SupplierCredit.php:385 SupplierCredit.php:421
@@ -1849,8 +1849,8 @@
"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:354 CounterSales.php:821 Customers.php:1091
-#: SelectOrderItems.php:1409 Stocks.php:1204 WorkOrderCosting.php:540
+#: BankReconciliation.php:354 CounterSales.php:822 Customers.php:1091
+#: SelectOrderItems.php:1410 Stocks.php:1204 WorkOrderCosting.php:540
#: WorkOrderEntry.php:569
msgid "Are You Sure?"
msgstr "Opravdu provést?"
@@ -1917,8 +1917,8 @@
#: BOMIndentedReverse.php:295 BOMInquiry.php:200 BOMs.php:532 BOMs.php:709
#: ContractBOM.php:237 ContractBOM.php:349 ContractCosting.php:81
#: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:94
-#: Contracts.php:961 Contracts.php:997 CounterSales.php:741
-#: CounterSales.php:2036 CounterSales.php:2221 CounterSales.php:2347
+#: Contracts.php:961 Contracts.php:997 CounterSales.php:742
+#: CounterSales.php:2037 CounterSales.php:2222 CounterSales.php:2348
#: Credit_Invoice.php:273 DeliveryDetails.php:827 DeliveryDetails.php:897
#: GoodsReceived.php:100 GoodsReceived.php:104 GoodsReceived.php:107
#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:246
@@ -1933,12 +1933,12 @@
#: ReorderLevel.php:268 ReverseGRN.php:387 ReverseGRN.php:388
#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:188
#: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:222
-#: SelectCreditItems.php:673 SelectCreditItems.php:1034
-#: SelectOrderItems.php:1333 SelectOrderItems.php:1491
-#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:149
+#: SelectCreditItems.php:674 SelectCreditItems.php:1035
+#: SelectOrderItems.php:1334 SelectOrderItems.php:1492
+#: SelectOrderItems.php:1676 SelectOrderItems.php:1803 ShipmentCosting.php:149
#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
-#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:276
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:277
#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
@@ -2097,10 +2097,10 @@
msgstr "Stavět"
#: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856
-#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:236
+#: CounterSales.php:2033 CounterSales.php:2218 PO_SelectOSPurchOrder.php:236
#: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70
#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:551
-#: SelectOrderItems.php:1487 SelectOrderItems.php:1671
+#: SelectOrderItems.php:1488 SelectOrderItems.php:1672
#: SelectSalesOrder.php:582 SelectWorkOrder.php:193 Shipt_Select.php:191
#: TopItems.php:182 includes/PDFTopItemsHeader.inc:54
msgid "On Hand"
@@ -2169,8 +2169,8 @@
#: BOMIndented.php:312 BOMIndentedReverse.php:292 BOMInquiry.php:113
#: BOMInquiry.php:199 BOMs.php:529 BOMs.php:855 ContractBOM.php:236
-#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2030
-#: CounterSales.php:2215 CreditStatus.php:152 CreditStatus.php:241
+#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2031
+#: CounterSales.php:2216 CreditStatus.php:152 CreditStatus.php:241
#: EmailConfirmation.php:192 FixedAssetCategories.php:163
#: FixedAssetDepreciation.php:86 FixedAssetRegister.php:83
#: FixedAssetRegister.php:372 FixedAssetTransfer.php:50
@@ -2187,8 +2187,8 @@
#: ReverseGRN.php:385 SalesCategories.php:422 SecurityTokens.php:94
#: SecurityTokens.php:103 SecurityTokens.php:118 SelectAsset.php:243
#: SelectCompletedOrder.php:550 SelectContract.php:153
-#: SelectCreditItems.php:988 SelectOrderItems.php:1485
-#: SelectOrderItems.php:1669 SelectProduct.php:516 SelectProduct.php:733
+#: SelectCreditItems.php:989 SelectOrderItems.php:1486
+#: SelectOrderItems.php:1670 SelectProduct.php:516 SelectProduct.php:733
#: SelectSalesOrder.php:581 SelectWorkOrder.php:192 Shipt_Select.php:190
#: StockCategories.php:216 StockDispatch.php:375 StockDispatch.php:382
#: StockLocStatus.php:161 StockQuantityByDate.php:106 SuppCreditGRNs.php:82
@@ -2284,7 +2284,7 @@
msgstr "popis"
#: BOMInquiry.php:30 BOMs.php:839 ContractBOM.php:324 ContractBOM.php:329
-#: Contracts.php:756 Contracts.php:759 CounterSales.php:2182
+#: Contracts.php:756 Contracts.php:759 CounterSales.php:2183
#: CustomerReceipt.php:1106 CustomerReceipt.php:1109
#: DiscountCategories.php:104 DiscountCategories.php:106
#: DiscountCategories.php:110 DiscountCategories.php:112
@@ -2292,10 +2292,10 @@
#: MRPReport.php:542 PO_Header.php:538 PO_Items.php:1050 PO_Items.php:1054
#: PO_SelectOSPurchOrder.php:217 PO_SelectPurchOrder.php:194 PurchData.php:268
#: SelectAsset.php:94 SelectCompletedOrder.php:529 SelectCreditItems.php:222
-#: SelectCreditItems.php:971 SelectCustomer.php:269 SelectCustomer.php:279
+#: SelectCreditItems.php:972 SelectCustomer.php:269 SelectCustomer.php:279
#: SelectCustomer.php:288 SelectCustomer.php:298 SelectCustomer.php:344
#: SelectGLAccount.php:90 SelectOrderItems.php:587 SelectOrderItems.php:590
-#: SelectOrderItems.php:1637 SelectProduct.php:523 SelectSalesOrder.php:565
+#: SelectOrderItems.php:1638 SelectProduct.php:523 SelectSalesOrder.php:565
#: SelectSupplier.php:209 SelectWorkOrder.php:179 Shipt_Select.php:173
#: SuppFixedAssetChgs.php:122 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667
@@ -2324,11 +2324,11 @@
msgstr "Skladový kód"
#: BOMInquiry.php:37 BOMs.php:844 ContractBOM.php:334 Contracts.php:764
-#: CounterSales.php:2186 CustomerReceipt.php:1116 FixedAssetTransfer.php:72
+#: CounterSales.php:2187 CustomerReceipt.php:1116 FixedAssetTransfer.php:72
#: MRPDemands.php:338 MRPReport.php:554 PO_Header.php:545 PO_Items.php:1058
-#: SelectAsset.php:102 SelectCreditItems.php:229 SelectCreditItems.php:978
+#: SelectAsset.php:102 SelectCreditItems.php:229 SelectCreditItems.php:979
#: SelectCustomer.php:369 SelectGLAccount.php:96 SelectOrderItems.php:595
-#: SelectOrderItems.php:1644 SelectProduct.php:531 SelectSupplier.php:219
+#: SelectOrderItems.php:1645 SelectProduct.php:531 SelectSupplier.php:219
#: SelectSupplier.php:252 SupplierTenders.php:367 WorkOrderEntry.php:610
#: WorkOrderIssue.php:672
msgid "Search Now"
@@ -2361,15 +2361,15 @@
msgstr "SQL najít vybrané části nepodařilo se zprávou"
#: BOMInquiry.php:112 BOMs.php:528 BOMs.php:854 ContractBOM.php:345
-#: CounterSales.php:2029 CounterSales.php:2214 CustomerBranches.php:367
+#: CounterSales.php:2030 CounterSales.php:2215 CustomerBranches.php:367
#: CustomerReceipt.php:1127 GLCodesInquiry.php:26 MRPDemands.php:90
#: MRPPlannedWorkOrders.php:256 MRPReport.php:746 PDFOrdersInvoiced.php:347
#: PDFOrderStatus.php:318 PDFPrintLabel.php:247 PO_Header.php:555
#: PO_Items.php:1070 PO_SelectOSPurchOrder.php:234 PO_SelectPurchOrder.php:211
#: PricesByCost.php:151 PurchData.php:350 ReorderLevelLocation.php:66
-#: SalesPeople.php:199 SelectCompletedOrder.php:549 SelectCreditItems.php:987
-#: SelectCustomer.php:412 SelectGLAccount.php:103 SelectOrderItems.php:1484
-#: SelectOrderItems.php:1668 SelectProduct.php:732 SelectSalesOrder.php:580
+#: SalesPeople.php:199 SelectCompletedOrder.php:549 SelectCreditItems.php:988
+#: SelectCustomer.php:412 SelectGLAccount.php:103 SelectOrderItems.php:1485
+#: SelectOrderItems.php:1669 SelectProduct.php:732 SelectSalesOrder.php:580
#: SelectSupplier.php:258 SelectWorkOrder.php:191 Shipt_Select.php:189
#: SpecialOrder.php:142 SupplierTenders.php:489 SuppPriceList.php:289
#: TopItems.php:177 WorkOrderEntry.php:622 WorkOrderIssue.php:691
@@ -2379,12 +2379,12 @@
msgstr "Kód"
#: BOMInquiry.php:115 BOMs.php:857 ConfirmDispatch_Invoice.php:280
-#: ContractBOM.php:347 CounterSales.php:2031 CounterSales.php:2216
+#: ContractBOM.php:347 CounterSales.php:2032 CounterSales.php:2217
#: Credit_Invoice.php:272 GoodsReceived.php:101 GoodsReceived.php:105
#: MRPReport.php:749 OffersReceived.php:106 PO_Items.php:1074
#: PO_SelectOSPurchOrder.php:238 PO_SelectPurchOrder.php:215
-#: SelectCompletedOrder.php:554 SelectCreditItems.php:989
-#: SelectOrderItems.php:1486 SelectOrderItems.php:1670 SelectProduct.php:117
+#: SelectCompletedOrder.php:554 SelectCreditItems.php:990
+#: SelectOrderItems.php:1487 SelectOrderItems.php:1671 SelectProduct.php:117
#: SelectProduct.php:735 SelectSalesOrder.php:583 SelectWorkOrder.php:194
#: Shipments.php:402 Shipments.php:489 Shipt_Select.php:193
#: StockLocTransferReceive.php:432 SupplierTenders.php:491 TopItems.php:180
@@ -2664,8 +2664,8 @@
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:405 ConfirmDispatch_Invoice.php:1021 CounterSales.php:1413
-#: Credit_Invoice.php:753 Credit_Invoice.php:781 SelectCreditItems.php:1453
+#: BOMs.php:405 ConfirmDispatch_Invoice.php:1021 CounterSales.php:1414
+#: Credit_Invoice.php:753 Credit_Invoice.php:781 SelectCreditItems.php:1454
#: Stocks.php:940 Stocks.php:942
msgid "Assembly"
msgstr "Sestava"
@@ -3059,7 +3059,7 @@
#: MRPCalendar.php:314 Payments.php:898 PcAuthorizeExpenses.php:288
#: PO_AuthoriseMyOrders.php:138 PricesByCost.php:221 PurchData.php:522
#: ReorderLevelLocation.php:148 SecurityTokens.php:97
-#: SelectCreditItems.php:923 SMTPServer.php:63 StockCostUpdate.php:184
+#: SelectCreditItems.php:924 SMTPServer.php:63 StockCostUpdate.php:184
#: StockReorderLevel.php:103 Stocks.php:1198 SystemParameters.php:1032
#: TaxAuthorityRates.php:83 WorkOrderEntry.php:566 WOSerialNos.php:332
msgid "Update"
@@ -3115,7 +3115,7 @@
msgid "Back to Confirmation of Dispatch"
msgstr "Zpět na Potvrzení o odeslání"
-#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1250
+#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1251
#: DeliveryDetails.php:583 DeliveryDetails.php:788 EmailCustTrans.php:9
#: PaymentAllocations.php:31 SelectSalesOrder.php:830 SelectSalesOrder.php:901
#: SelectSalesOrder.php:928 Z_SalesIntegrityCheck.php:46
@@ -3230,16 +3230,16 @@
msgstr "Všechny částky v"
#: ConfirmDispatch_Invoice.php:277 ContractBOM.php:235 ContractCosting.php:79
-#: ContractCosting.php:85 Contracts.php:959 CounterSales.php:739
-#: CounterSales.php:2346 Credit_Invoice.php:269 DeliveryDetails.php:825
+#: ContractCosting.php:85 Contracts.php:959 CounterSales.php:740
+#: CounterSales.php:2347 Credit_Invoice.php:269 DeliveryDetails.php:825
#: GoodsReceived.php:98 OrderDetails.php:162 PO_Items.php:658
#: PO_OrderDetails.php:146 PrintCustTrans.php:860 PrintCustTrans.php:949
#: PrintCustTrans.php:998 PrintCustTransPortrait.php:907
#: PrintCustTransPortrait.php:1005 PrintCustTransPortrait.php:1062
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
-#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
-#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:275 StockLocTransferReceive.php:427
+#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:672
+#: SelectOrderItems.php:1332 StockCostUpdate.php:123 StockLocMovements.php:87
+#: StockLocTransfer.php:276 StockLocTransferReceive.php:427
#: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787
#: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175
#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315
@@ -3255,14 +3255,14 @@
msgstr "Kód položky"
#: ConfirmDispatch_Invoice.php:278 ContractCosting.php:80
-#: ContractCosting.php:86 Contracts.php:960 CounterSales.php:740
+#: ContractCosting.php:86 Contracts.php:960 CounterSales.php:741
#: Credit_Invoice.php:270 DeliveryDetails.php:826 DeliveryDetails.php:896
#: OrderDetails.php:163 PO_Items.php:733 PO_OrderDetails.php:147
#: PrintCustTrans.php:861 PrintCustTrans.php:950 PrintCustTrans.php:999
#: PrintCustTransPortrait.php:908 PrintCustTransPortrait.php:1006
#: PrintCustTransPortrait.php:1063 RecurringSalesOrders.php:319
#: ReprintGRN.php:82 SalesInquiry.php:821 SalesInquiry.php:839
-#: SalesInquiry.php:938 SelectCreditItems.php:672 SelectOrderItems.php:1332
+#: SalesInquiry.php:938 SelectCreditItems.php:673 SelectOrderItems.php:1333
#: SpecialOrder.php:615 StockLocTransferReceive.php:428
#: includes/PDFOrderPageHeader_generic.inc:92
#: includes/PDFPickingListHeader.inc:73
@@ -3295,7 +3295,7 @@
msgid "This Dispatch"
msgstr "Tato zásilka"
-#: ConfirmDispatch_Invoice.php:283 CounterSales.php:744 Credit_Invoice.php:274
+#: ConfirmDispatch_Invoice.php:283 CounterSales.php:745 Credit_Invoice.php:274
#: DeliveryDetails.php:829 DeliveryDetails.php:899 GoodsReceived.php:111
#: OffersReceived.php:107 OffersReceived.php:215 OffersReceived.php:260
#: OrderDetails.php:166 PDFOrdersInvoiced.php:391 PDFPriceList.php:365
@@ -3304,8 +3304,8 @@
#: PrintCustTrans.php:864 PrintCustTrans.php:953 PrintCustTrans.php:1002
#: PrintCustTransPortrait.php:911 PrintCustTransPortrait.php:1009
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
-#: RecurringSalesOrders.php:322 SelectCreditItems.php:675
-#: SelectOrderItems.php:1336 Shipments.php:405 StockLocMovements.php:94
+#: RecurringSalesOrders.php:322 SelectCreditItems.php:676
+#: SelectOrderItems.php:1337 Shipments.php:405 StockLocMovements.php:94
#: StockMovements.php:99 StockStatus.php:309 SuppCreditGRNs.php:181
#: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267
#: SupplierTenders.php:494 SuppPriceList.php:292
@@ -3316,13 +3316,13 @@
msgid "Price"
msgstr "Cena"
-#: ConfirmDispatch_Invoice.php:284 CounterSales.php:745 Credit_Invoice.php:275
+#: ConfirmDispatch_Invoice.php:284 CounterSales.php:746 Credit_Invoice.php:275
#: CustomerReceipt.php:898 DeliveryDetails.php:830 OrderDetails.php:167
#: PrintCustTrans.php:865 PrintCustTrans.php:954 PrintCustTrans.php:1003
#: PrintCustTransPortrait.php:912 PrintCustTransPortrait.php:1010
#: PrintCustTransPortrait.php:1067 RecurringSalesOrders.php:323
-#: SalesAnalReptCols.php:41 SalesAnalReptCols.php:43 SelectCreditItems.php:677
-#: SelectOrderItems.php:1339 StockLocMovements.php:95 StockMovements.php:100
+#: SalesAnalReptCols.php:41 SalesAnalReptCols.php:43 SelectCreditItems.php:678
+#: SelectOrderItems.php:1340 StockLocMovements.php:95 StockMovements.php:100
#: StockStatus.php:310 includes/PDFQuotationPageHeader.inc:105
#: includes/PDFQuotationPortraitPageHeader.inc:105
#: includes/PDFTransPageHeader.inc:211
@@ -3330,7 +3330,7 @@
msgstr "Sleva"
#: ConfirmDispatch_Invoice.php:285 ConfirmDispatch_Invoice.php:289
-#: CounterSales.php:749 CounterSales.php:836 Credit_Invoice.php:276
+#: CounterSales.php:750 CounterSales.php:837 Credit_Invoice.php:276
#: Credit_Invoice.php:280 CustomerAllocations.php:331
#: CustomerAllocations.php:364 CustomerInquiry.php:201 DeliveryDetails.php:831
#: DeliveryDetails.php:900 GLBalanceSheet.php:183 GLBalanceSheet.php:192
@@ -3344,8 +3344,8 @@
#: PDFSuppTransListing.php:128 RecurringSalesOrders.php:324
#: SalesByTypePeriodInquiry.php:373 SalesByTypePeriodInquiry.php:408
#: SalesByTypePeriodInquiry.php:443 SalesByTypePeriodInquiry.php:478
-#: SalesByTypePeriodInquiry.php:539 SelectCreditItems.php:678
-#: SelectCreditItems.php:682 SelectOrderItems.php:1342
+#: SalesByTypePeriodInquiry.php:539 SelectCreditItems.php:679
+#: SelectCreditItems.php:683 SelectOrderItems.php:1343
#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:94
#: SupplierAllocations.php:457 SupplierAllocations.php:569
#: SupplierAllocations.php:644 SupplierCredit.php:406 SupplierInquiry.php:210
@@ -3359,12 +3359,12 @@
msgstr "Celkem"
#: ConfirmDispatch_Invoice.php:285 Credit_Invoice.php:276
-#: SelectCreditItems.php:678
+#: SelectCreditItems.php:679
msgid "Excl Tax"
msgstr "bez DPH"
#: ConfirmDispatch_Invoice.php:286 Credit_Invoice.php:277
-#: SelectCreditItems.php:679 SupplierInvoice.php:236 TaxGroups.php:285
+#: SelectCreditItems.php:680 SupplierInvoice.php:236 TaxGroups.php:285
msgid "Tax Authority"
msgstr "Daňový úřad"
@@ -3372,16 +3372,16 @@
msgid "Tax %"
msgstr "DPH %"
-#: ConfirmDispatch_Invoice.php:288 CounterSales.php:748 Credit_Invoice.php:278
+#: ConfirmDispatch_Invoice.php:288 CounterSales.php:749 Credit_Invoice.php:278
#: Credit_Invoice.php:279 PrintCustTrans.php:395 PrintCustTrans.php:1041
#: PrintCustTransPortrait.php:455 PrintCustTransPortrait.php:1105
-#: SelectCreditItems.php:680 SelectCreditItems.php:681
+#: SelectCreditItems.php:681 SelectCreditItems.php:682
#: includes/PDFTaxPageHeader.inc:40
msgid "Tax"
msgstr "DPH"
-#: ConfirmDispatch_Invoice.php:289 CounterSales.php:749 Credit_Invoice.php:280
-#: SelectCreditItems.php:682
+#: ConfirmDispatch_Invoice.php:289 CounterSales.php:750 Credit_Invoice.php:280
+#: SelectCreditItems.php:683
msgid "Incl Tax"
msgstr "včetně DPH"
@@ -3451,7 +3451,7 @@
msgid "No further processing has been done"
msgstr "Žádné další zpracování bylo provedeno"
-#: ConfirmDispatch_Invoice.php:594 CounterSales.php:937
+#: ConfirmDispatch_Invoice.php:594 CounterSales.php:938
msgid ""
"Could not retrieve the quantity left at the location once this order is "
"invoiced (for the purposes of checking that stock will not go negative "
@@ -3460,7 +3460,7 @@
"Nepodařilo se načíst množství vlevo na místě, jakmile toto pořadí je "
"fakturováno (za účelem kontroly, zda vozidla nepůjde, protože negativní)"
-#: ConfirmDispatch_Invoice.php:599 CounterSales.php:942
+#: ConfirmDispatch_Invoice.php:599 CounterSales.php:943
msgid ""
"Invoicing the selected order would result in negative stock. The system "
"parameters are set to prohibit negative stocks from occurring. This invoice "
@@ -3471,11 +3471,11 @@
"může být vytvořena do vyprodání na ruce je opraven."
#: ConfirmDispatch_Invoice.php:599 ConfirmDispatch_Invoice.php:622
-#: CounterSales.php:942 CounterSales.php:965 WorkOrderReceive.php:157
+#: CounterSales.php:943 CounterSales.php:966 WorkOrderReceive.php:157
msgid "Negative Stock Prohibited"
msgstr "Negativní Zakázané skladem"
-#: ConfirmDispatch_Invoice.php:618 CounterSales.php:961
+#: ConfirmDispatch_Invoice.php:618 CounterSales.php:962
msgid ""
"Could not retrieve the component quantity left at the location once the "
"assembly item on this order is invoiced (for the purposes of checking that "
@@ -3485,7 +3485,7 @@
"na tomto pořadí je fakturováno (za účelem kontroly, zda vozidla nepůjde, "
"protože negativní)"
-#: ConfirmDispatch_Invoice.php:622 CounterSales.php:965
+#: ConfirmDispatch_Invoice.php:622 CounterSales.php:966
msgid ""
"Invoicing the selected order would result in negative stock for a component "
"of an assembly item on the order. The system parameters are set to prohibit "
@@ -3609,12 +3609,12 @@
#: ConfirmDispatch_Invoice.php:1594 ContractCosting.php:248
#: ContractCosting.php:266 ContractCosting.php:274 ContractCosting.php:330
#: ContractCosting.php:359 ContractCosting.php:388 ContractCosting.php:408
-#: ContractCosting.php:415 CounterSales.php:1252 CounterSales.php:1292
-#: CounterSales.php:1308 CounterSales.php:1345 CounterSales.php:1364
-#: CounterSales.php:1378 CounterSales.php:1419 CounterSales.php:1429
-#: CounterSales.php:1511 CounterSales.php:1532 CounterSales.php:1694
-#: CounterSales.php:1716 CounterSales.php:1741 CounterSales.php:1762
-#: CounterSales.php:1788 CounterSales.php:1811 Credit_Invoice.php:191
+#: ContractCosting.php:415 CounterSales.php:1253 CounterSales.php:1293
+#: CounterSales.php:1309 CounterSales.php:1346 CounterSales.php:1365
+#: CounterSales.php:1379 CounterSales.php:1420 CounterSales.php:1430
+#: CounterSales.php:1512 CounterSales.php:1533 CounterSales.php:1695
+#: CounterSales.php:1717 CounterSales.php:1742 CounterSales.php:1763
+#: CounterSales.php:1789 CounterSales.php:1812 Credit_Invoice.php:191
#: Credit_Invoice.php:538 Credit_Invoice.php:579 Credit_Invoice.php:596
#: Credit_Invoice.php:612 Credit_Invoice.php:662 Credit_Invoice.php:675
#: Credit_Invoice.php:787 Credit_Invoice.php:797 Credit_Invoice.php:872
@@ -3637,25 +3637,25 @@
#: RecurringSalesOrdersProcess.php:692 ReverseGRN.php:55 ReverseGRN.php:128
#: ReverseGRN.php:139 ReverseGRN.php:148 ReverseGRN.php:155 ReverseGRN.php:219
#: ReverseGRN.php:248 ReverseGRN.php:306 ReverseGRN.php:328
-#: SelectCreditItems.php:1065 SelectCreditItems.php:1126
-#: SelectCreditItems.php:1143 SelectCreditItems.php:1211
-#: SelectCreditItems.php:1284 SelectCreditItems.php:1305
-#: SelectCreditItems.php:1322 SelectCreditItems.php:1341
-#: SelectCreditItems.php:1350 SelectCreditItems.php:1365
-#: SelectCreditItems.php:1386 SelectCreditItems.php:1460
-#: SelectCreditItems.php:1470 SelectCreditItems.php:1556
-#: SelectCreditItems.php:1574 SelectCreditItems.php:1590
-#: SelectCreditItems.php:1772 SelectCreditItems.php:1798
-#: SelectCreditItems.php:1821 SelectCreditItems.php:1852
-#: SelectCreditItems.php:1875 SelectCreditItems.php:1903
-#: SelectCreditItems.php:1923 SelectCreditItems.php:1944
+#: SelectCreditItems.php:1066 SelectCreditItems.php:1127
+#: SelectCreditItems.php:1144 SelectCreditItems.php:1212
+#: SelectCreditItems.php:1285 SelectCreditItems.php:1306
+#: SelectCreditItems.php:1323 SelectCreditItems.php:1342
+#: SelectCreditItems.php:1351 SelectCreditItems.php:1366
+#: SelectCreditItems.php:1387 SelectCreditItems.php:1461
+#: SelectCreditItems.php:1471 SelectCreditItems.php:1557
+#: SelectCreditItems.php:1575 SelectCreditItems.php:1591
+#: SelectCreditItems.php:1773 SelectCreditItems.php:1799
+#: SelectCreditItems.php:1822 SelectCreditItems.php:1853
+#: SelectCreditItems.php:1876 SelectCreditItems.php:1904
+#: SelectCreditItems.php:1924 SelectCreditItems.php:1945
#: ShipmentCosting.php:249 ShipmentCosting.php:294 ShipmentCosting.php:314
#: ShipmentCosting.php:328 ShipmentCosting.php:374 ShipmentCosting.php:397
#: ShipmentCosting.php:432 ShipmentCosting.php:451 ShipmentCosting.php:465
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
-#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:159
-#: StockLocTransfer.php:183 StockLocTransfer.php:187
+#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:160
+#: StockLocTransfer.php:184 StockLocTransfer.php:188
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
#: StockLocTransferReceive.php:214 StockLocTransferReceive.php:250
@@ -3720,12 +3720,12 @@
#: ConfirmDispatch_Invoice.php:1594 ContractCosting.php:248
#: ContractCosting.php:266 ContractCosting.php:274 ContractCosting.php:330
#: ContractCosting.php:359 ContractCosting.php:388 ContractCosting.php:408
-#: ContractCosting.php:415 CounterSales.php:1252 CounterSales.php:1292
-#: CounterSales.php:1308 CounterSales.php:1345 CounterSales.php:1364
-#: CounterSales.php:1378 CounterSales.php:1419 CounterSales.php:1429
-#: CounterSales.php:1511 CounterSales.php:1532 CounterSales.php:1694
-#: CounterSales.php:1716 CounterSales.php:1741 CounterSales.php:1762
-#: CounterSales.php:1788 CounterSales.php:1811 Credit_Invoice.php:538
+#: ContractCosting.php:415 CounterSales.php:1253 CounterSales.php:1293
+#: CounterSales.php:1309 CounterSales.php:1346 CounterSales.php:1365
+#: CounterSales.php:1379 CounterSales.php:1420 CounterSales.php:1430
+#: CounterSales.php:1512 CounterSales.php:1533 CounterSales.php:1695
+#: CounterSales.php:1717 CounterSales.php:1742 CounterSales.php:1763
+#: CounterSales.php:1789 CounterSales.php:1812 Credit_Invoice.php:538
#: Credit_Invoice.php:579 Credit_Invoice.php:596 Credit_Invoice.php:612
#: Credit_Invoice.php:662 Credit_Invoice.php:675 Credit_Invoice.php:787
#: Credit_Invoice.php:797 Credit_Invoice.php:872 Credit_Invoice.php:887
@@ -3748,18 +3748,18 @@
#: RecurringSalesOrdersProcess.php:692 ReverseGRN.php:55 ReverseGRN.php:128
#: ReverseGRN.php:139 ReverseGRN.php:148 ReverseGRN.php:155 ReverseGRN.php:219
#: ReverseGRN.php:248 ReverseGRN.php:306 ReverseGRN.php:328
-#: SelectCreditItems.php:1065 SelectCreditItems.php:1126
-#: SelectCreditItems.php:1143 SelectCreditItems.php:1211
-#: SelectCreditItems.php:1284 SelectCreditItems.php:1305
-#: SelectCreditItems.php:1322 SelectCreditItems.php:1341
-#: SelectCreditItems.php:1350 SelectCreditItems.php:1365
-#: SelectCreditItems.php:1386 SelectCreditItems.php:1460
-#: SelectCreditItems.php:1470 SelectCreditItems.php:1556
-#: SelectCreditItems.php:1574 SelectCreditItems.php:1590
-#: SelectCreditItems.php:1772 SelectCreditItems.php:1798
-#: SelectCreditItems.php:1821 SelectCreditItems.php:1852
-#: SelectCreditItems.php:1875 SelectCreditItems.php:1903
-#: SelectCreditItems.php:1923 SelectCreditItems.php:1944
+#: SelectCreditItems.php:1066 SelectCreditItems.php:1127
+#: SelectCreditItems.php:1144 SelectCreditItems.php:1212
+#: SelectCreditItems.php:1285 SelectCreditItems.php:1306
+#: SelectCreditItems.php:1323 SelectCreditItems.php:1342
+#: SelectCreditItems.php:1351 SelectCreditItems.php:1366
+#: SelectCreditItems.php:1387 SelectCreditItems.php:1461
+#: SelectCreditItems.php:1471 SelectCreditItems.php:1557
+#: SelectCreditItems.php:1575 SelectCreditItems.php:1591
+#: SelectCreditItems.php:1773 SelectCreditItems.php:1799
+#: SelectCreditItems.php:1822 SelectCreditItems.php:1853
+#: SelectCreditItems.php:1876 SelectCreditItems.php:1904
+#: SelectCreditItems.php:1924 SelectCreditItems.php:1945
#: ShipmentCosting.php:249 ShipmentCosting.php:294 ShipmentCosting.php:314
#: ShipmentCosting.php:328 ShipmentCosting.php:374 ShipmentCosting.php:397
#: ShipmentCosting.php:432 ShipmentCosting.php:451 ShipmentCosting.php:465
@@ -3811,35 +3811,35 @@
msgid "NOTE DOWN THIS ERROR AND SEEK ASSISTANCE"
msgstr "POZNÁMKA DOWN tuto chybu a požádat o pomoc"
-#: ConfirmDispatch_Invoice.php:750 CounterSales.php:1252
+#: ConfirmDispatch_Invoice.php:750 CounterSales.php:1253
#: RecurringSalesOrdersProcess.php:637
msgid "The sales order header could not be updated with the invoice number"
msgstr "Prodejní objednávky záhlaví nemohl být aktualizován číslo faktury"
-#: ConfirmDispatch_Invoice.php:751 CounterSales.php:1253
+#: ConfirmDispatch_Invoice.php:751 CounterSales.php:1254
#: RecurringSalesOrdersProcess.php:638
msgid "The following SQL to update the sales order was used"
msgstr "Následující SQL aktualizovat prodejní objednávky byly použity"
-#: ConfirmDispatch_Invoice.php:792 CounterSales.php:1292
+#: ConfirmDispatch_Invoice.php:792 CounterSales.php:1293
#: RecurringSalesOrdersProcess.php:678
msgid "The debtor transaction record could not be inserted because"
msgstr "Dlužník transakce záznam nemůže být vložen, protože"
-#: ConfirmDispatch_Invoice.php:793 CounterSales.php:1293
+#: ConfirmDispatch_Invoice.php:793 CounterSales.php:1294
#: RecurringSalesOrdersProcess.php:679
msgid "The following SQL to insert the debtor transaction record was used"
msgstr "Následující SQL vložit dlužníka transakce záznam byl použit"
-#: ConfirmDispatch_Invoice.php:808 CounterSales.php:1308
+#: ConfirmDispatch_Invoice.php:808 CounterSales.php:1309
#: Credit_Invoice.php:596 RecurringSalesOrdersProcess.php:692
-#: SelectCreditItems.php:1143
+#: SelectCreditItems.php:1144
msgid "The debtor transaction taxes records could not be inserted because"
msgstr "Dlužník transakčních daní záznamy nemohly být zařazeny, protože"
-#: ConfirmDispatch_Invoice.php:809 CounterSales.php:1309
+#: ConfirmDispatch_Invoice.php:809 CounterSales.php:1310
#: Credit_Invoice.php:597 RecurringSalesOrdersProcess.php:693
-#: SelectCreditItems.php:1144
+#: SelectCreditItems.php:1145
msgid ""
"The following SQL to insert the debtor transaction taxes record was used"
msgstr "Následující SQL vložit dlužníka transakce daní záznam byl použit"
@@ -3872,49 +3872,49 @@
msgid "Cannot retrieve the mbflag"
msgstr "Nelze načíst mbflag"
-#: ConfirmDispatch_Invoice.php:939 CounterSales.php:1329
+#: ConfirmDispatch_Invoice.php:939 CounterSales.php:1330
#: FixedAssetItems.php:627 SalesAnalReptCols.php:328 Stocks.php:1201
#: Suppliers.php:965 includes/MiscFunctions.php:36
msgid "WARNING"
msgstr "UPOZORNĚNÍ"
-#: ConfirmDispatch_Invoice.php:939 CounterSales.php:1329
+#: ConfirmDispatch_Invoice.php:939 CounterSales.php:1330
msgid "Could not retrieve current location stock"
msgstr "Nepodařilo se získat aktuální polohu vozidla"
-#: ConfirmDispatch_Invoice.php:955 CounterSales.php:1345
-#: Credit_Invoice.php:675 SelectCreditItems.php:1386
+#: ConfirmDispatch_Invoice.php:955 CounterSales.php:1346
+#: Credit_Invoice.php:675 SelectCreditItems.php:1387
msgid "Location stock record could not be updated because"
msgstr "Umístění skladové evidenci nelze aktualizovat, protože"
#: ConfirmDispatch_Invoice.php:956 ContractCosting.php:331
-#: CounterSales.php:1346 Credit_Invoice.php:676 GoodsReceived.php:486
-#: ReverseGRN.php:220 SelectCreditItems.php:1387 StockTransfers.php:423
+#: CounterSales.php:1347 Credit_Invoice.php:676 GoodsReceived.php:486
+#: ReverseGRN.php:220 SelectCreditItems.php:1388 StockTransfers.php:423
#: StockTransfers.php:432 WorkOrderIssue.php:161 WorkOrderReceive.php:321
#: WorkOrderReceive.php:428
msgid "The following SQL to update the location stock record was used"
msgstr "Následující SQL aktualizovat umístění skladové evidenci byl používán"
-#: ConfirmDispatch_Invoice.php:973 CounterSales.php:1364
-#: Credit_Invoice.php:696 SelectCreditItems.php:1407
+#: ConfirmDispatch_Invoice.php:973 CounterSales.php:1365
+#: Credit_Invoice.php:696 SelectCreditItems.php:1408
msgid "Could not retrieve assembly components from the database for"
msgstr "Nepodařilo se načíst součásti sestavy z databáze"
-#: ConfirmDispatch_Invoice.php:973 CounterSales.php:1364
+#: ConfirmDispatch_Invoice.php:973 CounterSales.php:1365
#: Credit_Invoice.php:696 EDIMessageFormat.php:43 EDISendInvoices.php:105
#: FixedAssetCategories.php:90 FixedAssetCategories.php:109
#: PricesBasedOnMarkUp.php:334 PricesBasedOnMarkUp.php:350
-#: SelectCreditItems.php:1407 SpecialOrder.php:494 StockCategories.php:23
+#: SelectCreditItems.php:1408 SpecialOrder.php:494 StockCategories.php:23
#: StockCategories.php:84 StockCategories.php:155 Z_ReApplyCostToSA.php:62
#: Z_ReApplyCostToSA.php:74
msgid "because"
msgstr "protože"
-#: ConfirmDispatch_Invoice.php:987 CounterSales.php:1378
+#: ConfirmDispatch_Invoice.php:987 CounterSales.php:1379
msgid "Can not retrieve assembly components location stock quantities because "
msgstr "Nelze načíst součásti sestavy množství umístění skladu, protože "
-#: ConfirmDispatch_Invoice.php:1021 CounterSales.php:1413
+#: ConfirmDispatch_Invoice.php:1021 CounterSales.php:1414
#: CustomerInquiry.php:200 CustomerTransInquiry.php:105
#: DeliveryDetails.php:593 DeliveryDetails.php:599 DeliveryDetails.php:606
#: DeliveryDetails.php:792 MRPReport.php:412 PDFOrdersInvoiced.php:304
@@ -3926,13 +3926,13 @@
msgid "Order"
msgstr "Objednávka"
-#: ConfirmDispatch_Invoice.php:1027 CounterSales.php:1419
-#: Credit_Invoice.php:787 SelectCreditItems.php:1460
+#: ConfirmDispatch_Invoice.php:1027 CounterSales.php:1420
+#: Credit_Invoice.php:787 SelectCreditItems.php:1461
msgid "Stock movement records for the assembly components of"
msgstr "Sklad pohyb záznamy pro montáž komponent"
-#: ConfirmDispatch_Invoice.php:1027 CounterSales.php:1419
-#: Credit_Invoice.php:787 SelectCreditItems.php:1460 ShipmentCosting.php:397
+#: ConfirmDispatch_Invoice.php:1027 CounterSales.php:1420
+#: Credit_Invoice.php:787 SelectCreditItems.php:1461 ShipmentCosting.php:397
#: SupplierAllocations.php:139 includes/PDFPaymentRun_PymtFooter.php:57
#: includes/PDFPaymentRun_PymtFooter.php:88
#: includes/PDFPaymentRun_PymtFooter.php:117
@@ -3942,23 +3942,23 @@
msgid "could not be inserted because"
msgstr "nemůže být vložen, protože"
-#: ConfirmDispatch_Invoice.php:1028 CounterSales.php:1420
-#: Credit_Invoice.php:788 SelectCreditItems.php:1461
+#: ConfirmDispatch_Invoice.php:1028 CounterSales.php:1421
+#: Credit_Invoice.php:788 SelectCreditItems.php:1462
msgid ""
"The following SQL to insert the assembly components stock movement records "
"was used"
msgstr ""
"Následující SQL vložit součásti sestavy záznamy pohyb zásob byla použita"
-#: ConfirmDispatch_Invoice.php:1037 CounterSales.php:1429
-#: Credit_Invoice.php:797 SelectCreditItems.php:1470
+#: ConfirmDispatch_Invoice.php:1037 CounterSales.php:1430
+#: Credit_Invoice.php:797 SelectCreditItems.php:1471
msgid ""
"Location stock record could not be updated for an assembly component because"
msgstr ""
"Umístění skladové evidenci nemohlo být aktualizovány pro montáž komponent, "
"protože"
-#: ConfirmDispatch_Invoice.php:1038 CounterSales.php:1430
+#: ConfirmDispatch_Invoice.php:1038 CounterSales.php:1431
msgid ""
"The following SQL to update the locations stock record for the component was "
"used"
@@ -3966,46 +3966,46 @@
"Následující SQL aktualizovat umístění skladové účetnictví pro složka byla "
"použita"
-#: ConfirmDispatch_Invoice.php:1120 CounterSales.php:1511
+#: ConfirmDispatch_Invoice.php:1120 CounterSales.php:1512
#: Credit_Invoice.php:872 Credit_Invoice.php:970 Credit_Invoice.php:1008
#: Credit_Invoice.php:1048 RecurringSalesOrdersProcess.php:361
-#: ReverseGRN.php:248 SelectCreditItems.php:1211 SelectCreditItems.php:1284
+#: ReverseGRN.php:248 SelectCreditItems.php:1212 SelectCreditItems.php:1285
msgid "Stock movement records could not be inserted because"
msgstr "Pohyb zásob záznamy nemohly být zařazeny, protože"
#: ConfirmDispatch_Invoice.php:1121 ContractCosting.php:360
-#: CounterSales.php:1512 Credit_Invoice.php:873 Credit_Invoice.php:971
+#: CounterSales.php:1513 Credit_Invoice.php:873 Credit_Invoice.php:971
#: Credit_Invoice.php:1009 GoodsReceived.php:517
#: RecurringSalesOrdersProcess.php:362 ReverseGRN.php:249
-#: SelectCreditItems.php:1285 WorkOrderIssue.php:192 WorkOrderReceive.php:350
+#: SelectCreditItems.php:1286 WorkOrderIssue.php:192 WorkOrderReceive.php:350
#: WorkOrderReceive.php:458
msgid "The following SQL to insert the stock movement records was used"
msgstr "Následující SQL vložit záznamy pohyb zásob byla použita"
-#: ConfirmDispatch_Invoice.php:1141 CounterSales.php:1532
+#: ConfirmDispatch_Invoice.php:1141 CounterSales.php:1533
#: RecurringSalesOrdersProcess.php:382
msgid ""
"Taxes and rates applicable to this invoice line item could not be inserted "
"because"
msgstr "Daně a sazby platné pro tato faktura řádku nemůže být vložen, protože"
-#: ConfirmDispatch_Invoice.php:1142 CounterSales.php:1533
+#: ConfirmDispatch_Invoice.php:1142 CounterSales.php:1534
#: Credit_Invoice.php:1072 RecurringSalesOrdersProcess.php:383
-#: SelectCreditItems.php:1306
+#: SelectCreditItems.php:1307
msgid ""
"The following SQL to insert the stock movement tax detail records was used"
msgstr "Následující SQL vložit pohyb zásob daňově detail byl použit"
#: ConfirmDispatch_Invoice.php:1158 Credit_Invoice.php:902
-#: Credit_Invoice.php:912 SelectCreditItems.php:1350 StockAdjustments.php:208
+#: Credit_Invoice.php:912 SelectCreditItems.php:1351 StockAdjustments.php:208
#: StockAdjustments.php:226 StockLocTransferReceive.php:136
#: StockTransfers.php:265 StockTransfers.php:378
msgid "The serial stock item record could not be updated because"
msgstr "Pořadové skladová položka záznamu nelze aktualizovat, protože"
#: ConfirmDispatch_Invoice.php:1159 Credit_Invoice.php:903
-#: Credit_Invoice.php:913 SelectCreditItems.php:1351
-#: SelectCreditItems.php:1575 StockAdjustments.php:209
+#: Credit_Invoice.php:913 SelectCreditItems.php:1352
+#: SelectCreditItems.php:1576 StockAdjustments.php:209
#: StockAdjustments.php:227 StockLocTransferReceive.php:137
#: StockLocTransferReceive.php:151 StockLocTransferReceive.php:251
#: StockLocTransferReceive.php:265 StockTransfers.php:266
@@ -4014,7 +4014,7 @@
msgstr "Následující SQL aktualizovat sériové skladě záznam byl použit"
#: ConfirmDispatch_Invoice.php:1173 Credit_Invoice.php:927
-#: GoodsReceived.php:580 SelectCreditItems.php:1365 StockAdjustments.php:242
+#: GoodsReceived.php:580 SelectCreditItems.php:1366 StockAdjustments.php:242
#: StockLocTransferReceive.php:169 StockLocTransferReceive.php:281
#: StockTransfers.php:301 StockTransfers.php:410 WorkOrderIssue.php:228
#: WorkOrderIssue.php:283 WorkOrderReceive.php:509 WorkOrderReceive.php:580
@@ -4029,29 +4029,29 @@
msgid "The following SQL to insert the serial stock movement records was used"
msgstr "Následující SQL vložit sériové záznamy, pohyb zásob byla použita"
-#: ConfirmDispatch_Invoice.php:1214 CounterSales.php:1611
+#: ConfirmDispatch_Invoice.php:1214 CounterSales.php:1612
#: RecurringSalesOrdersProcess.php:421
msgid "The count of existing Sales analysis records could not run because"
msgstr "Počet existujících záznamů Prodej analýza nemohla spustit, protože"
-#: ConfirmDispatch_Invoice.php:1215 CounterSales.php:1612
+#: ConfirmDispatch_Invoice.php:1215 CounterSales.php:1613
#: Credit_Invoice.php:1101 RecurringSalesOrdersProcess.php:422
-#: SelectCreditItems.php:1629
+#: SelectCreditItems.php:1630
msgid "SQL to count the no of sales analysis records"
msgstr "SQL počítat žádné prodeje analýzy záznamů"
-#: ConfirmDispatch_Invoice.php:1271 CounterSales.php:1669
+#: ConfirmDispatch_Invoice.php:1271 CounterSales.php:1670
#: RecurringSalesOrdersProcess.php:480
msgid "Sales analysis record could not be added or updated because"
msgstr "Prodej analýza záznamu nebylo možné přidat ani aktualizovat, protože"
-#: ConfirmDispatch_Invoice.php:1272 CounterSales.php:1670
+#: ConfirmDispatch_Invoice.php:1272 CounterSales.php:1671
#: Credit_Invoice.php:1213 RecurringSalesOrdersProcess.php:481
-#: SelectCreditItems.php:1739
+#: SelectCreditItems.php:1740
msgid "The following SQL to insert the sales analysis record was used"
msgstr "Následující SQL vložit prodejní rekord analýza byla použita"
-#: ConfirmDispatch_Invoice.php:1297 CounterSales.php:1694
+#: ConfirmDispatch_Invoice.php:1297 CounterSales.php:1695
#: Credit_Invoice.php:1243
msgid "The cost of sales GL posting could not be inserted because"
msgstr "Náklady na prodej GL vysílání nemohly být zařazeny, protože"
@@ -4061,17 +4061,17 @@
#: ConfirmDispatch_Invoice.php:1416 ConfirmDispatch_Invoice.php:1438
#: ConfirmDispatch_Invoice.php:1460 ConfirmDispatch_Invoice.php:1482
#: ConfirmDispatch_Invoice.php:1573 ConfirmDispatch_Invoice.php:1595
-#: ContractCosting.php:249 ContractCosting.php:267 CounterSales.php:1695
-#: CounterSales.php:1717 CounterSales.php:1742 CounterSales.php:1763
-#: CounterSales.php:1812 Credit_Invoice.php:1244 Credit_Invoice.php:1284
+#: ContractCosting.php:249 ContractCosting.php:267 CounterSales.php:1696
+#: CounterSales.php:1718 CounterSales.php:1743 CounterSales.php:1764
+#: CounterSales.php:1813 Credit_Invoice.php:1244 Credit_Invoice.php:1284
#: Credit_Invoice.php:1311 Credit_Invoice.php:1332 Credit_Invoice.php:1361
#: Credit_Invoice.php:1387 Credit_Invoice.php:1413
#: RecurringSalesOrdersProcess.php:509 RecurringSalesOrdersProcess.php:536
-#: RecurringSalesOrdersProcess.php:629 SelectCreditItems.php:1773
-#: SelectCreditItems.php:1799 SelectCreditItems.php:1822
-#: SelectCreditItems.php:1853 SelectCreditItems.php:1876
-#: SelectCreditItems.php:1904 SelectCreditItems.php:1924
-#: SelectCreditItems.php:1945 SupplierAllocations.php:216
+#: RecurringSalesOrdersProcess.php:629 SelectCreditItems.php:1774
+#: SelectCreditItems.php:1800 SelectCreditItems.php:1823
+#: SelectCreditItems.php:1854 SelectCreditItems.php:1877
+#: SelectCreditItems.php:1905 SelectCreditItems.php:1925
+#: SelectCreditItems.php:1946 SupplierAllocations.php:216
#: SupplierAllocations.php:239 WorkOrderCosting.php:363
#: WorkOrderCosting.php:384 WorkOrderCosting.php:403 WorkOrderCosting.php:440
#: WorkOrderCosting.php:459 WorkOrderCosting.php:482 WorkOrderCosting.php:501
@@ -4080,18 +4080,18 @@
msgid "The following SQL to insert the GLTrans record was used"
msgstr "Následující SQL vložit záznam GLTrans byla použita"
-#: ConfirmDispatch_Invoice.php:1320 CounterSales.php:1716
+#: ConfirmDispatch_Invoice.php:1320 CounterSales.php:1717
msgid ""
"The stock side of the cost of sales GL posting could not be inserted ...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-27 20:27:24
|
Revision: 4787
http://web-erp.svn.sourceforge.net/web-erp/?rev=4787&view=rev
Author: daintree
Date: 2011-12-27 20:27:16 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/PDFStockLocTransfer.php
trunk/doc/Change.log
trunk/doc/Manual/ManualShipments.html
Modified: trunk/PDFStockLocTransfer.php
===================================================================
--- trunk/PDFStockLocTransfer.php 2011-12-22 09:44:35 UTC (rev 4786)
+++ trunk/PDFStockLocTransfer.php 2011-12-27 20:27:16 UTC (rev 4787)
@@ -1,9 +1,8 @@
<?php
/* $Id$*/
-
-$title = _('Stock Location Transfer Docket Error');
include('includes/session.inc');
+$title = _('Stock Location Transfer Docket Error');
include('includes/PDFStarter.php');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-22 09:44:35 UTC (rev 4786)
+++ trunk/doc/Change.log 2011-12-27 20:27:16 UTC (rev 4787)
@@ -1,5 +1,7 @@
webERP Change Log
+27/12/11 Phil: PDFStockLocTransfer.php now has include('includes/session.inc') above the title.
+
22/12/11 Release 4.06.3
22/12/11 Phil: Fix to install/save.php to use mysqli_connect_error to report the connection error
@@ -1418,228 +1420,228 @@
30/06/09 Tim: sql/mysql/upgrade3.10-3.11.sql - New purchase order functionality
27/06/09 Tim: sql/mysql/upgrade3.10-3.11.sql - Add in extra fields for purchase orders
27/06/09 Tim: PO_AuthorisationLevels.php - New script to assign authorisation levels for purchase orders
-27/06/09 Tim: PDFDeliveryDifferences.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PDFCustomerList.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PDFChequeListing.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PDFBankingSummary.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PaymentTerms.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PaymentMethods.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PaymentAllocations.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: OutstandingGRNs.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: OrderDetails.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPShortages.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPReschedules.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPReport.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPPlannedWorkOrders.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPPlannedPurchaseOrders.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPDemandTypes.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPDemands.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPCreateDemands.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPCalendar.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRP.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MailInventoryValuation.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: Logout.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: Locations.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryValuation.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryQuantities.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryPlanningPrefSupplier.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryPlanning.php - Change to lower case html and remove <center> tags
+27/06/09 Tim: PDFDeliveryDifferences.php - Change to lower case html and remove
+27/06/09 Tim: PDFCustomerList.php - Change to lower case html and remove
+27/06/09 Tim: PDFChequeListing.php - Change to lower case html and remove
+27/06/09 Tim: PDFBankingSummary.php - Change to lower case html and remove
+27/06/09 Tim: PaymentTerms.php - Change to lower case html and remove
+27/06/09 Tim: PaymentMethods.php - Change to lower case html and remove
+27/06/09 Tim: PaymentAllocations.php - Change to lower case html and remove
+27/06/09 Tim: OutstandingGRNs.php - Change to lower case html and remove
+27/06/09 Tim: OrderDetails.php - Change to lower case html and remove
+27/06/09 Tim: MRPShortages.php - Change to lower case html and remove
+27/06/09 Tim: MRPReschedules.php - Change to lower case html and remove
+27/06/09 Tim: MRPReport.php - Change to lower case html and remove
+27/06/09 Tim: MRPPlannedWorkOrders.php - Change to lower case html and remove
+27/06/09 Tim: MRPPlannedPurchaseOrders.php - Change to lower case html and remove
+27/06/09 Tim: MRPDemandTypes.php - Change to lower case html and remove
+27/06/09 Tim: MRPDemands.php - Change to lower case html and remove
+27/06/09 Tim: MRPCreateDemands.php - Change to lower case html and remove
+27/06/09 Tim: MRPCalendar.php - Change to lower case html and remove
+27/06/09 Tim: MRP.php - Change to lower case html and remove
+27/06/09 Tim: MailInventoryValuation.php - Change to lower case html and remove
+27/06/09 Tim: Logout.php - Change to lower case html and remove
+27/06/09 Tim: Locations.php - Change to lower case html and remove
+27/06/09 Tim: InventoryValuation.php - Change to lower case html and remove
+27/06/09 Tim: InventoryQuantities.php - Change to lower case html and remove
+27/06/09 Tim: InventoryPlanningPrefSupplier.php - Change to lower case html and remove
+27/06/09 Tim: InventoryPlanning.php - Change to lower case html and remove
27/06/09 Tim: index.php - New menu items
-27/06/09 Tim: GoodsReceivedControlled.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GoodsReceived.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLTrialBalance.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLTransInquiry.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLTags.php - Change to lower case html and remove <center> tags
+27/06/09 Tim: GoodsReceivedControlled.php - Change to lower case html and remove
+27/06/09 Tim: GoodsReceived.php - Change to lower case html and remove
+27/06/09 Tim: GLTrialBalance.php - Change to lower case html and remove
+27/06/09 Tim: GLTransInquiry.php - Change to lower case html and remove
+27/06/09 Tim: GLTags.php - Change to lower case html and remove
27/06/09 Tim: GLTagProfit_Loss.php - Script for creating Profit and Loss accounts by Tag
-27/06/09 Tim: GLProfit_Loss.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLJournal.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLCodesInquiry.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLBudgets.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLBalanceSheet.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLAccounts.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLAccountInquiry.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GetStockImage.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: GeocodeSetup.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: geocode.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: geo_displaymap_suppliers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: geo_displaymap_customers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: FTP_RadioBeacon.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: FreightCosts.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Factors.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: ExchangeRateTrend.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EmailCustTrans.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EmailConfirmation.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EDISendInvoices.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EDIProcessOrders.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EDIMessageFormat.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DiscountMatrix.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DiscountCategories.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DemandWorkOrders.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DeliveryDetails.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DebtorsAtPeriodEnd.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustWhereAlloc.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerTypes.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerTransInquiry.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Customers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerReceipt.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerInquiry.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerBranches.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerAllocations.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustEDISetup.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Currencies.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CreditStatus.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CreditItemsControlled.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Credit_Invoice.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: ConfirmDispatchControlled_Invoice.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CompanyPreferences.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: COGSGLPostings.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMs.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMListing.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMInquiry.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMIndentedReverse.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMIndented.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMExtendedQty.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BankReconciliation.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BankMatching.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BankAccounts.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AuditTrail.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Areas.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AgedSuppliers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AgedDebtors.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AddCustomerTypeNotes.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AddCustomerNotes.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AddCustomerContacts.php - Change to lower case html and remove <center> tags
+27/06/09 Tim: GLProfit_Loss.php - Change to lower case html and remove
+27/06/09 Tim: GLJournal.php - Change to lower case html and remove
+27/06/09 Tim: GLCodesInquiry.php - Change to lower case html and remove
+27/06/09 Tim: GLBudgets.php - Change to lower case html and remove
+27/06/09 Tim: GLBalanceSheet.php - Change to lower case html and remove
+27/06/09 Tim: GLAccounts.php - Change to lower case html and remove
+27/06/09 Tim: GLAccountInquiry.php - Change to lower case html and remove
+27/06/09 Tim: GetStockImage.php - Change to lower case html and remove
+26/06/09 Tim: GeocodeSetup.php - Change to lower case html and remove
+26/06/09 Tim: geocode.php - Change to lower case html and remove
+26/06/09 Tim: geo_displaymap_suppliers.php - Change to lower case html and remove
+26/06/09 Tim: geo_displaymap_customers.php - Change to lower case html and remove
+26/06/09 Tim: FTP_RadioBeacon.php - Change to lower case html and remove
+26/06/09 Tim: FreightCosts.php - Change to lower case html and remove
+26/06/09 Tim: Factors.php - Change to lower case html and remove
+26/06/09 Tim: ExchangeRateTrend.php - Change to lower case html and remove
+26/06/09 Tim: EmailCustTrans.php - Change to lower case html and remove
+26/06/09 Tim: EmailConfirmation.php - Change to lower case html and remove
+26/06/09 Tim: EDISendInvoices.php - Change to lower case html and remove
+26/06/09 Tim: EDIProcessOrders.php - Change to lower case html and remove
+26/06/09 Tim: EDIMessageFormat.php - Change to lower case html and remove
+26/06/09 Tim: DiscountMatrix.php - Change to lower case html and remove
+26/06/09 Tim: DiscountCategories.php - Change to lower case html and remove
+26/06/09 Tim: DemandWorkOrders.php - Change to lower case html and remove
+26/06/09 Tim: DeliveryDetails.php - Change to lower case html and remove
+26/06/09 Tim: DebtorsAtPeriodEnd.php - Change to lower case html and remove
+26/06/09 Tim: CustWhereAlloc.php - Change to lower case html and remove
+26/06/09 Tim: CustomerTypes.php - Change to lower case html and remove
+26/06/09 Tim: CustomerTransInquiry.php - Change to lower case html and remove
+26/06/09 Tim: Customers.php - Change to lower case html and remove
+26/06/09 Tim: CustomerReceipt.php - Change to lower case html and remove
+26/06/09 Tim: CustomerInquiry.php - Change to lower case html and remove
+26/06/09 Tim: CustomerBranches.php - Change to lower case html and remove
+26/06/09 Tim: CustomerAllocations.php - Change to lower case html and remove
+26/06/09 Tim: CustEDISetup.php - Change to lower case html and remove
+26/06/09 Tim: Currencies.php - Change to lower case html and remove
+26/06/09 Tim: CreditStatus.php - Change to lower case html and remove
+26/06/09 Tim: CreditItemsControlled.php - Change to lower case html and remove
+26/06/09 Tim: Credit_Invoice.php - Change to lower case html and remove
+26/06/09 Tim: ConfirmDispatchControlled_Invoice.php - Change to lower case html and remove
+26/06/09 Tim: CompanyPreferences.php - Change to lower case html and remove
+26/06/09 Tim: COGSGLPostings.php - Change to lower case html and remove
+26/06/09 Tim: BOMs.php - Change to lower case html and remove
+26/06/09 Tim: BOMListing.php - Change to lower case html and remove
+26/06/09 Tim: BOMInquiry.php - Change to lower case html and remove
+26/06/09 Tim: BOMIndentedReverse.php - Change to lower case html and remove
+26/06/09 Tim: BOMIndented.php - Change to lower case html and remove
+26/06/09 Tim: BOMExtendedQty.php - Change to lower case html and remove
+26/06/09 Tim: BankReconciliation.php - Change to lower case html and remove
+26/06/09 Tim: BankMatching.php - Change to lower case html and remove
+26/06/09 Tim: BankAccounts.php - Change to lower case html and remove
+26/06/09 Tim: AuditTrail.php - Change to lower case html and remove
+26/06/09 Tim: Areas.php - Change to lower case html and remove
+26/06/09 Tim: AgedSuppliers.php - Change to lower case html and remove
+26/06/09 Tim: AgedDebtors.php - Change to lower case html and remove
+26/06/09 Tim: AddCustomerTypeNotes.php - Change to lower case html and remove
+26/06/09 Tim: AddCustomerNotes.php - Change to lower case html and remove
+26/06/09 Tim: AddCustomerContacts.php - Change to lower case html and remove
24/06/09 turbopt: SelectProduct.php - Correct field line up in inventory item display
-24/06/09 Tim: PeriodsInquiry.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockTransfer.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockNegatives.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockLocTransfer.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockCheckComparison.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFQuotation.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFPriceList.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFOrderStatus.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFOrdersInvoiced.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFLowGP.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFGrn.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFDIFOT.php - Change to lower case html and remove <center> tags
+24/06/09 Tim: PeriodsInquiry.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockTransfer.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockNegatives.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockLocTransfer.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockCheckComparison.php - Change to lower case html and remove
+24/06/09 Tim: PDFQuotation.php - Change to lower case html and remove
+24/06/09 Tim: PDFPriceList.php - Change to lower case html and remove
+24/06/09 Tim: PDFOrderStatus.php - Change to lower case html and remove
+24/06/09 Tim: PDFOrdersInvoiced.php - Change to lower case html and remove
+24/06/09 Tim: PDFLowGP.php - Change to lower case html and remove
+24/06/09 Tim: PDFGrn.php - Change to lower case html and remove
+24/06/09 Tim: PDFDIFOT.php - Change to lower case html and remove
24/06/09 Tim: ConfirmDispatch_Invoice.php - Remove backslashes from narrative
24/06/09 Tim: SelectOrderItems.php - Remove backslashes from narrative
24/06/09 Tim: PrintCustTransPortrait.php - Remove backslashes from narrative
24/06/09 Tim: PrintCustTrans.php - Remove backslashes from narrative
-21/06/09 Tim: ReverseGRN.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: ReorderLevel.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: RecurringSalesOrdersProcess.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: RecurringSalesOrders.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PurchData.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PrintCustTransPortrait.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PrintCustStatements.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PrintCustOrder.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PricesBasedOnMarkUp.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: Prices.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: Prices_Customer.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: POReport.php - Change to lower case html and remove <center> tags
+21/06/09 Tim: ReverseGRN.php - Change to lower case html and remove
+21/06/09 Tim: ReorderLevel.php - Change to lower case html and remove
+21/06/09 Tim: RecurringSalesOrdersProcess.php - Change to lower case html and remove
+21/06/09 Tim: RecurringSalesOrders.php - Change to lower case html and remove
+21/06/09 Tim: PurchData.php - Change to lower case html and remove
+21/06/09 Tim: PrintCustTransPortrait.php - Change to lower case html and remove
+21/06/09 Tim: PrintCustStatements.php - Change to lower case html and remove
+21/06/09 Tim: PrintCustOrder.php - Change to lower case html and remove
+21/06/09 Tim: PricesBasedOnMarkUp.php - Change to lower case html and remove
+21/06/09 Tim: Prices.php - Change to lower case html and remove
+21/06/09 Tim: Prices_Customer.php - Change to lower case html and remove
+21/06/09 Tim: POReport.php - Change to lower case html and remove
21/06/09 Lindsay: PrintCustOrder_generic.php - Prevent blank line on second page
21/06/09 Lindsay: PrintCustTrans.php - Prevent blank page being printed every second page
21/06/09 Lindsay: Z_ChangeStockCode.php - Add in check for woitems table
19/06/09 Murray: some improvements the html and css styles
-19/06/09 Tim: StockTransferControlled.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockStatus.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockSerialItems.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockSerialItemResearch.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Stocks.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockReorderLevel.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockQuantityByDate.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockQties_csv.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockMovements.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocTransferReceive.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocTransfer.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocStatus.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocMovements.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCounts.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCostUpdate.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCheck.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCategories.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockAdjustmentsControlled.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockAdjustments.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SpecialOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Shipt_Select.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Shippers.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Shipments.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: ShipmentCosting.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectWorkOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectSupplier.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectSalesOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectRecurringSalesOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectProduct.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectOrderItems.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectGLAccount.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectCustomer.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectCreditItems.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesTypes.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesPeople.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesInquiry.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesGraph.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesGLPostings.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesCategories.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesAnalysis_UserDefined.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesAnalRepts.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesAnalReptCols.php - Change to lower case html and remove <center> tags
+19/06/09 Tim: StockTransferControlled.php - Change to lower case html and remove
+19/06/09 Tim: StockStatus.php - Change to lower case html and remove
+19/06/09 Tim: StockSerialItems.php - Change to lower case html and remove
+19/06/09 Tim: StockSerialItemResearch.php - Change to lower case html and remove
+19/06/09 Tim: Stocks.php - Change to lower case html and remove
+19/06/09 Tim: StockReorderLevel.php - Change to lower case html and remove
+19/06/09 Tim: StockQuantityByDate.php - Change to lower case html and remove
+19/06/09 Tim: StockQties_csv.php - Change to lower case html and remove
+19/06/09 Tim: StockMovements.php - Change to lower case html and remove
+19/06/09 Tim: StockLocTransferReceive.php - Change to lower case html and remove
+19/06/09 Tim: StockLocTransfer.php - Change to lower case html and remove
+19/06/09 Tim: StockLocStatus.php - Change to lower case html and remove
+19/06/09 Tim: StockLocMovements.php - Change to lower case html and remove
+19/06/09 Tim: StockCounts.php - Change to lower case html and remove
+19/06/09 Tim: StockCostUpdate.php - Change to lower case html and remove
+19/06/09 Tim: StockCheck.php - Change to lower case html and remove
+19/06/09 Tim: StockCategories.php - Change to lower case html and remove
+19/06/09 Tim: StockAdjustmentsControlled.php - Change to lower case html and remove
+19/06/09 Tim: StockAdjustments.php - Change to lower case html and remove
+19/06/09 Tim: SpecialOrder.php - Change to lower case html and remove
+19/06/09 Tim: Shipt_Select.php - Change to lower case html and remove
+19/06/09 Tim: Shippers.php - Change to lower case html and remove
+19/06/09 Tim: Shipments.php - Change to lower case html and remove
+19/06/09 Tim: ShipmentCosting.php - Change to lower case html and remove
+19/06/09 Tim: SelectWorkOrder.php - Change to lower case html and remove
+19/06/09 Tim: SelectSupplier.php - Change to lower case html and remove
+19/06/09 Tim: SelectSalesOrder.php - Change to lower case html and remove
+19/06/09 Tim: SelectRecurringSalesOrder.php - Change to lower case html and remove
+19/06/09 Tim: SelectProduct.php - Change to lower case html and remove
+19/06/09 Tim: SelectOrderItems.php - Change to lower case html and remove
+19/06/09 Tim: SelectGLAccount.php - Change to lower case html and remove
+19/06/09 Tim: SelectCustomer.php - Change to lower case html and remove
+19/06/09 Tim: SelectCreditItems.php - Change to lower case html and remove
+19/06/09 Tim: SalesTypes.php - Change to lower case html and remove
+19/06/09 Tim: SalesPeople.php - Change to lower case html and remove
+19/06/09 Tim: SalesInquiry.php - Change to lower case html and remove
+19/06/09 Tim: SalesGraph.php - Change to lower case html and remove
+19/06/09 Tim: SalesGLPostings.php - Change to lower case html and remove
+19/06/09 Tim: SalesCategories.php - Change to lower case html and remove
+19/06/09 Tim: SalesAnalysis_UserDefined.php - Change to lower case html and remove
+19/06/09 Tim: SalesAnalRepts.php - Change to lower case html and remove
+19/06/09 Tim: SalesAnalReptCols.php - Change to lower case html and remove
12/6/09 Mark: Added SalesInquiry.php - detailed or summarized inquiries on Sales Orders
-17/06/09 Tim: Z_UploadForm.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.09-3.10.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.08-3.09.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.07-3.08.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.05-3.06.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.04-3.05.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_UpdateChartDetailsBFwd.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_SalesIntegrityCheck.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ReverseSuppPaymentRun.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_RePostGLFromPeriod.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ReApplyCostToSA.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_PriceChanges.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poRebuildDefault.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poEditLangRemaining.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poEditLangModule.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poEditLangHeader.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poAdmin.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poAddLanguage.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_MakeStockLocns.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_MakeNewCompany.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ImportStocks.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ImportPartCodes.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ImportGLAccountSections.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ImportGLAccountGroups.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ImportChartOfAccounts.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_DescribeTable.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_DeleteSalesTransActions.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_DeleteInvoice.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_DeleteCreditNote.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_DataExport.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CurrencySuppliersBalances.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CurrencyDebtorsBalances.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CreateCompany.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CheckGLTransBalance.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CheckDebtorsControl.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CheckAllocs.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CheckAllocationsFrom.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ChangeStockCode.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ChangeCustomerCode.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ChangeBranchCode.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WWW_Users.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WWW_Access.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WOSerialNos.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WorkOrderStatus.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WorkOrderReceive.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WorkOrderIssue.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WorkOrderEntry.php - Change to lower case html and remove <center> tags
+17/06/09 Tim: Z_UploadForm.php - Change to lower case html and remove
+17/06/09 Tim: Z_Upgrade_3.09-3.10.php - Change to lower case html and remove
+17/06/09 Tim: Z_Upgrade_3.08-3.09.php - Change to lower case html and remove
+17/06/09 Tim: Z_Upgrade_3.07-3.08.php - Change to lower case html and remove
+17/06/09 Tim: Z_Upgrade_3.05-3.06.php - Change to lower case html and remove
+17/06/09 Tim: Z_Upgrade_3.04-3.05.php - Change to lower case html and remove
+17/06/09 Tim: Z_UpdateChartDetailsBFwd.php - Change to lower case html and remove
+17/06/09 Tim: Z_SalesIntegrityCheck.php - Change to lower case html and remove
+17/06/09 Tim: Z_ReverseSuppPaymentRun.php - Change to lower case html and remove
+17/06/09 Tim: Z_RePostGLFromPeriod.php - Change to lower case html and remove
+17/06/09 Tim: Z_ReApplyCostToSA.php - Change to lower case html and remove
+17/06/09 Tim: Z_PriceChanges.php - Change to lower case html and remove
+17/06/09 Tim: Z_poRebuildDefault.php - Change to lower case html and remove
+17/06/09 Tim: Z_poEditLangRemaining.php - Change to lower case html and remove
+17/06/09 Tim: Z_poEditLangModule.php - Change to lower case html and remove
+17/06/09 Tim: Z_poEditLangHeader.php - Change to lower case html and remove
+17/06/09 Tim: Z_poAdmin.php - Change to lower case html and remove
+17/06/09 Tim: Z_poAddLanguage.php - Change to lower case html and remove
+17/06/09 Tim: Z_MakeStockLocns.php - Change to lower case html and remove
+17/06/09 Tim: Z_MakeNewCompany.php - Change to lower case html and remove
+17/06/09 Tim: Z_ImportStocks.php - Change to lower case html and remove
+17/06/09 Tim: Z_ImportPartCodes.php - Change to lower case html and remove
+17/06/09 Tim: Z_ImportGLAccountSections.php - Change to lower case html and remove
+17/06/09 Tim: Z_ImportGLAccountGroups.php - Change to lower case html and remove
+17/06/09 Tim: Z_ImportChartOfAccounts.php - Change to lower case html and remove
+17/06/09 Tim: Z_DescribeTable.php - Change to lower case html and remove
+17/06/09 Tim: Z_DeleteSalesTransActions.php - Change to lower case html and remove
+17/06/09 Tim: Z_DeleteInvoice.php - Change to lower case html and remove
+17/06/09 Tim: Z_DeleteCreditNote.php - Change to lower case html and remove
+17/06/09 Tim: Z_DataExport.php - Change to lower case html and remove
+17/06/09 Tim: Z_CurrencySuppliersBalances.php - Change to lower case html and remove
+17/06/09 Tim: Z_CurrencyDebtorsBalances.php - Change to lower case html and remove
+17/06/09 Tim: Z_CreateCompany.php - Change to lower case html and remove
+17/06/09 Tim: Z_CheckGLTransBalance.php - Change to lower case html and remove
+17/06/09 Tim: Z_CheckDebtorsControl.php - Change to lower case html and remove
+17/06/09 Tim: Z_CheckAllocs.php - Change to lower case html and remove
+17/06/09 Tim: Z_CheckAllocationsFrom.php - Change to lower case html and remove
+17/06/09 Tim: Z_ChangeStockCode.php - Change to lower case html and remove
+17/06/09 Tim: Z_ChangeCustomerCode.php - Change to lower case html and remove
+17/06/09 Tim: Z_ChangeBranchCode.php - Change to lower case html and remove
+17/06/09 Tim: WWW_Users.php - Change to lower case html and remove
+17/06/09 Tim: WWW_Access.php - Change to lower case html and remove
+17/06/09 Tim: WOSerialNos.php - Change to lower case html and remove
+17/06/09 Tim: WorkOrderStatus.php - Change to lower case html and remove
+17/06/09 Tim: WorkOrderReceive.php - Change to lower case html and remove
+17/06/09 Tim: WorkOrderIssue.php - Change to lower case html and remove
+17/06/09 Tim: WorkOrderEntry.php - Change to lower case html and remove
16/06/09 Tim: ConfirmDispatch_Invoice.php - Correctly show multiple lines of narrative
16/06/09 Tim: PrintCustTransPortrait.php - Correctly show multiple lines of narrative
16/06/09 Tim: PrintCustTrans.php - Correctly show multiple lines of narrative
-16/06/09 Tim: Payments.php - Change to lower case html and remove <center> tags
-16/06/09 Tim: SelectOrderItems.php - Change to lower case html and remove <center> tags and include javascript
-16/06/09 Tim: SelectSalesOrder.php - Change to lower case html and remove <center> tags
-16/06/09 Tim: ShiptsList.php - Change to lower case html and remove <center> tags
-16/06/09 Tim: StockAdjustments.php - Change to lower case html and remove <center> tags
+16/06/09 Tim: Payments.php - Change to lower case html and remove
+16/06/09 Tim: SelectOrderItems.php - Change to lower case html and remove and include javascript
+16/06/09 Tim: SelectSalesOrder.php - Change to lower case html and remove
+16/06/09 Tim: ShiptsList.php - Change to lower case html and remove
+16/06/09 Tim: StockAdjustments.php - Change to lower case html and remove
16/06/09 Tim: SuppInvGRNs.php - Change to lower case html and and change to show GRN batch number and Purchase Order number
16/06/09 Tim: WWW_Users.php - Change to lower case html and various changes for Opera compatability
16/06/09 Tim: css/jelly/default.css - Correct typo in css
@@ -1706,7 +1708,7 @@
11/04/09 Tim: SelectProduct.php - Correct justification and show prices info when security is high enough
10/04/09 Tim: SelectCustomer.php - Correctly change the customer when returning from OrderDetails.php
10/04/09 Tim: includes/session.inc - Ensure last visit field is always updated
-10/04/09 Tim: Z_Upgrade3.10.php - Remove deprecated <center> tags
+10/04/09 Tim: Z_Upgrade3.10.php - Remove deprecated
09/04/09 Tim: reportwriter/admin/forms/TplFrmTtl.html - Remove duplication of <html> and <body> tags
09/04/09 Tim: reportwriter/admin/forms/TplFrmText.html - Remove duplication of <html> and <body> tags
09/04/09 Tim: reportwriter/admin/forms/TplFrmTBlk.html - Remove duplication of <html> and <body> tags
@@ -1736,8 +1738,8 @@
08/04/09 Tim: css/gel/default.css - Include specific entities for numbers
08/04/09 Tim: css/fresh/default.css - Include specific entities for numbers
08/04/09 Tim: css/default/default.css - Include specific entities for numbers
-08/04/09 Tim: DiscountMatrix.php - Improve methods of input, include javascript, and remove <center> tags for xhtml compatability
-08/04/09 Tim: DiscountCategories.php - Improve methods of input, include javascript, and remove <center> tags for xhtml compatability
+08/04/09 Tim: DiscountMatrix.php - Improve methods of input, include javascript, and remove for xhtml compatability
+08/04/09 Tim: DiscountCategories.php - Improve methods of input, include javascript, and remove for xhtml compatability
06/04/09 Tim: index.php - Incorrect link to BOMExtendedQty.php
06/04/09 Tim: Stocks.php - Move reload form function to javascript library
06/04/09 Tim: javascripts/MiscFunctions.js - Move reload form function to javascript library
Modified: trunk/doc/Manual/ManualShipments.html
===================================================================
--- trunk/doc/Manual/ManualShipments.html 2011-12-22 09:44:35 UTC (rev 4786)
+++ trunk/doc/Manual/ManualShipments.html 2011-12-27 20:27:16 UTC (rev 4787)
@@ -18,7 +18,7 @@
<br /><br />
<font size="+1"><b>Creating Shipments</b></font>
<br /><br />
-The purchase order(s) must already be created. The shipment must be created before the goods are received - as the process of receiving them flags the Goods Received as received against the shipment. After selecting the supplier from which the product has been sourced and having entered the purchase order(s) to initiate the transaction, from the select supplier menu, choose the link "Set up a New Shipment". Each time this page is called the system increments a shipment reference and shows the shipment number that will be used. The shipment page allows the details of the shipment to be entered.
+The purchase order(s) must already be created. The shipment must be created before any of the goods have had supplier invoices entered against them. After selecting the supplier from which the product has been sourced and having entered the purchase order(s) to initiate the transaction, from the select supplier menu, choose the link "Set up a New Shipment". Each time this page is called the system increments a shipment reference and shows the shipment number that will be used. The shipment page allows the details of the shipment to be entered.
<br /><br />
<ul>
<li>The name of the vessel on which the product has been loaded
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-27 20:27:24
|
Revision: 4787
http://web-erp.svn.sourceforge.net/web-erp/?rev=4787&view=rev
Author: daintree
Date: 2011-12-27 20:27:16 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/PDFStockLocTransfer.php
trunk/doc/Change.log
trunk/doc/Manual/ManualShipments.html
Modified: trunk/PDFStockLocTransfer.php
===================================================================
--- trunk/PDFStockLocTransfer.php 2011-12-22 09:44:35 UTC (rev 4786)
+++ trunk/PDFStockLocTransfer.php 2011-12-27 20:27:16 UTC (rev 4787)
@@ -1,9 +1,8 @@
<?php
/* $Id$*/
-
-$title = _('Stock Location Transfer Docket Error');
include('includes/session.inc');
+$title = _('Stock Location Transfer Docket Error');
include('includes/PDFStarter.php');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-22 09:44:35 UTC (rev 4786)
+++ trunk/doc/Change.log 2011-12-27 20:27:16 UTC (rev 4787)
@@ -1,5 +1,7 @@
webERP Change Log
+27/12/11 Phil: PDFStockLocTransfer.php now has include('includes/session.inc') above the title.
+
22/12/11 Release 4.06.3
22/12/11 Phil: Fix to install/save.php to use mysqli_connect_error to report the connection error
@@ -1418,228 +1420,228 @@
30/06/09 Tim: sql/mysql/upgrade3.10-3.11.sql - New purchase order functionality
27/06/09 Tim: sql/mysql/upgrade3.10-3.11.sql - Add in extra fields for purchase orders
27/06/09 Tim: PO_AuthorisationLevels.php - New script to assign authorisation levels for purchase orders
-27/06/09 Tim: PDFDeliveryDifferences.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PDFCustomerList.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PDFChequeListing.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PDFBankingSummary.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PaymentTerms.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PaymentMethods.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: PaymentAllocations.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: OutstandingGRNs.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: OrderDetails.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPShortages.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPReschedules.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPReport.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPPlannedWorkOrders.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPPlannedPurchaseOrders.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPDemandTypes.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPDemands.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPCreateDemands.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRPCalendar.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MRP.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: MailInventoryValuation.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: Logout.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: Locations.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryValuation.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryQuantities.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryPlanningPrefSupplier.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: InventoryPlanning.php - Change to lower case html and remove <center> tags
+27/06/09 Tim: PDFDeliveryDifferences.php - Change to lower case html and remove
+27/06/09 Tim: PDFCustomerList.php - Change to lower case html and remove
+27/06/09 Tim: PDFChequeListing.php - Change to lower case html and remove
+27/06/09 Tim: PDFBankingSummary.php - Change to lower case html and remove
+27/06/09 Tim: PaymentTerms.php - Change to lower case html and remove
+27/06/09 Tim: PaymentMethods.php - Change to lower case html and remove
+27/06/09 Tim: PaymentAllocations.php - Change to lower case html and remove
+27/06/09 Tim: OutstandingGRNs.php - Change to lower case html and remove
+27/06/09 Tim: OrderDetails.php - Change to lower case html and remove
+27/06/09 Tim: MRPShortages.php - Change to lower case html and remove
+27/06/09 Tim: MRPReschedules.php - Change to lower case html and remove
+27/06/09 Tim: MRPReport.php - Change to lower case html and remove
+27/06/09 Tim: MRPPlannedWorkOrders.php - Change to lower case html and remove
+27/06/09 Tim: MRPPlannedPurchaseOrders.php - Change to lower case html and remove
+27/06/09 Tim: MRPDemandTypes.php - Change to lower case html and remove
+27/06/09 Tim: MRPDemands.php - Change to lower case html and remove
+27/06/09 Tim: MRPCreateDemands.php - Change to lower case html and remove
+27/06/09 Tim: MRPCalendar.php - Change to lower case html and remove
+27/06/09 Tim: MRP.php - Change to lower case html and remove
+27/06/09 Tim: MailInventoryValuation.php - Change to lower case html and remove
+27/06/09 Tim: Logout.php - Change to lower case html and remove
+27/06/09 Tim: Locations.php - Change to lower case html and remove
+27/06/09 Tim: InventoryValuation.php - Change to lower case html and remove
+27/06/09 Tim: InventoryQuantities.php - Change to lower case html and remove
+27/06/09 Tim: InventoryPlanningPrefSupplier.php - Change to lower case html and remove
+27/06/09 Tim: InventoryPlanning.php - Change to lower case html and remove
27/06/09 Tim: index.php - New menu items
-27/06/09 Tim: GoodsReceivedControlled.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GoodsReceived.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLTrialBalance.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLTransInquiry.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLTags.php - Change to lower case html and remove <center> tags
+27/06/09 Tim: GoodsReceivedControlled.php - Change to lower case html and remove
+27/06/09 Tim: GoodsReceived.php - Change to lower case html and remove
+27/06/09 Tim: GLTrialBalance.php - Change to lower case html and remove
+27/06/09 Tim: GLTransInquiry.php - Change to lower case html and remove
+27/06/09 Tim: GLTags.php - Change to lower case html and remove
27/06/09 Tim: GLTagProfit_Loss.php - Script for creating Profit and Loss accounts by Tag
-27/06/09 Tim: GLProfit_Loss.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLJournal.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLCodesInquiry.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLBudgets.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLBalanceSheet.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLAccounts.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GLAccountInquiry.php - Change to lower case html and remove <center> tags
-27/06/09 Tim: GetStockImage.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: GeocodeSetup.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: geocode.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: geo_displaymap_suppliers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: geo_displaymap_customers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: FTP_RadioBeacon.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: FreightCosts.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Factors.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: ExchangeRateTrend.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EmailCustTrans.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EmailConfirmation.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EDISendInvoices.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EDIProcessOrders.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: EDIMessageFormat.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DiscountMatrix.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DiscountCategories.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DemandWorkOrders.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DeliveryDetails.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: DebtorsAtPeriodEnd.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustWhereAlloc.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerTypes.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerTransInquiry.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Customers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerReceipt.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerInquiry.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerBranches.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustomerAllocations.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CustEDISetup.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Currencies.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CreditStatus.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CreditItemsControlled.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Credit_Invoice.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: ConfirmDispatchControlled_Invoice.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: CompanyPreferences.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: COGSGLPostings.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMs.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMListing.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMInquiry.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMIndentedReverse.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMIndented.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BOMExtendedQty.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BankReconciliation.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BankMatching.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: BankAccounts.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AuditTrail.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: Areas.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AgedSuppliers.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AgedDebtors.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AddCustomerTypeNotes.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AddCustomerNotes.php - Change to lower case html and remove <center> tags
-26/06/09 Tim: AddCustomerContacts.php - Change to lower case html and remove <center> tags
+27/06/09 Tim: GLProfit_Loss.php - Change to lower case html and remove
+27/06/09 Tim: GLJournal.php - Change to lower case html and remove
+27/06/09 Tim: GLCodesInquiry.php - Change to lower case html and remove
+27/06/09 Tim: GLBudgets.php - Change to lower case html and remove
+27/06/09 Tim: GLBalanceSheet.php - Change to lower case html and remove
+27/06/09 Tim: GLAccounts.php - Change to lower case html and remove
+27/06/09 Tim: GLAccountInquiry.php - Change to lower case html and remove
+27/06/09 Tim: GetStockImage.php - Change to lower case html and remove
+26/06/09 Tim: GeocodeSetup.php - Change to lower case html and remove
+26/06/09 Tim: geocode.php - Change to lower case html and remove
+26/06/09 Tim: geo_displaymap_suppliers.php - Change to lower case html and remove
+26/06/09 Tim: geo_displaymap_customers.php - Change to lower case html and remove
+26/06/09 Tim: FTP_RadioBeacon.php - Change to lower case html and remove
+26/06/09 Tim: FreightCosts.php - Change to lower case html and remove
+26/06/09 Tim: Factors.php - Change to lower case html and remove
+26/06/09 Tim: ExchangeRateTrend.php - Change to lower case html and remove
+26/06/09 Tim: EmailCustTrans.php - Change to lower case html and remove
+26/06/09 Tim: EmailConfirmation.php - Change to lower case html and remove
+26/06/09 Tim: EDISendInvoices.php - Change to lower case html and remove
+26/06/09 Tim: EDIProcessOrders.php - Change to lower case html and remove
+26/06/09 Tim: EDIMessageFormat.php - Change to lower case html and remove
+26/06/09 Tim: DiscountMatrix.php - Change to lower case html and remove
+26/06/09 Tim: DiscountCategories.php - Change to lower case html and remove
+26/06/09 Tim: DemandWorkOrders.php - Change to lower case html and remove
+26/06/09 Tim: DeliveryDetails.php - Change to lower case html and remove
+26/06/09 Tim: DebtorsAtPeriodEnd.php - Change to lower case html and remove
+26/06/09 Tim: CustWhereAlloc.php - Change to lower case html and remove
+26/06/09 Tim: CustomerTypes.php - Change to lower case html and remove
+26/06/09 Tim: CustomerTransInquiry.php - Change to lower case html and remove
+26/06/09 Tim: Customers.php - Change to lower case html and remove
+26/06/09 Tim: CustomerReceipt.php - Change to lower case html and remove
+26/06/09 Tim: CustomerInquiry.php - Change to lower case html and remove
+26/06/09 Tim: CustomerBranches.php - Change to lower case html and remove
+26/06/09 Tim: CustomerAllocations.php - Change to lower case html and remove
+26/06/09 Tim: CustEDISetup.php - Change to lower case html and remove
+26/06/09 Tim: Currencies.php - Change to lower case html and remove
+26/06/09 Tim: CreditStatus.php - Change to lower case html and remove
+26/06/09 Tim: CreditItemsControlled.php - Change to lower case html and remove
+26/06/09 Tim: Credit_Invoice.php - Change to lower case html and remove
+26/06/09 Tim: ConfirmDispatchControlled_Invoice.php - Change to lower case html and remove
+26/06/09 Tim: CompanyPreferences.php - Change to lower case html and remove
+26/06/09 Tim: COGSGLPostings.php - Change to lower case html and remove
+26/06/09 Tim: BOMs.php - Change to lower case html and remove
+26/06/09 Tim: BOMListing.php - Change to lower case html and remove
+26/06/09 Tim: BOMInquiry.php - Change to lower case html and remove
+26/06/09 Tim: BOMIndentedReverse.php - Change to lower case html and remove
+26/06/09 Tim: BOMIndented.php - Change to lower case html and remove
+26/06/09 Tim: BOMExtendedQty.php - Change to lower case html and remove
+26/06/09 Tim: BankReconciliation.php - Change to lower case html and remove
+26/06/09 Tim: BankMatching.php - Change to lower case html and remove
+26/06/09 Tim: BankAccounts.php - Change to lower case html and remove
+26/06/09 Tim: AuditTrail.php - Change to lower case html and remove
+26/06/09 Tim: Areas.php - Change to lower case html and remove
+26/06/09 Tim: AgedSuppliers.php - Change to lower case html and remove
+26/06/09 Tim: AgedDebtors.php - Change to lower case html and remove
+26/06/09 Tim: AddCustomerTypeNotes.php - Change to lower case html and remove
+26/06/09 Tim: AddCustomerNotes.php - Change to lower case html and remove
+26/06/09 Tim: AddCustomerContacts.php - Change to lower case html and remove
24/06/09 turbopt: SelectProduct.php - Correct field line up in inventory item display
-24/06/09 Tim: PeriodsInquiry.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockTransfer.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockNegatives.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockLocTransfer.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFStockCheckComparison.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFQuotation.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFPriceList.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFOrderStatus.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFOrdersInvoiced.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFLowGP.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFGrn.php - Change to lower case html and remove <center> tags
-24/06/09 Tim: PDFDIFOT.php - Change to lower case html and remove <center> tags
+24/06/09 Tim: PeriodsInquiry.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockTransfer.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockNegatives.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockLocTransfer.php - Change to lower case html and remove
+24/06/09 Tim: PDFStockCheckComparison.php - Change to lower case html and remove
+24/06/09 Tim: PDFQuotation.php - Change to lower case html and remove
+24/06/09 Tim: PDFPriceList.php - Change to lower case html and remove
+24/06/09 Tim: PDFOrderStatus.php - Change to lower case html and remove
+24/06/09 Tim: PDFOrdersInvoiced.php - Change to lower case html and remove
+24/06/09 Tim: PDFLowGP.php - Change to lower case html and remove
+24/06/09 Tim: PDFGrn.php - Change to lower case html and remove
+24/06/09 Tim: PDFDIFOT.php - Change to lower case html and remove
24/06/09 Tim: ConfirmDispatch_Invoice.php - Remove backslashes from narrative
24/06/09 Tim: SelectOrderItems.php - Remove backslashes from narrative
24/06/09 Tim: PrintCustTransPortrait.php - Remove backslashes from narrative
24/06/09 Tim: PrintCustTrans.php - Remove backslashes from narrative
-21/06/09 Tim: ReverseGRN.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: ReorderLevel.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: RecurringSalesOrdersProcess.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: RecurringSalesOrders.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PurchData.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PrintCustTransPortrait.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PrintCustStatements.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PrintCustOrder.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: PricesBasedOnMarkUp.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: Prices.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: Prices_Customer.php - Change to lower case html and remove <center> tags
-21/06/09 Tim: POReport.php - Change to lower case html and remove <center> tags
+21/06/09 Tim: ReverseGRN.php - Change to lower case html and remove
+21/06/09 Tim: ReorderLevel.php - Change to lower case html and remove
+21/06/09 Tim: RecurringSalesOrdersProcess.php - Change to lower case html and remove
+21/06/09 Tim: RecurringSalesOrders.php - Change to lower case html and remove
+21/06/09 Tim: PurchData.php - Change to lower case html and remove
+21/06/09 Tim: PrintCustTransPortrait.php - Change to lower case html and remove
+21/06/09 Tim: PrintCustStatements.php - Change to lower case html and remove
+21/06/09 Tim: PrintCustOrder.php - Change to lower case html and remove
+21/06/09 Tim: PricesBasedOnMarkUp.php - Change to lower case html and remove
+21/06/09 Tim: Prices.php - Change to lower case html and remove
+21/06/09 Tim: Prices_Customer.php - Change to lower case html and remove
+21/06/09 Tim: POReport.php - Change to lower case html and remove
21/06/09 Lindsay: PrintCustOrder_generic.php - Prevent blank line on second page
21/06/09 Lindsay: PrintCustTrans.php - Prevent blank page being printed every second page
21/06/09 Lindsay: Z_ChangeStockCode.php - Add in check for woitems table
19/06/09 Murray: some improvements the html and css styles
-19/06/09 Tim: StockTransferControlled.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockStatus.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockSerialItems.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockSerialItemResearch.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Stocks.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockReorderLevel.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockQuantityByDate.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockQties_csv.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockMovements.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocTransferReceive.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocTransfer.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocStatus.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockLocMovements.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCounts.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCostUpdate.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCheck.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockCategories.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockAdjustmentsControlled.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: StockAdjustments.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SpecialOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Shipt_Select.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Shippers.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: Shipments.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: ShipmentCosting.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectWorkOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectSupplier.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectSalesOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectRecurringSalesOrder.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectProduct.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectOrderItems.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectGLAccount.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectCustomer.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SelectCreditItems.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesTypes.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesPeople.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesInquiry.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesGraph.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesGLPostings.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesCategories.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesAnalysis_UserDefined.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesAnalRepts.php - Change to lower case html and remove <center> tags
-19/06/09 Tim: SalesAnalReptCols.php - Change to lower case html and remove <center> tags
+19/06/09 Tim: StockTransferControlled.php - Change to lower case html and remove
+19/06/09 Tim: StockStatus.php - Change to lower case html and remove
+19/06/09 Tim: StockSerialItems.php - Change to lower case html and remove
+19/06/09 Tim: StockSerialItemResearch.php - Change to lower case html and remove
+19/06/09 Tim: Stocks.php - Change to lower case html and remove
+19/06/09 Tim: StockReorderLevel.php - Change to lower case html and remove
+19/06/09 Tim: StockQuantityByDate.php - Change to lower case html and remove
+19/06/09 Tim: StockQties_csv.php - Change to lower case html and remove
+19/06/09 Tim: StockMovements.php - Change to lower case html and remove
+19/06/09 Tim: StockLocTransferReceive.php - Change to lower case html and remove
+19/06/09 Tim: StockLocTransfer.php - Change to lower case html and remove
+19/06/09 Tim: StockLocStatus.php - Change to lower case html and remove
+19/06/09 Tim: StockLocMovements.php - Change to lower case html and remove
+19/06/09 Tim: StockCounts.php - Change to lower case html and remove
+19/06/09 Tim: StockCostUpdate.php - Change to lower case html and remove
+19/06/09 Tim: StockCheck.php - Change to lower case html and remove
+19/06/09 Tim: StockCategories.php - Change to lower case html and remove
+19/06/09 Tim: StockAdjustmentsControlled.php - Change to lower case html and remove
+19/06/09 Tim: StockAdjustments.php - Change to lower case html and remove
+19/06/09 Tim: SpecialOrder.php - Change to lower case html and remove
+19/06/09 Tim: Shipt_Select.php - Change to lower case html and remove
+19/06/09 Tim: Shippers.php - Change to lower case html and remove
+19/06/09 Tim: Shipments.php - Change to lower case html and remove
+19/06/09 Tim: ShipmentCosting.php - Change to lower case html and remove
+19/06/09 Tim: SelectWorkOrder.php - Change to lower case html and remove
+19/06/09 Tim: SelectSupplier.php - Change to lower case html and remove
+19/06/09 Tim: SelectSalesOrder.php - Change to lower case html and remove
+19/06/09 Tim: SelectRecurringSalesOrder.php - Change to lower case html and remove
+19/06/09 Tim: SelectProduct.php - Change to lower case html and remove
+19/06/09 Tim: SelectOrderItems.php - Change to lower case html and remove
+19/06/09 Tim: SelectGLAccount.php - Change to lower case html and remove
+19/06/09 Tim: SelectCustomer.php - Change to lower case html and remove
+19/06/09 Tim: SelectCreditItems.php - Change to lower case html and remove
+19/06/09 Tim: SalesTypes.php - Change to lower case html and remove
+19/06/09 Tim: SalesPeople.php - Change to lower case html and remove
+19/06/09 Tim: SalesInquiry.php - Change to lower case html and remove
+19/06/09 Tim: SalesGraph.php - Change to lower case html and remove
+19/06/09 Tim: SalesGLPostings.php - Change to lower case html and remove
+19/06/09 Tim: SalesCategories.php - Change to lower case html and remove
+19/06/09 Tim: SalesAnalysis_UserDefined.php - Change to lower case html and remove
+19/06/09 Tim: SalesAnalRepts.php - Change to lower case html and remove
+19/06/09 Tim: SalesAnalReptCols.php - Change to lower case html and remove
12/6/09 Mark: Added SalesInquiry.php - detailed or summarized inquiries on Sales Orders
-17/06/09 Tim: Z_UploadForm.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.09-3.10.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.08-3.09.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.07-3.08.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.05-3.06.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_Upgrade_3.04-3.05.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_UpdateChartDetailsBFwd.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_SalesIntegrityCheck.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ReverseSuppPaymentRun.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_RePostGLFromPeriod.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ReApplyCostToSA.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_PriceChanges.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poRebuildDefault.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poEditLangRemaining.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poEditLangModule.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poEditLangHeader.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poAdmin.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_poAddLanguage.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_MakeStockLocns.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_MakeNewCompany.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ImportStocks.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ImportPartCodes.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ImportGLAccountSections.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ImportGLAccountGroups.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ImportChartOfAccounts.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_DescribeTable.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_DeleteSalesTransActions.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_DeleteInvoice.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_DeleteCreditNote.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_DataExport.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CurrencySuppliersBalances.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CurrencyDebtorsBalances.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CreateCompany.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CheckGLTransBalance.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CheckDebtorsControl.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CheckAllocs.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_CheckAllocationsFrom.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ChangeStockCode.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ChangeCustomerCode.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: Z_ChangeBranchCode.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WWW_Users.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WWW_Access.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WOSerialNos.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WorkOrderStatus.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WorkOrderReceive.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WorkOrderIssue.php - Change to lower case html and remove <center> tags
-17/06/09 Tim: WorkOrderEntry.php - Change to lower case html and remove <center> tags
+17/06/09 Tim: Z_UploadForm.php - Change to lower case html and remove
+17/06/09 Tim: Z_Upgrade_3.09-3.10.php - Change to lower case html and remove
+17/06/09 Tim: Z_Upgrade_3.08-3.09.php - Change to lower case html and remove
+17/06/09 Tim: Z_Upgrade_3.07-3.08.php - Change to lower case html and remove
+17/06/09 Tim: Z_Upgrade_3.05-3.06.php - Change to lower case html and remove
+17/06/09 Tim: Z_Upgrade_3.04-3.05.php - Change to lower case html and remove
+17/06/09 Tim: Z_UpdateChartDetailsBFwd.php - Change to lower case html and remove
+17/06/09 Tim: Z_SalesIntegrityCheck.php - Change to lower case html and remove
+17/06/09 Tim: Z_ReverseSuppPaymentRun.php - Change to lower case html and remove
+17/06/09 Tim: Z_RePostGLFromPeriod.php - Change to lower case html and remove
+17/06/09 Tim: Z_ReApplyCostToSA.php - Change to lower case html and remove
+17/06/09 Tim: Z_PriceChanges.php - Change to lower case html and remove
+17/06/09 Tim: Z_poRebuildDefault.php - Change to lower case html and remove
+17/06/09 Tim: Z_poEditLangRemaining.php - Change to lower case html and remove
+17/06/09 Tim: Z_poEditLangModule.php - Change to lower case html and remove
+17/06/09 Tim: Z_poEditLangHeader.php - Change to lower case html and remove
+17/06/09 Tim: Z_poAdmin.php - Change to lower case html and remove
+17/06/09 Tim: Z_poAddLanguage.php - Change to lower case html and remove
+17/06/09 Tim: Z_MakeStockLocns.php - Change to lower case html and remove
+17/06/09 Tim: Z_MakeNewCompany.php - Change to lower case html and remove
+17/06/09 Tim: Z_ImportStocks.php - Change to lower case html and remove
+17/06/09 Tim: Z_ImportPartCodes.php - Change to lower case html and remove
+17/06/09 Tim: Z_ImportGLAccountSections.php - Change to lower case html and remove
+17/06/09 Tim: Z_ImportGLAccountGroups.php - Change to lower case html and remove
+17/06/09 Tim: Z_ImportChartOfAccounts.php - Change to lower case html and remove
+17/06/09 Tim: Z_DescribeTable.php - Change to lower case html and remove
+17/06/09 Tim: Z_DeleteSalesTransActions.php - Change to lower case html and remove
+17/06/09 Tim: Z_DeleteInvoice.php - Change to lower case html and remove
+17/06/09 Tim: Z_DeleteCreditNote.php - Change to lower case html and remove
+17/06/09 Tim: Z_DataExport.php - Change to lower case html and remove
+17/06/09 Tim: Z_CurrencySuppliersBalances.php - Change to lower case html and remove
+17/06/09 Tim: Z_CurrencyDebtorsBalances.php - Change to lower case html and remove
+17/06/09 Tim: Z_CreateCompany.php - Change to lower case html and remove
+17/06/09 Tim: Z_CheckGLTransBalance.php - Change to lower case html and remove
+17/06/09 Tim: Z_CheckDebtorsControl.php - Change to lower case html and remove
+17/06/09 Tim: Z_CheckAllocs.php - Change to lower case html and remove
+17/06/09 Tim: Z_CheckAllocationsFrom.php - Change to lower case html and remove
+17/06/09 Tim: Z_ChangeStockCode.php - Change to lower case html and remove
+17/06/09 Tim: Z_ChangeCustomerCode.php - Change to lower case html and remove
+17/06/09 Tim: Z_ChangeBranchCode.php - Change to lower case html and remove
+17/06/09 Tim: WWW_Users.php - Change to lower case html and remove
+17/06/09 Tim: WWW_Access.php - Change to lower case html and remove
+17/06/09 Tim: WOSerialNos.php - Change to lower case html and remove
+17/06/09 Tim: WorkOrderStatus.php - Change to lower case html and remove
+17/06/09 Tim: WorkOrderReceive.php - Change to lower case html and remove
+17/06/09 Tim: WorkOrderIssue.php - Change to lower case html and remove
+17/06/09 Tim: WorkOrderEntry.php - Change to lower case html and remove
16/06/09 Tim: ConfirmDispatch_Invoice.php - Correctly show multiple lines of narrative
16/06/09 Tim: PrintCustTransPortrait.php - Correctly show multiple lines of narrative
16/06/09 Tim: PrintCustTrans.php - Correctly show multiple lines of narrative
-16/06/09 Tim: Payments.php - Change to lower case html and remove <center> tags
-16/06/09 Tim: SelectOrderItems.php - Change to lower case html and remove <center> tags and include javascript
-16/06/09 Tim: SelectSalesOrder.php - Change to lower case html and remove <center> tags
-16/06/09 Tim: ShiptsList.php - Change to lower case html and remove <center> tags
-16/06/09 Tim: StockAdjustments.php - Change to lower case html and remove <center> tags
+16/06/09 Tim: Payments.php - Change to lower case html and remove
+16/06/09 Tim: SelectOrderItems.php - Change to lower case html and remove and include javascript
+16/06/09 Tim: SelectSalesOrder.php - Change to lower case html and remove
+16/06/09 Tim: ShiptsList.php - Change to lower case html and remove
+16/06/09 Tim: StockAdjustments.php - Change to lower case html and remove
16/06/09 Tim: SuppInvGRNs.php - Change to lower case html and and change to show GRN batch number and Purchase Order number
16/06/09 Tim: WWW_Users.php - Change to lower case html and various changes for Opera compatability
16/06/09 Tim: css/jelly/default.css - Correct typo in css
@@ -1706,7 +1708,7 @@
11/04/09 Tim: SelectProduct.php - Correct justification and show prices info when security is high enough
10/04/09 Tim: SelectCustomer.php - Correctly change the customer when returning from OrderDetails.php
10/04/09 Tim: includes/session.inc - Ensure last visit field is always updated
-10/04/09 Tim: Z_Upgrade3.10.php - Remove deprecated <center> tags
+10/04/09 Tim: Z_Upgrade3.10.php - Remove deprecated
09/04/09 Tim: reportwriter/admin/forms/TplFrmTtl.html - Remove duplication of <html> and <body> tags
09/04/09 Tim: reportwriter/admin/forms/TplFrmText.html - Remove duplication of <html> and <body> tags
09/04/09 Tim: reportwriter/admin/forms/TplFrmTBlk.html - Remove duplication of <html> and <body> tags
@@ -1736,8 +1738,8 @@
08/04/09 Tim: css/gel/default.css - Include specific entities for numbers
08/04/09 Tim: css/fresh/default.css - Include specific entities for numbers
08/04/09 Tim: css/default/default.css - Include specific entities for numbers
-08/04/09 Tim: DiscountMatrix.php - Improve methods of input, include javascript, and remove <center> tags for xhtml compatability
-08/04/09 Tim: DiscountCategories.php - Improve methods of input, include javascript, and remove <center> tags for xhtml compatability
+08/04/09 Tim: DiscountMatrix.php - Improve methods of input, include javascript, and remove for xhtml compatability
+08/04/09 Tim: DiscountCategories.php - Improve methods of input, include javascript, and remove for xhtml compatability
06/04/09 Tim: index.php - Incorrect link to BOMExtendedQty.php
06/04/09 Tim: Stocks.php - Move reload form function to javascript library
06/04/09 Tim: javascripts/MiscFunctions.js - Move reload form function to javascript library
Modified: trunk/doc/Manual/ManualShipments.html
===================================================================
--- trunk/doc/Manual/ManualShipments.html 2011-12-22 09:44:35 UTC (rev 4786)
+++ trunk/doc/Manual/ManualShipments.html 2011-12-27 20:27:16 UTC (rev 4787)
@@ -18,7 +18,7 @@
<br /><br />
<font size="+1"><b>Creating Shipments</b></font>
<br /><br />
-The purchase order(s) must already be created. The shipment must be created before the goods are received - as the process of receiving them flags the Goods Received as received against the shipment. After selecting the supplier from which the product has been sourced and having entered the purchase order(s) to initiate the transaction, from the select supplier menu, choose the link "Set up a New Shipment". Each time this page is called the system increments a shipment reference and shows the shipment number that will be used. The shipment page allows the details of the shipment to be entered.
+The purchase order(s) must already be created. The shipment must be created before any of the goods have had supplier invoices entered against them. After selecting the supplier from which the product has been sourced and having entered the purchase order(s) to initiate the transaction, from the select supplier menu, choose the link "Set up a New Shipment". Each time this page is called the system increments a shipment reference and shows the shipment number that will be used. The shipment page allows the details of the shipment to be entered.
<br /><br />
<ul>
<li>The name of the vessel on which the product has been loaded
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-22 09:44:50
|
Revision: 4786
http://web-erp.svn.sourceforge.net/web-erp/?rev=4786&view=rev
Author: daintree
Date: 2011-12-22 09:44:35 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/doc/Manual/ManualShipments.html
trunk/includes/ConnectDB.inc
trunk/install/save.php
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
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/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.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_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.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/upgrade4.05-4.06.sql
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/ShipmentCosting.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -45,25 +45,28 @@
}
$HeaderData = DB_fetch_array($GetShiptHdrResult);
-echo '<br />';
-echo '<table class="selection">';
-echo '<tr><th colspan="4"><font size="3" color="navy">'._('Shipment Details').'</font></th></tr>';
-echo '<tr>
+echo '<br />
+ <table class="selection">
+ <tr>
+ <th colspan="4"><font size="3" color="navy">'._('Shipment Details').'</font></th>
+ </tr>
+ <tr>
<td><b>'. _('Shipment') .': </td>
<td><b>' . $_GET['SelectedShipment'] . '</b></td>
<td><b>'. _('From').' ' . $HeaderData['suppname'] . '</b></td>
- </tr>';
+ </tr>
+ <tr>
+ <td>' . _('Vessel'). ': </td>
+ <td>' . $HeaderData['vessel'] . '</td>
+ <td>'. _('Voyage Ref'). ': </td>
+ <td>' . $HeaderData['voyageref'] . '</td>
+ </tr>
+ <tr>
+ <td>' . _('Expected Arrival Date (ETA)') . ': </td>
+ <td>' . ConvertSQLDate($HeaderData['eta']) . '</td>
+ </tr>
+ </table>';
-echo '<tr><td>' . _('Vessel'). ': </td>
- <td>' . $HeaderData['vessel'] . '</td>
- <td>'. _('Voyage Ref'). ': </td>
- <td>' . $HeaderData['voyageref'] . '</td></tr>';
-
-echo '<tr><td>' . _('Expected Arrival Date (ETA)') . ': </td>
- <td>' . ConvertSQLDate($HeaderData['eta']) . '</td></tr>';
-
-echo '</table>';
-
/*Get the total non-stock item shipment charges */
$sql = "SELECT SUM(value)
@@ -75,7 +78,7 @@
$GetShiptCostsResult = DB_query($sql,$db, $ErrMsg);
if (DB_num_rows($GetShiptCostsResult)==0) {
echo '<br />';
- prnMsg ( _('No General Cost Records exist for Shipment') . ' ' . $_GET['SelectedShipment'] . ' ' . _('in the database'), 'error');
+ prnMsg (_('No General Cost Records exist for Shipment') . ' ' . $_GET['SelectedShipment'] . ' ' . _('in the database'), 'error');
include ('includes/footer.inc');
exit;
}
@@ -122,12 +125,12 @@
if (isset($_POST['Close'])){
while ($myrow=DB_fetch_array($LineItemsResult)){
- if ($myrow['totqtyinvoiced'] < $myrow['totqtyrecd']){
- prnMsg(_('Cannot close a shipment where the quantity received is more than the quantity invoiced. Check the item') . ' ' . $myrow['itemcode'] . ' - ' . $myrow['itemdescription'],'warn');
- unset($_POST['Close']);
- }
- }
- DB_data_seek($LineItemsResult,0);
+ if ($myrow['totqtyinvoiced'] < $myrow['totqtyrecd']){
+ prnMsg(_('Cannot close a shipment where the quantity received is more than the quantity invoiced. Check the item') . ' ' . $myrow['itemcode'] . ' - ' . $myrow['itemdescription'],'warn');
+ unset($_POST['Close']);
+ }
+ }
+ DB_data_seek($LineItemsResult,0);
}
@@ -138,7 +141,8 @@
}
echo '<br /><table cellpadding="2" colspan="7" class="selection">';
- echo '<tr><th colspan=9><font color=navy size=3>' . _('Items on shipment'). '</font></th></tr>';
+ echo '<tr>
+ <th colspan="9"><font color="navy" size="3">' . _('Items on shipment'). '</font></th></tr>';
$TableHeader = '<tr>
<th>'. _('Item'). '</th>
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/Shipments.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -195,13 +195,13 @@
prnMsg(_('Cannot add purchase order lines to the shipment unless the shipment is first initiated - hit update to setup the shipment first'),'info');
$InputError = 1;
}
-
+ if ($InputError==0){
+ $_SESSION['Shipment']->Vessel = $_POST['Vessel'];
+ $_SESSION['Shipment']->VoyageRef = $_POST['VoyageRef'];
+ }
/*The user hit the update the shipment button and there are some lines on the shipment*/
if ($InputError == 0 AND (count($_SESSION['Shipment']->LineItems) > 0 OR isset($_GET['Add']))){
- $_SESSION['Shipment']->Vessel = $_POST['Vessel'];
- $_SESSION['Shipment']->VoyageRef = $_POST['VoyageRef'];
-
$sql = "SELECT shiptref FROM shipments WHERE shiptref =" . $_SESSION['Shipment']->ShiptRef;
$result = DB_query($sql,$db);
if (DB_num_rows($result)==1){
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/UpgradeDatabase.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -126,8 +126,9 @@
case '4.05.3':
case '4.06':
case '4.06.1':
+ case '4.06.2':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.2':
+ case '4.06.3':
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/doc/Change.log 2011-12-22 09:44:35 UTC (rev 4786)
@@ -1,5 +1,9 @@
webERP Change Log
+22/12/11 Release 4.06.3
+
+22/12/11 Phil: Fix to install/save.php to use mysqli_connect_error to report the connection error
+22/12/11 Phil: Shipments.php was not retaining vessel and voyage
20/12/11 Phil: StockLocTransfer.php can now import a csv of items to transfer and each line can be checked to remove if required,
20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
Modified: trunk/doc/Manual/ManualShipments.html
===================================================================
--- trunk/doc/Manual/ManualShipments.html 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/doc/Manual/ManualShipments.html 2011-12-22 09:44:35 UTC (rev 4786)
@@ -6,8 +6,10 @@
<br /><br />
The shipment costing system is meant for use in situations where there are substantial freight costs on purchased products and the business wishes to keep track of the actual cost of these items. Many smaller businesses do these calculations on spreadsheets outside the integrated system. The advantage of bringing them inside the system is that the possibility for updating standards and calculation of variances from standard at the time the costing is completed.
<br /><br />
-Having selected a supplier the system allows outstanding purchase order items to be collated into a shipment of goods arriving altogether, the shipment is allocated a shipment number. By changing the expected time of arrival of the shipment (ETA) the delivery date of all purchase order lines on the shipment will be updated. The costs associated with landing and clearing this bundle of products can be entered against it from purchase invoice entry. Most likely there will be many different supplier/vendor providing services to get the goods from the supplier's warehouse to the business's warehouse. Any number of different supplier's/vendor's charges can be entered against the shipment costing. Freight charges and cartage from the wharf, airfreight, unpacking, demurrage etc can be entered as costs of the shipment. These charges are entered by clicking the shipment charges button on the supplier invoice entry screen. Where a supplier provides freight services, it is possible that the supplier invoice has charges for many different shipments, the supplier invoice entry allows for the invoice to be split between any number of shipments. The shipment costing inquiry will show these costs allocated against all of the items on the shipment, using the invoiced value of the items as the basis for apportionment. The actual shipment cost will show together with the existing standard cost and the variance.
+Having selected a supplier the system allows outstanding purchase order items to be collated into a shipment of goods arriving altogether, the shipment is allocated a shipment number. As a convenience to changing all the individual purchase orders allocated to the shipment, by changing the expected time of arrival of the shipment (ETA) the delivery date of all purchase order lines on the shipment will be updated.
<br /><br />
+The costs associated with landing and clearing this bundle of products can be entered against it from purchase invoice entry. Most likely there will be many different supplier/vendor providing services to get the goods from the supplier's warehouse to the business's warehouse. Any number of different supplier's/vendor's charges can be entered against the shipment costing. Freight charges and cartage from the wharf, airfreight, unpacking, demurrage etc can be entered as costs of the shipment. These charges are entered by clicking the shipment charges button on the supplier invoice entry screen. Where a supplier provides freight services, it is possible that the supplier invoice has charges for many different shipments, the supplier invoice entry allows for the invoice to be split between any number of shipments. The shipment costing inquiry will show these costs allocated against all of the items on the shipment, using the invoiced value of the items as the basis for apportionment. The actual shipment cost will show together with the existing standard cost and the variance.
+<br /><br />
<font size="+1"><b>Shipment General Ledger Posting</b></font>
<br /><br />
Shipment charges are posted to the GRN suspense account at the time of entry of the purchase invoice. When the shipment is closed the costs of the shipment are compared against the standard cost of the shipment items taken into stock and the difference that was left in the GRN suspense account is taken to purchase variances.
@@ -16,18 +18,16 @@
<br /><br />
<font size="+1"><b>Creating Shipments</b></font>
<br /><br />
-After selecting the supplier from which the product has been sourced and having entered the purchase order(s) to initiate the transaction, from the select supplier menu, choose the link "Set up a New Shipment". Each time this page is called the system increments a shipment reference and shows the shipment number that will be used. The shipment page that shows allows, the details of the shipment to be entered.
+The purchase order(s) must already be created. The shipment must be created before the goods are received - as the process of receiving them flags the Goods Received as received against the shipment. After selecting the supplier from which the product has been sourced and having entered the purchase order(s) to initiate the transaction, from the select supplier menu, choose the link "Set up a New Shipment". Each time this page is called the system increments a shipment reference and shows the shipment number that will be used. The shipment page allows the details of the shipment to be entered.
<br /><br />
<ul>
<li>The name of the vessel on which the product has been loaded
<li>The voyage reference - this could refer to the HAWB in the case of airfreight
</ul>
-The above are not required if deemed unnecessary, but serve as a useful reference for following and tracking where product is currently and monitoring ETA through the shipping company who will need these details.
+The above fields are required and serve as a useful reference for following and tracking where product is currently and monitoring ETA through the shipping company who will need these details.
<br /><br />
In addition to the above details the Expected Time of Arrival (ETA) is required to be entered.
<br /><br />
-It is important to hit the "Update Shipment Details" button after this data is entered. As clicking one of the add links will lose this information just entered otherwise.
-<br /><br />
When the shipment entry screen is first displayed there is facility to select the inventory location where the purchase order has been requested to arrive. By default the user's default inventory location will be used, but once the inputs above are entered the location can be changed and a click on the "Update" button will then show all the purchase order items defined to arrive at the new location.
<br /><br />
Once a purchase order item has been selected to be part of the shipment the shipment entry screen will only allow other purchase order items that are also to be delivered to the same location. The location will be displayed on screen for informational purposes only.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/includes/ConnectDB.inc 2011-12-22 09:44:35 UTC (rev 4786)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.06.2'; //must update manually every time there is a DB change
+$Version='4.06.3'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/install/save.php
===================================================================
--- trunk/install/save.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/install/save.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -325,7 +325,7 @@
$db = mysqli_connect($_POST['database_host'], $_POST['database_username'], $_POST['database_password']);
if (!$db){
- set_error('Database host name, username and/or password incorrect. MySQL Error:<br />'. mysqli_error());
+ set_error('Database host name, username and/or password incorrect. MySQL Error:<br />'. mysqli_connect_error());
}
if($_POST['install_tables'] == true){
@@ -339,7 +339,7 @@
$SQLScriptFile = file($path_to_root . '/sql/mysql/weberp-new.sql');
}
mysqli_query($db, 'CREATE DATABASE IF NOT EXISTS `' . mysqli_real_escape_string($db, $_POST['company_name']) . '`');
- mysqli_select_db($db, $_POST['company_name']);
+ mysqli_select_db($db, $_POST['company_name']);
$ScriptFileEntries = sizeof($SQLScriptFile);
$SQL ='';
$InAFunction = false;
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-22 09:44:35 UTC (rev 4786)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-10 09:04+1300\n"
+"POT-Creation-Date: 2011-12-22 22:36+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -271,7 +271,7 @@
#: CompanyPreferences.php:506 CompanyPreferences.php:508
#: ContractCosting.php:198 CustomerBranches.php:410 Customers.php:593
#: Customers.php:941 Customers.php:950 Customers.php:953
-#: DeliveryDetails.php:1079 DeliveryDetails.php:1118 DeliveryDetails.php:1121
+#: DeliveryDetails.php:1071 DeliveryDetails.php:1114 DeliveryDetails.php:1117
#: GLTransInquiry.php:69 MRPCalendar.php:224 MRP.php:529 MRP.php:533
#: MRP.php:537 MRP.php:541 PaymentMethods.php:197 PaymentMethods.php:198
#: PaymentMethods.php:199 PaymentMethods.php:262 PaymentMethods.php:268
@@ -285,7 +285,7 @@
#: SalesAnalReptCols.php:422 SalesAnalRepts.php:415 SalesAnalRepts.php:418
#: SalesAnalRepts.php:443 SalesAnalRepts.php:446 SalesAnalRepts.php:471
#: SalesAnalRepts.php:474 SalesPeople.php:219 SalesPeople.php:355
-#: SalesPeople.php:357 SelectProduct.php:381 ShipmentCosting.php:663
+#: SalesPeople.php:357 SelectProduct.php:381 ShipmentCosting.php:667
#: Stocks.php:1015 Stocks.php:1017 Stocks.php:1040 Stocks.php:1042
#: SuppContractChgs.php:90 SystemParameters.php:389 SystemParameters.php:412
#: SystemParameters.php:428 SystemParameters.php:491 SystemParameters.php:499
@@ -306,7 +306,7 @@
#: CompanyPreferences.php:505 CompanyPreferences.php:509
#: ContractCosting.php:196 CustomerBranches.php:410 Customers.php:592
#: Customers.php:936 Customers.php:949 Customers.php:952
-#: DeliveryDetails.php:1080 DeliveryDetails.php:1119 DeliveryDetails.php:1122
+#: DeliveryDetails.php:1072 DeliveryDetails.php:1115 DeliveryDetails.php:1118
#: GLTransInquiry.php:86 MRPCalendar.php:226 MRP.php:527 MRP.php:531
#: MRP.php:535 MRP.php:539 PaymentMethods.php:197 PaymentMethods.php:198
#: PaymentMethods.php:199 PaymentMethods.php:263 PaymentMethods.php:269
@@ -320,7 +320,7 @@
#: SalesAnalReptCols.php:423 SalesAnalRepts.php:414 SalesAnalRepts.php:417
#: SalesAnalRepts.php:442 SalesAnalRepts.php:445 SalesAnalRepts.php:470
#: SalesAnalRepts.php:473 SalesPeople.php:221 SalesPeople.php:360
-#: SalesPeople.php:362 SelectProduct.php:383 ShipmentCosting.php:664
+#: SalesPeople.php:362 SelectProduct.php:383 ShipmentCosting.php:668
#: Stocks.php:1010 Stocks.php:1012 Stocks.php:1035 Stocks.php:1037
#: SuppContractChgs.php:92 SystemParameters.php:390 SystemParameters.php:413
#: SystemParameters.php:429 SystemParameters.php:492 SystemParameters.php:500
@@ -386,13 +386,13 @@
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398
#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
-#: StockCategories.php:243 StockCategories.php:557 SuppContractChgs.php:99
-#: SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:147
-#: SupplierContacts.php:164 SupplierTypes.php:191 SuppShiptChgs.php:90
-#: SuppTransGLAnalysis.php:121 TaxAuthorities.php:175 TaxCategories.php:183
-#: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186
-#: WorkCentres.php:142 WOSerialNos.php:320 WWW_Access.php:124
-#: WWW_Users.php:319 includes/InputSerialItemsKeyed.php:58
+#: StockCategories.php:243 StockCategories.php:557 StockLocTransfer.php:301
+#: SuppContractChgs.php:99 SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87
+#: SuppInvGRNs.php:147 SupplierContacts.php:164 SupplierTypes.php:191
+#: SuppShiptChgs.php:90 SuppTransGLAnalysis.php:121 TaxAuthorities.php:175
+#: TaxCategories.php:183 TaxGroups.php:189 TaxProvinces.php:181
+#: UnitsOfMeasure.php:186 WorkCentres.php:142 WOSerialNos.php:320
+#: WWW_Access.php:124 WWW_Users.php:319 includes/InputSerialItemsKeyed.php:58
#: includes/OutputSerialItems.php:99
#, php-format
msgid "Delete"
@@ -558,7 +558,7 @@
#: AddCustomerContacts.php:61 AddCustomerNotes.php:52
#: AddCustomerTypeNotes.php:49 Areas.php:73 CustomerTypes.php:69
-#: DeliveryDetails.php:774 Factors.php:105 FixedAssetItems.php:246
+#: DeliveryDetails.php:776 Factors.php:105 FixedAssetItems.php:246
#: MRPCalendar.php:176 PcAssignCashToTab.php:88 PcClaimExpensesFromTab.php:79
#: PcExpenses.php:95 PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:371
#: SalesAnalReptCols.php:129 SalesPeople.php:97 SalesTypes.php:66
@@ -685,7 +685,7 @@
#: PaymentAllocations.php:66 PcAssignCashToTab.php:220
#: PcAuthorizeExpenses.php:88 PDFRemittanceAdvice.php:300
#: PrintCustTrans.php:822 PrintCustTransPortrait.php:867 ReverseGRN.php:386
-#: ShipmentCosting.php:534 ShipmentCosting.php:611 Shipments.php:491
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:491
#: StockDispatch.php:189 StockDispatch.php:201 StockLocMovements.php:90
#: StockMovements.php:94 StockSerialItemResearch.php:81
#: SupplierAllocations.php:455 SupplierAllocations.php:568
@@ -699,10 +699,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: Stocks.php:1019 UpgradeDatabase.php:176 UpgradeDatabase.php:179
-#: UpgradeDatabase.php:182 UpgradeDatabase.php:185 UpgradeDatabase.php:188
-#: UpgradeDatabase.php:191 UpgradeDatabase.php:194 UpgradeDatabase.php:197
-#: UpgradeDatabase.php:200 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:181 UpgradeDatabase.php:184
+#: UpgradeDatabase.php:187 UpgradeDatabase.php:190 UpgradeDatabase.php:193
+#: UpgradeDatabase.php:196 UpgradeDatabase.php:199 UpgradeDatabase.php:202
+#: UpgradeDatabase.php:205 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
@@ -891,7 +891,7 @@
#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1365
#: CounterSales.php:1379 Credit_Invoice.php:697 Credit_Invoice.php:718
#: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709
-#: CustomerTransInquiry.php:91 DeliveryDetails.php:396 GLProfit_Loss.php:596
+#: CustomerTransInquiry.php:91 DeliveryDetails.php:393 GLProfit_Loss.php:596
#: GLTagProfit_Loss.php:511 Payments.php:334 PDFRemittanceAdvice.php:85
#: PurchData.php:86 PurchData.php:104 PurchData.php:245
#: RecurringSalesOrders.php:256 ReverseGRN.php:191 ReverseGRN.php:205
@@ -899,7 +899,7 @@
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
-#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
+#: StockTransfers.php:192 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
#: SuppPaymentRun.php:188 SuppPaymentRun.php:219 WorkOrderCosting.php:418
@@ -1158,7 +1158,7 @@
#: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298
#: CounterSales.php:2157 CounterSales.php:2160 CustomerTransInquiry.php:31
-#: DailySalesInquiry.php:47 DailySalesInquiry.php:49 FixedAssetRegister.php:56
+#: DailySalesInquiry.php:48 DailySalesInquiry.php:50 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:167
#: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585
#: MRPReport.php:523 MRPReport.php:525 MRPReschedules.php:144
@@ -1208,7 +1208,7 @@
#: CustWhereAlloc.php:18 CustWhereAlloc.php:105 DailyBankTransactions.php:112
#: GLAccountInquiry.php:150 GLAccountReport.php:336 GLJournal.php:262
#: MRPReschedules.php:191 SalesByTypePeriodInquiry.php:334
-#: SelectCustomer.php:416 ShipmentCosting.php:532 ShipmentCosting.php:609
+#: SelectCustomer.php:416 ShipmentCosting.php:536 ShipmentCosting.php:613
#: StockCategories.php:217 StockLocMovements.php:88 StockMovements.php:92
#: SupplierAllocations.php:453 SupplierInquiry.php:207
#: SupplierTransInquiry.php:19 SupplierTransInquiry.php:100
@@ -1411,7 +1411,7 @@
#: PO_Header.php:558 PO_SelectOSPurchOrder.php:489 PO_SelectPurchOrder.php:432
#: PricesByCost.php:274 Prices.php:222 Prices.php:295 PurchData.php:169
#: PurchData.php:352 PurchData.php:481 SelectSupplier.php:260
-#: SupplierCredit.php:263 SupplierInvoice.php:233 SupplierTransInquiry.php:109
+#: SupplierCredit.php:263 SupplierInvoice.php:234 SupplierTransInquiry.php:109
#: SuppPriceList.php:284 includes/PDFBankingSummaryPageHeader.inc:42
#: includes/PDFDebtorBalsPageHeader.inc:33
#: includes/PDFSupplierBalsPageHeader.inc:36
@@ -1542,7 +1542,7 @@
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
-#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
+#: StockTransfers.php:437 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
#: includes/PDFDeliveryDifferencesPageHeader.inc:19
@@ -1636,7 +1636,7 @@
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:261 ShipmentCosting.php:533 ShipmentCosting.php:610
+#: BankMatching.php:261 ShipmentCosting.php:537 ShipmentCosting.php:614
#: SupplierAllocations.php:456
msgid "Ref"
msgstr "Ref"
@@ -1652,8 +1652,8 @@
#: SuppContractChgs.php:79 SuppContractChgs.php:163 SuppFixedAssetChgs.php:76
#: SuppFixedAssetChgs.php:149 SupplierAllocations.php:457
#: SupplierCredit.php:352 SupplierCredit.php:385 SupplierCredit.php:421
-#: SupplierCredit.php:460 SupplierInvoice.php:328 SupplierInvoice.php:369
-#: SupplierInvoice.php:409 SupplierInvoice.php:453
+#: SupplierCredit.php:460 SupplierInvoice.php:332 SupplierInvoice.php:373
+#: SupplierInvoice.php:413 SupplierInvoice.php:457
#: SupplierTransInquiry.php:108 SuppShiptChgs.php:81 SuppShiptChgs.php:146
#: SuppTransGLAnalysis.php:106 SuppTransGLAnalysis.php:191
#: Z_CheckAllocs.php:66 includes/PDFBankingSummaryPageHeader.inc:55
@@ -1919,7 +1919,7 @@
#: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:94
#: Contracts.php:961 Contracts.php:997 CounterSales.php:741
#: CounterSales.php:2036 CounterSales.php:2221 CounterSales.php:2347
-#: Credit_Invoice.php:273 DeliveryDetails.php:825 DeliveryDetails.php:891
+#: Credit_Invoice.php:273 DeliveryDetails.php:827 DeliveryDetails.php:897
#: GoodsReceived.php:100 GoodsReceived.php:104 GoodsReceived.php:107
#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:246
#: MRPDemands.php:294 MRPDemands.php:390 MRPPlannedPurchaseOrders.php:324
@@ -1932,13 +1932,13 @@
#: PrintCustTransPortrait.php:1064 RecurringSalesOrders.php:320
#: ReorderLevel.php:268 ReverseGRN.php:387 ReverseGRN.php:388
#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:188
-#: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:223
+#: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:222
#: SelectCreditItems.php:673 SelectCreditItems.php:1034
#: SelectOrderItems.php:1333 SelectOrderItems.php:1491
-#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
-#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403
+#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:149
+#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
-#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:261
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:276
#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
@@ -2194,7 +2194,7 @@
#: StockLocStatus.php:161 StockQuantityByDate.php:106 SuppCreditGRNs.php:82
#: SuppCreditGRNs.php:176 SuppFixedAssetChgs.php:75 SuppInvGRNs.php:126
#: SuppInvGRNs.php:304 SupplierCredit.php:316 SupplierCredit.php:384
-#: SupplierInvoice.php:288 SupplierInvoice.php:368 SupplierTenders.php:264
+#: SupplierInvoice.php:292 SupplierInvoice.php:372 SupplierTenders.php:264
#: SupplierTenders.php:350 SupplierTenders.php:490 SuppPriceList.php:290
#: TaxAuthorities.php:147 TopItems.php:178 WorkCentres.php:127
#: WorkOrderCosting.php:88 WorkOrderCosting.php:120 WorkOrderEntry.php:623
@@ -2316,10 +2316,10 @@
#: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173
#: StockAdjustments.php:85 StockAdjustments.php:359 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:32 StockReorderLevel.php:46
-#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:458
+#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:459
#: StockUsage.php:64 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667 Z_ChangeStockCategory.php:90
-#: Z_ChangeStockCode.php:313
+#: Z_ChangeStockCode.php:311
msgid "Stock Code"
msgstr "Skladový kód"
@@ -2535,7 +2535,7 @@
msgid "The effective to date field must be a date in the format"
msgstr "Datum účinnosti, musí být zadáno ve formátu"
-#: BOMs.php:236 StockAdjustments.php:109 StockTransfers.php:162
+#: BOMs.php:236 StockAdjustments.php:109 StockTransfers.php:163
#: WorkOrderEntry.php:265
msgid "The quantity entered must be numeric"
msgstr "Množství uvedené musí být číslo"
@@ -3116,7 +3116,7 @@
msgstr "Zpět na Potvrzení o odeslání"
#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1250
-#: DeliveryDetails.php:586 DeliveryDetails.php:786 EmailCustTrans.php:9
+#: DeliveryDetails.php:583 DeliveryDetails.php:788 EmailCustTrans.php:9
#: PaymentAllocations.php:31 SelectSalesOrder.php:830 SelectSalesOrder.php:901
#: SelectSalesOrder.php:928 Z_SalesIntegrityCheck.php:46
#: includes/PDFDeliveryDifferencesPageHeader.inc:40
@@ -3188,7 +3188,7 @@
#: CustomerBranches.php:532 CustomerBranches.php:579 CustomerInquiry.php:126
#: CustomerReceipt.php:899 CustomerReceipt.php:953 CustomerReceipt.php:1101
#: Customers.php:14 Customers.php:325 CustomerTransInquiry.php:101
-#: DeliveryDetails.php:804 FTP_RadioBeacon.php:51 PDFOrdersInvoiced.php:305
+#: DeliveryDetails.php:806 FTP_RadioBeacon.php:51 PDFOrdersInvoiced.php:305
#: PDFOrderStatus.php:275 PricesByCost.php:153 SalesGraph.php:180
#: SelectCompletedOrder.php:601 SelectContract.php:154
#: SelectCreditItems.php:238 SelectCustomer.php:24 SelectCustomer.php:210
@@ -3206,7 +3206,7 @@
msgstr "Zákazník"
#: ConfirmDispatch_Invoice.php:260 CustEDISetup.php:93 Customers.php:440
-#: Customers.php:659 Customers.php:694 DeliveryDetails.php:804
+#: Customers.php:659 Customers.php:694 DeliveryDetails.php:806
#: OrderDetails.php:67 SalesAnalRepts.php:27 SalesAnalRepts.php:29
#: WWW_Users.php:275 WWW_Users.php:498 Z_ChangeBranchCode.php:201
#: includes/PDFStatementPageHeader.inc:112 includes/PDFTransPageHeader.inc:46
@@ -3216,7 +3216,7 @@
#: ConfirmDispatch_Invoice.php:261 CustEDISetup.php:96 CustomerReceipt.php:252
#: CustomerReceipt.php:1128 Customers.php:443 Customers.php:700
-#: Customers.php:730 DeliveryDetails.php:805 OrderDetails.php:69
+#: Customers.php:730 DeliveryDetails.php:807 OrderDetails.php:69
#: POReport.php:494 POReport.php:1268 SalesInquiry.php:754
#: SalesInquiry.php:764 SalesInquiry.php:788 SalesInquiry.php:932
#: SalesInquiry.php:943 SalesInquiry.php:949 SalesInquiry.php:955
@@ -3231,7 +3231,7 @@
#: ConfirmDispatch_Invoice.php:277 ContractBOM.php:235 ContractCosting.php:79
#: ContractCosting.php:85 Contracts.php:959 CounterSales.php:739
-#: CounterSales.php:2346 Credit_Invoice.php:269 DeliveryDetails.php:823
+#: CounterSales.php:2346 Credit_Invoice.php:269 DeliveryDetails.php:825
#: GoodsReceived.php:98 OrderDetails.php:162 PO_Items.php:658
#: PO_OrderDetails.php:146 PrintCustTrans.php:860 PrintCustTrans.php:949
#: PrintCustTrans.php:998 PrintCustTransPortrait.php:907
@@ -3239,11 +3239,11 @@
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:260 StockLocTransferReceive.php:427
+#: StockLocTransfer.php:275 StockLocTransferReceive.php:427
#: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787
#: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175
#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315
-#: SupplierInvoice.php:287 includes/PDFOrderPageHeader_generic.inc:91
+#: SupplierInvoice.php:291 includes/PDFOrderPageHeader_generic.inc:91
#: includes/PDFPickingListHeader.inc:72
#: includes/PDFQuotationPageHeader.inc:101
#: includes/PDFQuotationPortraitPageHeader.inc:101
@@ -3256,7 +3256,7 @@
#: ConfirmDispatch_Invoice.php:278 ContractCosting.php:80
#: ContractCosting.php:86 Contracts.php:960 CounterSales.php:740
-#: Credit_Invoice.php:270 DeliveryDetails.php:824 DeliveryDetails.php:890
+#: Credit_Invoice.php:270 DeliveryDetails.php:826 DeliveryDetails.php:896
#: OrderDetails.php:163 PO_Items.php:733 PO_OrderDetails.php:147
#: PrintCustTrans.php:861 PrintCustTrans.php:950 PrintCustTrans.php:999
#: PrintCustTransPortrait.php:908 PrintCustTransPortrait.php:1006
@@ -3296,7 +3296,7 @@
msgstr "Tato zásilka"
#: ConfirmDispatch_Invoice.php:283 CounterSales.php:744 Credit_Invoice.php:274
-#: DeliveryDetails.php:827 DeliveryDetails.php:893 GoodsReceived.php:111
+#: DeliveryDetails.php:829 DeliveryDetails.php:899 GoodsReceived.php:111
#: OffersReceived.php:107 OffersReceived.php:215 OffersReceived.php:260
#: OrderDetails.php:166 PDFOrdersInvoiced.php:391 PDFPriceList.php:365
#: PDFPrintLabel.php:249 PO_AuthoriseMyOrders.php:116 PricesByCost.php:248
@@ -3317,7 +3317,7 @@
msgstr "Cena"
#: ConfirmDispatch_Invoice.php:284 CounterSales.php:745 Credit_Invoice.php:275
-#: CustomerReceipt.php:898 DeliveryDetails.php:828 OrderDetails.php:167
+#: CustomerReceipt.php:898 DeliveryDetails.php:830 OrderDetails.php:167
#: PrintCustTrans.php:865 PrintCustTrans.php:954 PrintCustTrans.php:1003
#: PrintCustTransPortrait.php:912 PrintCustTransPortrait.php:1010
#: PrintCustTransPortrait.php:1067 RecurringSalesOrders.php:323
@@ -3332,8 +3332,8 @@
#: ConfirmDispatch_Invoice.php:285 ConfirmDispatch_Invoice.php:289
#: CounterSales.php:749 CounterSales.php:836 Credit_Invoice.php:276
#: Credit_Invoice.php:280 CustomerAllocations.php:331
-#: CustomerAllocations.php:364 CustomerInquiry.php:201 DeliveryDetails.php:829
-#: DeliveryDetails.php:894 GLBalanceSheet.php:183 GLBalanceSheet.php:192
+#: CustomerAllocations.php:364 CustomerInquiry.php:201 DeliveryDetails.php:831
+#: DeliveryDetails.php:900 GLBalanceSheet.php:183 GLBalanceSheet.php:192
#: GLBalanceSheet.php:269 GLBalanceSheet.php:278 GLBudgets.php:207
#: GLJournal.php:432 GLTransInquiry.php:182 GLTrialBalance.php:217
#: GLTrialBalance.php:237 GLTrialBalance.php:258 GLTrialBalance.php:354
@@ -3364,7 +3364,7 @@
msgstr "bez DPH"
#: ConfirmDispatch_Invoice.php:286 Credit_Invoice.php:277
-#: SelectCreditItems.php:679 SupplierInvoice.php:235 TaxGroups.php:285
+#: SelectCreditItems.php:679 SupplierInvoice.php:236 TaxGroups.php:285
msgid "Tax Authority"
msgstr "Daňový úřad"
@@ -3415,7 +3415,7 @@
"systém očekává, že námořní společnosti, které budou vybrány, nebo výchozí "
"nákladní společnost mají být použity"
-#: ConfirmDispatch_Invoice.php:450 DeliveryDetails.php:245 Prices.php:355
+#: ConfirmDispatch_Invoice.php:450 DeliveryDetails.php:244 Prices.php:355
#: includes/InputSerialItemsExisting.php:59
#: includes/InputSerialItemsKeyed.php:150
#: includes/InputSerialItemsSequential.php:53
@@ -3423,7 +3423,7 @@
msgid "Enter"
msgstr "Vložit"
-#: ConfirmDispatch_Invoice.php:450 DeliveryDetails.php:245
+#: ConfirmDispatch_Invoice.php:450 DeliveryDetails.php:244
msgid "Amend Freight Companies"
msgstr "Mění se Nákladní Firmy"
@@ -3649,23 +3649,23 @@
#: SelectCreditItems.php:1821 SelectCreditItems.php:1852
#: SelectCreditItems.php:1875 SelectCreditItems.php:1903
#: SelectCreditItems.php:1923 SelectCreditItems.php:1944
-#: ShipmentCosting.php:245 ShipmentCosting.php:290 ShipmentCosting.php:310
-#: ShipmentCosting.php:324 ShipmentCosting.php:370 ShipmentCosting.php:393
-#: ShipmentCosting.php:428 ShipmentCosting.php:447 ShipmentCosting.php:461
+#: ShipmentCosting.php:249 ShipmentCosting.php:294 ShipmentCosting.php:314
+#: ShipmentCosting.php:328 ShipmentCosting.php:374 ShipmentCosting.php:397
+#: ShipmentCosting.php:432 ShipmentCosting.php:451 ShipmentCosting.php:465
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
-#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:148
-#: StockLocTransfer.php:170 StockLocTransfer.php:174
+#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:159
+#: StockLocTransfer.php:183 StockLocTransfer.php:187
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
#: StockLocTransferReceive.php:214 StockLocTransferReceive.php:250
#: StockLocTransferReceive.php:264 StockLocTransferReceive.php:281
#: StockLocTransferReceive.php:293 StockLocTransferReceive.php:302
#: StockLocTransferReceive.php:320 StockLocTransferReceive.php:329
-#: StockLocTransferReceive.php:335 StockTransfers.php:229
-#: StockTransfers.php:264 StockTransfers.php:280 StockTransfers.php:300
-#: StockTransfers.php:343 StockTransfers.php:377 StockTransfers.php:393
-#: StockTransfers.php:409 StockTransfers.php:421 StockTransfers.php:430
+#: StockLocTransferReceive.php:335 StockTransfers.php:230
+#: StockTransfers.php:265 StockTransfers.php:281 StockTransfers.php:301
+#: StockTransfers.php:344 StockTransfers.php:378 StockTransfers.php:394
+#: StockTransfers.php:410 StockTransfers.php:422 StockTransfers.php:431
#: SupplierAllocations.php:117 SupplierAllocations.php:139
#: SupplierAllocations.php:157 SupplierAllocations.php:181
#: SupplierAllocations.php:215 SupplierAllocations.php:236
@@ -3676,28 +3676,30 @@
#: SupplierCredit.php:1092 SupplierCredit.php:1116 SupplierCredit.php:1148
#: SupplierCredit.php:1164 SupplierCredit.php:1177 SupplierCredit.php:1184
#: SupplierCredit.php:1206 SupplierCredit.php:1260 SupplierCredit.php:1288
-#: SupplierInvoice.php:654 SupplierInvoice.php:727 SupplierInvoice.php:755
-#: SupplierInvoice.php:782 SupplierInvoice.php:814 SupplierInvoice.php:847
-#: SupplierInvoice.php:877 SupplierInvoice.php:913 SupplierInvoice.php:994
-#: SupplierInvoice.php:1006 SupplierInvoice.php:1043 SupplierInvoice.php:1080
-#: SupplierInvoice.php:1105 SupplierInvoice.php:1139 SupplierInvoice.php:1165
-#: SupplierInvoice.php:1198 SupplierInvoice.php:1214 SupplierInvoice.php:1228
-#: SupplierInvoice.php:1237 SupplierInvoice.php:1255 SupplierInvoice.php:1310
-#: SupplierInvoice.php:1340 TaxAuthorities.php:140 WorkOrderCosting.php:362
-#: WorkOrderCosting.php:383 WorkOrderCosting.php:402 WorkOrderCosting.php:439
-#: WorkOrderCosting.php:458 WorkOrderCosting.php:481 WorkOrderCosting.php:500
-#: WorkOrderIssue.php:160 WorkOrderIssue.php:191 WorkOrderIssue.php:213
-#: WorkOrderIssue.php:228 WorkOrderIssue.php:245 WorkOrderIssue.php:268
-#: WorkOrderIssue.php:283 WorkOrderIssue.php:314 WorkOrderIssue.php:334
-#: WorkOrderIssue.php:342 WorkOrderReceive.php:123 WorkOrderReceive.php:240
-#: WorkOrderReceive.php:259 WorkOrderReceive.php:320 WorkOrderReceive.php:349
-#: WorkOrderReceive.php:357 WorkOrderReceive.php:380 WorkOrderReceive.php:399
-#: WorkOrderReceive.php:427 WorkOrderReceive.php:457 WorkOrderReceive.php:494
-#: WorkOrderReceive.php:509 WorkOrderReceive.php:519 WorkOrderReceive.php:538
-#: WorkOrderReceive.php:565 WorkOrderReceive.php:580 WorkOrderReceive.php:600
-#: WorkOrderReceive.php:634 WorkOrderReceive.php:654 WorkOrderReceive.php:664
-#: includes/SQL_CommonFunctions.inc:24 includes/SQL_CommonFunctions.inc:31
-#: includes/SQL_CommonFunctions.inc:184 includes/SQL_CommonFunctions.inc:203
+#: SupplierInvoice.php:660 SupplierInvoice.php:733 SupplierInvoice.php:761
+#: SupplierInvoice.php:788 SupplierInvoice.php:820 SupplierInvoice.php:853
+#: SupplierInvoice.php:883 SupplierInvoice.php:919 SupplierInvoice.php:945
+#: SupplierInvoice.php:967 SupplierInvoice.php:1004 SupplierInvoice.php:1029
+#: SupplierInvoice.php:1063 SupplierInvoice.php:1089 SupplierInvoice.php:1122
+#: SupplierInvoice.php:1138 SupplierInvoice.php:1156 SupplierInvoice.php:1166
+#: SupplierInvoice.php:1184 SupplierInvoice.php:1212 SupplierInvoice.php:1233
+#: SupplierInvoice.php:1253 SupplierInvoice.php:1316 SupplierInvoice.php:1338
+#: SupplierInvoice.php:1409 SupplierInvoice.php:1439 TaxAuthorities.php:140
+#: WorkOrderCosting.php:362 WorkOrderCosting.php:383 WorkOrderCosting.php:402
+#: WorkOrderCosting.php:439 WorkOrderCosting.php:458 WorkOrderCosting.php:481
+#: WorkOrderCosting.php:500 WorkOrderIssue.php:160 WorkOrderIssue.php:191
+#: WorkOrderIssue.php:213 WorkOrderIssue.php:228 WorkOrderIssue.php:245
+#: WorkOrderIssue.php:268 WorkOrderIssue.php:283 WorkOrderIssue.php:314
+#: WorkOrderIssue.php:334 WorkOrderIssue.php:342 WorkOrderReceive.php:123
+#: WorkOrderReceive.php:240 WorkOrderReceive.php:259 WorkOrderReceive.php:320
+#: WorkOrderReceive.php:349 WorkOrderReceive.php:357 WorkOrderReceive.php:380
+#: WorkOrderReceive.php:399 WorkOrderReceive.php:427 WorkOrderReceive.php:457
+#: WorkOrderReceive.php:494 WorkOrderReceive.php:509 WorkOrderReceive.php:519
+#: WorkOrderReceive.php:538 WorkOrderReceive.php:565 WorkOrderReceive.php:580
+#: WorkOrderReceive.php:600 WorkOrderReceive.php:634 WorkOrderReceive.php:654
+#: WorkOrderReceive.php:664 includes/SQL_CommonFunctions.inc:24
+#: includes/SQL_CommonFunctions.inc:31 includes/SQL_CommonFunctions.inc:184
+#: includes/SQL_CommonFunctions.inc:203
msgid "CRITICAL ERROR"
msgstr "KRITICKÁ CHYBA"
@@ -3758,9 +3760,9 @@
#: SelectCreditItems.php:1821 SelectCreditItems.php:1852
#: SelectCreditItems.php:1875 SelectCreditItems.php:1903
#: SelectCreditItems.php:1923 SelectCreditItems.php:1944
-#: ShipmentCosting.php:245 ShipmentCosting.php:290 ShipmentCosting.php:310
-#: ShipmentCosting.php:324 ShipmentCosting.php:370 ShipmentCosting.php:393
-#: ShipmentCosting.php:428 ShipmentCosting.php:447 ShipmentCosting.php:461
+#: ShipmentCosting.php:249 ShipmentCosting.php:294 ShipmentCosting.php:314
+#: ShipmentCosting.php:328 ShipmentCosting.php:374 ShipmentCosting.php:397
+#: ShipmentCosting.php:432 ShipmentCosting.php:451 ShipmentCosting.php:465
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
#: StockAdjustments.php:305 StockLocTransferReceive.php:102
@@ -3769,10 +3771,10 @@
#: StockLocTransferReceive.php:250 StockLocTransferReceive.php:264
#: StockLocTransferReceive.php:281 StockLocTransferReceive.php:293
#: StockLocTransferReceive.php:302 StockLocTransferReceive.php:335
-#: StockTransfers.php:229 StockTransfers.php:264 StockTransfers.php:280
-#: StockTransfers.php:300 StockTransfers.php:343 StockTransfers.php:377
-#: StockTransfers.php:393 StockTransfers.php:409 StockTransfers.php:421
-#: StockTransfers.php:430 SupplierAllocations.php:117
+#: StockTransfers.php:230 StockTransfers.php:265 StockTransfers.php:281
+#: StockTransfers.php:301 StockTransfers.php:344 StockTransfers.php:378
+#: StockTransfers.php:394 StockTransfers.php:410 StockTransfers.php:422
+#: StockTransfers.php:431 SupplierAllocations.php:117
#: SupplierAllocations.php:139 SupplierAllocations.php:157
#: SupplierAllocations.php:181 SupplierAllocations.php:215
#: SupplierAllocations.php:236 SupplierCredit.php:730 SupplierCredit.php:759
@@ -3782,29 +3784,30 @@
#: SupplierCredit.php:1060 SupplierCredit.php:1092 SupplierCredit.php:1116
#: SupplierCredit.php:1148 SupplierCredit.php:1164 SupplierCredit.php:1177
#: SupplierCredit.php:1184 SupplierCredit.php:1206 SupplierCredit.php:1260
-#: SupplierCredit.php:1288 SupplierInvoice.php:654 SupplierInvoice.php:727
-#: SupplierInvoice.php:755 SupplierInvoice.php:782 SupplierInvoice.php:814
-#: SupplierInvoice.php:847 SupplierInvoice.php:877 SupplierInvoice.php:913
-#: SupplierInvoice.php:994 SupplierInvoice.php:1006 SupplierInvoice.php:1043
-#: SupplierInvoice.php:1080 SupplierInvoice.php:1105 SupplierInvoice.php:1139
-#: SupplierInvoice.php:1165 SupplierInvoice.php:1198 SupplierInvoice.php:1214
-#: SupplierInvoice.php:1228 SupplierInvoice.php:1237 SupplierInvoice.php:1255
-#: SupplierInvoice.php:1310 SupplierInvoice.php:1340 TaxAuthorities.php:140
-#: WorkOrderCosting.php:362 WorkOrderCosting.php:383 WorkOrderCosting.php:402
-#: WorkOrderCosting.php:439 WorkOrderCosting.php:458 WorkOrderCosting.php:481
-#: WorkOrderCosting.php:500 WorkOrderIssue.php:160 WorkOrderIssue.php:191
-#: WorkOrderIssue.php:213 WorkOrderIssue.php:228 WorkOrderIssue.php:245
-#: WorkOrderIssue.php:268 WorkOrderIssue.php:283 WorkOrderIssue.php:314
-#: WorkOrderIssue.php:334 WorkOrderIssue.php:342 WorkOrderReceive.php:123
-#: WorkOrderReceive.php:240 WorkOrderReceive.php:259 WorkOrderReceive.php:320
-#: WorkOrderReceive.php:349 WorkOrderReceive.php:357 WorkOrderReceive.php:380
-#: WorkOrderReceive.php:399 WorkOrderReceive.php:427 WorkOrderReceive.php:457
-#: WorkOrderReceive.php:494 WorkOrderReceive.php:509 WorkOrderReceive.php:519
-#: WorkOrderReceive.php:538 WorkOrderReceive.php:565 WorkOrderReceive.php:580
-#: WorkOrderReceive.php:600 WorkOrderReceive.php:634 WorkOrderReceive.php:654
-#: WorkOrderReceive.php:664 includes/SQL_CommonFunctions.inc:24
-#: includes/SQL_CommonFunctions.inc:31 includes/SQL_CommonFunctions.inc:184
-#: includes/SQL_CommonFunctions.inc:203
+#: SupplierCredit.php:1288 SupplierInvoice.php:660 SupplierInvoice.php:733
+#: SupplierInvoice.php:761 SupplierInvoice.php:788 SupplierInvoice.php:820
+#: SupplierInvoice.php:853 SupplierInvoice.php:883 SupplierInvoice.php:919
+#: SupplierInvoice.php:945 SupplierInvoice.php:967 SupplierInvoice.php:1004
+#: SupplierInvoice.php:1029 SupplierInvoice.php:1063 SupplierInvoice.php:1089
+#: SupplierInvoice.php:1122 SupplierInvoice.php:1138 SupplierInvoice.php:1156
+#: SupplierInvoice.php:1166 SupplierInvoice.php:1184 SupplierInvoice.php:1212
+#: SupplierInvoice.php:1233 SupplierInvoice.php:1253 SupplierInvoice.php:1316
+#: SupplierInvoice.php:1338 SupplierInvoice.php:1409 SupplierInvoice.php:1439
+#: TaxAuthorities.php:140 WorkOrderCosting.php:362 WorkOrderCosting.php:383
+#: WorkOrderCosting.php:402 WorkOrderCosting.php:439 WorkOrderCosting.php:458
+#: WorkOrderCosting.php:481 WorkOrderCosting.php:500 WorkOrderIssue.php:160
+#: WorkOrderIssue.php:191 WorkOrderIssue.php:213 WorkOrderIssue.php:228
+#: WorkOrderIssue.php:245 WorkOrderIssue.php:268 WorkOrderIssue.php:283
+#: WorkOrderIssue.php:314 WorkOrderIssue.php:334 WorkOrderIssue.php:342
+#: WorkOrderReceive.php:123 WorkOrderReceive.php:240 WorkOrderReceive.php:259
+#: WorkOrderReceive.php:320 WorkOrderReceive.php:349 WorkOrderReceive.php:357
+#: WorkOrderReceive.php:380 WorkOrderReceive.php:399 WorkOrderReceive.php:427
+#: WorkOrderReceive.php:457 WorkOrderReceive.php:494 WorkOrderReceive.php:509
+#: WorkOrderReceive.php:519 WorkOrderReceive.php:538 WorkOrderReceive.php:565
+#: WorkOrderReceive.php:580 WorkOrderReceive.php:600 WorkOrderReceive.php:634
+#: WorkOrderReceive.php:654 WorkOrderReceive.php:664
+#: includes/SQL_CommonFunctions.inc:24 includes/SQL_CommonFunctions.inc:31
+#: includes/SQL_CommonFunctions.inc:184 includes/SQL_CommonFunctions.inc:203
msgid "NOTE DOWN THIS ERROR AND SEEK ASSISTANCE"
msgstr "POZNÁMKA DOWN tuto chybu a požádat o pomoc"
@@ -3886,8 +3889,8 @@
#: ConfirmDispatch_Invoice.php:956 ContractCosting.php:331
#: CounterSales.php:1346 Credit_Invoice.php:676 GoodsReceived.php:486
-#: ReverseGRN.php:220 SelectCreditItems.php:1387 StockTransfers.php:422
-#: StockTransfers.php:431 WorkOrderIssue.php:161 WorkOrderReceive.php:321
+#: ReverseGRN.php:220 SelectCreditItems.php:1387 StockTransfers.php:423
+#: StockTransfers.php:432 WorkOrderIssue.php:161 WorkOrderReceive.php:321
#: WorkOrderReceive.php:428
msgid "The following SQL to update the location stock record was used"
msgstr "Následující SQL aktualizovat umístění skladové evidenci byl používán"
@@ -3913,8 +3916,8 @@
#: ConfirmDispatch_Invoice.php:1021 CounterSales.php:1413
#: CustomerInquiry.php:200 CustomerTransInquiry.php:105
-#: DeliveryDetails.php:596 DeliveryDetails.php:602 DeliveryDetails.php:609
-#: DeliveryDetails.php:790 MRPReport.php:412 PDFOrdersInvoiced.php:304
+#: DeliveryDetails.php:593 DeliveryDetails.php:599 DeliveryDetails.php:606
+#: DeliveryDetails.php:792 MRPReport.php:412 PDFOrdersInvoiced.php:304
#: PDFOrderStatus.php:274 SelectCompletedOrder.php:600 SelectContract.php:149
#: SelectOrderItems.php:702 SelectProduct.php:386 Shipments.php:399
#: Shipments.php:486 SuppCreditGRNs.php:174 SuppInvGRNs.php:302
@@ -3929,7 +3932,7 @@
msgstr "Sklad pohyb záznamy pro montáž komponent"
#: ConfirmDispatch_Invoice.php:1027 CounterSales.php:1419
-#: Credit_Invoice.php:787 SelectCreditItems.php:1460 ShipmentCosting.php:393
+#: Credit_Invoice.php:787 SelectCreditItems.php:1460 ShipmentCosting.php:397
#: SupplierAllocations.php:139 includes/PDFPaymentRun_PymtFooter.php:57
#: includes/PDFPaymentRun_PymtFooter.php:88
#: includes/PDFPaymentRun_PymtFooter.php:117
@@ -3996,7 +3999,7 @@
#: ConfirmDispatch_Invoice.php:1158 Credit_Invoice.php:902
#: Credit_Invoice.php:912 SelectCreditItems.php:1350 StockAdjustments.php:208
#: StockAdjustments.php:226 StockLocTransferReceive.php:136
-#: StockTransfers.php:264 StockTransfers.php:377
+#: StockTransfers.php:265 StockTransfers.php:378
msgid "The serial stock item record could not be updated because"
msgstr "Pořadové skladová položka záznamu nelze aktualizovat, protože"
@@ -4005,15 +4008,15 @@
#: SelectCreditItems.php:1575 StockAdjustments.php:209
#: StockAdjustments.php:227 StockLocTransferReceive.php:137
#: StockLocTransferReceive.php:151 StockLocTransferReceive.php:251
-#: StockLocTransferReceive.php:265 StockTransfers.php:265
-#: StockTransfers.php:378
+#: StockLocTransferReceive.php:265 StockTransfers.php:266
+#: StockTransfers.php:379
msgid "The following SQL to update the serial stock item record was used"
msgstr "Následující SQL aktualizovat sériové skladě záznam byl použit"
#: ConfirmDispatch_Invoice.php:1173 Credit_Invoice.php:927
#: GoodsReceived.php:580 SelectCreditItems.php:1365 StockAdjustments.php:242
#: StockLocTransferReceive.php:169 StockLocTransferReceive.php:281
-#: StockTransfers.php:300 StockTransfers.php:409 WorkOrderIssue.php:228
+#: StockTransfers.php:301 StockTransfers.php:410 WorkOrderIssue.php:228
#: WorkOrderIssue.php:283 WorkOrderReceive.php:509 WorkOrderReceive.php:580
msgid "The serial stock movement record could not be inserted because"
msgstr "Sériové fotografie hnutí záznam nemůže být vložen, protože"
@@ -4021,7 +4024,7 @@
#: ConfirmDispatch_Invoice.php:1174 Credit_Invoice.php:928
#: GoodsReceived.php:581 StockAdjustments.php:243
#: StockLocTransferReceive.php:170 StockLocTransferReceive.php:282
-#: StockTransfers.php:301 StockTransfers.php:410 WorkOrderIssue.php:229
+#: StockTransfers.php:302 StockTransfers.php:411 WorkOrderIssue.php:229
#: WorkOrderIssue.php:284 WorkOrderReceive.php:510 WorkOrderReceive.php:581
msgid "The following SQL to insert the serial stock movement records was used"
msgstr "Následující SQL vložit sériové záznamy, pohyb zásob byla použita"
@@ -4133,8 +4136,8 @@
msgstr "Dlouhodobého majetku transakce nemůže být vložen, protože"
#: ConfirmDispatch_Invoice.php:1510 GoodsReceived.php:619 ReverseGRN.php:176
-#: SupplierCredit.php:1232 SupplierCredit.php:1320 SupplierInvoice.php:1284
-#: SupplierInvoice.php:1371
+#: SupplierCredit.php:1232 SupplierCredit.php:1320 SupplierInvoice.php:1383
+#: SupplierInvoice.php:1470
msgid "The following SQL to insert the fixed asset transaction record was used"
msgstr "Následující SQL vložit stálých aktiv transakce záznam byl použit"
@@ -4180,8 +4183,8 @@
#: ConfirmDispatch_Invoice.php:1616 ConfirmDispatch_Invoice.php:1618
#: ContractBOM.php:293 CounterSales.php:1984 CounterSales.php:1986
-#: CustomerReceipt.php:547 DeliveryDetails.php:577 DeliveryDetails.php:581
-#: DeliveryDetails.php:779 DeliveryDetails.php:782 GLBalanceSheet.php:18
+#: CustomerReceipt.php:547 DeliveryDetails.php:574 DeliveryDetails.php:578
+#: DeliveryDetails.php:781 DeliveryDetails.php:784 GLBalanceSheet.php:18
#: GLProfit_Loss.php:22 GLTagProfit_Loss.php:22 GLTagProfit_Loss.php:519
#: GLTags.php:51 GLTransInquiry.php:36 PDFStockLocTransfer.php:28
#: PO_OrderDetails.php:115 PO_PDFPurchOrder.php:367 PO_PDFPurchOrder.php:370
@@ -4257,7 +4260,7 @@
"snad prohlížeč nepodporuje META Aktualizovat"
#: ContractBOM.php:39 ContractOtherReqts.php:43 Contracts.php:85
-#: Contracts.php:94 DeliveryDetails.php:260 DeliveryDetails.php:269
+#: Contracts.php:94 DeliveryDetails.php:259 DeliveryDetails.php:268
#: EmailCustTrans.php:22 EmailCustTrans.php:26 GLAccountCSV.php:261
#: PO_Header.php:245 POReport.php:1486 SalesAnalysis_UserDefined.php:46
#: SelectOrderItems.php:1187 StockQties_csv.php:43 StockUsage.php:21
@@ -4270,7 +4273,7 @@
msgstr "klikněte zde"
#: ContractBOM.php:39 ContractOtherReqts.php:43 Contracts.php:85
-#: Contracts.php:94 DeliveryDetails.php:260 DeliveryDetails.php:269
+#: Contracts.php:94 DeliveryDetails.php:259 DeliveryDetails.php:268
#: PO_Header.php:245 SalesAnalysis_UserDefined.php:46
#: SelectOrderItems.php:1187 StockUsage.php:21 SupplierCredit.php:210
#: SupplierCredit.php:221 SupplierCredit.php:233 SupplierCredit.php:243
@@ -4443,7 +4446,7 @@
#: ContractCosting.php:58 ContractCosting.php:66 Contracts.php:187
#: Contracts.php:748 Contracts.php:821 EDIProcessOrders.php:373
-#: SuppContractChgs.php:78 SupplierCredit.php:419 SupplierInvoice.php:407
+#: SuppContractChgs.php:78 SupplierCredit.php:419 SupplierInvoice.php:411
msgid "Contract"
msgstr "Smlouvy"
@@ -4472,7 +4475,7 @@
msgstr "Inventury"
#: ContractCosting.php:82 ContractCosting.php:88 Contracts.php:962
-#: CounterSales.php:743 DeliveryDetails.php:826 DeliveryDetails.php:892
+#: CounterSales.php:743 DeliveryDetails.php:828 DeliveryDetails.php:898
#: OrderDetails.php:165 PO_Items.php:765 PrintCustTrans.php:863
#: PrintCustTrans.php:952 PrintCustTrans.php:1001
#: PrintCustTransPortrait.php:910 PrintCustTransPortrait.php:1008
@@ -4509,10 +4512,10 @@
#: ContractCosting.php:171 OffersReceived.php:103 PO_AuthoriseMyOrders.php:59
#: PO_SelectOSPurchOrder.php:488 PO_SelectPurchOrder.php:431 PurchData.php:164
#: ReprintGRN.php:78 SelectProduct.php:349 SelectSupplier.php:143
-#: ShipmentCosting.php:531 ShipmentCosting.php:608 Shipt_Select.php:293
+#: ShipmentCosting.php:535 ShipmentCosting.php:612 Shipt_Select.php:293
#: ShiptsList.php:11 SuppCreditGRNs.php:269 SupplierAllocations.php:566
#: SupplierAllocations.php:641 SupplierCredit.php:262 SupplierInquiry.php:118
-#: SupplierInvoice.php:232 SupplierTransInquiry.php:104 SuppLoginSetup.php:33
+#: SupplierInvoice.php:233 SupplierTransInquiry.php:104 SuppLoginSetup.php:33
#: SuppPriceList.php:205 SuppPriceList.php:276
#: includes/PDFAgedSuppliersPageHeader.inc:34
#: includes/PDFPaymentRunPageHeader.inc:39
@@ -4571,7 +4574,7 @@
#: ContractCosting.php:330 GoodsReceived.php:485
#: PDFStockCheckComparison.php:127 ReverseGRN.php:219 StockAdjustments.php:255
#: StockLocTransferReceive.php:293 StockLocTransferReceive.php:302
-#: StockTransfers.php:421 StockTransfers.php:430 WorkOrderIssue.php:160
+#: StockTransfers.php:422 StockTransfers.php:431 WorkOrderIssue.php:160
#: WorkOrderReceive.php:427
msgid "The location stock record could not be updated because"
msgstr "Umístění skladové evidenci nelze aktualizovat, protože"
@@ -4723,8 +4726,8 @@
msgstr ""
"Měli byste být automaticky předána na vstup smlouvy stránku řádkové položky"
-#: Contracts.php:85 Contracts.php:93 Customers.php:265 DeliveryDetails.php:260
-#: DeliveryDetails.php:269 EmailCustTrans.php:22 PO_Header.php:244
+#: Contracts.php:85 Contracts.php:93 Customers.php:265 DeliveryDetails.php:259
+#: DeliveryDetails.php:268 EmailCustTrans.php:22 PO_Header.php:244
#: SalesAnalysis_UserDefined.php:46 StockUsage.php:20 SupplierCredit.php:210
#: SupplierCredit.php:221 SupplierCredit.php:233 SupplierCredit.php:243
#: SupplierCredit.php:253 SupplierInvoice.php:189 SupplierInvoice.php:198
@@ -4733,8 +4736,8 @@
msgid "If this does not happen"
msgstr "Pokud se tak nestane"
-#: Contracts.php:85 Contracts.php:93 Customers.php:265 DeliveryDetails.php:260
-#: DeliveryDetails.php:269 EmailCustTrans.php:22 PO_Header.php:244
+#: Contracts.php:85 Contracts.php:93 Customers.php:265 DeliveryDetails.php:259
+#: DeliveryDetails.php:268 EmailCustTrans.php:22 PO_Header.php:244
#: SelectOrderItems.php:1186 StockUsage.php:20 SupplierCredit.php:210
#: SupplierCredit.php:221 SupplierCredit.php:233 SupplierCredit.php:243
#: SupplierCredit.php:253 SupplierInvoice.php:189 SupplierInvoice.php:198
@@ -4953,8 +4956,8 @@
#: Contracts.php:490 Factors.php:80 Stocks.php:560 SupplierCredit.php:759
#: SupplierCredit.php:818 SupplierCredit.php:1206 SupplierCredit.php:1260
-#: SupplierCredit.php:1288 SupplierInvoice.php:756 SupplierInvoice.php:814
-#: SupplierInvoice.php:1256 SupplierInvoice.php:1311 SupplierInvoice.php:1340
+#: SupplierCredit.php:1288 SupplierInvoice.php:762 SupplierInvoice.php:820
+#: SupplierInvoice.php:1185 SupplierInvoice.php:1410 SupplierInvoice.php:1439
#: Suppliers.php:562 Z_ImportStocks.php:245
msgid "could not be added because"
msgstr "nelze přidat, protože"
@@ -5015,7 +5018,7 @@
"Zákazník Pobočka Kód byl použit v preferenci k zákazníkovi pobočky telefonní "
"číslo zadané"
-#: Contracts.php:608 SelectOrderItems.php:302
+#: Contracts.php:608 SelectOrderItems.php:303
msgid ""
"At least one Customer Branch Name keyword OR an extract of a Customer Branch "
"Code or Branch Phone Number must be entered for the search"
@@ -5167,8 +5170,8 @@
#: Contracts.php:845 InventoryQuantities.php:235 PDFPriceList.php:358
#: PDFPrintLabel.php:98 PricesByCost.php:241 ReorderLevelLocation.php:184
-#: ReorderLevel.php:254 SalesCategoryPeriodInquiry.php:162
-#: SalesTopItemsInquiry.php:219 SpecialOrder.php:686 StockDispatch.php:363
+#: ReorderLevel.php:254 SalesCategoryPeriodInquiry.php:161
+#: SalesTo...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-22 09:44:49
|
Revision: 4786
http://web-erp.svn.sourceforge.net/web-erp/?rev=4786&view=rev
Author: daintree
Date: 2011-12-22 09:44:35 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/doc/Manual/ManualShipments.html
trunk/includes/ConnectDB.inc
trunk/install/save.php
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
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/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.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_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.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/upgrade4.05-4.06.sql
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/ShipmentCosting.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -45,25 +45,28 @@
}
$HeaderData = DB_fetch_array($GetShiptHdrResult);
-echo '<br />';
-echo '<table class="selection">';
-echo '<tr><th colspan="4"><font size="3" color="navy">'._('Shipment Details').'</font></th></tr>';
-echo '<tr>
+echo '<br />
+ <table class="selection">
+ <tr>
+ <th colspan="4"><font size="3" color="navy">'._('Shipment Details').'</font></th>
+ </tr>
+ <tr>
<td><b>'. _('Shipment') .': </td>
<td><b>' . $_GET['SelectedShipment'] . '</b></td>
<td><b>'. _('From').' ' . $HeaderData['suppname'] . '</b></td>
- </tr>';
+ </tr>
+ <tr>
+ <td>' . _('Vessel'). ': </td>
+ <td>' . $HeaderData['vessel'] . '</td>
+ <td>'. _('Voyage Ref'). ': </td>
+ <td>' . $HeaderData['voyageref'] . '</td>
+ </tr>
+ <tr>
+ <td>' . _('Expected Arrival Date (ETA)') . ': </td>
+ <td>' . ConvertSQLDate($HeaderData['eta']) . '</td>
+ </tr>
+ </table>';
-echo '<tr><td>' . _('Vessel'). ': </td>
- <td>' . $HeaderData['vessel'] . '</td>
- <td>'. _('Voyage Ref'). ': </td>
- <td>' . $HeaderData['voyageref'] . '</td></tr>';
-
-echo '<tr><td>' . _('Expected Arrival Date (ETA)') . ': </td>
- <td>' . ConvertSQLDate($HeaderData['eta']) . '</td></tr>';
-
-echo '</table>';
-
/*Get the total non-stock item shipment charges */
$sql = "SELECT SUM(value)
@@ -75,7 +78,7 @@
$GetShiptCostsResult = DB_query($sql,$db, $ErrMsg);
if (DB_num_rows($GetShiptCostsResult)==0) {
echo '<br />';
- prnMsg ( _('No General Cost Records exist for Shipment') . ' ' . $_GET['SelectedShipment'] . ' ' . _('in the database'), 'error');
+ prnMsg (_('No General Cost Records exist for Shipment') . ' ' . $_GET['SelectedShipment'] . ' ' . _('in the database'), 'error');
include ('includes/footer.inc');
exit;
}
@@ -122,12 +125,12 @@
if (isset($_POST['Close'])){
while ($myrow=DB_fetch_array($LineItemsResult)){
- if ($myrow['totqtyinvoiced'] < $myrow['totqtyrecd']){
- prnMsg(_('Cannot close a shipment where the quantity received is more than the quantity invoiced. Check the item') . ' ' . $myrow['itemcode'] . ' - ' . $myrow['itemdescription'],'warn');
- unset($_POST['Close']);
- }
- }
- DB_data_seek($LineItemsResult,0);
+ if ($myrow['totqtyinvoiced'] < $myrow['totqtyrecd']){
+ prnMsg(_('Cannot close a shipment where the quantity received is more than the quantity invoiced. Check the item') . ' ' . $myrow['itemcode'] . ' - ' . $myrow['itemdescription'],'warn');
+ unset($_POST['Close']);
+ }
+ }
+ DB_data_seek($LineItemsResult,0);
}
@@ -138,7 +141,8 @@
}
echo '<br /><table cellpadding="2" colspan="7" class="selection">';
- echo '<tr><th colspan=9><font color=navy size=3>' . _('Items on shipment'). '</font></th></tr>';
+ echo '<tr>
+ <th colspan="9"><font color="navy" size="3">' . _('Items on shipment'). '</font></th></tr>';
$TableHeader = '<tr>
<th>'. _('Item'). '</th>
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/Shipments.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -195,13 +195,13 @@
prnMsg(_('Cannot add purchase order lines to the shipment unless the shipment is first initiated - hit update to setup the shipment first'),'info');
$InputError = 1;
}
-
+ if ($InputError==0){
+ $_SESSION['Shipment']->Vessel = $_POST['Vessel'];
+ $_SESSION['Shipment']->VoyageRef = $_POST['VoyageRef'];
+ }
/*The user hit the update the shipment button and there are some lines on the shipment*/
if ($InputError == 0 AND (count($_SESSION['Shipment']->LineItems) > 0 OR isset($_GET['Add']))){
- $_SESSION['Shipment']->Vessel = $_POST['Vessel'];
- $_SESSION['Shipment']->VoyageRef = $_POST['VoyageRef'];
-
$sql = "SELECT shiptref FROM shipments WHERE shiptref =" . $_SESSION['Shipment']->ShiptRef;
$result = DB_query($sql,$db);
if (DB_num_rows($result)==1){
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/UpgradeDatabase.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -126,8 +126,9 @@
case '4.05.3':
case '4.06':
case '4.06.1':
+ case '4.06.2':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.2':
+ case '4.06.3':
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/doc/Change.log 2011-12-22 09:44:35 UTC (rev 4786)
@@ -1,5 +1,9 @@
webERP Change Log
+22/12/11 Release 4.06.3
+
+22/12/11 Phil: Fix to install/save.php to use mysqli_connect_error to report the connection error
+22/12/11 Phil: Shipments.php was not retaining vessel and voyage
20/12/11 Phil: StockLocTransfer.php can now import a csv of items to transfer and each line can be checked to remove if required,
20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
Modified: trunk/doc/Manual/ManualShipments.html
===================================================================
--- trunk/doc/Manual/ManualShipments.html 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/doc/Manual/ManualShipments.html 2011-12-22 09:44:35 UTC (rev 4786)
@@ -6,8 +6,10 @@
<br /><br />
The shipment costing system is meant for use in situations where there are substantial freight costs on purchased products and the business wishes to keep track of the actual cost of these items. Many smaller businesses do these calculations on spreadsheets outside the integrated system. The advantage of bringing them inside the system is that the possibility for updating standards and calculation of variances from standard at the time the costing is completed.
<br /><br />
-Having selected a supplier the system allows outstanding purchase order items to be collated into a shipment of goods arriving altogether, the shipment is allocated a shipment number. By changing the expected time of arrival of the shipment (ETA) the delivery date of all purchase order lines on the shipment will be updated. The costs associated with landing and clearing this bundle of products can be entered against it from purchase invoice entry. Most likely there will be many different supplier/vendor providing services to get the goods from the supplier's warehouse to the business's warehouse. Any number of different supplier's/vendor's charges can be entered against the shipment costing. Freight charges and cartage from the wharf, airfreight, unpacking, demurrage etc can be entered as costs of the shipment. These charges are entered by clicking the shipment charges button on the supplier invoice entry screen. Where a supplier provides freight services, it is possible that the supplier invoice has charges for many different shipments, the supplier invoice entry allows for the invoice to be split between any number of shipments. The shipment costing inquiry will show these costs allocated against all of the items on the shipment, using the invoiced value of the items as the basis for apportionment. The actual shipment cost will show together with the existing standard cost and the variance.
+Having selected a supplier the system allows outstanding purchase order items to be collated into a shipment of goods arriving altogether, the shipment is allocated a shipment number. As a convenience to changing all the individual purchase orders allocated to the shipment, by changing the expected time of arrival of the shipment (ETA) the delivery date of all purchase order lines on the shipment will be updated.
<br /><br />
+The costs associated with landing and clearing this bundle of products can be entered against it from purchase invoice entry. Most likely there will be many different supplier/vendor providing services to get the goods from the supplier's warehouse to the business's warehouse. Any number of different supplier's/vendor's charges can be entered against the shipment costing. Freight charges and cartage from the wharf, airfreight, unpacking, demurrage etc can be entered as costs of the shipment. These charges are entered by clicking the shipment charges button on the supplier invoice entry screen. Where a supplier provides freight services, it is possible that the supplier invoice has charges for many different shipments, the supplier invoice entry allows for the invoice to be split between any number of shipments. The shipment costing inquiry will show these costs allocated against all of the items on the shipment, using the invoiced value of the items as the basis for apportionment. The actual shipment cost will show together with the existing standard cost and the variance.
+<br /><br />
<font size="+1"><b>Shipment General Ledger Posting</b></font>
<br /><br />
Shipment charges are posted to the GRN suspense account at the time of entry of the purchase invoice. When the shipment is closed the costs of the shipment are compared against the standard cost of the shipment items taken into stock and the difference that was left in the GRN suspense account is taken to purchase variances.
@@ -16,18 +18,16 @@
<br /><br />
<font size="+1"><b>Creating Shipments</b></font>
<br /><br />
-After selecting the supplier from which the product has been sourced and having entered the purchase order(s) to initiate the transaction, from the select supplier menu, choose the link "Set up a New Shipment". Each time this page is called the system increments a shipment reference and shows the shipment number that will be used. The shipment page that shows allows, the details of the shipment to be entered.
+The purchase order(s) must already be created. The shipment must be created before the goods are received - as the process of receiving them flags the Goods Received as received against the shipment. After selecting the supplier from which the product has been sourced and having entered the purchase order(s) to initiate the transaction, from the select supplier menu, choose the link "Set up a New Shipment". Each time this page is called the system increments a shipment reference and shows the shipment number that will be used. The shipment page allows the details of the shipment to be entered.
<br /><br />
<ul>
<li>The name of the vessel on which the product has been loaded
<li>The voyage reference - this could refer to the HAWB in the case of airfreight
</ul>
-The above are not required if deemed unnecessary, but serve as a useful reference for following and tracking where product is currently and monitoring ETA through the shipping company who will need these details.
+The above fields are required and serve as a useful reference for following and tracking where product is currently and monitoring ETA through the shipping company who will need these details.
<br /><br />
In addition to the above details the Expected Time of Arrival (ETA) is required to be entered.
<br /><br />
-It is important to hit the "Update Shipment Details" button after this data is entered. As clicking one of the add links will lose this information just entered otherwise.
-<br /><br />
When the shipment entry screen is first displayed there is facility to select the inventory location where the purchase order has been requested to arrive. By default the user's default inventory location will be used, but once the inputs above are entered the location can be changed and a click on the "Update" button will then show all the purchase order items defined to arrive at the new location.
<br /><br />
Once a purchase order item has been selected to be part of the shipment the shipment entry screen will only allow other purchase order items that are also to be delivered to the same location. The location will be displayed on screen for informational purposes only.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/includes/ConnectDB.inc 2011-12-22 09:44:35 UTC (rev 4786)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.06.2'; //must update manually every time there is a DB change
+$Version='4.06.3'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/install/save.php
===================================================================
--- trunk/install/save.php 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/install/save.php 2011-12-22 09:44:35 UTC (rev 4786)
@@ -325,7 +325,7 @@
$db = mysqli_connect($_POST['database_host'], $_POST['database_username'], $_POST['database_password']);
if (!$db){
- set_error('Database host name, username and/or password incorrect. MySQL Error:<br />'. mysqli_error());
+ set_error('Database host name, username and/or password incorrect. MySQL Error:<br />'. mysqli_connect_error());
}
if($_POST['install_tables'] == true){
@@ -339,7 +339,7 @@
$SQLScriptFile = file($path_to_root . '/sql/mysql/weberp-new.sql');
}
mysqli_query($db, 'CREATE DATABASE IF NOT EXISTS `' . mysqli_real_escape_string($db, $_POST['company_name']) . '`');
- mysqli_select_db($db, $_POST['company_name']);
+ mysqli_select_db($db, $_POST['company_name']);
$ScriptFileEntries = sizeof($SQLScriptFile);
$SQL ='';
$InAFunction = false;
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-20 07:19:02 UTC (rev 4785)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-22 09:44:35 UTC (rev 4786)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-10 09:04+1300\n"
+"POT-Creation-Date: 2011-12-22 22:36+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -271,7 +271,7 @@
#: CompanyPreferences.php:506 CompanyPreferences.php:508
#: ContractCosting.php:198 CustomerBranches.php:410 Customers.php:593
#: Customers.php:941 Customers.php:950 Customers.php:953
-#: DeliveryDetails.php:1079 DeliveryDetails.php:1118 DeliveryDetails.php:1121
+#: DeliveryDetails.php:1071 DeliveryDetails.php:1114 DeliveryDetails.php:1117
#: GLTransInquiry.php:69 MRPCalendar.php:224 MRP.php:529 MRP.php:533
#: MRP.php:537 MRP.php:541 PaymentMethods.php:197 PaymentMethods.php:198
#: PaymentMethods.php:199 PaymentMethods.php:262 PaymentMethods.php:268
@@ -285,7 +285,7 @@
#: SalesAnalReptCols.php:422 SalesAnalRepts.php:415 SalesAnalRepts.php:418
#: SalesAnalRepts.php:443 SalesAnalRepts.php:446 SalesAnalRepts.php:471
#: SalesAnalRepts.php:474 SalesPeople.php:219 SalesPeople.php:355
-#: SalesPeople.php:357 SelectProduct.php:381 ShipmentCosting.php:663
+#: SalesPeople.php:357 SelectProduct.php:381 ShipmentCosting.php:667
#: Stocks.php:1015 Stocks.php:1017 Stocks.php:1040 Stocks.php:1042
#: SuppContractChgs.php:90 SystemParameters.php:389 SystemParameters.php:412
#: SystemParameters.php:428 SystemParameters.php:491 SystemParameters.php:499
@@ -306,7 +306,7 @@
#: CompanyPreferences.php:505 CompanyPreferences.php:509
#: ContractCosting.php:196 CustomerBranches.php:410 Customers.php:592
#: Customers.php:936 Customers.php:949 Customers.php:952
-#: DeliveryDetails.php:1080 DeliveryDetails.php:1119 DeliveryDetails.php:1122
+#: DeliveryDetails.php:1072 DeliveryDetails.php:1115 DeliveryDetails.php:1118
#: GLTransInquiry.php:86 MRPCalendar.php:226 MRP.php:527 MRP.php:531
#: MRP.php:535 MRP.php:539 PaymentMethods.php:197 PaymentMethods.php:198
#: PaymentMethods.php:199 PaymentMethods.php:263 PaymentMethods.php:269
@@ -320,7 +320,7 @@
#: SalesAnalReptCols.php:423 SalesAnalRepts.php:414 SalesAnalRepts.php:417
#: SalesAnalRepts.php:442 SalesAnalRepts.php:445 SalesAnalRepts.php:470
#: SalesAnalRepts.php:473 SalesPeople.php:221 SalesPeople.php:360
-#: SalesPeople.php:362 SelectProduct.php:383 ShipmentCosting.php:664
+#: SalesPeople.php:362 SelectProduct.php:383 ShipmentCosting.php:668
#: Stocks.php:1010 Stocks.php:1012 Stocks.php:1035 Stocks.php:1037
#: SuppContractChgs.php:92 SystemParameters.php:390 SystemParameters.php:413
#: SystemParameters.php:429 SystemParameters.php:492 SystemParameters.php:500
@@ -386,13 +386,13 @@
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398
#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
-#: StockCategories.php:243 StockCategories.php:557 SuppContractChgs.php:99
-#: SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:147
-#: SupplierContacts.php:164 SupplierTypes.php:191 SuppShiptChgs.php:90
-#: SuppTransGLAnalysis.php:121 TaxAuthorities.php:175 TaxCategories.php:183
-#: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186
-#: WorkCentres.php:142 WOSerialNos.php:320 WWW_Access.php:124
-#: WWW_Users.php:319 includes/InputSerialItemsKeyed.php:58
+#: StockCategories.php:243 StockCategories.php:557 StockLocTransfer.php:301
+#: SuppContractChgs.php:99 SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87
+#: SuppInvGRNs.php:147 SupplierContacts.php:164 SupplierTypes.php:191
+#: SuppShiptChgs.php:90 SuppTransGLAnalysis.php:121 TaxAuthorities.php:175
+#: TaxCategories.php:183 TaxGroups.php:189 TaxProvinces.php:181
+#: UnitsOfMeasure.php:186 WorkCentres.php:142 WOSerialNos.php:320
+#: WWW_Access.php:124 WWW_Users.php:319 includes/InputSerialItemsKeyed.php:58
#: includes/OutputSerialItems.php:99
#, php-format
msgid "Delete"
@@ -558,7 +558,7 @@
#: AddCustomerContacts.php:61 AddCustomerNotes.php:52
#: AddCustomerTypeNotes.php:49 Areas.php:73 CustomerTypes.php:69
-#: DeliveryDetails.php:774 Factors.php:105 FixedAssetItems.php:246
+#: DeliveryDetails.php:776 Factors.php:105 FixedAssetItems.php:246
#: MRPCalendar.php:176 PcAssignCashToTab.php:88 PcClaimExpensesFromTab.php:79
#: PcExpenses.php:95 PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:371
#: SalesAnalReptCols.php:129 SalesPeople.php:97 SalesTypes.php:66
@@ -685,7 +685,7 @@
#: PaymentAllocations.php:66 PcAssignCashToTab.php:220
#: PcAuthorizeExpenses.php:88 PDFRemittanceAdvice.php:300
#: PrintCustTrans.php:822 PrintCustTransPortrait.php:867 ReverseGRN.php:386
-#: ShipmentCosting.php:534 ShipmentCosting.php:611 Shipments.php:491
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:491
#: StockDispatch.php:189 StockDispatch.php:201 StockLocMovements.php:90
#: StockMovements.php:94 StockSerialItemResearch.php:81
#: SupplierAllocations.php:455 SupplierAllocations.php:568
@@ -699,10 +699,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: Stocks.php:1019 UpgradeDatabase.php:176 UpgradeDatabase.php:179
-#: UpgradeDatabase.php:182 UpgradeDatabase.php:185 UpgradeDatabase.php:188
-#: UpgradeDatabase.php:191 UpgradeDatabase.php:194 UpgradeDatabase.php:197
-#: UpgradeDatabase.php:200 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:181 UpgradeDatabase.php:184
+#: UpgradeDatabase.php:187 UpgradeDatabase.php:190 UpgradeDatabase.php:193
+#: UpgradeDatabase.php:196 UpgradeDatabase.php:199 UpgradeDatabase.php:202
+#: UpgradeDatabase.php:205 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
@@ -891,7 +891,7 @@
#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1365
#: CounterSales.php:1379 Credit_Invoice.php:697 Credit_Invoice.php:718
#: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709
-#: CustomerTransInquiry.php:91 DeliveryDetails.php:396 GLProfit_Loss.php:596
+#: CustomerTransInquiry.php:91 DeliveryDetails.php:393 GLProfit_Loss.php:596
#: GLTagProfit_Loss.php:511 Payments.php:334 PDFRemittanceAdvice.php:85
#: PurchData.php:86 PurchData.php:104 PurchData.php:245
#: RecurringSalesOrders.php:256 ReverseGRN.php:191 ReverseGRN.php:205
@@ -899,7 +899,7 @@
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
-#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
+#: StockTransfers.php:192 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
#: SuppPaymentRun.php:188 SuppPaymentRun.php:219 WorkOrderCosting.php:418
@@ -1158,7 +1158,7 @@
#: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298
#: CounterSales.php:2157 CounterSales.php:2160 CustomerTransInquiry.php:31
-#: DailySalesInquiry.php:47 DailySalesInquiry.php:49 FixedAssetRegister.php:56
+#: DailySalesInquiry.php:48 DailySalesInquiry.php:50 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:167
#: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585
#: MRPReport.php:523 MRPReport.php:525 MRPReschedules.php:144
@@ -1208,7 +1208,7 @@
#: CustWhereAlloc.php:18 CustWhereAlloc.php:105 DailyBankTransactions.php:112
#: GLAccountInquiry.php:150 GLAccountReport.php:336 GLJournal.php:262
#: MRPReschedules.php:191 SalesByTypePeriodInquiry.php:334
-#: SelectCustomer.php:416 ShipmentCosting.php:532 ShipmentCosting.php:609
+#: SelectCustomer.php:416 ShipmentCosting.php:536 ShipmentCosting.php:613
#: StockCategories.php:217 StockLocMovements.php:88 StockMovements.php:92
#: SupplierAllocations.php:453 SupplierInquiry.php:207
#: SupplierTransInquiry.php:19 SupplierTransInquiry.php:100
@@ -1411,7 +1411,7 @@
#: PO_Header.php:558 PO_SelectOSPurchOrder.php:489 PO_SelectPurchOrder.php:432
#: PricesByCost.php:274 Prices.php:222 Prices.php:295 PurchData.php:169
#: PurchData.php:352 PurchData.php:481 SelectSupplier.php:260
-#: SupplierCredit.php:263 SupplierInvoice.php:233 SupplierTransInquiry.php:109
+#: SupplierCredit.php:263 SupplierInvoice.php:234 SupplierTransInquiry.php:109
#: SuppPriceList.php:284 includes/PDFBankingSummaryPageHeader.inc:42
#: includes/PDFDebtorBalsPageHeader.inc:33
#: includes/PDFSupplierBalsPageHeader.inc:36
@@ -1542,7 +1542,7 @@
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
-#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
+#: StockTransfers.php:437 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
#: includes/PDFDeliveryDifferencesPageHeader.inc:19
@@ -1636,7 +1636,7 @@
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:261 ShipmentCosting.php:533 ShipmentCosting.php:610
+#: BankMatching.php:261 ShipmentCosting.php:537 ShipmentCosting.php:614
#: SupplierAllocations.php:456
msgid "Ref"
msgstr "Ref"
@@ -1652,8 +1652,8 @@
#: SuppContractChgs.php:79 SuppContractChgs.php:163 SuppFixedAssetChgs.php:76
#: SuppFixedAssetChgs.php:149 SupplierAllocations.php:457
#: SupplierCredit.php:352 SupplierCredit.php:385 SupplierCredit.php:421
-#: SupplierCredit.php:460 SupplierInvoice.php:328 SupplierInvoice.php:369
-#: SupplierInvoice.php:409 SupplierInvoice.php:453
+#: SupplierCredit.php:460 SupplierInvoice.php:332 SupplierInvoice.php:373
+#: SupplierInvoice.php:413 SupplierInvoice.php:457
#: SupplierTransInquiry.php:108 SuppShiptChgs.php:81 SuppShiptChgs.php:146
#: SuppTransGLAnalysis.php:106 SuppTransGLAnalysis.php:191
#: Z_CheckAllocs.php:66 includes/PDFBankingSummaryPageHeader.inc:55
@@ -1919,7 +1919,7 @@
#: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:94
#: Contracts.php:961 Contracts.php:997 CounterSales.php:741
#: CounterSales.php:2036 CounterSales.php:2221 CounterSales.php:2347
-#: Credit_Invoice.php:273 DeliveryDetails.php:825 DeliveryDetails.php:891
+#: Credit_Invoice.php:273 DeliveryDetails.php:827 DeliveryDetails.php:897
#: GoodsReceived.php:100 GoodsReceived.php:104 GoodsReceived.php:107
#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:246
#: MRPDemands.php:294 MRPDemands.php:390 MRPPlannedPurchaseOrders.php:324
@@ -1932,13 +1932,13 @@
#: PrintCustTransPortrait.php:1064 RecurringSalesOrders.php:320
#: ReorderLevel.php:268 ReverseGRN.php:387 ReverseGRN.php:388
#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:188
-#: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:223
+#: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:222
#: SelectCreditItems.php:673 SelectCreditItems.php:1034
#: SelectOrderItems.php:1333 SelectOrderItems.php:1491
-#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
-#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403
+#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:149
+#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
-#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:261
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:276
#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
@@ -2194,7 +2194,7 @@
#: StockLocStatus.php:161 StockQuantityByDate.php:106 SuppCreditGRNs.php:82
#: SuppCreditGRNs.php:176 SuppFixedAssetChgs.php:75 SuppInvGRNs.php:126
#: SuppInvGRNs.php:304 SupplierCredit.php:316 SupplierCredit.php:384
-#: SupplierInvoice.php:288 SupplierInvoice.php:368 SupplierTenders.php:264
+#: SupplierInvoice.php:292 SupplierInvoice.php:372 SupplierTenders.php:264
#: SupplierTenders.php:350 SupplierTenders.php:490 SuppPriceList.php:290
#: TaxAuthorities.php:147 TopItems.php:178 WorkCentres.php:127
#: WorkOrderCosting.php:88 WorkOrderCosting.php:120 WorkOrderEntry.php:623
@@ -2316,10 +2316,10 @@
#: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173
#: StockAdjustments.php:85 StockAdjustments.php:359 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:32 StockReorderLevel.php:46
-#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:458
+#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:459
#: StockUsage.php:64 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667 Z_ChangeStockCategory.php:90
-#: Z_ChangeStockCode.php:313
+#: Z_ChangeStockCode.php:311
msgid "Stock Code"
msgstr "Skladový kód"
@@ -2535,7 +2535,7 @@
msgid "The effective to date field must be a date in the format"
msgstr "Datum účinnosti, musí být zadáno ve formátu"
-#: BOMs.php:236 StockAdjustments.php:109 StockTransfers.php:162
+#: BOMs.php:236 StockAdjustments.php:109 StockTransfers.php:163
#: WorkOrderEntry.php:265
msgid "The quantity entered must be numeric"
msgstr "Množství uvedené musí být číslo"
@@ -3116,7 +3116,7 @@
msgstr "Zpět na Potvrzení o odeslání"
#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1250
-#: DeliveryDetails.php:586 DeliveryDetails.php:786 EmailCustTrans.php:9
+#: DeliveryDetails.php:583 DeliveryDetails.php:788 EmailCustTrans.php:9
#: PaymentAllocations.php:31 SelectSalesOrder.php:830 SelectSalesOrder.php:901
#: SelectSalesOrder.php:928 Z_SalesIntegrityCheck.php:46
#: includes/PDFDeliveryDifferencesPageHeader.inc:40
@@ -3188,7 +3188,7 @@
#: CustomerBranches.php:532 CustomerBranches.php:579 CustomerInquiry.php:126
#: CustomerReceipt.php:899 CustomerReceipt.php:953 CustomerReceipt.php:1101
#: Customers.php:14 Customers.php:325 CustomerTransInquiry.php:101
-#: DeliveryDetails.php:804 FTP_RadioBeacon.php:51 PDFOrdersInvoiced.php:305
+#: DeliveryDetails.php:806 FTP_RadioBeacon.php:51 PDFOrdersInvoiced.php:305
#: PDFOrderStatus.php:275 PricesByCost.php:153 SalesGraph.php:180
#: SelectCompletedOrder.php:601 SelectContract.php:154
#: SelectCreditItems.php:238 SelectCustomer.php:24 SelectCustomer.php:210
@@ -3206,7 +3206,7 @@
msgstr "Zákazník"
#: ConfirmDispatch_Invoice.php:260 CustEDISetup.php:93 Customers.php:440
-#: Customers.php:659 Customers.php:694 DeliveryDetails.php:804
+#: Customers.php:659 Customers.php:694 DeliveryDetails.php:806
#: OrderDetails.php:67 SalesAnalRepts.php:27 SalesAnalRepts.php:29
#: WWW_Users.php:275 WWW_Users.php:498 Z_ChangeBranchCode.php:201
#: includes/PDFStatementPageHeader.inc:112 includes/PDFTransPageHeader.inc:46
@@ -3216,7 +3216,7 @@
#: ConfirmDispatch_Invoice.php:261 CustEDISetup.php:96 CustomerReceipt.php:252
#: CustomerReceipt.php:1128 Customers.php:443 Customers.php:700
-#: Customers.php:730 DeliveryDetails.php:805 OrderDetails.php:69
+#: Customers.php:730 DeliveryDetails.php:807 OrderDetails.php:69
#: POReport.php:494 POReport.php:1268 SalesInquiry.php:754
#: SalesInquiry.php:764 SalesInquiry.php:788 SalesInquiry.php:932
#: SalesInquiry.php:943 SalesInquiry.php:949 SalesInquiry.php:955
@@ -3231,7 +3231,7 @@
#: ConfirmDispatch_Invoice.php:277 ContractBOM.php:235 ContractCosting.php:79
#: ContractCosting.php:85 Contracts.php:959 CounterSales.php:739
-#: CounterSales.php:2346 Credit_Invoice.php:269 DeliveryDetails.php:823
+#: CounterSales.php:2346 Credit_Invoice.php:269 DeliveryDetails.php:825
#: GoodsReceived.php:98 OrderDetails.php:162 PO_Items.php:658
#: PO_OrderDetails.php:146 PrintCustTrans.php:860 PrintCustTrans.php:949
#: PrintCustTrans.php:998 PrintCustTransPortrait.php:907
@@ -3239,11 +3239,11 @@
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:260 StockLocTransferReceive.php:427
+#: StockLocTransfer.php:275 StockLocTransferReceive.php:427
#: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787
#: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175
#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315
-#: SupplierInvoice.php:287 includes/PDFOrderPageHeader_generic.inc:91
+#: SupplierInvoice.php:291 includes/PDFOrderPageHeader_generic.inc:91
#: includes/PDFPickingListHeader.inc:72
#: includes/PDFQuotationPageHeader.inc:101
#: includes/PDFQuotationPortraitPageHeader.inc:101
@@ -3256,7 +3256,7 @@
#: ConfirmDispatch_Invoice.php:278 ContractCosting.php:80
#: ContractCosting.php:86 Contracts.php:960 CounterSales.php:740
-#: Credit_Invoice.php:270 DeliveryDetails.php:824 DeliveryDetails.php:890
+#: Credit_Invoice.php:270 DeliveryDetails.php:826 DeliveryDetails.php:896
#: OrderDetails.php:163 PO_Items.php:733 PO_OrderDetails.php:147
#: PrintCustTrans.php:861 PrintCustTrans.php:950 PrintCustTrans.php:999
#: PrintCustTransPortrait.php:908 PrintCustTransPortrait.php:1006
@@ -3296,7 +3296,7 @@
msgstr "Tato zásilka"
#: ConfirmDispatch_Invoice.php:283 CounterSales.php:744 Credit_Invoice.php:274
-#: DeliveryDetails.php:827 DeliveryDetails.php:893 GoodsReceived.php:111
+#: DeliveryDetails.php:829 DeliveryDetails.php:899 GoodsReceived.php:111
#: OffersReceived.php:107 OffersReceived.php:215 OffersReceived.php:260
#: OrderDetails.php:166 PDFOrdersInvoiced.php:391 PDFPriceList.php:365
#: PDFPrintLabel.php:249 PO_AuthoriseMyOrders.php:116 PricesByCost.php:248
@@ -3317,7 +3317,7 @@
msgstr "Cena"
#: ConfirmDispatch_Invoice.php:284 CounterSales.php:745 Credit_Invoice.php:275
-#: CustomerReceipt.php:898 DeliveryDetails.php:828 OrderDetails.php:167
+#: CustomerReceipt.php:898 DeliveryDetails.php:830 OrderDetails.php:167
#: PrintCustTrans.php:865 PrintCustTrans.php:954 PrintCustTrans.php:1003
#: PrintCustTransPortrait.php:912 PrintCustTransPortrait.php:1010
#: PrintCustTransPortrait.php:1067 RecurringSalesOrders.php:323
@@ -3332,8 +3332,8 @@
#: ConfirmDispatch_Invoice.php:285 ConfirmDispatch_Invoice.php:289
#: CounterSales.php:749 CounterSales.php:836 Credit_Invoice.php:276
#: Credit_Invoice.php:280 CustomerAllocations.php:331
-#: CustomerAllocations.php:364 CustomerInquiry.php:201 DeliveryDetails.php:829
-#: DeliveryDetails.php:894 GLBalanceSheet.php:183 GLBalanceSheet.php:192
+#: CustomerAllocations.php:364 CustomerInquiry.php:201 DeliveryDetails.php:831
+#: DeliveryDetails.php:900 GLBalanceSheet.php:183 GLBalanceSheet.php:192
#: GLBalanceSheet.php:269 GLBalanceSheet.php:278 GLBudgets.php:207
#: GLJournal.php:432 GLTransInquiry.php:182 GLTrialBalance.php:217
#: GLTrialBalance.php:237 GLTrialBalance.php:258 GLTrialBalance.php:354
@@ -3364,7 +3364,7 @@
msgstr "bez DPH"
#: ConfirmDispatch_Invoice.php:286 Credit_Invoice.php:277
-#: SelectCreditItems.php:679 SupplierInvoice.php:235 TaxGroups.php:285
+#: SelectCreditItems.php:679 SupplierInvoice.php:236 TaxGroups.php:285
msgid "Tax Authority"
msgstr "Daňový úřad"
@@ -3415,7 +3415,7 @@
"systém očekává, že námořní společnosti, které budou vybrány, nebo výchozí "
"nákladní společnost mají být použity"
-#: ConfirmDispatch_Invoice.php:450 DeliveryDetails.php:245 Prices.php:355
+#: ConfirmDispatch_Invoice.php:450 DeliveryDetails.php:244 Prices.php:355
#: includes/InputSerialItemsExisting.php:59
#: includes/InputSerialItemsKeyed.php:150
#: includes/InputSerialItemsSequential.php:53
@@ -3423,7 +3423,7 @@
msgid "Enter"
msgstr "Vložit"
-#: ConfirmDispatch_Invoice.php:450 DeliveryDetails.php:245
+#: ConfirmDispatch_Invoice.php:450 DeliveryDetails.php:244
msgid "Amend Freight Companies"
msgstr "Mění se Nákladní Firmy"
@@ -3649,23 +3649,23 @@
#: SelectCreditItems.php:1821 SelectCreditItems.php:1852
#: SelectCreditItems.php:1875 SelectCreditItems.php:1903
#: SelectCreditItems.php:1923 SelectCreditItems.php:1944
-#: ShipmentCosting.php:245 ShipmentCosting.php:290 ShipmentCosting.php:310
-#: ShipmentCosting.php:324 ShipmentCosting.php:370 ShipmentCosting.php:393
-#: ShipmentCosting.php:428 ShipmentCosting.php:447 ShipmentCosting.php:461
+#: ShipmentCosting.php:249 ShipmentCosting.php:294 ShipmentCosting.php:314
+#: ShipmentCosting.php:328 ShipmentCosting.php:374 ShipmentCosting.php:397
+#: ShipmentCosting.php:432 ShipmentCosting.php:451 ShipmentCosting.php:465
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
-#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:148
-#: StockLocTransfer.php:170 StockLocTransfer.php:174
+#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:159
+#: StockLocTransfer.php:183 StockLocTransfer.php:187
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
#: StockLocTransferReceive.php:214 StockLocTransferReceive.php:250
#: StockLocTransferReceive.php:264 StockLocTransferReceive.php:281
#: StockLocTransferReceive.php:293 StockLocTransferReceive.php:302
#: StockLocTransferReceive.php:320 StockLocTransferReceive.php:329
-#: StockLocTransferReceive.php:335 StockTransfers.php:229
-#: StockTransfers.php:264 StockTransfers.php:280 StockTransfers.php:300
-#: StockTransfers.php:343 StockTransfers.php:377 StockTransfers.php:393
-#: StockTransfers.php:409 StockTransfers.php:421 StockTransfers.php:430
+#: StockLocTransferReceive.php:335 StockTransfers.php:230
+#: StockTransfers.php:265 StockTransfers.php:281 StockTransfers.php:301
+#: StockTransfers.php:344 StockTransfers.php:378 StockTransfers.php:394
+#: StockTransfers.php:410 StockTransfers.php:422 StockTransfers.php:431
#: SupplierAllocations.php:117 SupplierAllocations.php:139
#: SupplierAllocations.php:157 SupplierAllocations.php:181
#: SupplierAllocations.php:215 SupplierAllocations.php:236
@@ -3676,28 +3676,30 @@
#: SupplierCredit.php:1092 SupplierCredit.php:1116 SupplierCredit.php:1148
#: SupplierCredit.php:1164 SupplierCredit.php:1177 SupplierCredit.php:1184
#: SupplierCredit.php:1206 SupplierCredit.php:1260 SupplierCredit.php:1288
-#: SupplierInvoice.php:654 SupplierInvoice.php:727 SupplierInvoice.php:755
-#: SupplierInvoice.php:782 SupplierInvoice.php:814 SupplierInvoice.php:847
-#: SupplierInvoice.php:877 SupplierInvoice.php:913 SupplierInvoice.php:994
-#: SupplierInvoice.php:1006 SupplierInvoice.php:1043 SupplierInvoice.php:1080
-#: SupplierInvoice.php:1105 SupplierInvoice.php:1139 SupplierInvoice.php:1165
-#: SupplierInvoice.php:1198 SupplierInvoice.php:1214 SupplierInvoice.php:1228
-#: SupplierInvoice.php:1237 SupplierInvoice.php:1255 SupplierInvoice.php:1310
-#: SupplierInvoice.php:1340 TaxAuthorities.php:140 WorkOrderCosting.php:362
-#: WorkOrderCosting.php:383 WorkOrderCosting.php:402 WorkOrderCosting.php:439
-#: WorkOrderCosting.php:458 WorkOrderCosting.php:481 WorkOrderCosting.php:500
-#: WorkOrderIssue.php:160 WorkOrderIssue.php:191 WorkOrderIssue.php:213
-#: WorkOrderIssue.php:228 WorkOrderIssue.php:245 WorkOrderIssue.php:268
-#: WorkOrderIssue.php:283 WorkOrderIssue.php:314 WorkOrderIssue.php:334
-#: WorkOrderIssue.php:342 WorkOrderReceive.php:123 WorkOrderReceive.php:240
-#: WorkOrderReceive.php:259 WorkOrderReceive.php:320 WorkOrderReceive.php:349
-#: WorkOrderReceive.php:357 WorkOrderReceive.php:380 WorkOrderReceive.php:399
-#: WorkOrderReceive.php:427 WorkOrderReceive.php:457 WorkOrderReceive.php:494
-#: WorkOrderReceive.php:509 WorkOrderReceive.php:519 WorkOrderReceive.php:538
-#: WorkOrderReceive.php:565 WorkOrderReceive.php:580 WorkOrderReceive.php:600
-#: WorkOrderReceive.php:634 WorkOrderReceive.php:654 WorkOrderReceive.php:664
-#: includes/SQL_CommonFunctions.inc:24 includes/SQL_CommonFunctions.inc:31
-#: includes/SQL_CommonFunctions.inc:184 includes/SQL_CommonFunctions.inc:203
+#: SupplierInvoice.php:660 SupplierInvoice.php:733 SupplierInvoice.php:761
+#: SupplierInvoice.php:788 SupplierInvoice.php:820 SupplierInvoice.php:853
+#: SupplierInvoice.php:883 SupplierInvoice.php:919 SupplierInvoice.php:945
+#: SupplierInvoice.php:967 SupplierInvoice.php:1004 SupplierInvoice.php:1029
+#: SupplierInvoice.php:1063 SupplierInvoice.php:1089 SupplierInvoice.php:1122
+#: SupplierInvoice.php:1138 SupplierInvoice.php:1156 SupplierInvoice.php:1166
+#: SupplierInvoice.php:1184 SupplierInvoice.php:1212 SupplierInvoice.php:1233
+#: SupplierInvoice.php:1253 SupplierInvoice.php:1316 SupplierInvoice.php:1338
+#: SupplierInvoice.php:1409 SupplierInvoice.php:1439 TaxAuthorities.php:140
+#: WorkOrderCosting.php:362 WorkOrderCosting.php:383 WorkOrderCosting.php:402
+#: WorkOrderCosting.php:439 WorkOrderCosting.php:458 WorkOrderCosting.php:481
+#: WorkOrderCosting.php:500 WorkOrderIssue.php:160 WorkOrderIssue.php:191
+#: WorkOrderIssue.php:213 WorkOrderIssue.php:228 WorkOrderIssue.php:245
+#: WorkOrderIssue.php:268 WorkOrderIssue.php:283 WorkOrderIssue.php:314
+#: WorkOrderIssue.php:334 WorkOrderIssue.php:342 WorkOrderReceive.php:123
+#: WorkOrderReceive.php:240 WorkOrderReceive.php:259 WorkOrderReceive.php:320
+#: WorkOrderReceive.php:349 WorkOrderReceive.php:357 WorkOrderReceive.php:380
+#: WorkOrderReceive.php:399 WorkOrderReceive.php:427 WorkOrderReceive.php:457
+#: WorkOrderReceive.php:494 WorkOrderReceive.php:509 WorkOrderReceive.php:519
+#: WorkOrderReceive.php:538 WorkOrderReceive.php:565 WorkOrderReceive.php:580
+#: WorkOrderReceive.php:600 WorkOrderReceive.php:634 WorkOrderReceive.php:654
+#: WorkOrderReceive.php:664 includes/SQL_CommonFunctions.inc:24
+#: includes/SQL_CommonFunctions.inc:31 includes/SQL_CommonFunctions.inc:184
+#: includes/SQL_CommonFunctions.inc:203
msgid "CRITICAL ERROR"
msgstr "KRITICKÁ CHYBA"
@@ -3758,9 +3760,9 @@
#: SelectCreditItems.php:1821 SelectCreditItems.php:1852
#: SelectCreditItems.php:1875 SelectCreditItems.php:1903
#: SelectCreditItems.php:1923 SelectCreditItems.php:1944
-#: ShipmentCosting.php:245 ShipmentCosting.php:290 ShipmentCosting.php:310
-#: ShipmentCosting.php:324 ShipmentCosting.php:370 ShipmentCosting.php:393
-#: ShipmentCosting.php:428 ShipmentCosting.php:447 ShipmentCosting.php:461
+#: ShipmentCosting.php:249 ShipmentCosting.php:294 ShipmentCosting.php:314
+#: ShipmentCosting.php:328 ShipmentCosting.php:374 ShipmentCosting.php:397
+#: ShipmentCosting.php:432 ShipmentCosting.php:451 ShipmentCosting.php:465
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
#: StockAdjustments.php:305 StockLocTransferReceive.php:102
@@ -3769,10 +3771,10 @@
#: StockLocTransferReceive.php:250 StockLocTransferReceive.php:264
#: StockLocTransferReceive.php:281 StockLocTransferReceive.php:293
#: StockLocTransferReceive.php:302 StockLocTransferReceive.php:335
-#: StockTransfers.php:229 StockTransfers.php:264 StockTransfers.php:280
-#: StockTransfers.php:300 StockTransfers.php:343 StockTransfers.php:377
-#: StockTransfers.php:393 StockTransfers.php:409 StockTransfers.php:421
-#: StockTransfers.php:430 SupplierAllocations.php:117
+#: StockTransfers.php:230 StockTransfers.php:265 StockTransfers.php:281
+#: StockTransfers.php:301 StockTransfers.php:344 StockTransfers.php:378
+#: StockTransfers.php:394 StockTransfers.php:410 StockTransfers.php:422
+#: StockTransfers.php:431 SupplierAllocations.php:117
#: SupplierAllocations.php:139 SupplierAllocations.php:157
#: SupplierAllocations.php:181 SupplierAllocations.php:215
#: SupplierAllocations.php:236 SupplierCredit.php:730 SupplierCredit.php:759
@@ -3782,29 +3784,30 @@
#: SupplierCredit.php:1060 SupplierCredit.php:1092 SupplierCredit.php:1116
#: SupplierCredit.php:1148 SupplierCredit.php:1164 SupplierCredit.php:1177
#: SupplierCredit.php:1184 SupplierCredit.php:1206 SupplierCredit.php:1260
-#: SupplierCredit.php:1288 SupplierInvoice.php:654 SupplierInvoice.php:727
-#: SupplierInvoice.php:755 SupplierInvoice.php:782 SupplierInvoice.php:814
-#: SupplierInvoice.php:847 SupplierInvoice.php:877 SupplierInvoice.php:913
-#: SupplierInvoice.php:994 SupplierInvoice.php:1006 SupplierInvoice.php:1043
-#: SupplierInvoice.php:1080 SupplierInvoice.php:1105 SupplierInvoice.php:1139
-#: SupplierInvoice.php:1165 SupplierInvoice.php:1198 SupplierInvoice.php:1214
-#: SupplierInvoice.php:1228 SupplierInvoice.php:1237 SupplierInvoice.php:1255
-#: SupplierInvoice.php:1310 SupplierInvoice.php:1340 TaxAuthorities.php:140
-#: WorkOrderCosting.php:362 WorkOrderCosting.php:383 WorkOrderCosting.php:402
-#: WorkOrderCosting.php:439 WorkOrderCosting.php:458 WorkOrderCosting.php:481
-#: WorkOrderCosting.php:500 WorkOrderIssue.php:160 WorkOrderIssue.php:191
-#: WorkOrderIssue.php:213 WorkOrderIssue.php:228 WorkOrderIssue.php:245
-#: WorkOrderIssue.php:268 WorkOrderIssue.php:283 WorkOrderIssue.php:314
-#: WorkOrderIssue.php:334 WorkOrderIssue.php:342 WorkOrderReceive.php:123
-#: WorkOrderReceive.php:240 WorkOrderReceive.php:259 WorkOrderReceive.php:320
-#: WorkOrderReceive.php:349 WorkOrderReceive.php:357 WorkOrderReceive.php:380
-#: WorkOrderReceive.php:399 WorkOrderReceive.php:427 WorkOrderReceive.php:457
-#: WorkOrderReceive.php:494 WorkOrderReceive.php:509 WorkOrderReceive.php:519
-#: WorkOrderReceive.php:538 WorkOrderReceive.php:565 WorkOrderReceive.php:580
-#: WorkOrderReceive.php:600 WorkOrderReceive.php:634 WorkOrderReceive.php:654
-#: WorkOrderReceive.php:664 includes/SQL_CommonFunctions.inc:24
-#: includes/SQL_CommonFunctions.inc:31 includes/SQL_CommonFunctions.inc:184
-#: includes/SQL_CommonFunctions.inc:203
+#: SupplierCredit.php:1288 SupplierInvoice.php:660 SupplierInvoice.php:733
+#: SupplierInvoice.php:761 SupplierInvoice.php:788 SupplierInvoice.php:820
+#: SupplierInvoice.php:853 SupplierInvoice.php:883 SupplierInvoice.php:919
+#: SupplierInvoice.php:945 SupplierInvoice.php:967 SupplierInvoice.php:1004
+#: SupplierInvoice.php:1029 SupplierInvoice.php:1063 SupplierInvoice.php:1089
+#: SupplierInvoice.php:1122 SupplierInvoice.php:1138 SupplierInvoice.php:1156
+#: SupplierInvoice.php:1166 SupplierInvoice.php:1184 SupplierInvoice.php:1212
+#: SupplierInvoice.php:1233 SupplierInvoice.php:1253 SupplierInvoice.php:1316
+#: SupplierInvoice.php:1338 SupplierInvoice.php:1409 SupplierInvoice.php:1439
+#: TaxAuthorities.php:140 WorkOrderCosting.php:362 WorkOrderCosting.php:383
+#: WorkOrderCosting.php:402 WorkOrderCosting.php:439 WorkOrderCosting.php:458
+#: WorkOrderCosting.php:481 WorkOrderCosting.php:500 WorkOrderIssue.php:160
+#: WorkOrderIssue.php:191 WorkOrderIssue.php:213 WorkOrderIssue.php:228
+#: WorkOrderIssue.php:245 WorkOrderIssue.php:268 WorkOrderIssue.php:283
+#: WorkOrderIssue.php:314 WorkOrderIssue.php:334 WorkOrderIssue.php:342
+#: WorkOrderReceive.php:123 WorkOrderReceive.php:240 WorkOrderReceive.php:259
+#: WorkOrderReceive.php:320 WorkOrderReceive.php:349 WorkOrderReceive.php:357
+#: WorkOrderReceive.php:380 WorkOrderReceive.php:399 WorkOrderReceive.php:427
+#: WorkOrderReceive.php:457 WorkOrderReceive.php:494 WorkOrderReceive.php:509
+#: WorkOrderReceive.php:519 WorkOrderReceive.php:538 WorkOrderReceive.php:565
+#: WorkOrderReceive.php:580 WorkOrderReceive.php:600 WorkOrderReceive.php:634
+#: WorkOrderReceive.php:654 WorkOrderReceive.php:664
+#: includes/SQL_CommonFunctions.inc:24 includes/SQL_CommonFunctions.inc:31
+#: includes/SQL_CommonFunctions.inc:184 includes/SQL_CommonFunctions.inc:203
msgid "NOTE DOWN THIS ERROR AND SEEK ASSISTANCE"
msgstr "POZNÁMKA DOWN tuto chybu a požádat o pomoc"
@@ -3886,8 +3889,8 @@
#: ConfirmDispatch_Invoice.php:956 ContractCosting.php:331
#: CounterSales.php:1346 Credit_Invoice.php:676 GoodsReceived.php:486
-#: ReverseGRN.php:220 SelectCreditItems.php:1387 StockTransfers.php:422
-#: StockTransfers.php:431 WorkOrderIssue.php:161 WorkOrderReceive.php:321
+#: ReverseGRN.php:220 SelectCreditItems.php:1387 StockTransfers.php:423
+#: StockTransfers.php:432 WorkOrderIssue.php:161 WorkOrderReceive.php:321
#: WorkOrderReceive.php:428
msgid "The following SQL to update the location stock record was used"
msgstr "Následující SQL aktualizovat umístění skladové evidenci byl používán"
@@ -3913,8 +3916,8 @@
#: ConfirmDispatch_Invoice.php:1021 CounterSales.php:1413
#: CustomerInquiry.php:200 CustomerTransInquiry.php:105
-#: DeliveryDetails.php:596 DeliveryDetails.php:602 DeliveryDetails.php:609
-#: DeliveryDetails.php:790 MRPReport.php:412 PDFOrdersInvoiced.php:304
+#: DeliveryDetails.php:593 DeliveryDetails.php:599 DeliveryDetails.php:606
+#: DeliveryDetails.php:792 MRPReport.php:412 PDFOrdersInvoiced.php:304
#: PDFOrderStatus.php:274 SelectCompletedOrder.php:600 SelectContract.php:149
#: SelectOrderItems.php:702 SelectProduct.php:386 Shipments.php:399
#: Shipments.php:486 SuppCreditGRNs.php:174 SuppInvGRNs.php:302
@@ -3929,7 +3932,7 @@
msgstr "Sklad pohyb záznamy pro montáž komponent"
#: ConfirmDispatch_Invoice.php:1027 CounterSales.php:1419
-#: Credit_Invoice.php:787 SelectCreditItems.php:1460 ShipmentCosting.php:393
+#: Credit_Invoice.php:787 SelectCreditItems.php:1460 ShipmentCosting.php:397
#: SupplierAllocations.php:139 includes/PDFPaymentRun_PymtFooter.php:57
#: includes/PDFPaymentRun_PymtFooter.php:88
#: includes/PDFPaymentRun_PymtFooter.php:117
@@ -3996,7 +3999,7 @@
#: ConfirmDispatch_Invoice.php:1158 Credit_Invoice.php:902
#: Credit_Invoice.php:912 SelectCreditItems.php:1350 StockAdjustments.php:208
#: StockAdjustments.php:226 StockLocTransferReceive.php:136
-#: StockTransfers.php:264 StockTransfers.php:377
+#: StockTransfers.php:265 StockTransfers.php:378
msgid "The serial stock item record could not be updated because"
msgstr "Pořadové skladová položka záznamu nelze aktualizovat, protože"
@@ -4005,15 +4008,15 @@
#: SelectCreditItems.php:1575 StockAdjustments.php:209
#: StockAdjustments.php:227 StockLocTransferReceive.php:137
#: StockLocTransferReceive.php:151 StockLocTransferReceive.php:251
-#: StockLocTransferReceive.php:265 StockTransfers.php:265
-#: StockTransfers.php:378
+#: StockLocTransferReceive.php:265 StockTransfers.php:266
+#: StockTransfers.php:379
msgid "The following SQL to update the serial stock item record was used"
msgstr "Následující SQL aktualizovat sériové skladě záznam byl použit"
#: ConfirmDispatch_Invoice.php:1173 Credit_Invoice.php:927
#: GoodsReceived.php:580 SelectCreditItems.php:1365 StockAdjustments.php:242
#: StockLocTransferReceive.php:169 StockLocTransferReceive.php:281
-#: StockTransfers.php:300 StockTransfers.php:409 WorkOrderIssue.php:228
+#: StockTransfers.php:301 StockTransfers.php:410 WorkOrderIssue.php:228
#: WorkOrderIssue.php:283 WorkOrderReceive.php:509 WorkOrderReceive.php:580
msgid "The serial stock movement record could not be inserted because"
msgstr "Sériové fotografie hnutí záznam nemůže být vložen, protože"
@@ -4021,7 +4024,7 @@
#: ConfirmDispatch_Invoice.php:1174 Credit_Invoice.php:928
#: GoodsReceived.php:581 StockAdjustments.php:243
#: StockLocTransferReceive.php:170 StockLocTransferReceive.php:282
-#: StockTransfers.php:301 StockTransfers.php:410 WorkOrderIssue.php:229
+#: StockTransfers.php:302 StockTransfers.php:411 WorkOrderIssue.php:229
#: WorkOrderIssue.php:284 WorkOrderReceive.php:510 WorkOrderReceive.php:581
msgid "The following SQL to insert the serial stock movement records was used"
msgstr "Následující SQL vložit sériové záznamy, pohyb zásob byla použita"
@@ -4133,8 +4136,8 @@
msgstr "Dlouhodobého majetku transakce nemůže být vložen, protože"
#: ConfirmDispatch_Invoice.php:1510 GoodsReceived.php:619 ReverseGRN.php:176
-#: SupplierCredit.php:1232 SupplierCredit.php:1320 SupplierInvoice.php:1284
-#: SupplierInvoice.php:1371
+#: SupplierCredit.php:1232 SupplierCredit.php:1320 SupplierInvoice.php:1383
+#: SupplierInvoice.php:1470
msgid "The following SQL to insert the fixed asset transaction record was used"
msgstr "Následující SQL vložit stálých aktiv transakce záznam byl použit"
@@ -4180,8 +4183,8 @@
#: ConfirmDispatch_Invoice.php:1616 ConfirmDispatch_Invoice.php:1618
#: ContractBOM.php:293 CounterSales.php:1984 CounterSales.php:1986
-#: CustomerReceipt.php:547 DeliveryDetails.php:577 DeliveryDetails.php:581
-#: DeliveryDetails.php:779 DeliveryDetails.php:782 GLBalanceSheet.php:18
+#: CustomerReceipt.php:547 DeliveryDetails.php:574 DeliveryDetails.php:578
+#: DeliveryDetails.php:781 DeliveryDetails.php:784 GLBalanceSheet.php:18
#: GLProfit_Loss.php:22 GLTagProfit_Loss.php:22 GLTagProfit_Loss.php:519
#: GLTags.php:51 GLTransInquiry.php:36 PDFStockLocTransfer.php:28
#: PO_OrderDetails.php:115 PO_PDFPurchOrder.php:367 PO_PDFPurchOrder.php:370
@@ -4257,7 +4260,7 @@
"snad prohlížeč nepodporuje META Aktualizovat"
#: ContractBOM.php:39 ContractOtherReqts.php:43 Contracts.php:85
-#: Contracts.php:94 DeliveryDetails.php:260 DeliveryDetails.php:269
+#: Contracts.php:94 DeliveryDetails.php:259 DeliveryDetails.php:268
#: EmailCustTrans.php:22 EmailCustTrans.php:26 GLAccountCSV.php:261
#: PO_Header.php:245 POReport.php:1486 SalesAnalysis_UserDefined.php:46
#: SelectOrderItems.php:1187 StockQties_csv.php:43 StockUsage.php:21
@@ -4270,7 +4273,7 @@
msgstr "klikněte zde"
#: ContractBOM.php:39 ContractOtherReqts.php:43 Contracts.php:85
-#: Contracts.php:94 DeliveryDetails.php:260 DeliveryDetails.php:269
+#: Contracts.php:94 DeliveryDetails.php:259 DeliveryDetails.php:268
#: PO_Header.php:245 SalesAnalysis_UserDefined.php:46
#: SelectOrderItems.php:1187 StockUsage.php:21 SupplierCredit.php:210
#: SupplierCredit.php:221 SupplierCredit.php:233 SupplierCredit.php:243
@@ -4443,7 +4446,7 @@
#: ContractCosting.php:58 ContractCosting.php:66 Contracts.php:187
#: Contracts.php:748 Contracts.php:821 EDIProcessOrders.php:373
-#: SuppContractChgs.php:78 SupplierCredit.php:419 SupplierInvoice.php:407
+#: SuppContractChgs.php:78 SupplierCredit.php:419 SupplierInvoice.php:411
msgid "Contract"
msgstr "Smlouvy"
@@ -4472,7 +4475,7 @@
msgstr "Inventury"
#: ContractCosting.php:82 ContractCosting.php:88 Contracts.php:962
-#: CounterSales.php:743 DeliveryDetails.php:826 DeliveryDetails.php:892
+#: CounterSales.php:743 DeliveryDetails.php:828 DeliveryDetails.php:898
#: OrderDetails.php:165 PO_Items.php:765 PrintCustTrans.php:863
#: PrintCustTrans.php:952 PrintCustTrans.php:1001
#: PrintCustTransPortrait.php:910 PrintCustTransPortrait.php:1008
@@ -4509,10 +4512,10 @@
#: ContractCosting.php:171 OffersReceived.php:103 PO_AuthoriseMyOrders.php:59
#: PO_SelectOSPurchOrder.php:488 PO_SelectPurchOrder.php:431 PurchData.php:164
#: ReprintGRN.php:78 SelectProduct.php:349 SelectSupplier.php:143
-#: ShipmentCosting.php:531 ShipmentCosting.php:608 Shipt_Select.php:293
+#: ShipmentCosting.php:535 ShipmentCosting.php:612 Shipt_Select.php:293
#: ShiptsList.php:11 SuppCreditGRNs.php:269 SupplierAllocations.php:566
#: SupplierAllocations.php:641 SupplierCredit.php:262 SupplierInquiry.php:118
-#: SupplierInvoice.php:232 SupplierTransInquiry.php:104 SuppLoginSetup.php:33
+#: SupplierInvoice.php:233 SupplierTransInquiry.php:104 SuppLoginSetup.php:33
#: SuppPriceList.php:205 SuppPriceList.php:276
#: includes/PDFAgedSuppliersPageHeader.inc:34
#: includes/PDFPaymentRunPageHeader.inc:39
@@ -4571,7 +4574,7 @@
#: ContractCosting.php:330 GoodsReceived.php:485
#: PDFStockCheckComparison.php:127 ReverseGRN.php:219 StockAdjustments.php:255
#: StockLocTransferReceive.php:293 StockLocTransferReceive.php:302
-#: StockTransfers.php:421 StockTransfers.php:430 WorkOrderIssue.php:160
+#: StockTransfers.php:422 StockTransfers.php:431 WorkOrderIssue.php:160
#: WorkOrderReceive.php:427
msgid "The location stock record could not be updated because"
msgstr "Umístění skladové evidenci nelze aktualizovat, protože"
@@ -4723,8 +4726,8 @@
msgstr ""
"Měli byste být automaticky předána na vstup smlouvy stránku řádkové položky"
-#: Contracts.php:85 Contracts.php:93 Customers.php:265 DeliveryDetails.php:260
-#: DeliveryDetails.php:269 EmailCustTrans.php:22 PO_Header.php:244
+#: Contracts.php:85 Contracts.php:93 Customers.php:265 DeliveryDetails.php:259
+#: DeliveryDetails.php:268 EmailCustTrans.php:22 PO_Header.php:244
#: SalesAnalysis_UserDefined.php:46 StockUsage.php:20 SupplierCredit.php:210
#: SupplierCredit.php:221 SupplierCredit.php:233 SupplierCredit.php:243
#: SupplierCredit.php:253 SupplierInvoice.php:189 SupplierInvoice.php:198
@@ -4733,8 +4736,8 @@
msgid "If this does not happen"
msgstr "Pokud se tak nestane"
-#: Contracts.php:85 Contracts.php:93 Customers.php:265 DeliveryDetails.php:260
-#: DeliveryDetails.php:269 EmailCustTrans.php:22 PO_Header.php:244
+#: Contracts.php:85 Contracts.php:93 Customers.php:265 DeliveryDetails.php:259
+#: DeliveryDetails.php:268 EmailCustTrans.php:22 PO_Header.php:244
#: SelectOrderItems.php:1186 StockUsage.php:20 SupplierCredit.php:210
#: SupplierCredit.php:221 SupplierCredit.php:233 SupplierCredit.php:243
#: SupplierCredit.php:253 SupplierInvoice.php:189 SupplierInvoice.php:198
@@ -4953,8 +4956,8 @@
#: Contracts.php:490 Factors.php:80 Stocks.php:560 SupplierCredit.php:759
#: SupplierCredit.php:818 SupplierCredit.php:1206 SupplierCredit.php:1260
-#: SupplierCredit.php:1288 SupplierInvoice.php:756 SupplierInvoice.php:814
-#: SupplierInvoice.php:1256 SupplierInvoice.php:1311 SupplierInvoice.php:1340
+#: SupplierCredit.php:1288 SupplierInvoice.php:762 SupplierInvoice.php:820
+#: SupplierInvoice.php:1185 SupplierInvoice.php:1410 SupplierInvoice.php:1439
#: Suppliers.php:562 Z_ImportStocks.php:245
msgid "could not be added because"
msgstr "nelze přidat, protože"
@@ -5015,7 +5018,7 @@
"Zákazník Pobočka Kód byl použit v preferenci k zákazníkovi pobočky telefonní "
"číslo zadané"
-#: Contracts.php:608 SelectOrderItems.php:302
+#: Contracts.php:608 SelectOrderItems.php:303
msgid ""
"At least one Customer Branch Name keyword OR an extract of a Customer Branch "
"Code or Branch Phone Number must be entered for the search"
@@ -5167,8 +5170,8 @@
#: Contracts.php:845 InventoryQuantities.php:235 PDFPriceList.php:358
#: PDFPrintLabel.php:98 PricesByCost.php:241 ReorderLevelLocation.php:184
-#: ReorderLevel.php:254 SalesCategoryPeriodInquiry.php:162
-#: SalesTopItemsInquiry.php:219 SpecialOrder.php:686 StockDispatch.php:363
+#: ReorderLevel.php:254 SalesCategoryPeriodInquiry.php:161
+#: SalesTo...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-20 07:19:08
|
Revision: 4785
http://web-erp.svn.sourceforge.net/web-erp/?rev=4785&view=rev
Author: daintree
Date: 2011-12-20 07:19:02 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockLocTransfer.php
trunk/doc/Change.log
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-20 06:59:01 UTC (rev 4784)
+++ trunk/StockLocTransfer.php 2011-12-20 07:19:02 UTC (rev 4785)
@@ -157,7 +157,9 @@
if(isset($_POST['Submit']) AND $InputError==False){
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to BEGIN Location Transfer transaction');
+
DB_Txn_Begin($db);
+
for ($i=0;$i < $_POST['LinesCounter'];$i++){
if($_POST['StockID' . $i] != ''){
@@ -209,8 +211,7 @@
}
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') .
- '" alt="" />' . ' ' . $title . '</p>';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -222,9 +223,11 @@
$sql = "SELECT loccode, locationname FROM locations";
$resultStkLocs = DB_query($sql,$db);
+
echo '<tr>
- <td>'._('From Stock Location').':</td>
+ <td>' . _('From Stock Location') . ':</td>
<td><select name="FromStockLocation">';
+
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['FromStockLocation'])){
if ($myrow['loccode'] == $_POST['FromStockLocation']){
@@ -322,7 +325,7 @@
echo '</table>
<br />
<div class="centre">
- <input type="hidden" name="LinesCounter" value="'. $i .'" />
+ <input type="hidden" name="LinesCounter" value="'. $j .'" />
<input type=submit name="EnterMoreItems" value="'. _('Add More Items'). '" />
<input type="submit" name="Submit" value="'. _('Create Transfer Shipment'). '" />
<br />';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-20 06:59:01 UTC (rev 4784)
+++ trunk/doc/Change.log 2011-12-20 07:19:02 UTC (rev 4785)
@@ -1,10 +1,11 @@
webERP Change Log
+20/12/11 Phil: StockLocTransfer.php can now import a csv of items to transfer and each line can be checked to remove if required,
20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
-14/12/11 Tim Schofield: check_syntax.sh Script for checkeing syntax of all php scripts in webERP
+14/12/11 Tim Schofield: check_syntax.sh Script for checking syntax of all php scripts in webERP
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-20 07:19:08
|
Revision: 4785
http://web-erp.svn.sourceforge.net/web-erp/?rev=4785&view=rev
Author: daintree
Date: 2011-12-20 07:19:02 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockLocTransfer.php
trunk/doc/Change.log
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-20 06:59:01 UTC (rev 4784)
+++ trunk/StockLocTransfer.php 2011-12-20 07:19:02 UTC (rev 4785)
@@ -157,7 +157,9 @@
if(isset($_POST['Submit']) AND $InputError==False){
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('Unable to BEGIN Location Transfer transaction');
+
DB_Txn_Begin($db);
+
for ($i=0;$i < $_POST['LinesCounter'];$i++){
if($_POST['StockID' . $i] != ''){
@@ -209,8 +211,7 @@
}
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') .
- '" alt="" />' . ' ' . $title . '</p>';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -222,9 +223,11 @@
$sql = "SELECT loccode, locationname FROM locations";
$resultStkLocs = DB_query($sql,$db);
+
echo '<tr>
- <td>'._('From Stock Location').':</td>
+ <td>' . _('From Stock Location') . ':</td>
<td><select name="FromStockLocation">';
+
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['FromStockLocation'])){
if ($myrow['loccode'] == $_POST['FromStockLocation']){
@@ -322,7 +325,7 @@
echo '</table>
<br />
<div class="centre">
- <input type="hidden" name="LinesCounter" value="'. $i .'" />
+ <input type="hidden" name="LinesCounter" value="'. $j .'" />
<input type=submit name="EnterMoreItems" value="'. _('Add More Items'). '" />
<input type="submit" name="Submit" value="'. _('Create Transfer Shipment'). '" />
<br />';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-20 06:59:01 UTC (rev 4784)
+++ trunk/doc/Change.log 2011-12-20 07:19:02 UTC (rev 4785)
@@ -1,10 +1,11 @@
webERP Change Log
+20/12/11 Phil: StockLocTransfer.php can now import a csv of items to transfer and each line can be checked to remove if required,
20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
-14/12/11 Tim Schofield: check_syntax.sh Script for checkeing syntax of all php scripts in webERP
+14/12/11 Tim Schofield: check_syntax.sh Script for checking syntax of all php scripts in webERP
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-20 06:59:07
|
Revision: 4784
http://web-erp.svn.sourceforge.net/web-erp/?rev=4784&view=rev
Author: daintree
Date: 2011-12-20 06:59:01 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockTransfers.php
trunk/doc/Change.log
trunk/sql/mysql/weberp-new.sql
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/StockTransfers.php 2011-12-20 06:59:01 UTC (rev 4784)
@@ -73,10 +73,11 @@
if (isset($_GET['StockID'])){ /*carry the stockid through to the form for additional inputs */
$_POST['StockID'] = trim(mb_strtoupper($_GET['StockID']));
} elseif (isset($_POST['StockID'])){ /* initiate a new transfer only if the StockID is different to the previous entry */
- if (isset($_SESSION['Transfer'])
- AND $_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
- unset($_SESSION['Transfer']);
- $NewTransfer = true;
+ if (isset($_SESSION['Transfer']->TransferItem[0])) {
+ if ($_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
+ unset($_SESSION['Transfer']);
+ $NewTransfer = true;
+ }
}
}
@@ -223,7 +224,7 @@
'" . $PeriodNo . "',
'To " . $_SESSION['Transfer']->StockLocationTo ."',
'" . round(-$_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces) . "',
- '" . $QtyOnHandPrior - round($_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces) ."'
+ '" . ($QtyOnHandPrior - round($_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces)) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock movement record cannot be inserted because');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/doc/Change.log 2011-12-20 06:59:01 UTC (rev 4784)
@@ -1,5 +1,6 @@
webERP Change Log
+20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
Modified: trunk/sql/mysql/weberp-new.sql
===================================================================
--- trunk/sql/mysql/weberp-new.sql 2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/sql/mysql/weberp-new.sql 2011-12-20 06:59:01 UTC (rev 4784)
@@ -3142,7 +3142,7 @@
-- Dumping data for table `www_users`
--
-INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','ph...@lo...','MEL',8,'2011-12-04 10:35:00','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'aguapop','en_IN.utf8',0);
+INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','ph...@lo...','MEL',8,'2011-12-04 10:35:00','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'aguapop','en_GB.utf8',0);
--
-- Dumping data for table `edi_orders_segs`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-20 06:59:07
|
Revision: 4784
http://web-erp.svn.sourceforge.net/web-erp/?rev=4784&view=rev
Author: daintree
Date: 2011-12-20 06:59:01 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockTransfers.php
trunk/doc/Change.log
trunk/sql/mysql/weberp-new.sql
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/StockTransfers.php 2011-12-20 06:59:01 UTC (rev 4784)
@@ -73,10 +73,11 @@
if (isset($_GET['StockID'])){ /*carry the stockid through to the form for additional inputs */
$_POST['StockID'] = trim(mb_strtoupper($_GET['StockID']));
} elseif (isset($_POST['StockID'])){ /* initiate a new transfer only if the StockID is different to the previous entry */
- if (isset($_SESSION['Transfer'])
- AND $_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
- unset($_SESSION['Transfer']);
- $NewTransfer = true;
+ if (isset($_SESSION['Transfer']->TransferItem[0])) {
+ if ($_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
+ unset($_SESSION['Transfer']);
+ $NewTransfer = true;
+ }
}
}
@@ -223,7 +224,7 @@
'" . $PeriodNo . "',
'To " . $_SESSION['Transfer']->StockLocationTo ."',
'" . round(-$_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces) . "',
- '" . $QtyOnHandPrior - round($_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces) ."'
+ '" . ($QtyOnHandPrior - round($_SESSION['Transfer']->TransferItem[0]->Quantity,$_SESSION['Transfer']->TransferItem[0]->DecimalPlaces)) . "'
)";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock movement record cannot be inserted because');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/doc/Change.log 2011-12-20 06:59:01 UTC (rev 4784)
@@ -1,5 +1,6 @@
webERP Change Log
+20/12/11 Phil: Fix StockTransfers.php missing brackets around calculation in parameter passed to SQL
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
Modified: trunk/sql/mysql/weberp-new.sql
===================================================================
--- trunk/sql/mysql/weberp-new.sql 2011-12-19 16:56:02 UTC (rev 4783)
+++ trunk/sql/mysql/weberp-new.sql 2011-12-20 06:59:01 UTC (rev 4784)
@@ -3142,7 +3142,7 @@
-- Dumping data for table `www_users`
--
-INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','ph...@lo...','MEL',8,'2011-12-04 10:35:00','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'aguapop','en_IN.utf8',0);
+INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','ph...@lo...','MEL',8,'2011-12-04 10:35:00','','A4','1,1,1,1,1,1,1,1,1,1,',0,50,'aguapop','en_GB.utf8',0);
--
-- Dumping data for table `edi_orders_segs`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-12-19 16:56:13
|
Revision: 4783
http://web-erp.svn.sourceforge.net/web-erp/?rev=4783&view=rev
Author: tim_schofield
Date: 2011-12-19 16:56:02 +0000 (Mon, 19 Dec 2011)
Log Message:
-----------
Script for checking syntax of all php scripts in webERP
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-18 18:28:48 UTC (rev 4782)
+++ trunk/doc/Change.log 2011-12-19 16:56:02 UTC (rev 4783)
@@ -3,6 +3,7 @@
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
+14/12/11 Tim Schofield: check_syntax.sh Script for checkeing syntax of all php scripts in webERP
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-12-19 16:56:11
|
Revision: 4783
http://web-erp.svn.sourceforge.net/web-erp/?rev=4783&view=rev
Author: tim_schofield
Date: 2011-12-19 16:56:02 +0000 (Mon, 19 Dec 2011)
Log Message:
-----------
Script for checking syntax of all php scripts in webERP
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-18 18:28:48 UTC (rev 4782)
+++ trunk/doc/Change.log 2011-12-19 16:56:02 UTC (rev 4783)
@@ -3,6 +3,7 @@
15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
+14/12/11 Tim Schofield: check_syntax.sh Script for checkeing syntax of all php scripts in webERP
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-18 18:28:55
|
Revision: 4782
http://web-erp.svn.sourceforge.net/web-erp/?rev=4782&view=rev
Author: daintree
Date: 2011-12-18 18:28:48 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/UpgradeDatabase.php
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2011-12-17 23:06:55 UTC (rev 4781)
+++ trunk/BOMExtendedQty.php 2011-12-18 18:28:48 UTC (rev 4782)
@@ -320,7 +320,7 @@
$pdf->addTextWrap($Page_Width-$Right_Margin-140,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
$YPos -=$line_height;
- $pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('Build Quantity: ') . locale_number_format($_POST['Quantity'],'Variable');
+ $pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('Build Quantity: ') . locale_number_format($_POST['Quantity'],'Variable'),'left');
$YPos -=(2*$line_height);
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-17 23:06:55 UTC (rev 4781)
+++ trunk/UpgradeDatabase.php 2011-12-18 18:28:48 UTC (rev 4782)
@@ -1,223 +1,223 @@
-<?php
-/* $Id UpgradeDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */
-
-$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
-
-include('includes/session.inc');
-$title = _('Upgrade webERP Database');
-include('includes/header.inc');
-
-if (!isset($_POST['DoUpgrade'])){
-
- echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
- if (!isset($_SESSION['VersionNumber'])){
- prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is not actually recorded at this version'),'info');
- echo '<table class="selection">
- <tr>
- <td>' . _('Select the version you are upgrading from:') . '</td>
- <td><select name="OldVersion" >
- <option selected value="Manual">' . _('Apply database changes manually') . '</option>
- <option value="3.00">' . _('Version 3.00') . '</option>
- <option value="3.01">' . _('Version 3.01') . '</option>
- <option value="3.02">' . _('Version 3.02') . '</option>
- <option value="3.03">' . _('Version 3.03') . '</option>
- <option value="3.04">' . _('Version 3.04') . '</option>
- <option value="3.05">' . _('Version 3.05') . '</option>
- <option value="3.06">' . _('Version 3.06') . '</option>
- <option value="3.07">' . _('Version 3.07') . '</option>
- <option value="3.08">' . _('Version 3.08') . '</option>
- <option value="3.09">' . _('Version 3.09') . '</option>
- <option value="3.10">' . _('Version 3.10') . '</option>
- <option value="3.11.x">' . _('Version 3.11 or 4.01 - 4.02') . '</option>
- </select></td>
- </tr>
- </table>';
- prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
- echo '<div class="centre">
- <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
- </div>';
- } else {
- if ($_SESSION['VersionNumber']=='4.00RC1'){
- $_SESSION['VersionNumber']='3.12';
- }
- if (strcmp($Version,$_SESSION['VersionNumber'])==0){
- prnMsg(_('The database is up to date, there are no upgrades to perform'),'info');
- } else {
- prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br />' . _('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is') . ' ' . $_SESSION['VersionNumber'] . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
-
- echo '<input type="hidden" name="OldVersion" value="' . $_SESSION['VersionNumber'] . '" />';
- echo '<div class="centre">
- <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
- </div>';
- }
- }
-
- echo '</form>';
-}
-
-if (isset($_POST['DoUpgrade'])){
-
- if ($dbType=='mysql' OR $dbType =='mysqli'){
-
- $SQLScripts = array();
-
- if ($_POST['OldVersion']=='Manual') {
- prnMsg(_('No datbase updates have been done as you selected to apply these manually - upgrade SQL scripts are under sql/mysql/ directory in the distribution'),'info');
- } else { //we are into automatically applying database upgrades
-
- prnMsg(_('If there are any failures then please check with your system administrator. Please read all notes carefully to ensure they are expected'),'info');
- switch ($_POST['OldVersion']) {
- //since there are no "break" statements subsequent upgrade scripts will be added to the array
- case '3.00':
- $SQLScripts[] = './sql/mysql/upgrade3.00-3.01.sql';
- case '3.01':
- $SQLScripts[] = './sql/mysql/upgrade3.01-3.02.sql';
- case '3.02':
- $SQLScripts[] = './sql/mysql/upgrade3.02-3.03.sql';
- case '3.03':
- $SQLScripts[] = './sql/mysql/upgrade3.03-3.04.sql';
- case '3.04':
- $SQLScripts[] = './sql/mysql/upgrade3.04-3.05.sql';
- case '3.05':
- $SQLScripts[] = './sql/mysql/upgrade3.05-3.06.sql';
- case '3.06':
- $SQLScripts[] = './sql/mysql/upgrade3.06-3.07.sql';
- case '3.07':
- $SQLScripts[] = './sql/mysql/upgrade3.07-3.08.sql';
- case '3.08':
- case '3.09':
- $SQLScripts[] = './sql/mysql/upgrade3.09-3.10.sql';
- case '3.10':
- $SQLScripts[] = './sql/mysql/upgrade3.10-3.11.sql';
- case '3.11.x':
- case '3.11.1':
- case '3.11.2':
- case '3.11.3':
- case '3.12.32':
- case '4.0RC1':
- case '4.01':
- case '4.02':
- case '4.03RC1':
- case '4.03RC2':
- case '4.03':
- case '4.03.2':
- case '4.03.3':
- case '4.03.5':
- case '4.03.6':
- case '4.03.7':
- $SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
- case '4.03.8':
- $SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
- case '4.04':
- $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
- case '4.04.1':
- case '4.04.2':
- case '4.04.3':
- $SQLScripts[] = './sql/mysql/upgrade4.04.1-4.04.4.sql';
- case '4.04.4':
- $SQLScripts[] = './sql/mysql/upgrade4.04.4-4.04.5.sql';
- case '4.04.5':
- $SQLScripts[] = './sql/mysql/upgrade4.04.5-4.05.sql';
- case '4.05':
- case '4.05.1':
- case '4.05.2':
- case '4.05.3':
- case '4.06':
- case '4.06.1':
- $SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.2':
- break;
- } //end switch
- }
- } else { //dbType is not mysql or mysqli
- prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
- }
-
- $result = DB_IgnoreForeignKeys($db);
-
- foreach ($SQLScripts AS $SQLScriptFile) {
-
- $SQLEntries = file($SQLScriptFile);
- $ScriptFileEntries = sizeof($SQLEntries);
- $sql ='';
- $InAFunction = false;
- echo '<br />
- <table>
- <tr>
- <th colspan="2">' . _('Applying') . ' ' . $SQLScriptFile . '</th>
- </tr>';
-
- for ($i=0; $i<=$ScriptFileEntries; $i++) {
-
- $SQLEntries[$i] = trim($SQLEntries[$i]);
-
- if (mb_substr($SQLEntries[$i], 0, 2) != '--'
- AND mb_substr($SQLEntries[$i], 0, 3) != 'USE'
- AND mb_strstr($SQLEntries[$i],'/*')==FALSE
- AND mb_strlen($SQLEntries[$i])>1){
-
- $sql .= ' ' . $SQLEntries[$i];
-
- //check if this line kicks off a function definition - pg chokes otherwise
- if (mb_substr($SQLEntries[$i],0,15) == 'CREATE FUNCTION'){
- $InAFunction = true;
- }
- //check if this line completes a function definition - pg chokes otherwise
- if (mb_substr($SQLEntries[$i],0,8) == 'LANGUAGE'){
- $InAFunction = false;
- }
- if (mb_strpos($SQLEntries[$i],';')>0 AND ! $InAFunction){
- $sql = mb_substr($sql,0,mb_strlen($sql)-1);
- $result = DB_query($sql, $db, '','', false, false);
- echo '<tr><td>' . $sql . '</td>';
- switch (DB_error_no($db)) {
- case 0:
- echo '<td bgcolor="green">'._('Success').'</td></tr>';
- break;
- case 1025:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Foreign Key already removed').'</td></tr>';
- break;
- case 1050:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Table has already been created').'</td></tr>';
- break;
- case 1054:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been changed').'</td></tr>';
- break;
- case 1060:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been created').'</td></tr>';
- break;
- case 1061:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already exists').'</td></tr>';
- break;
- case 1062:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Entry has already been done').'</td></tr>';
- break;
- case 1064:
- echo '<td bgcolor="red">'._('Note').' - '. _('SQL syntax error. The SQL error message is'). ' ' . DB_error_msg($db) . '</td></tr>';
- break;
- case 1068:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Primary key already exists').'</td></tr>';
- break;
- case 1091:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already dropped previously').'</td></tr>';
- break;
- default:
- echo '<td bgcolor="red">'._('Failure').' - '. _('Error number').' - '.DB_error_no($db) .' ' . DB_error_msg($db) . '</td></tr>';
- break;
- }
- $sql='';
- }
- } //end if its a valid sql line not a comment
- } //end of for loop around the lines of the sql script
- echo '</table>';
- } //end of loop around SQLScripts apply
- $result =DB_ReinstateForeignKeys($db);
- /*Now get the modified VersionNumber and script pagesecurities */
- $ForceConfigReload=true;
- include('includes/GetConfig.php');
-} /*Dont do upgrade */
-
-include('includes/footer.inc');
+<?php
+/* $Id UpgradeDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */
+
+$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
+
+include('includes/session.inc');
+$title = _('Upgrade webERP Database');
+include('includes/header.inc');
+
+if (!isset($_POST['DoUpgrade'])){
+
+ echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ if (!isset($_SESSION['VersionNumber'])){
+ prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is not actually recorded at this version'),'info');
+ echo '<table class="selection">
+ <tr>
+ <td>' . _('Select the version you are upgrading from:') . '</td>
+ <td><select name="OldVersion" >
+ <option selected value="Manual">' . _('Apply database changes manually') . '</option>
+ <option value="3.00">' . _('Version 3.00') . '</option>
+ <option value="3.01">' . _('Version 3.01') . '</option>
+ <option value="3.02">' . _('Version 3.02') . '</option>
+ <option value="3.03">' . _('Version 3.03') . '</option>
+ <option value="3.04">' . _('Version 3.04') . '</option>
+ <option value="3.05">' . _('Version 3.05') . '</option>
+ <option value="3.06">' . _('Version 3.06') . '</option>
+ <option value="3.07">' . _('Version 3.07') . '</option>
+ <option value="3.08">' . _('Version 3.08') . '</option>
+ <option value="3.09">' . _('Version 3.09') . '</option>
+ <option value="3.10">' . _('Version 3.10') . '</option>
+ <option value="3.11.x">' . _('Version 3.11 or 4.01 - 4.02') . '</option>
+ </select></td>
+ </tr>
+ </table>';
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+ echo '<div class="centre">
+ <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+ </div>';
+ } else {
+ if ($_SESSION['VersionNumber']=='4.00RC1'){
+ $_SESSION['VersionNumber']='3.12';
+ }
+ if (strcmp($Version,$_SESSION['VersionNumber'])==0){
+ prnMsg(_('The database is up to date, there are no upgrades to perform'),'info');
+ } else {
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br />' . _('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is') . ' ' . $_SESSION['VersionNumber'] . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+
+ echo '<input type="hidden" name="OldVersion" value="' . $_SESSION['VersionNumber'] . '" />';
+ echo '<div class="centre">
+ <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+ </div>';
+ }
+ }
+
+ echo '</form>';
+}
+
+if (isset($_POST['DoUpgrade'])){
+
+ if ($dbType=='mysql' OR $dbType =='mysqli'){
+
+ $SQLScripts = array();
+
+ if ($_POST['OldVersion']=='Manual') {
+ prnMsg(_('No datbase updates have been done as you selected to apply these manually - upgrade SQL scripts are under sql/mysql/ directory in the distribution'),'info');
+ } else { //we are into automatically applying database upgrades
+
+ prnMsg(_('If there are any failures then please check with your system administrator. Please read all notes carefully to ensure they are expected'),'info');
+ switch ($_POST['OldVersion']) {
+ //since there are no "break" statements subsequent upgrade scripts will be added to the array
+ case '3.00':
+ $SQLScripts[] = './sql/mysql/upgrade3.00-3.01.sql';
+ case '3.01':
+ $SQLScripts[] = './sql/mysql/upgrade3.01-3.02.sql';
+ case '3.02':
+ $SQLScripts[] = './sql/mysql/upgrade3.02-3.03.sql';
+ case '3.03':
+ $SQLScripts[] = './sql/mysql/upgrade3.03-3.04.sql';
+ case '3.04':
+ $SQLScripts[] = './sql/mysql/upgrade3.04-3.05.sql';
+ case '3.05':
+ $SQLScripts[] = './sql/mysql/upgrade3.05-3.06.sql';
+ case '3.06':
+ $SQLScripts[] = './sql/mysql/upgrade3.06-3.07.sql';
+ case '3.07':
+ $SQLScripts[] = './sql/mysql/upgrade3.07-3.08.sql';
+ case '3.08':
+ case '3.09':
+ $SQLScripts[] = './sql/mysql/upgrade3.09-3.10.sql';
+ case '3.10':
+ $SQLScripts[] = './sql/mysql/upgrade3.10-3.11.sql';
+ case '3.11.x':
+ case '3.11.1':
+ case '3.11.2':
+ case '3.11.3':
+ case '3.12.32':
+ case '4.0RC1':
+ case '4.01':
+ case '4.02':
+ case '4.03RC1':
+ case '4.03RC2':
+ case '4.03':
+ case '4.03.2':
+ case '4.03.3':
+ case '4.03.5':
+ case '4.03.6':
+ case '4.03.7':
+ $SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
+ case '4.03.8':
+ $SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
+ case '4.04':
+ $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
+ case '4.04.1':
+ case '4.04.2':
+ case '4.04.3':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.1-4.04.4.sql';
+ case '4.04.4':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.4-4.04.5.sql';
+ case '4.04.5':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.5-4.05.sql';
+ case '4.05':
+ case '4.05.1':
+ case '4.05.2':
+ case '4.05.3':
+ case '4.06':
+ case '4.06.1':
+ $SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
+ case '4.06.2':
+ break;
+ } //end switch
+ }
+ } else { //dbType is not mysql or mysqli
+ prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
+ }
+
+ $result = DB_IgnoreForeignKeys($db);
+
+ foreach ($SQLScripts AS $SQLScriptFile) {
+
+ $SQLEntries = file($SQLScriptFile);
+ $ScriptFileEntries = sizeof($SQLEntries);
+ $sql ='';
+ $InAFunction = false;
+ echo '<br />
+ <table>
+ <tr>
+ <th colspan="2">' . _('Applying') . ' ' . $SQLScriptFile . '</th>
+ </tr>';
+
+ for ($i=0; $i<=$ScriptFileEntries; $i++) {
+
+ $SQLEntries[$i] = trim($SQLEntries[$i]);
+
+ if (mb_substr($SQLEntries[$i], 0, 2) != '--'
+ AND mb_substr($SQLEntries[$i], 0, 3) != 'USE'
+ AND mb_strstr($SQLEntries[$i],'/*')==FALSE
+ AND mb_strlen($SQLEntries[$i])>1){
+
+ $sql .= ' ' . $SQLEntries[$i];
+
+ //check if this line kicks off a function definition - pg chokes otherwise
+ if (mb_substr($SQLEntries[$i],0,15) == 'CREATE FUNCTION'){
+ $InAFunction = true;
+ }
+ //check if this line completes a function definition - pg chokes otherwise
+ if (mb_substr($SQLEntries[$i],0,8) == 'LANGUAGE'){
+ $InAFunction = false;
+ }
+ if (mb_strpos($SQLEntries[$i],';')>0 AND ! $InAFunction){
+ $sql = mb_substr($sql,0,mb_strlen($sql)-1);
+ $result = DB_query($sql, $db, '','', false, false);
+ echo '<tr><td>' . $sql . '</td>';
+ switch (DB_error_no($db)) {
+ case 0:
+ echo '<td bgcolor="green">'._('Success').'</td></tr>';
+ break;
+ case 1025:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Foreign Key already removed').'</td></tr>';
+ break;
+ case 1050:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Table has already been created').'</td></tr>';
+ break;
+ case 1054:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been changed').'</td></tr>';
+ break;
+ case 1060:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been created').'</td></tr>';
+ break;
+ case 1061:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already exists').'</td></tr>';
+ break;
+ case 1062:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Entry has already been done').'</td></tr>';
+ break;
+ case 1064:
+ echo '<td bgcolor="red">'._('Note').' - '. _('SQL syntax error. The SQL error message is'). ' ' . DB_error_msg($db) . '</td></tr>';
+ break;
+ case 1068:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Primary key already exists').'</td></tr>';
+ break;
+ case 1091:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already dropped previously').'</td></tr>';
+ break;
+ default:
+ echo '<td bgcolor="red">'._('Failure').' - '. _('Error number').' - '.DB_error_no($db) .' ' . DB_error_msg($db) . '</td></tr>';
+ break;
+ }
+ $sql='';
+ }
+ } //end if its a valid sql line not a comment
+ } //end of for loop around the lines of the sql script
+ echo '</table>';
+ } //end of loop around SQLScripts apply
+ $result =DB_ReinstateForeignKeys($db);
+ /*Now get the modified VersionNumber and script pagesecurities */
+ $ForceConfigReload=true;
+ include('includes/GetConfig.php');
+} /*Dont do upgrade */
+
+include('includes/footer.inc');
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-18 18:28:55
|
Revision: 4782
http://web-erp.svn.sourceforge.net/web-erp/?rev=4782&view=rev
Author: daintree
Date: 2011-12-18 18:28:48 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/UpgradeDatabase.php
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2011-12-17 23:06:55 UTC (rev 4781)
+++ trunk/BOMExtendedQty.php 2011-12-18 18:28:48 UTC (rev 4782)
@@ -320,7 +320,7 @@
$pdf->addTextWrap($Page_Width-$Right_Margin-140,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
$YPos -=$line_height;
- $pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('Build Quantity: ') . locale_number_format($_POST['Quantity'],'Variable');
+ $pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('Build Quantity: ') . locale_number_format($_POST['Quantity'],'Variable'),'left');
$YPos -=(2*$line_height);
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-17 23:06:55 UTC (rev 4781)
+++ trunk/UpgradeDatabase.php 2011-12-18 18:28:48 UTC (rev 4782)
@@ -1,223 +1,223 @@
-<?php
-/* $Id UpgradeDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */
-
-$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
-
-include('includes/session.inc');
-$title = _('Upgrade webERP Database');
-include('includes/header.inc');
-
-if (!isset($_POST['DoUpgrade'])){
-
- echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
- if (!isset($_SESSION['VersionNumber'])){
- prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is not actually recorded at this version'),'info');
- echo '<table class="selection">
- <tr>
- <td>' . _('Select the version you are upgrading from:') . '</td>
- <td><select name="OldVersion" >
- <option selected value="Manual">' . _('Apply database changes manually') . '</option>
- <option value="3.00">' . _('Version 3.00') . '</option>
- <option value="3.01">' . _('Version 3.01') . '</option>
- <option value="3.02">' . _('Version 3.02') . '</option>
- <option value="3.03">' . _('Version 3.03') . '</option>
- <option value="3.04">' . _('Version 3.04') . '</option>
- <option value="3.05">' . _('Version 3.05') . '</option>
- <option value="3.06">' . _('Version 3.06') . '</option>
- <option value="3.07">' . _('Version 3.07') . '</option>
- <option value="3.08">' . _('Version 3.08') . '</option>
- <option value="3.09">' . _('Version 3.09') . '</option>
- <option value="3.10">' . _('Version 3.10') . '</option>
- <option value="3.11.x">' . _('Version 3.11 or 4.01 - 4.02') . '</option>
- </select></td>
- </tr>
- </table>';
- prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
- echo '<div class="centre">
- <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
- </div>';
- } else {
- if ($_SESSION['VersionNumber']=='4.00RC1'){
- $_SESSION['VersionNumber']='3.12';
- }
- if (strcmp($Version,$_SESSION['VersionNumber'])==0){
- prnMsg(_('The database is up to date, there are no upgrades to perform'),'info');
- } else {
- prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br />' . _('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is') . ' ' . $_SESSION['VersionNumber'] . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
-
- echo '<input type="hidden" name="OldVersion" value="' . $_SESSION['VersionNumber'] . '" />';
- echo '<div class="centre">
- <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
- </div>';
- }
- }
-
- echo '</form>';
-}
-
-if (isset($_POST['DoUpgrade'])){
-
- if ($dbType=='mysql' OR $dbType =='mysqli'){
-
- $SQLScripts = array();
-
- if ($_POST['OldVersion']=='Manual') {
- prnMsg(_('No datbase updates have been done as you selected to apply these manually - upgrade SQL scripts are under sql/mysql/ directory in the distribution'),'info');
- } else { //we are into automatically applying database upgrades
-
- prnMsg(_('If there are any failures then please check with your system administrator. Please read all notes carefully to ensure they are expected'),'info');
- switch ($_POST['OldVersion']) {
- //since there are no "break" statements subsequent upgrade scripts will be added to the array
- case '3.00':
- $SQLScripts[] = './sql/mysql/upgrade3.00-3.01.sql';
- case '3.01':
- $SQLScripts[] = './sql/mysql/upgrade3.01-3.02.sql';
- case '3.02':
- $SQLScripts[] = './sql/mysql/upgrade3.02-3.03.sql';
- case '3.03':
- $SQLScripts[] = './sql/mysql/upgrade3.03-3.04.sql';
- case '3.04':
- $SQLScripts[] = './sql/mysql/upgrade3.04-3.05.sql';
- case '3.05':
- $SQLScripts[] = './sql/mysql/upgrade3.05-3.06.sql';
- case '3.06':
- $SQLScripts[] = './sql/mysql/upgrade3.06-3.07.sql';
- case '3.07':
- $SQLScripts[] = './sql/mysql/upgrade3.07-3.08.sql';
- case '3.08':
- case '3.09':
- $SQLScripts[] = './sql/mysql/upgrade3.09-3.10.sql';
- case '3.10':
- $SQLScripts[] = './sql/mysql/upgrade3.10-3.11.sql';
- case '3.11.x':
- case '3.11.1':
- case '3.11.2':
- case '3.11.3':
- case '3.12.32':
- case '4.0RC1':
- case '4.01':
- case '4.02':
- case '4.03RC1':
- case '4.03RC2':
- case '4.03':
- case '4.03.2':
- case '4.03.3':
- case '4.03.5':
- case '4.03.6':
- case '4.03.7':
- $SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
- case '4.03.8':
- $SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
- case '4.04':
- $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
- case '4.04.1':
- case '4.04.2':
- case '4.04.3':
- $SQLScripts[] = './sql/mysql/upgrade4.04.1-4.04.4.sql';
- case '4.04.4':
- $SQLScripts[] = './sql/mysql/upgrade4.04.4-4.04.5.sql';
- case '4.04.5':
- $SQLScripts[] = './sql/mysql/upgrade4.04.5-4.05.sql';
- case '4.05':
- case '4.05.1':
- case '4.05.2':
- case '4.05.3':
- case '4.06':
- case '4.06.1':
- $SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.2':
- break;
- } //end switch
- }
- } else { //dbType is not mysql or mysqli
- prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
- }
-
- $result = DB_IgnoreForeignKeys($db);
-
- foreach ($SQLScripts AS $SQLScriptFile) {
-
- $SQLEntries = file($SQLScriptFile);
- $ScriptFileEntries = sizeof($SQLEntries);
- $sql ='';
- $InAFunction = false;
- echo '<br />
- <table>
- <tr>
- <th colspan="2">' . _('Applying') . ' ' . $SQLScriptFile . '</th>
- </tr>';
-
- for ($i=0; $i<=$ScriptFileEntries; $i++) {
-
- $SQLEntries[$i] = trim($SQLEntries[$i]);
-
- if (mb_substr($SQLEntries[$i], 0, 2) != '--'
- AND mb_substr($SQLEntries[$i], 0, 3) != 'USE'
- AND mb_strstr($SQLEntries[$i],'/*')==FALSE
- AND mb_strlen($SQLEntries[$i])>1){
-
- $sql .= ' ' . $SQLEntries[$i];
-
- //check if this line kicks off a function definition - pg chokes otherwise
- if (mb_substr($SQLEntries[$i],0,15) == 'CREATE FUNCTION'){
- $InAFunction = true;
- }
- //check if this line completes a function definition - pg chokes otherwise
- if (mb_substr($SQLEntries[$i],0,8) == 'LANGUAGE'){
- $InAFunction = false;
- }
- if (mb_strpos($SQLEntries[$i],';')>0 AND ! $InAFunction){
- $sql = mb_substr($sql,0,mb_strlen($sql)-1);
- $result = DB_query($sql, $db, '','', false, false);
- echo '<tr><td>' . $sql . '</td>';
- switch (DB_error_no($db)) {
- case 0:
- echo '<td bgcolor="green">'._('Success').'</td></tr>';
- break;
- case 1025:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Foreign Key already removed').'</td></tr>';
- break;
- case 1050:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Table has already been created').'</td></tr>';
- break;
- case 1054:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been changed').'</td></tr>';
- break;
- case 1060:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been created').'</td></tr>';
- break;
- case 1061:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already exists').'</td></tr>';
- break;
- case 1062:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Entry has already been done').'</td></tr>';
- break;
- case 1064:
- echo '<td bgcolor="red">'._('Note').' - '. _('SQL syntax error. The SQL error message is'). ' ' . DB_error_msg($db) . '</td></tr>';
- break;
- case 1068:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Primary key already exists').'</td></tr>';
- break;
- case 1091:
- echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already dropped previously').'</td></tr>';
- break;
- default:
- echo '<td bgcolor="red">'._('Failure').' - '. _('Error number').' - '.DB_error_no($db) .' ' . DB_error_msg($db) . '</td></tr>';
- break;
- }
- $sql='';
- }
- } //end if its a valid sql line not a comment
- } //end of for loop around the lines of the sql script
- echo '</table>';
- } //end of loop around SQLScripts apply
- $result =DB_ReinstateForeignKeys($db);
- /*Now get the modified VersionNumber and script pagesecurities */
- $ForceConfigReload=true;
- include('includes/GetConfig.php');
-} /*Dont do upgrade */
-
-include('includes/footer.inc');
+<?php
+/* $Id UpgradeDatabase.php 4183 2010-12-14 09:30:20Z daintree $ */
+
+$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
+
+include('includes/session.inc');
+$title = _('Upgrade webERP Database');
+include('includes/header.inc');
+
+if (!isset($_POST['DoUpgrade'])){
+
+ echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ if (!isset($_SESSION['VersionNumber'])){
+ prnMsg(_('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is not actually recorded at this version'),'info');
+ echo '<table class="selection">
+ <tr>
+ <td>' . _('Select the version you are upgrading from:') . '</td>
+ <td><select name="OldVersion" >
+ <option selected value="Manual">' . _('Apply database changes manually') . '</option>
+ <option value="3.00">' . _('Version 3.00') . '</option>
+ <option value="3.01">' . _('Version 3.01') . '</option>
+ <option value="3.02">' . _('Version 3.02') . '</option>
+ <option value="3.03">' . _('Version 3.03') . '</option>
+ <option value="3.04">' . _('Version 3.04') . '</option>
+ <option value="3.05">' . _('Version 3.05') . '</option>
+ <option value="3.06">' . _('Version 3.06') . '</option>
+ <option value="3.07">' . _('Version 3.07') . '</option>
+ <option value="3.08">' . _('Version 3.08') . '</option>
+ <option value="3.09">' . _('Version 3.09') . '</option>
+ <option value="3.10">' . _('Version 3.10') . '</option>
+ <option value="3.11.x">' . _('Version 3.11 or 4.01 - 4.02') . '</option>
+ </select></td>
+ </tr>
+ </table>';
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+ echo '<div class="centre">
+ <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+ </div>';
+ } else {
+ if ($_SESSION['VersionNumber']=='4.00RC1'){
+ $_SESSION['VersionNumber']='3.12';
+ }
+ if (strcmp($Version,$_SESSION['VersionNumber'])==0){
+ prnMsg(_('The database is up to date, there are no upgrades to perform'),'info');
+ } else {
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br />' . _('The webERP code is version') . ' ' . $Version . ' ' . _('and the database version is') . ' ' . $_SESSION['VersionNumber'] . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+
+ echo '<input type="hidden" name="OldVersion" value="' . $_SESSION['VersionNumber'] . '" />';
+ echo '<div class="centre">
+ <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+ </div>';
+ }
+ }
+
+ echo '</form>';
+}
+
+if (isset($_POST['DoUpgrade'])){
+
+ if ($dbType=='mysql' OR $dbType =='mysqli'){
+
+ $SQLScripts = array();
+
+ if ($_POST['OldVersion']=='Manual') {
+ prnMsg(_('No datbase updates have been done as you selected to apply these manually - upgrade SQL scripts are under sql/mysql/ directory in the distribution'),'info');
+ } else { //we are into automatically applying database upgrades
+
+ prnMsg(_('If there are any failures then please check with your system administrator. Please read all notes carefully to ensure they are expected'),'info');
+ switch ($_POST['OldVersion']) {
+ //since there are no "break" statements subsequent upgrade scripts will be added to the array
+ case '3.00':
+ $SQLScripts[] = './sql/mysql/upgrade3.00-3.01.sql';
+ case '3.01':
+ $SQLScripts[] = './sql/mysql/upgrade3.01-3.02.sql';
+ case '3.02':
+ $SQLScripts[] = './sql/mysql/upgrade3.02-3.03.sql';
+ case '3.03':
+ $SQLScripts[] = './sql/mysql/upgrade3.03-3.04.sql';
+ case '3.04':
+ $SQLScripts[] = './sql/mysql/upgrade3.04-3.05.sql';
+ case '3.05':
+ $SQLScripts[] = './sql/mysql/upgrade3.05-3.06.sql';
+ case '3.06':
+ $SQLScripts[] = './sql/mysql/upgrade3.06-3.07.sql';
+ case '3.07':
+ $SQLScripts[] = './sql/mysql/upgrade3.07-3.08.sql';
+ case '3.08':
+ case '3.09':
+ $SQLScripts[] = './sql/mysql/upgrade3.09-3.10.sql';
+ case '3.10':
+ $SQLScripts[] = './sql/mysql/upgrade3.10-3.11.sql';
+ case '3.11.x':
+ case '3.11.1':
+ case '3.11.2':
+ case '3.11.3':
+ case '3.12.32':
+ case '4.0RC1':
+ case '4.01':
+ case '4.02':
+ case '4.03RC1':
+ case '4.03RC2':
+ case '4.03':
+ case '4.03.2':
+ case '4.03.3':
+ case '4.03.5':
+ case '4.03.6':
+ case '4.03.7':
+ $SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
+ case '4.03.8':
+ $SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
+ case '4.04':
+ $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
+ case '4.04.1':
+ case '4.04.2':
+ case '4.04.3':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.1-4.04.4.sql';
+ case '4.04.4':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.4-4.04.5.sql';
+ case '4.04.5':
+ $SQLScripts[] = './sql/mysql/upgrade4.04.5-4.05.sql';
+ case '4.05':
+ case '4.05.1':
+ case '4.05.2':
+ case '4.05.3':
+ case '4.06':
+ case '4.06.1':
+ $SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
+ case '4.06.2':
+ break;
+ } //end switch
+ }
+ } else { //dbType is not mysql or mysqli
+ prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
+ }
+
+ $result = DB_IgnoreForeignKeys($db);
+
+ foreach ($SQLScripts AS $SQLScriptFile) {
+
+ $SQLEntries = file($SQLScriptFile);
+ $ScriptFileEntries = sizeof($SQLEntries);
+ $sql ='';
+ $InAFunction = false;
+ echo '<br />
+ <table>
+ <tr>
+ <th colspan="2">' . _('Applying') . ' ' . $SQLScriptFile . '</th>
+ </tr>';
+
+ for ($i=0; $i<=$ScriptFileEntries; $i++) {
+
+ $SQLEntries[$i] = trim($SQLEntries[$i]);
+
+ if (mb_substr($SQLEntries[$i], 0, 2) != '--'
+ AND mb_substr($SQLEntries[$i], 0, 3) != 'USE'
+ AND mb_strstr($SQLEntries[$i],'/*')==FALSE
+ AND mb_strlen($SQLEntries[$i])>1){
+
+ $sql .= ' ' . $SQLEntries[$i];
+
+ //check if this line kicks off a function definition - pg chokes otherwise
+ if (mb_substr($SQLEntries[$i],0,15) == 'CREATE FUNCTION'){
+ $InAFunction = true;
+ }
+ //check if this line completes a function definition - pg chokes otherwise
+ if (mb_substr($SQLEntries[$i],0,8) == 'LANGUAGE'){
+ $InAFunction = false;
+ }
+ if (mb_strpos($SQLEntries[$i],';')>0 AND ! $InAFunction){
+ $sql = mb_substr($sql,0,mb_strlen($sql)-1);
+ $result = DB_query($sql, $db, '','', false, false);
+ echo '<tr><td>' . $sql . '</td>';
+ switch (DB_error_no($db)) {
+ case 0:
+ echo '<td bgcolor="green">'._('Success').'</td></tr>';
+ break;
+ case 1025:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Foreign Key already removed').'</td></tr>';
+ break;
+ case 1050:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Table has already been created').'</td></tr>';
+ break;
+ case 1054:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been changed').'</td></tr>';
+ break;
+ case 1060:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Column has already been created').'</td></tr>';
+ break;
+ case 1061:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already exists').'</td></tr>';
+ break;
+ case 1062:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Entry has already been done').'</td></tr>';
+ break;
+ case 1064:
+ echo '<td bgcolor="red">'._('Note').' - '. _('SQL syntax error. The SQL error message is'). ' ' . DB_error_msg($db) . '</td></tr>';
+ break;
+ case 1068:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Primary key already exists').'</td></tr>';
+ break;
+ case 1091:
+ echo '<td bgcolor="yellow">'._('Note').' - '. _('Index already dropped previously').'</td></tr>';
+ break;
+ default:
+ echo '<td bgcolor="red">'._('Failure').' - '. _('Error number').' - '.DB_error_no($db) .' ' . DB_error_msg($db) . '</td></tr>';
+ break;
+ }
+ $sql='';
+ }
+ } //end if its a valid sql line not a comment
+ } //end of for loop around the lines of the sql script
+ echo '</table>';
+ } //end of loop around SQLScripts apply
+ $result =DB_ReinstateForeignKeys($db);
+ /*Now get the modified VersionNumber and script pagesecurities */
+ $ForceConfigReload=true;
+ include('includes/GetConfig.php');
+} /*Dont do upgrade */
+
+include('includes/footer.inc');
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-17 23:07:07
|
Revision: 4781
http://web-erp.svn.sourceforge.net/web-erp/?rev=4781&view=rev
Author: daintree
Date: 2011-12-17 23:06:55 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
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/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.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_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.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/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-15 11:56:25 UTC (rev 4780)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-17 23:06:55 UTC (rev 4781)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 16:31+1300\n"
+"POT-Creation-Date: 2011-12-10 09:04+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -898,7 +898,7 @@
#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
-#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:265
+#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
@@ -1541,7 +1541,7 @@
#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
-#: Stocks.php:266 Stocks.php:271 StockStatus.php:306 StockStatus.php:347
+#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
@@ -1938,8 +1938,8 @@
#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
-#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186
-#: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:261
+#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
#: WOSerialNos.php:296 includes/InputSerialItems.php:111
@@ -2316,7 +2316,7 @@
#: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173
#: StockAdjustments.php:85 StockAdjustments.php:359 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:32 StockReorderLevel.php:46
-#: StockStatus.php:59 StockTransfers.php:47 StockTransfers.php:458
+#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:458
#: StockUsage.php:64 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667 Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:313
@@ -2711,7 +2711,7 @@
#: PDFOrdersInvoiced.php:309 PDFOrderStatus.php:278
#: ReorderLevelLocation.php:169 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:53 StockSerialItemResearch.php:80
-#: StockStatus.php:82 StockStatus.php:87 WhereUsedInquiry.php:72
+#: StockStatus.php:80 StockStatus.php:85 WhereUsedInquiry.php:72
#: WorkCentres.php:128 WorkCentres.php:221
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2258
@@ -3239,7 +3239,7 @@
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:185 StockLocTransferReceive.php:427
+#: StockLocTransfer.php:260 StockLocTransferReceive.php:427
#: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787
#: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175
#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315
@@ -3306,7 +3306,7 @@
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
#: RecurringSalesOrders.php:322 SelectCreditItems.php:675
#: SelectOrderItems.php:1336 Shipments.php:405 StockLocMovements.php:94
-#: StockMovements.php:99 StockStatus.php:311 SuppCreditGRNs.php:181
+#: StockMovements.php:99 StockStatus.php:309 SuppCreditGRNs.php:181
#: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267
#: SupplierTenders.php:494 SuppPriceList.php:292
#: includes/DefineLabelClass.php:49 includes/PDFQuotationPageHeader.inc:104
@@ -3323,7 +3323,7 @@
#: PrintCustTransPortrait.php:1067 RecurringSalesOrders.php:323
#: SalesAnalReptCols.php:41 SalesAnalReptCols.php:43 SelectCreditItems.php:677
#: SelectOrderItems.php:1339 StockLocMovements.php:95 StockMovements.php:100
-#: StockStatus.php:312 includes/PDFQuotationPageHeader.inc:105
+#: StockStatus.php:310 includes/PDFQuotationPageHeader.inc:105
#: includes/PDFQuotationPortraitPageHeader.inc:105
#: includes/PDFTransPageHeader.inc:211
msgid "Discount"
@@ -3654,8 +3654,8 @@
#: ShipmentCosting.php:428 ShipmentCosting.php:447 ShipmentCosting.php:461
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
-#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:79
-#: StockLocTransfer.php:101 StockLocTransfer.php:105
+#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:148
+#: StockLocTransfer.php:170 StockLocTransfer.php:174
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
#: StockLocTransferReceive.php:214 StockLocTransferReceive.php:250
@@ -4302,7 +4302,7 @@
msgstr ""
"Smlouvu kusovníku nelze alterned, protože zákazník má již umístěn objednávky"
-#: ContractBOM.php:175 PO_Items.php:538
+#: ContractBOM.php:175 PO_Items.php:538 StockLocTransfer.php:75
#: includes/SelectOrderItems_IntoCart.inc:27
#: includes/SelectOrderItems_IntoCart.inc:64
msgid "The item"
@@ -5057,8 +5057,8 @@
#: SelectOrderItems.php:548 SelectOrderItems.php:1523
#: SelectOrderItems.php:1704 SpecialOrder.php:61 SpecialOrder.php:85
#: StockCheck.php:221 StockLocStatus.php:183 StockLocStatus.php:206
-#: StockLocStatus.php:239 StockStatus.php:117 StockStatus.php:141
-#: StockStatus.php:161 StockStatus.php:181 StockStatus.php:198
+#: StockLocStatus.php:239 StockStatus.php:115 StockStatus.php:139
+#: StockStatus.php:159 StockStatus.php:179 StockStatus.php:196
#: SupplierCredit.php:91 SupplierInvoice.php:70
msgid "cannot be retrieved because"
msgstr "nelze načíst, protože"
@@ -5826,19 +5826,19 @@
msgstr "On Demand"
#: CounterSales.php:2034 CounterSales.php:2219 SelectOrderItems.php:1489
-#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:92
+#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:90
msgid "On Order"
msgstr "Na objednávku"
#: CounterSales.php:2035 CounterSales.php:2220 SelectOrderItems.php:1490
-#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:91
+#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:89
#: includes/OutputSerialItems.php:37 includes/PDFStockCheckPageHeader.inc:40
msgid "Available"
msgstr "K dispozici"
#: CounterSales.php:2064 CounterSales.php:2246 SelectOrderItems.php:1522
#: SelectOrderItems.php:1704 StockCheck.php:221 StockLocStatus.php:183
-#: StockLocStatus.php:206 StockStatus.php:117 StockStatus.php:141
+#: StockLocStatus.php:206 StockStatus.php:115 StockStatus.php:139
msgid "The demand for this product from"
msgstr "Poptávka po tomto produktu ze"
@@ -12724,7 +12724,7 @@
#: ReorderLevel.php:164 SelectProduct.php:78 StockDispatch.php:221
#: StockMovements.php:19 StockQties_csv.php:8 StockQuantityByDate.php:10
#: StockReorderLevel.php:18 StockSerialItemResearch.php:9
-#: StockSerialItems.php:9 StockStatus.php:42 StockTransferControlled.php:14
+#: StockSerialItems.php:9 StockStatus.php:40 StockTransferControlled.php:14
#: SuppLoginSetup.php:24 WWW_Users.php:16
msgid "Inventory"
msgstr "Sklad"
@@ -13002,7 +13002,7 @@
msgid "Bulk Inventory Transfer"
msgstr "Hromadný přesun položek"
-#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:132
+#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:201
#: StockLocTransferReceive.php:411 StockLocTransferReceive.php:503
#: StockTransfers.php:27 StockTransfers.php:446 StockUsage.php:28
#: SuppCreditGRNs.php:19 SuppInvGRNs.php:16
@@ -14965,10 +14965,11 @@
#: MRPReport.php:724 SelectAsset.php:222 SelectCustomer.php:392
#: SelectCustomer.php:473 SelectOrderItems.php:1380 SelectProduct.php:709
-#: SelectSupplier.php:235 SelectSupplier.php:297 SupplierTenders.php:146
-#: SupplierTenders.php:204 WorkOrderIssue.php:352 WorkOrderReceive.php:676
-#: includes/Add_SerialItemsOut.php:23 includes/Add_SerialItems.php:33
-#: includes/Add_SerialItems.php:184 includes/Add_SerialItems.php:281
+#: SelectSupplier.php:235 SelectSupplier.php:297 StockLocTransfer.php:61
+#: SupplierTenders.php:146 SupplierTenders.php:204 WorkOrderIssue.php:352
+#: WorkOrderReceive.php:676 includes/Add_SerialItemsOut.php:23
+#: includes/Add_SerialItems.php:33 includes/Add_SerialItems.php:184
+#: includes/Add_SerialItems.php:281
#: includes/PDFBankingSummaryPageHeader.inc:19
msgid "of"
msgstr "ze dne"
@@ -15002,7 +15003,7 @@
msgid "Total Qty On Hand"
msgstr "Celkem Množství na ruce"
-#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:9
+#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:7
msgid "Stock Status"
msgstr "Stav skladu"
@@ -15124,8 +15125,8 @@
msgid "Supply"
msgstr "Zásobování"
-#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:83
-#: StockStatus.php:90
+#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:81
+#: StockStatus.php:88
msgid "Demand"
msgstr "Poptávka"
@@ -19013,7 +19014,7 @@
msgstr "Datum Typ"
#: POReport.php:516 POReport.php:1286 POReport.php:1515 SalesInquiry.php:780
-#: SalesInquiry.php:1087 StockStatus.php:309
+#: SalesInquiry.php:1087 StockStatus.php:307
msgid "Date Range"
msgstr "Časové"
@@ -19127,7 +19128,7 @@
msgid "Run Inquiry"
msgstr "Spustit Poptávka"
-#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:357
+#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:355
#: StockUsage.php:200
msgid "Search Outstanding Purchase Orders"
msgstr "Hledat Vynikající Objednávky"
@@ -20639,7 +20640,7 @@
#: PurchData.php:529 SelectProduct.php:402 StockAdjustments.php:464
#: StockCostUpdate.php:189 StockLocStatus.php:108 StockMovements.php:201
-#: StockQuantityByDate.php:70 StockStatus.php:61 StockTransfers.php:559
+#: StockQuantityByDate.php:70 StockStatus.php:59 StockTransfers.php:559
#: StockUsage.php:192
msgid "Show Stock Status"
msgstr "Zobrazit stavu populace"
@@ -20652,14 +20653,14 @@
#: PurchData.php:531 SelectProduct.php:405 SelectSalesOrder.php:6
#: StockAdjustments.php:470 StockCostUpdate.php:192 StockMovements.php:203
-#: StockReorderLevel.php:109 StockStatus.php:354 StockTransfers.php:565
+#: StockReorderLevel.php:109 StockStatus.php:352 StockTransfers.php:565
#: StockUsage.php:196
msgid "Search Outstanding Sales Orders"
msgstr "Hledat Vynikající Prodejní objednávky"
#: PurchData.php:532 SelectProduct.php:406 StockAdjustments.php:472
#: StockCostUpdate.php:193 StockMovements.php:204 StockReorderLevel.php:110
-#: StockStatus.php:355 StockTransfers.php:567 StockUsage.php:198
+#: StockStatus.php:353 StockTransfers.php:567 StockUsage.php:198
msgid "Search Completed Sales Orders"
msgstr "Vyhledávání Dokončené Prodejní objednávky"
@@ -21008,7 +21009,7 @@
msgstr "Zásoby Změna pořadí Úroveň zprávě"
#: ReorderLevel.php:175 SelectSalesOrder.php:496 StockDispatch.php:248
-#: StockLocMovements.php:18 StockLocStatus.php:32 StockLocTransfer.php:146
+#: StockLocMovements.php:18 StockLocStatus.php:32 StockLocTransfer.php:215
#: StockMovements.php:34 StockTransfers.php:484 StockUsage.php:66
msgid "From Stock Location"
msgstr "Od Umístění skladu"
@@ -23687,7 +23688,7 @@
#: SelectProduct.php:336 StockLocStatus.php:162 StockQuantityByDate.php:107
#: StockReorderLevel.php:54 StockSerialItems.php:108 StockSerialItems.php:111
#: StockSerialItems.php:114 StockSerialItems.php:119 StockSerialItems.php:123
-#: StockSerialItems.php:127 StockStatus.php:88
+#: StockSerialItems.php:127 StockStatus.php:86
msgid "Quantity On Hand"
msgstr "Množství na ruce"
@@ -25049,7 +25050,7 @@
msgid "Enter Stock Adjustment"
msgstr "Zadejte skladem Nastavení"
-#: StockAdjustments.php:466 StockStatus.php:352 StockTransfers.php:561
+#: StockAdjustments.php:466 StockStatus.php:350 StockTransfers.php:561
msgid "Show Movements"
msgstr "Zobrazit Pohyby"
@@ -25484,7 +25485,7 @@
msgid "The quantity entered for line"
msgstr "Množství propuštěné do linky"
-#: StockCounts.php:51 StockLocTransfer.php:40 StockLocTransferReceive.php:34
+#: StockCounts.php:51 StockLocTransfer.php:104 StockLocTransferReceive.php:34
msgid "is not numeric"
msgstr "není číselný"
@@ -25572,7 +25573,7 @@
msgid "The stock dispatch did not have any items to list"
msgstr "Populace odeslání neměl žádné položky do seznamu"
-#: StockDispatch.php:179 StockLocTransfer.php:101
+#: StockDispatch.php:179 StockLocTransfer.php:170
msgid "Unable to enter Location Transfer record for"
msgstr "Nelze zadat umístění Transfer rekord"
@@ -25621,7 +25622,7 @@
msgid "Dispatch Percent"
msgstr "Expedice procent"
-#: StockDispatch.php:264 StockLocTransfer.php:165 StockTransfers.php:508
+#: StockDispatch.php:264 StockLocTransfer.php:234 StockTransfers.php:508
msgid "To Stock Location"
msgstr "Chcete-li Umístění skladu"
@@ -25690,7 +25691,7 @@
msgid "But after"
msgstr "Ale poté, co"
-#: StockLocMovements.php:82 StockMovements.php:86 StockStatus.php:264
+#: StockLocMovements.php:82 StockMovements.php:86 StockStatus.php:262
msgid ""
"The stock movements for the selected criteria could not be retrieved because"
msgstr "Pohyby zásob pro zvolená kritéria se nepodařilo získat, protože"
@@ -25720,7 +25721,7 @@
msgid "Only items where stock is available"
msgstr "Pouze položky, kde je k dispozici skladem"
-#: StockLocStatus.php:152 StockReorderLevel.php:39 StockStatus.php:73
+#: StockLocStatus.php:152 StockReorderLevel.php:39 StockStatus.php:71
msgid "The stock held at each location cannot be retrieved because"
msgstr "Stavu zásob v každém místě, nemůže získat, protože"
@@ -25729,19 +25730,19 @@
msgid "StockID"
msgstr "StockID"
-#: StockLocStatus.php:163 StockReorderLevel.php:55 StockStatus.php:89
+#: StockLocStatus.php:163 StockReorderLevel.php:55 StockStatus.php:87
msgid "Re-Order Level"
msgstr "Re-Objednávka úrovni"
-#: StockLocStatus.php:239 StockStatus.php:181
+#: StockLocStatus.php:239 StockStatus.php:179
msgid "The quantity on order for this product to be received into"
msgstr "Množství na objednávku pro tento produkt mají být přijaty do"
-#: StockLocStatus.php:281 StockLocStatus.php:311 StockStatus.php:222
+#: StockLocStatus.php:281 StockLocStatus.php:311 StockStatus.php:220
msgid "Serial Numbers"
msgstr "Sériová čísla"
-#: StockLocStatus.php:283 StockLocStatus.php:313 StockStatus.php:224
+#: StockLocStatus.php:283 StockLocStatus.php:313 StockStatus.php:222
#: WorkOrderEntry.php:541
msgid "Batches"
msgstr "Dávky"
@@ -25758,82 +25759,112 @@
msgid "Please start over now"
msgstr "Prosím začít více než nyní"
-#: StockLocTransfer.php:34 StockLocTransfer.php:58
+#: StockLocTransfer.php:37 Z_ImportFixedAssets.php:48
+msgid "File contains"
+msgstr "Soubor obsahuje"
+
+#: StockLocTransfer.php:37
+msgid ""
+"columns, but only 2 columns are expected. The comma separated file should "
+"have just two columns the first for the item code and the second for the "
+"quantity to transfer"
+msgstr ""
+
+#: StockLocTransfer.php:54 StockLocTransfer.php:98 StockLocTransfer.php:123
msgid "The part code entered of"
msgstr "Část kódu vstoupila na"
-#: StockLocTransfer.php:34
+#: StockLocTransfer.php:54 StockLocTransfer.php:98
msgid "is not set up in the database"
msgstr "není zřízen v databázi"
-#: StockLocTransfer.php:34
+#: StockLocTransfer.php:54 StockLocTransfer.php:98
msgid "Only valid parts can be entered for transfers"
msgstr "Platné pouze části mohou být zapsány pro převody"
-#: StockLocTransfer.php:40
+#: StockLocTransfer.php:61 StockLocTransfer.php:109
+#: StockLocTransferReceive.php:34 StockLocTransferReceive.php:38
+msgid "The quantity entered for"
+msgstr "Množství propuštěné do"
+
+#: StockLocTransfer.php:61
+#, fuzzy
+msgid "is not numeric."
+msgstr "není číselný"
+
+#: StockLocTransfer.php:61 StockLocTransfer.php:104
+msgid "The quantity entered for transfers is expected to be numeric"
+msgstr "Množství uvedené pro převody Očekává se, že číselné"
+
+#: StockLocTransfer.php:75
+#, fuzzy
+msgid "does not have enough stock available ("
+msgstr "nemá dostatek zásob k dispozici pro převod."
+
+#: StockLocTransfer.php:75
+#, fuzzy
+msgid "The quantity required to transfer was"
+msgstr "SQL získat převod byl"
+
+#: StockLocTransfer.php:104
msgid "The quantity entered of"
msgstr "Množství uvedené v"
-#: StockLocTransfer.php:40
+#: StockLocTransfer.php:104
msgid "for part code"
msgstr "pro část kódu"
-#: StockLocTransfer.php:40
-msgid "The quantity entered for transfers is expected to be numeric"
-msgstr "Množství uvedené pro převody Očekává se, že číselné"
-
-#: StockLocTransfer.php:45 StockLocTransferReceive.php:34
-#: StockLocTransferReceive.php:38
-msgid "The quantity entered for"
-msgstr "Množství propuštěné do"
-
-#: StockLocTransfer.php:45
+#: StockLocTransfer.php:109
msgid "is less than or equal to 0"
msgstr "je menší než nebo rovna 0"
-#: StockLocTransfer.php:45
+#: StockLocTransfer.php:109
msgid "Please correct this or remove the item"
msgstr "Opravte to nebo odebrat položku"
-#: StockLocTransfer.php:58
+#: StockLocTransfer.php:123
msgid "does not have enough stock available for transfer."
msgstr "nemá dostatek zásob k dispozici pro převod."
-#: StockLocTransfer.php:67
+#: StockLocTransfer.php:135
msgid "You must enter at least 1 Stock Item to transfer"
msgstr "Musíte zadat alespoň 1 bod skladem k převodu"
-#: StockLocTransfer.php:73
+#: StockLocTransfer.php:141
msgid ""
"The transfer must have a different location to receive into and location "
"sent from"
msgstr "Převod musí mít jiné umístění pro příjem a umístění do odeslané z"
-#: StockLocTransfer.php:79
+#: StockLocTransfer.php:148
msgid "Unable to BEGIN Location Transfer transaction"
msgstr "Nelze BEGIN Místo Transfer transakce"
-#: StockLocTransfer.php:105
+#: StockLocTransfer.php:174
msgid "Unable to COMMIT Location Transfer transaction"
msgstr "Nelze COMMIT Místo transakce Transfer"
-#: StockLocTransfer.php:108
+#: StockLocTransfer.php:177
msgid "The inventory transfer records have been created successfully"
msgstr "Inventární převod byly úspěšně vytvořen"
-#: StockLocTransfer.php:109
+#: StockLocTransfer.php:178
msgid "Print the Transfer Docket"
msgstr "Tisk Transfer Docket"
-#: StockLocTransfer.php:140
+#: StockLocTransfer.php:209
msgid "Inventory Location Transfer Shipment Reference"
msgstr "Zásoby Umístění Transfer zásilku Reference"
-#: StockLocTransfer.php:229
+#: StockLocTransfer.php:253
+msgid "Upload CSV file of Transfer Items and Quantites"
+msgstr ""
+
+#: StockLocTransfer.php:304
msgid "Add More Items"
msgstr "Přidat další položky"
-#: StockLocTransfer.php:230
+#: StockLocTransfer.php:305
msgid "Create Transfer Shipment"
msgstr "Vytvořit zásilku Transfer"
@@ -26024,7 +26055,7 @@
msgid "Stock Movements"
msgstr "Pohybů zásob"
-#: StockMovements.php:19 StockStatus.php:43 StockUsage.php:57
+#: StockMovements.php:19 StockStatus.php:41 StockUsage.php:57
#: WhereUsedInquiry.php:33
msgid "in units of"
msgstr "v jednotkách"
@@ -26435,7 +26466,7 @@
msgid "The stock item could not be updated because"
msgstr "Skladová položka nelze aktualizovat, protože"
-#: Stocks.php:372 StockStatus.php:74
+#: Stocks.php:372 StockStatus.php:72
msgid "The SQL that was used to update the stock item and failed was"
msgstr "SQL, který byl použit k aktualizaci na skladě a neúspěšný byl"
@@ -26731,47 +26762,47 @@
msgid "Delete This Item"
msgstr "Odstranit tuto položku"
-#: StockStatus.php:33
+#: StockStatus.php:31
msgid "Could not retrieve the requested item"
msgstr "Nepodařilo se načíst požadovanou položku"
-#: StockStatus.php:34
+#: StockStatus.php:32
msgid "The SQL used to retrieve the items was"
msgstr "SQL používá k načtení položek byl"
-#: StockStatus.php:48
+#: StockStatus.php:46
msgid "This is a kitset part and cannot have a stock holding"
msgstr "Jedná se o kitset část a nemůže mít skladového hospodářství"
-#: StockStatus.php:48 StockStatus.php:51 StockStatus.php:54
+#: StockStatus.php:46 StockStatus.php:49 StockStatus.php:52
msgid "only the total quantity on outstanding sales orders is shown"
msgstr "pouze celkové množství, pro vynikající prodejní objednávky je zobrazen"
-#: StockStatus.php:51
+#: StockStatus.php:49
msgid "This is an assembly part and cannot have a stock holding"
msgstr "To je součástí sestavy a nemohou mít skladového hospodářství"
-#: StockStatus.php:54
+#: StockStatus.php:52
msgid "This is an dummy part and cannot have a stock holding"
msgstr "Toto je fiktivní část a nemůže mít skladového hospodářství"
-#: StockStatus.php:161
+#: StockStatus.php:159
msgid "The workorder component demand for this product from"
msgstr "Workorder složka poptávky po tomto výrobku z"
-#: StockStatus.php:198
+#: StockStatus.php:196
msgid "The quantity on work orders for this product to be received into"
msgstr "Množství na pracovních příkazů pro tento produkt mají být přijaty do"
-#: StockStatus.php:306
+#: StockStatus.php:304
msgid "Pricing history for sales of"
msgstr "Historie cen za prodej"
-#: StockStatus.php:347
+#: StockStatus.php:345
msgid "No history of sales of"
msgstr "Neexistuje žádný záznam o prodeji"
-#: StockStatus.php:353
+#: StockStatus.php:351
msgid "Show Usage"
msgstr "Zobrazit Využití"
@@ -33715,10 +33746,6 @@
msgstr "Import Dlouhodobý majetek"
#: Z_ImportFixedAssets.php:48
-msgid "File contains"
-msgstr "Soubor obsahuje"
-
-#: Z_ImportFixedAssets.php:48
msgid "columns, expected"
msgstr "sloupy, očekávané"
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2011-12-15 11:56:25 UTC (rev 4780)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2011-12-17 23:06:55 UTC (rev 4781)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WebERP 4.00/trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 16:31+1300\n"
+"POT-Creation-Date: 2011-12-10 09:04+1300\n"
"PO-Revision-Date: 2011-07-17 13:46+0000\n"
"Last-Translator: Peter Hürlimann <su...@ph...>\n"
"Language-Team: Deutsch <web...@li...>\n"
@@ -894,7 +894,7 @@
#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
-#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:265
+#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
@@ -1541,7 +1541,7 @@
#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
-#: Stocks.php:266 Stocks.php:271 StockStatus.php:306 StockStatus.php:347
+#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
@@ -1952,8 +1952,8 @@
#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
-#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186
-#: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:261
+#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
#: WOSerialNos.php:296 includes/InputSerialItems.php:111
@@ -2334,7 +2334,7 @@
#: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173
#: StockAdjustments.php:85 StockAdjustments.php:359 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:32 StockReorderLevel.php:46
-#: StockStatus.php:59 StockTransfers.php:47 StockTransfers.php:458
+#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:458
#: StockUsage.php:64 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667 Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:313
@@ -2736,7 +2736,7 @@
#: PDFOrdersInvoiced.php:309 PDFOrderStatus.php:278
#: ReorderLevelLocation.php:169 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:53 StockSerialItemResearch.php:80
-#: StockStatus.php:82 StockStatus.php:87 WhereUsedInquiry.php:72
+#: StockStatus.php:80 StockStatus.php:85 WhereUsedInquiry.php:72
#: WorkCentres.php:128 WorkCentres.php:221
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2258
@@ -3267,7 +3267,7 @@
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:185 StockLocTransferReceive.php:427
+#: StockLocTransfer.php:260 StockLocTransferReceive.php:427
#: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787
#: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175
#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315
@@ -3334,7 +3334,7 @@
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
#: RecurringSalesOrders.php:322 SelectCreditItems.php:675
#: SelectOrderItems.php:1336 Shipments.php:405 StockLocMovements.php:94
-#: StockMovements.php:99 StockStatus.php:311 SuppCreditGRNs.php:181
+#: StockMovements.php:99 StockStatus.php:309 SuppCreditGRNs.php:181
#: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267
#: SupplierTenders.php:494 SuppPriceList.php:292
#: includes/DefineLabelClass.php:49 includes/PDFQuotationPageHeader.inc:104
@@ -3351,7 +3351,7 @@
#: PrintCustTransPortrait.php:1067 RecurringSalesOrders.php:323
#: SalesAnalReptCols.php:41 SalesAnalReptCols.php:43 SelectCreditItems.php:677
#: SelectOrderItems.php:1339 StockLocMovements.php:95 StockMovements.php:100
-#: StockStatus.php:312 includes/PDFQuotationPageHeader.inc:105
+#: StockStatus.php:310 includes/PDFQuotationPageHeader.inc:105
#: includes/PDFQuotationPortraitPageHeader.inc:105
#: includes/PDFTransPageHeader.inc:211
msgid "Discount"
@@ -3692,8 +3692,8 @@
#: ShipmentCosting.php:428 ShipmentCosting.php:447 ShipmentCosting.php:461
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
-#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:79
-#: StockLocTransfer.php:101 StockLocTransfer.php:105
+#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:148
+#: StockLocTransfer.php:170 StockLocTransfer.php:174
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
#: StockLocTransferReceive.php:214 StockLocTransferReceive.php:250
@@ -4351,7 +4351,7 @@
"Die Vertragsstückliste kann nicht mehr geändert werden, da der Kunde bereits "
"den Auftrag erteilt hat."
-#: ContractBOM.php:175 PO_Items.php:538
+#: ContractBOM.php:175 PO_Items.php:538 StockLocTransfer.php:75
#: includes/SelectOrderItems_IntoCart.inc:27
#: includes/SelectOrderItems_IntoCart.inc:64
msgid "The item"
@@ -5124,8 +5124,8 @@
#: SelectOrderItems.php:548 SelectOrderItems.php:1523
#: SelectOrderItems.php:1704 SpecialOrder.php:61 SpecialOrder.php:85
#: StockCheck.php:221 StockLocStatus.php:183 StockLocStatus.php:206
-#: StockLocStatus.php:239 StockStatus.php:117 StockStatus.php:141
-#: StockStatus.php:161 StockStatus.php:181 StockStatus.php:198
+#: StockLocStatus.php:239 StockStatus.php:115 StockStatus.php:139
+#: StockStatus.php:159 StockStatus.php:179 StockStatus.php:196
#: SupplierCredit.php:91 SupplierInvoice.php:70
msgid "cannot be retrieved because"
msgstr "kann nicht ermittelt werden weil"
@@ -5905,19 +5905,19 @@
msgstr "Muss beschafft werden"
#: CounterSales.php:2034 CounterSales.php:2219 SelectOrderItems.php:1489
-#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:92
+#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:90
msgid "On Order"
msgstr "Bestellt"
#: CounterSales.php:2035 CounterSales.php:2220 SelectOrderItems.php:1490
-#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:91
+#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:89
#: includes/OutputSerialItems.php:37 includes/PDFStockCheckPageHeader.inc:40
msgid "Available"
msgstr "Verfügbar"
#: CounterSales.php:2064 CounterSales.php:2246 SelectOrderItems.php:1522
#: SelectOrderItems.php:1704 StockCheck.php:221 StockLocStatus.php:183
-#: StockLocStatus.php:206 StockStatus.php:117 StockStatus.php:141
+#: StockLocStatus.php:206 StockStatus.php:115 StockStatus.php:139
msgid "The demand for this product from"
msgstr "Der Bedarf für diesen Artikel vom"
@@ -12905,7 +12905,7 @@
#: ReorderLevel.php:164 SelectProduct.php:78 StockDispatch.php:221
#: StockMovements.php:19 StockQties_csv.php:8 StockQuantityByDate.php:10
#: StockReorderLevel.php:18 StockSerialItemResearch.php:9
-#: StockSerialItems.php:9 StockStatus.php:42 StockTransferControlled.php:14
+#: StockSerialItems.php:9 StockStatus.php:40 StockTransferControlled.php:14
#: SuppLoginSetup.php:24 WWW_Users.php:16
msgid "Inventory"
msgstr "Bestandsführung"
@@ -13183,7 +13183,7 @@
msgid "Bulk Inventory Transfer"
msgstr "Massenumlagerung"
-#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:132
+#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:201
#: StockLocTransferReceive.php:411 StockLocTransferReceive.php:503
#: StockTransfers.php:27 StockTransfers.php:446 StockUsage.php:28
#: SuppCreditGRNs.php:19 SuppInvGRNs.php:16
@@ -15168,10 +15168,11 @@
#: MRPReport.php:724 SelectAsset.php:222 SelectCustomer.php:392
#: SelectCustomer.php:473 SelectOrderItems.php:1380 SelectProduct.php:709
-#: SelectSupplier.php:235 SelectSupplier.php:297 SupplierTenders.php:146
-#: SupplierTenders.php:204 WorkOrderIssue.php:352 WorkOrderReceive.php:676
-#: includes/Add_SerialItemsOut.php:23 includes/Add_SerialItems.php:33
-#: includes/Add_SerialItems.php:184 includes/Add_SerialItems.php:281
+#: SelectSupplier.php:235 SelectSupplier.php:297 StockLocTransfer.php:61
+#: SupplierTenders.php:146 SupplierTenders.php:204 WorkOrderIssue.php:352
+#: WorkOrderReceive.php:676 includes/Add_SerialItemsOut.php:23
+#: includes/Add_SerialItems.php:33 includes/Add_SerialItems.php:184
+#: includes/Add_SerialItems.php:281
#: includes/PDFBankingSummaryPageHeader.inc:19
msgid "of"
msgstr "von"
@@ -15205,7 +15206,7 @@
msgid "Total Qty On Hand"
msgstr "Gesamtbestand"
-#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:9
+#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:7
msgid "Stock Status"
msgstr "Bestandsstatus"
@@ -15330,8 +15331,8 @@
msgid "Supply"
msgstr "Vorrat"
-#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:83
-#: StockStatus.php:90
+#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:81
+#: StockStatus.php:88
msgid "Demand"
msgstr "Bedarf"
@@ -19306,7 +19307,7 @@
msgstr "Datumsart"
#: POReport.php:516 POReport.php:1286 POReport.php:1515 SalesInquiry.php:780
-#: SalesInquiry.php:1087 StockStatus.php:309
+#: SalesInquiry.php:1087 StockStatus.php:307
msgid "Date Range"
msgstr "Zeitraum:"
@@ -19420,7 +19421,7 @@
msgid "Run Inquiry"
msgstr "Abfrage ausführen"
-#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:357
+#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:355
#: StockUsage.php:200
msgid "Search Outstanding Purchase Orders"
msgstr "Offene Bestellungen suchen"
@@ -20974,7 +20975,7 @@
#: PurchData.php:529 SelectProduct.php:402 StockAdjustments.php:464
#: StockCostUpdate.php:189 StockLocStatus.php:108 StockMovements.php:201
-#: StockQuantityByDate.php:70 StockStatus.php:61 StockTransfers.php:559
+#: StockQuantityByDate.php:70 StockStatus.php:59 StockTransfers.php:559
#: StockUsage.php:192
msgid "Show Stock Status"
msgstr "Bestandsstatus anzeigen"
@@ -20987,14 +20988,14 @@
#: PurchData.php:531 SelectProduct.php:405 SelectSalesOrder.php:6
#: StockAdjustments.php:470 StockCostUpdate.php:192 StockMovements.php:203
-#: StockReorderLevel.php:109 StockStatus.php:354 StockTransfers.php:565
+#: StockReorderLevel.php:109 StockStatus.php:352 StockTransfers.php:565
#: StockUsage.php:196
msgid "Search Outstanding Sales Orders"
msgstr "Offene Kundenaufträge suchen"
#: PurchData.php:532 SelectProduct.php:406 StockAdjustments.php:472
#: StockCostUpdate.php:193 StockMovements.php:204 StockReorderLevel.php:110
-#: StockStatus.php:355 StockTransfers.php:567 StockUsage.php:198
+#: StockStatus.php:353 StockTransfers.php:567 StockUsage.php:198
msgid "Search Completed Sales Orders"
msgstr "Abgeschlossene Kundenaufträge suchen"
@@ -21347,7 +21348,7 @@
msgstr "Bericht Wiederbestellbestände"
#: ReorderLevel.php:175 SelectSalesOrder.php:496 StockDispatch.php:248
-#: StockLocMovements.php:18 StockLocStatus.php:32 StockLocTransfer.php:146
+#: StockLocMovements.php:18 StockLocStatus.php:32 StockLocTransfer.php:215
#: StockMovements.php:34 StockTransfers.php:484 StockUsage.php:66
msgid "From Stock Location"
msgstr "Vom Lager"
@@ -24069,7 +24070,7 @@
#: SelectProduct.php:336 StockLocStatus.php:162 StockQuantityByDate.php:107
#: StockReorderLevel.php:54 StockSerialItems.php:108 StockSerialItems.php:111
#: StockSerialItems.php:114 StockSerialItems.php:119 StockSerialItems.php:123
-#: StockSerialItems.php:127 StockStatus.php:88
+#: StockSerialItems.php:127 StockStatus.php:86
msgid "Quantity On Hand"
msgstr "Bestandsmenge"
@@ -25456,7 +25457,7 @@
msgid "Enter Stock Adjustment"
msgstr "Bestandskorrektur erfassen"
-#: StockAdjustments.php:466 StockStatus.php:352 StockTransfers.php:561
+#: StockAdjustments.php:466 StockStatus.php:350 StockTransfers.php:561
msgid "Show Movements"
msgstr "Bewegungen anzeigen"
@@ -25895,7 +25896,7 @@
msgid "The quantity entered for line"
msgstr "Die eingegebene Menge für Zeile"
-#: StockCounts.php:51 StockLocTransfer.php:40 StockLocTransferReceive.php:34
+#: StockCounts.php:51 StockLocTransfer.php:104 StockLocTransferReceive.php:34
msgid "is not numeric"
msgstr "ist nicht numerisch"
@@ -25986,7 +25987,7 @@
msgid "The stock dispatch did not have any items to list"
msgstr "Zur Warenausgangsliste waren keine Positionen auszugeben"
-#: StockDispatch.php:179 StockLocTransfer.php:101
+#: StockDispatch.php:179 StockLocTransfer.php:170
msgid "Unable to enter Location Transfer record for"
msgstr "Die Umlagerungsbuchung konnte nicht eingebucht werden für"
@@ -26034,7 +26035,7 @@
msgid "Dispatch Percent"
msgstr "Umlagerungs-Prozentsatz"
-#: StockDispatch.php:264 StockLocTransfer.php:165 StockTransfers.php:508
+#: StockDispatch.php:264 StockLocTransfer.php:234 StockTransfers.php:508
msgid "To Stock Location"
msgstr "Ziel-Lagerort"
@@ -26103,7 +26104,7 @@
msgid "But after"
msgstr "und nach"
-#: StockLocMovements.php:82 StockMovements.php:86 StockStatus.php:264
+#: StockLocMovements.php:82 StockMovements.php:86 StockStatus.php:262
msgid ""
"The stock movements for the selected criteria could not be retrieved because"
msgstr ""
@@ -26135,7 +26136,7 @@
msgid "Only items where stock is available"
msgstr "Nur Artikel mit Bestand"
-#: StockLocStatus.php:152 StockReorderLevel.php:39 StockStatus.php:73
+#: StockLocStatus.php:152 StockReorderLevel.php:39 StockStatus.php:71
msgid "The stock held at each location cannot be retrieved because"
msgstr ""
"Der Bestand an den einzelnen Lagerorten kann nicht abgerufen werden, weil"
@@ -26145,19 +26146,19 @@
msgid "StockID"
msgstr "Mat.Nr."
-#: StockLocStatus.php:163 StockReorderLevel.php:55 StockStatus.php:89
+#: StockLocStatus.php:163 StockReorderLevel.php:55 StockStatus.php:87
msgid "Re-Order Level"
msgstr "Bestellpunkt"
-#: StockLocStatus.php:239 StockStatus.php:181
+#: StockLocStatus.php:239 StockStatus.php:179
msgid "The quantity on order for this product to be received into"
msgstr "Erwartete Bestellmenge für diesen Artikel ins Lager"
-#: StockLocStatus.php:281 StockLocStatus.php:311 StockStatus.php:222
+#: StockLocStatus.php:281 StockLocStatus.php:311 StockStatus.php:220
msgid "Serial Numbers"
msgstr "Seriennummern"
-#: StockLocStatus.php:283 StockLocStatus.php:313 StockStatus.php:224
+#: StockLocStatus.php:283 StockLocStatus.php:313 StockStatus.php:222
#: WorkOrderEntry.php:541
msgid "Batches"
msgstr "Chargen"
@@ -26174,52 +26175,78 @@
msgid "Please start over now"
msgstr "Bitte beginnen Sie nochmals von vorn"
-#: StockLocTransfer.php:34 StockLocTransfer.php:58
+#: StockLocTransfer.php:37 Z_ImportFixedAssets.php:48
+msgid "File contains"
+msgstr "Die Datei enthält"
+
+#: StockLocTransfer.php:37
+msgid ""
+"columns, but only 2 columns are expected. The comma separated file should "
+"have just two columns the first for the item code and the second for the "
+"quantity to transfer"
+msgstr ""
+
+#: StockLocTransfer.php:54 StockLocTransfer.php:98 StockLocTransfer.php:123
msgid "The part code entered of"
msgstr "Die eingegebene Artikelnummer"
-#: StockLocTransfer.php:34
+#: StockLocTransfer.php:54 StockLocTransfer.php:98
msgid "is not set up in the database"
msgstr "ist nicht in der Datenbank erfasst"
-#: StockLocTransfer.php:34
+#: StockLocTransfer.php:54 StockLocTransfer.php:98
msgid "Only valid parts can be entered for transfers"
msgstr "Nur gültige Artikel können für Umlagerungen angegeben werden"
-#: StockLocTransfer.php:40
+#: StockLocTransfer.php:61 StockLocTransfer.php:109
+#: StockLocTransferReceive.php:34 StockLocTransferReceive.php:38
+msgid "The quantity entered for"
+msgstr "Die eingegebene Menge für"
+
+#: StockLocTransfer.php:61
+#, fuzzy
+msgid "is not numeric."
+msgstr "ist nicht numerisch"
+
+#: StockLocTransfer.php:61 StockLocTransfer.php:104
+msgid "The quantity entered for transfers is expected to be numeric"
+msgstr "Die eingegebene Umlagerungsmenge muss numerisch sein"
+
+#: StockLocTransfer.php:75
+#, fuzzy
+msgid "does not have enough stock available ("
+msgstr "hat nicht genügend für die Umlagerung verfügbaren Bestand"
+
+#: StockLocTransfer.php:75
+#, fuzzy
+msgid "The quantity required to transfer was"
+msgstr "Die fehlerhafte Abfrage war"
+
+#: StockLocTransfer.php:104
msgid "The quantity entered of"
msgstr "Die angegebene Menge von"
-#: StockLocTransfer.php:40
+#: StockLocTransfer.php:104
msgid "for part code"
msgstr "für den Artikel"
-#: StockLocTransfer.php:40
-msgid "The quantity entered for transfers is expected to be numeric"
-msgstr "Die eingegebene Umlagerungsmenge muss numerisch sein"
-
-#: StockLocTransfer.php:45 StockLocTransferReceive.php:34
-#: StockLocTransferReceive.php:38
-msgid "The quantity entered for"
-msgstr "Die eingegebene Menge für"
-
-#: StockLocTransfer.php:45
+#: StockLocTransfer.php:109
msgid "is less than or equal to 0"
msgstr "ist kleiner oder gleich 0"
-#: StockLocTransfer.php:45
+#: StockLocTransfer.php:109
msgid "Please correct this or remove the item"
msgstr "Bitte bitte die Menge korrigieren oder diese Position entfernen"
-#: StockLocTransfer.php:58
+#: StockLocTransfer.php:123
msgid "does not have enough stock available for transfer."
msgstr "hat nicht genügend für die Umlagerung verfügbaren Bestand"
-#: StockLocTransfer.php:67
+#: StockLocTransfer.php:135
msgid "You must enter at least 1 Stock Item to transfer"
msgstr "Sie müssem wenigstens einen Artikel für die Umlagerung angeben"
-#: StockLocTransfer.php:73
+#: StockLocTransfer.php:141
msgid ""
"The transfer must have a different location to receive into and location "
"sent from"
@@ -26227,31 +26254,35 @@
"Für die Umlagerung müssen unterschiedliche Abgangs- und Zugangs-Lagerorte "
"angegeben werden"
-#: StockLocTransfer.php:79
+#: StockLocTransfer.php:148
msgid "Unable to BEGIN Location Transfer transaction"
msgstr "Umlagerungstransaktion konnte nicht begonnen werden"
-#: StockLocTransfer.php:105
+#: StockLocTransfer.php:174
msgid "Unable to COMMIT Location Transfer transaction"
msgstr "Die Umlagerungstransakton konnte nicht beendet werden"
-#: StockLocTransfer.php:108
+#: StockLocTransfer.php:177
msgid "The inventory transfer records have been created successfully"
msgstr "Die Umlagerungssätze wurden erfolgreich angelegt"
-#: StockLocTransfer.php:109
+#: StockLocTransfer.php:178
msgid "Print the Transfer Docket"
msgstr "Umlagerungszettel drucken"
-#: StockLocTransfer.php:140
+#: StockLocTransfer.php:209
msgid "Inventory Location Transfer Shipment Reference"
msgstr "Umlagerung Transportschein"
-#: StockLocTransfer.php:229
+#: StockLocTransfer.php:253
+msgid "Upload CSV file of Transfer Items and Quantites"
+msgstr ""
+
+#: StockLocTransfer.php:304
msgid "Add More Items"
msgstr "Weitere Artikel hinzufügen"
-#: StockLocTransfer.php:230
+#: StockLocTransfer.php:305
msgid "Create Transfer Shipment"
msgstr "Umlagerung anlegen"
@@ -26443,7 +26474,7 @@
msgid "Stock Movements"
msgstr "Warenbewegungen"
-#: StockMovements.php:19 StockStatus.php:43 StockUsage.php:57
+#: StockMovements.php:19 StockStatus.php:41 StockUsage.php:57
#: WhereUsedInquiry.php:33
msgid "in units of"
msgstr "in Einheiten von"
@@ -26870,7 +26901,7 @@
msgid "The stock item could not be updated because"
msgstr "Der Artikelsatz konnte nicht geändert werden, weil"
-#: Stocks.php:372 StockStatus.php:74
+#: Stocks.php:372 StockStatus.php:72
msgid "The SQL that was used to update the stock item and failed was"
msgstr "Die fehlerhafte Abfrage war"
@@ -27164,48 +27195,48 @@
msgid "Delete This Item"
msgstr "Diesen Artikel löschen"
-#: StockStatus.php:33
+#: StockStatus.php:31
msgid "Could not retrieve the requested item"
msgstr "Konnte den gewünschten Artikel nicht finden"
-#: StockStatus.php:34
+#: StockStatus.php:32
msgid "The SQL used to retrieve the items was"
msgstr "Die fehlerhafte Abfrage war"
-#: StockStatus.php:48
+#: StockStatus.php:46
msgid "This is a kitset part and cannot have a stock holding"
msgstr "Dies ist ein Bestellsatz und kann keine Lagerhaltung haben"
-#: StockStatus.php:48 StockStatus.php:51 StockStatus.php:54
+#: StockStatus.php:46 StockStatus.php:49 StockStatus.php:52
msgid "only the total quantity on outstanding sales orders is shown"
msgstr "nur die Gesamtmenge der offenen Auftragspositionen wird angezeigt"
-#: StockStatus.php:51
+#: StockStatus.php:49
msgid "This is an assembly part and cannot have a stock holding"
msgstr "Dies ist eine Baugruppe und kann keine Lagerhaltung haben"
-#: StockStatus.php:54
+#: StockStatus.php:52
msgid "This is an dummy part and cannot have a stock holding"
msgstr "Dies ist eine Dummy-Position und kann keine Lagerhaltung haben"
-#: StockStatus.php:161
+#: StockStatus.php:159
msgid "The workorder component demand for this product from"
msgstr "Der Bedarf aus Fertigungsaufträgen für diesen Artikel aus"
-#: StockStatus.php:198
+#: StockStatus.php:196
msgid "The quantity on work orders for this product to be received into"
msgstr ""
"abzuliefernde Menge aus Fertigungsaufträgen für diesen Artikel ins Lager"
-#: StockStatus.php:306
+#: StockStatus.php:304
msgid "Pricing history for sales of"
msgstr "Preisentwicklung für den Verkauf von"
-#: StockStatus.php:347
+#: StockStatus.php:345
msgid "No history of sales of"
msgstr "Keine Vergangenheitsdaten für"
-#: StockStatus.php:353
+#: StockStatus.php:351
msgid "Show Usage"
msgstr "Verwendung anzeigen"
@@ -34367,10 +34398,6 @@
msgstr "Sachanlagen importieren"
#: Z_ImportFixedAssets.php:48
-msgid "File contains"
-msgstr "Die Datei enthält"
-
-#: Z_ImportFixedAssets.php:48
msgid "columns, expected"
msgstr "Spalten, erwartet wurden"
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2011-12-15 11:56:25 UTC (rev 4780)
+++ trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2011-12-17 23:06:55 UTC (rev 4781)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 16:31+1300\n"
+"POT-Creation-Date: 2011-12-10 09:04+1300\n"
"PO-Revision-Date: 2011-02-08 10:30+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -911,7 +911,7 @@
#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
-#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:265
+#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
@@ -1569,7 +1569,7 @@
#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
-#: Stocks.php:266 Stocks.php:271 StockStatus.php:306 StockStatus.php:347
+#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
@@ -1983,8 +1983,8 @@
#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
-#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186
-#: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:261
+#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
#: WOSerialNos.php:296 includes/InputSerialItems.php:111
@@ -2363,7 +2363,7 @@
#: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173
#: StockAdjustments.php:85 StockAdjustments.php:359 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:32 StockReorderLevel.php:46
-#: StockStatus.php:59 StockTransfers.php:47 StockTransfers.php:458
+#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:458
#: StockUsage.php:64 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667 Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:313
@@ -2772,7 +2772,7 @@
#: PDFOrdersInvoiced.php:309 PDFOrderStatus.php:278
#: ReorderLevelLocation.php:169 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:53 StockSerialItemResearch.php:80
-#: StockStatus.php:82 StockStatus.php:87 WhereUsedInquiry.php:72
+#: StockStatus.php:80 StockStatus.php:85 WhereUsedInquiry.php:72
#: WorkCentres.php:128 WorkCentres.php:221
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2258
@@ -3319,7 +3319,7 @@
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:185 StockLocTransferReceive.php:427
+#: StockLocTransfer.php:260 StockLocTransferReceive.php:427
#: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787
#: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175
#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315
@@ -3386,7 +3386,7 @@
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
#: RecurringSalesOrders.php:322 SelectCreditItems.php:675
#: SelectOrderItems.php:1336 Shipments.php:405 StockLocMovements.php:94
-#: StockMovements.php:99 StockStatus.php:311 SuppCreditGRNs.php:181
+#: StockMovements.php:99 StockStatus.php:309 SuppCreditGRNs.php:181
#: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267
#: SupplierTenders.php:494 SuppPriceList.php:292
#: includes/DefineLabelClass.php:49 includes/PDFQuotationPageHeader.inc:104
@@ -3403,7 +3403,7 @@
#: PrintCustTransPortrait.php:1067 RecurringSalesOrders.php:323
#: SalesAnalReptCols.php:41 SalesAnalReptCols.php:43 SelectCreditItems.php:677
#: SelectOrderItems.php:1339 StockLocMovements.php:95 StockMovements.php:100
-#: StockStatus.php:312 includes/PDFQuotationPageHeader.inc:105
+#: StockStatus.php:310 includes/PDFQuotationPageHeader.inc:105
#: includes/PDFQuotationPortraitPageHeader.inc:105
#: includes/PDFTransPageHeader.inc:211
msgid "Discount"
@@ -3748,8 +3748,8 @@
#: ShipmentCosting.php:428 ShipmentCosting.php:447 ShipmentCosting.php:461
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
-#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:79
-#: StockLocTransfer.php:101 StockLocTransfer.php:105
+#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:148
+#: StockLocTransfer.php:170 StockLocTransfer.php:174
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
#: StockLocTransferReceive.php:214 StockLocTransferReceive.php:250
@@ -4453,7 +4453,7 @@
"Το BOM σύμβαση δεν μπορεί να alterned διότι ο πελάτης έχει τοποθετήσει ήδη "
"τη σειρά"
-#: ContractBOM.php:175 PO_Items.php:538
+#: ContractBOM.php:175 PO_Items.php:538 StockLocTransfer.php:75
#: includes/SelectOrderItems_IntoCart.inc:27
#: includes/SelectOrderItems_IntoCart.inc:64
msgid "The item"
@@ -5252,8 +5252,8 @@
#: SelectOrderItems.php:548 SelectOrderItems.php:1523
#: SelectOrderItems.php:1704 SpecialOrder.php:61 SpecialOrder.php:85
#: StockCheck.php:221 StockLocStatus.php:183 StockLocStatus.php:206
-#: StockLocStatus.php:239 StockStatus.php:117 StockStatus.php:141
-#: StockStatus.php:161 StockStatus.php:181 StockStatus.php:198
+#: StockLocStatus.php:239 StockStatus.php:115 StockStatus.php:139
+#: StockStatus.php:159 StockStatus.php:179 StockStatus.php:196
#: SupplierCredit.php:91 SupplierInvoice.php:70
msgid "cannot be retrieved because"
msgstr "δεν μπορούν να ανακτηθούν επειδή"
@@ -6055,19 +6055,19 @@
msgstr "On Demand"
#: CounterSales.php:2034 CounterSales.php:2219 SelectOrderItems.php:1489
-#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:92
+#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:90
msgid "On Order"
msgstr "Στις Παραγγελία"
#: CounterSales.php:2035 CounterSales.php:2220 SelectOrderItems.php:1490
-#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:91
+#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:89
#: includes/OutputSerialItems.php:37 includes/PDFStockCheckPageHeader.inc:40
msgid "Available"
msgstr "Διαθέσιμο"
#: CounterSales.php:2064 CounterSales.php:2246 SelectOrderItems.php:1522
#: SelectOrderItems.php:1704 StockCheck.php:221 StockLocStatus.php:183
-#: StockLocStatus.php:206 StockStatus.php:117 StockStatus.php:141
+#: StockLocStatus.php:206 StockStatus.php:115 StockStatus.php:139
msgid "The demand for this product from"
msgstr "Η ζήτηση για αυτό το προϊόν από"
@@ -13252,7 +13252,7 @@
#: ReorderLevel.php:164 SelectProduct.php:78 StockDispatch.php:221
#: StockMovements.php:19 StockQties_csv.php:8 StockQuantityByDate.php:10
#: StockReorderLevel.php:18 StockSerialItemResearch.php:9
-#: StockSerialItems.php:9 StockStatus.php:42 StockTransferControlled.php:14
+#: StockSerialItems.php:9 StockStatus.php:40 StockTransferControlled.php:14
#: SuppLoginSetup.php:24 WWW_Users.php:16
msgid "Inventory"
msgstr "Απογραφή"
@@ -13530,7 +13530,7 @@
msgid "Bulk Inventory Transfer"
msgstr "Μαζική Απογραφή Μεταφορά"
-#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:132
+#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:201
#: StockLocTransferReceive.php:411 StockLocTransferReceive.php:503
#: StockTransfers.php:27 StockTransfers.php:446 StockUsage.php:28
#: SuppCreditGRNs.php:19 SuppInvGRNs.php:16
@@ -15529,10 +15529,11 @@
#: MRPReport.php:724 SelectAsset.php:222 SelectCustomer.php:392
#: SelectCustomer.php:473 SelectOrderItems.php:1380 SelectProduct.php:709
-#: SelectSupplier.php:235 SelectSupplier.php:297 SupplierTenders.php:146
-#: SupplierTenders.php:204 WorkOrderIssue.php:352 WorkOrderReceive.php:676
-#: includes/Add_SerialItemsOut.php:23 includes/Add_SerialItems.php:33
-#: includes/Add_SerialItems.php:184 includes/Add_SerialItems.php:281
+#: SelectSupplier.php:235 SelectSupplier.php:297 StockLocTransfer.php:61
+#: SupplierTenders.php:146 SupplierTenders.php:204 WorkOrderIssue.php:352
+#: WorkOrderReceive.php:676 includes/Add_SerialItemsOut.php:23
+#: includes/Add_SerialItems.php:33 includes/Add_SerialItems.php:184
+#: includes/Add_SerialItems.php:281
#: includes/PDFBankingSummaryPageHeader.inc:19
msgid "of"
msgstr "του"
@@ -15566,7 +15567,7 @@
msgid "Total Qty On Hand"
msgstr "Συνολική Ποσότητα για το χέρι"
-#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:9
+#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:7
msgid "Stock Status"
msgstr "Χρηματιστήριο Κατάσταση"
@@ -15688,8 +15689,8 @@
msgid "Supply"
msgstr "Εφοδιασμού"
-#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:83
-#: StockStatus.php:90
+#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:81
+#: StockStatus.php:88
msgid "Demand"
msgstr "Ζήτησης"
@@ -19778,7 +19779,7 @@
msgstr "Ημερομηνία Τύπος"
#: POReport.php:516 POReport.php:1286 POReport.php:1515 SalesInquiry.php:780
-#: SalesInquiry.php:1087 StockStatus.php:309
+#: SalesInquiry.php:1087 StockStatus.php:307
msgid "Date Range"
msgstr "Χρονικό διάστημα"
@@ -19892,7 +19893,7 @@
msgid "Run Inquiry"
msgstr "Εκτέλεση Εξεταστική"
-#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:357
+#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:355
#: StockUsage.php:200
msgid "Search Outstanding Purchase Orders"
msgstr "Αναζήτηση Εκκρεμείς Εντολές Αγοράς"
@@ -21466,7 +21467,7 @@
#: PurchData.php:529 SelectProduct.php:402 StockAdjustments.php:464
#: StockCostUpdate.php:189 StockLocStatus.php:108 StockMovements.php:201
-#: StockQuantityByDate.php:70 StockStatus.php:61 StockTransfers.php:559
+#: StockQuantityByDate.php:70 StockStatus.php:59 StockTransfers.php:559
#: StockUsage.php:192
msgid "Show Stock Status"
msgstr "Εμφάνιση κατάστασης των αποθεμάτων"
@@ -21479,14 +21480,14 @@
#: PurchData.php:531 SelectProduct.php:405 SelectSalesOrder.php:6
#: StockAdjustments.php:470 StockCostUpdate.php:192 StockMovements.php:203
-#: StockReorderLevel.php:109 StockStatus.php:354 StockTransfers.php:565
+#: StockReorderLevel.php:109 StockStatus.php:352 StockTransfers.php:565
#: StockUsage.php:196
msgid "Search Outstanding Sales Orders"
msgstr "Αναζήτηση ε...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-17 23:07:06
|
Revision: 4781
http://web-erp.svn.sourceforge.net/web-erp/?rev=4781&view=rev
Author: daintree
Date: 2011-12-17 23:06:55 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
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/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.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_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.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/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-15 11:56:25 UTC (rev 4780)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-17 23:06:55 UTC (rev 4781)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 16:31+1300\n"
+"POT-Creation-Date: 2011-12-10 09:04+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -898,7 +898,7 @@
#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
-#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:265
+#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
@@ -1541,7 +1541,7 @@
#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
-#: Stocks.php:266 Stocks.php:271 StockStatus.php:306 StockStatus.php:347
+#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
@@ -1938,8 +1938,8 @@
#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
-#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186
-#: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:261
+#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
#: WOSerialNos.php:296 includes/InputSerialItems.php:111
@@ -2316,7 +2316,7 @@
#: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173
#: StockAdjustments.php:85 StockAdjustments.php:359 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:32 StockReorderLevel.php:46
-#: StockStatus.php:59 StockTransfers.php:47 StockTransfers.php:458
+#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:458
#: StockUsage.php:64 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667 Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:313
@@ -2711,7 +2711,7 @@
#: PDFOrdersInvoiced.php:309 PDFOrderStatus.php:278
#: ReorderLevelLocation.php:169 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:53 StockSerialItemResearch.php:80
-#: StockStatus.php:82 StockStatus.php:87 WhereUsedInquiry.php:72
+#: StockStatus.php:80 StockStatus.php:85 WhereUsedInquiry.php:72
#: WorkCentres.php:128 WorkCentres.php:221
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2258
@@ -3239,7 +3239,7 @@
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:185 StockLocTransferReceive.php:427
+#: StockLocTransfer.php:260 StockLocTransferReceive.php:427
#: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787
#: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175
#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315
@@ -3306,7 +3306,7 @@
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
#: RecurringSalesOrders.php:322 SelectCreditItems.php:675
#: SelectOrderItems.php:1336 Shipments.php:405 StockLocMovements.php:94
-#: StockMovements.php:99 StockStatus.php:311 SuppCreditGRNs.php:181
+#: StockMovements.php:99 StockStatus.php:309 SuppCreditGRNs.php:181
#: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267
#: SupplierTenders.php:494 SuppPriceList.php:292
#: includes/DefineLabelClass.php:49 includes/PDFQuotationPageHeader.inc:104
@@ -3323,7 +3323,7 @@
#: PrintCustTransPortrait.php:1067 RecurringSalesOrders.php:323
#: SalesAnalReptCols.php:41 SalesAnalReptCols.php:43 SelectCreditItems.php:677
#: SelectOrderItems.php:1339 StockLocMovements.php:95 StockMovements.php:100
-#: StockStatus.php:312 includes/PDFQuotationPageHeader.inc:105
+#: StockStatus.php:310 includes/PDFQuotationPageHeader.inc:105
#: includes/PDFQuotationPortraitPageHeader.inc:105
#: includes/PDFTransPageHeader.inc:211
msgid "Discount"
@@ -3654,8 +3654,8 @@
#: ShipmentCosting.php:428 ShipmentCosting.php:447 ShipmentCosting.php:461
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
-#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:79
-#: StockLocTransfer.php:101 StockLocTransfer.php:105
+#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:148
+#: StockLocTransfer.php:170 StockLocTransfer.php:174
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
#: StockLocTransferReceive.php:214 StockLocTransferReceive.php:250
@@ -4302,7 +4302,7 @@
msgstr ""
"Smlouvu kusovníku nelze alterned, protože zákazník má již umístěn objednávky"
-#: ContractBOM.php:175 PO_Items.php:538
+#: ContractBOM.php:175 PO_Items.php:538 StockLocTransfer.php:75
#: includes/SelectOrderItems_IntoCart.inc:27
#: includes/SelectOrderItems_IntoCart.inc:64
msgid "The item"
@@ -5057,8 +5057,8 @@
#: SelectOrderItems.php:548 SelectOrderItems.php:1523
#: SelectOrderItems.php:1704 SpecialOrder.php:61 SpecialOrder.php:85
#: StockCheck.php:221 StockLocStatus.php:183 StockLocStatus.php:206
-#: StockLocStatus.php:239 StockStatus.php:117 StockStatus.php:141
-#: StockStatus.php:161 StockStatus.php:181 StockStatus.php:198
+#: StockLocStatus.php:239 StockStatus.php:115 StockStatus.php:139
+#: StockStatus.php:159 StockStatus.php:179 StockStatus.php:196
#: SupplierCredit.php:91 SupplierInvoice.php:70
msgid "cannot be retrieved because"
msgstr "nelze načíst, protože"
@@ -5826,19 +5826,19 @@
msgstr "On Demand"
#: CounterSales.php:2034 CounterSales.php:2219 SelectOrderItems.php:1489
-#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:92
+#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:90
msgid "On Order"
msgstr "Na objednávku"
#: CounterSales.php:2035 CounterSales.php:2220 SelectOrderItems.php:1490
-#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:91
+#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:89
#: includes/OutputSerialItems.php:37 includes/PDFStockCheckPageHeader.inc:40
msgid "Available"
msgstr "K dispozici"
#: CounterSales.php:2064 CounterSales.php:2246 SelectOrderItems.php:1522
#: SelectOrderItems.php:1704 StockCheck.php:221 StockLocStatus.php:183
-#: StockLocStatus.php:206 StockStatus.php:117 StockStatus.php:141
+#: StockLocStatus.php:206 StockStatus.php:115 StockStatus.php:139
msgid "The demand for this product from"
msgstr "Poptávka po tomto produktu ze"
@@ -12724,7 +12724,7 @@
#: ReorderLevel.php:164 SelectProduct.php:78 StockDispatch.php:221
#: StockMovements.php:19 StockQties_csv.php:8 StockQuantityByDate.php:10
#: StockReorderLevel.php:18 StockSerialItemResearch.php:9
-#: StockSerialItems.php:9 StockStatus.php:42 StockTransferControlled.php:14
+#: StockSerialItems.php:9 StockStatus.php:40 StockTransferControlled.php:14
#: SuppLoginSetup.php:24 WWW_Users.php:16
msgid "Inventory"
msgstr "Sklad"
@@ -13002,7 +13002,7 @@
msgid "Bulk Inventory Transfer"
msgstr "Hromadný přesun položek"
-#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:132
+#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:201
#: StockLocTransferReceive.php:411 StockLocTransferReceive.php:503
#: StockTransfers.php:27 StockTransfers.php:446 StockUsage.php:28
#: SuppCreditGRNs.php:19 SuppInvGRNs.php:16
@@ -14965,10 +14965,11 @@
#: MRPReport.php:724 SelectAsset.php:222 SelectCustomer.php:392
#: SelectCustomer.php:473 SelectOrderItems.php:1380 SelectProduct.php:709
-#: SelectSupplier.php:235 SelectSupplier.php:297 SupplierTenders.php:146
-#: SupplierTenders.php:204 WorkOrderIssue.php:352 WorkOrderReceive.php:676
-#: includes/Add_SerialItemsOut.php:23 includes/Add_SerialItems.php:33
-#: includes/Add_SerialItems.php:184 includes/Add_SerialItems.php:281
+#: SelectSupplier.php:235 SelectSupplier.php:297 StockLocTransfer.php:61
+#: SupplierTenders.php:146 SupplierTenders.php:204 WorkOrderIssue.php:352
+#: WorkOrderReceive.php:676 includes/Add_SerialItemsOut.php:23
+#: includes/Add_SerialItems.php:33 includes/Add_SerialItems.php:184
+#: includes/Add_SerialItems.php:281
#: includes/PDFBankingSummaryPageHeader.inc:19
msgid "of"
msgstr "ze dne"
@@ -15002,7 +15003,7 @@
msgid "Total Qty On Hand"
msgstr "Celkem Množství na ruce"
-#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:9
+#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:7
msgid "Stock Status"
msgstr "Stav skladu"
@@ -15124,8 +15125,8 @@
msgid "Supply"
msgstr "Zásobování"
-#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:83
-#: StockStatus.php:90
+#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:81
+#: StockStatus.php:88
msgid "Demand"
msgstr "Poptávka"
@@ -19013,7 +19014,7 @@
msgstr "Datum Typ"
#: POReport.php:516 POReport.php:1286 POReport.php:1515 SalesInquiry.php:780
-#: SalesInquiry.php:1087 StockStatus.php:309
+#: SalesInquiry.php:1087 StockStatus.php:307
msgid "Date Range"
msgstr "Časové"
@@ -19127,7 +19128,7 @@
msgid "Run Inquiry"
msgstr "Spustit Poptávka"
-#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:357
+#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:355
#: StockUsage.php:200
msgid "Search Outstanding Purchase Orders"
msgstr "Hledat Vynikající Objednávky"
@@ -20639,7 +20640,7 @@
#: PurchData.php:529 SelectProduct.php:402 StockAdjustments.php:464
#: StockCostUpdate.php:189 StockLocStatus.php:108 StockMovements.php:201
-#: StockQuantityByDate.php:70 StockStatus.php:61 StockTransfers.php:559
+#: StockQuantityByDate.php:70 StockStatus.php:59 StockTransfers.php:559
#: StockUsage.php:192
msgid "Show Stock Status"
msgstr "Zobrazit stavu populace"
@@ -20652,14 +20653,14 @@
#: PurchData.php:531 SelectProduct.php:405 SelectSalesOrder.php:6
#: StockAdjustments.php:470 StockCostUpdate.php:192 StockMovements.php:203
-#: StockReorderLevel.php:109 StockStatus.php:354 StockTransfers.php:565
+#: StockReorderLevel.php:109 StockStatus.php:352 StockTransfers.php:565
#: StockUsage.php:196
msgid "Search Outstanding Sales Orders"
msgstr "Hledat Vynikající Prodejní objednávky"
#: PurchData.php:532 SelectProduct.php:406 StockAdjustments.php:472
#: StockCostUpdate.php:193 StockMovements.php:204 StockReorderLevel.php:110
-#: StockStatus.php:355 StockTransfers.php:567 StockUsage.php:198
+#: StockStatus.php:353 StockTransfers.php:567 StockUsage.php:198
msgid "Search Completed Sales Orders"
msgstr "Vyhledávání Dokončené Prodejní objednávky"
@@ -21008,7 +21009,7 @@
msgstr "Zásoby Změna pořadí Úroveň zprávě"
#: ReorderLevel.php:175 SelectSalesOrder.php:496 StockDispatch.php:248
-#: StockLocMovements.php:18 StockLocStatus.php:32 StockLocTransfer.php:146
+#: StockLocMovements.php:18 StockLocStatus.php:32 StockLocTransfer.php:215
#: StockMovements.php:34 StockTransfers.php:484 StockUsage.php:66
msgid "From Stock Location"
msgstr "Od Umístění skladu"
@@ -23687,7 +23688,7 @@
#: SelectProduct.php:336 StockLocStatus.php:162 StockQuantityByDate.php:107
#: StockReorderLevel.php:54 StockSerialItems.php:108 StockSerialItems.php:111
#: StockSerialItems.php:114 StockSerialItems.php:119 StockSerialItems.php:123
-#: StockSerialItems.php:127 StockStatus.php:88
+#: StockSerialItems.php:127 StockStatus.php:86
msgid "Quantity On Hand"
msgstr "Množství na ruce"
@@ -25049,7 +25050,7 @@
msgid "Enter Stock Adjustment"
msgstr "Zadejte skladem Nastavení"
-#: StockAdjustments.php:466 StockStatus.php:352 StockTransfers.php:561
+#: StockAdjustments.php:466 StockStatus.php:350 StockTransfers.php:561
msgid "Show Movements"
msgstr "Zobrazit Pohyby"
@@ -25484,7 +25485,7 @@
msgid "The quantity entered for line"
msgstr "Množství propuštěné do linky"
-#: StockCounts.php:51 StockLocTransfer.php:40 StockLocTransferReceive.php:34
+#: StockCounts.php:51 StockLocTransfer.php:104 StockLocTransferReceive.php:34
msgid "is not numeric"
msgstr "není číselný"
@@ -25572,7 +25573,7 @@
msgid "The stock dispatch did not have any items to list"
msgstr "Populace odeslání neměl žádné položky do seznamu"
-#: StockDispatch.php:179 StockLocTransfer.php:101
+#: StockDispatch.php:179 StockLocTransfer.php:170
msgid "Unable to enter Location Transfer record for"
msgstr "Nelze zadat umístění Transfer rekord"
@@ -25621,7 +25622,7 @@
msgid "Dispatch Percent"
msgstr "Expedice procent"
-#: StockDispatch.php:264 StockLocTransfer.php:165 StockTransfers.php:508
+#: StockDispatch.php:264 StockLocTransfer.php:234 StockTransfers.php:508
msgid "To Stock Location"
msgstr "Chcete-li Umístění skladu"
@@ -25690,7 +25691,7 @@
msgid "But after"
msgstr "Ale poté, co"
-#: StockLocMovements.php:82 StockMovements.php:86 StockStatus.php:264
+#: StockLocMovements.php:82 StockMovements.php:86 StockStatus.php:262
msgid ""
"The stock movements for the selected criteria could not be retrieved because"
msgstr "Pohyby zásob pro zvolená kritéria se nepodařilo získat, protože"
@@ -25720,7 +25721,7 @@
msgid "Only items where stock is available"
msgstr "Pouze položky, kde je k dispozici skladem"
-#: StockLocStatus.php:152 StockReorderLevel.php:39 StockStatus.php:73
+#: StockLocStatus.php:152 StockReorderLevel.php:39 StockStatus.php:71
msgid "The stock held at each location cannot be retrieved because"
msgstr "Stavu zásob v každém místě, nemůže získat, protože"
@@ -25729,19 +25730,19 @@
msgid "StockID"
msgstr "StockID"
-#: StockLocStatus.php:163 StockReorderLevel.php:55 StockStatus.php:89
+#: StockLocStatus.php:163 StockReorderLevel.php:55 StockStatus.php:87
msgid "Re-Order Level"
msgstr "Re-Objednávka úrovni"
-#: StockLocStatus.php:239 StockStatus.php:181
+#: StockLocStatus.php:239 StockStatus.php:179
msgid "The quantity on order for this product to be received into"
msgstr "Množství na objednávku pro tento produkt mají být přijaty do"
-#: StockLocStatus.php:281 StockLocStatus.php:311 StockStatus.php:222
+#: StockLocStatus.php:281 StockLocStatus.php:311 StockStatus.php:220
msgid "Serial Numbers"
msgstr "Sériová čísla"
-#: StockLocStatus.php:283 StockLocStatus.php:313 StockStatus.php:224
+#: StockLocStatus.php:283 StockLocStatus.php:313 StockStatus.php:222
#: WorkOrderEntry.php:541
msgid "Batches"
msgstr "Dávky"
@@ -25758,82 +25759,112 @@
msgid "Please start over now"
msgstr "Prosím začít více než nyní"
-#: StockLocTransfer.php:34 StockLocTransfer.php:58
+#: StockLocTransfer.php:37 Z_ImportFixedAssets.php:48
+msgid "File contains"
+msgstr "Soubor obsahuje"
+
+#: StockLocTransfer.php:37
+msgid ""
+"columns, but only 2 columns are expected. The comma separated file should "
+"have just two columns the first for the item code and the second for the "
+"quantity to transfer"
+msgstr ""
+
+#: StockLocTransfer.php:54 StockLocTransfer.php:98 StockLocTransfer.php:123
msgid "The part code entered of"
msgstr "Část kódu vstoupila na"
-#: StockLocTransfer.php:34
+#: StockLocTransfer.php:54 StockLocTransfer.php:98
msgid "is not set up in the database"
msgstr "není zřízen v databázi"
-#: StockLocTransfer.php:34
+#: StockLocTransfer.php:54 StockLocTransfer.php:98
msgid "Only valid parts can be entered for transfers"
msgstr "Platné pouze části mohou být zapsány pro převody"
-#: StockLocTransfer.php:40
+#: StockLocTransfer.php:61 StockLocTransfer.php:109
+#: StockLocTransferReceive.php:34 StockLocTransferReceive.php:38
+msgid "The quantity entered for"
+msgstr "Množství propuštěné do"
+
+#: StockLocTransfer.php:61
+#, fuzzy
+msgid "is not numeric."
+msgstr "není číselný"
+
+#: StockLocTransfer.php:61 StockLocTransfer.php:104
+msgid "The quantity entered for transfers is expected to be numeric"
+msgstr "Množství uvedené pro převody Očekává se, že číselné"
+
+#: StockLocTransfer.php:75
+#, fuzzy
+msgid "does not have enough stock available ("
+msgstr "nemá dostatek zásob k dispozici pro převod."
+
+#: StockLocTransfer.php:75
+#, fuzzy
+msgid "The quantity required to transfer was"
+msgstr "SQL získat převod byl"
+
+#: StockLocTransfer.php:104
msgid "The quantity entered of"
msgstr "Množství uvedené v"
-#: StockLocTransfer.php:40
+#: StockLocTransfer.php:104
msgid "for part code"
msgstr "pro část kódu"
-#: StockLocTransfer.php:40
-msgid "The quantity entered for transfers is expected to be numeric"
-msgstr "Množství uvedené pro převody Očekává se, že číselné"
-
-#: StockLocTransfer.php:45 StockLocTransferReceive.php:34
-#: StockLocTransferReceive.php:38
-msgid "The quantity entered for"
-msgstr "Množství propuštěné do"
-
-#: StockLocTransfer.php:45
+#: StockLocTransfer.php:109
msgid "is less than or equal to 0"
msgstr "je menší než nebo rovna 0"
-#: StockLocTransfer.php:45
+#: StockLocTransfer.php:109
msgid "Please correct this or remove the item"
msgstr "Opravte to nebo odebrat položku"
-#: StockLocTransfer.php:58
+#: StockLocTransfer.php:123
msgid "does not have enough stock available for transfer."
msgstr "nemá dostatek zásob k dispozici pro převod."
-#: StockLocTransfer.php:67
+#: StockLocTransfer.php:135
msgid "You must enter at least 1 Stock Item to transfer"
msgstr "Musíte zadat alespoň 1 bod skladem k převodu"
-#: StockLocTransfer.php:73
+#: StockLocTransfer.php:141
msgid ""
"The transfer must have a different location to receive into and location "
"sent from"
msgstr "Převod musí mít jiné umístění pro příjem a umístění do odeslané z"
-#: StockLocTransfer.php:79
+#: StockLocTransfer.php:148
msgid "Unable to BEGIN Location Transfer transaction"
msgstr "Nelze BEGIN Místo Transfer transakce"
-#: StockLocTransfer.php:105
+#: StockLocTransfer.php:174
msgid "Unable to COMMIT Location Transfer transaction"
msgstr "Nelze COMMIT Místo transakce Transfer"
-#: StockLocTransfer.php:108
+#: StockLocTransfer.php:177
msgid "The inventory transfer records have been created successfully"
msgstr "Inventární převod byly úspěšně vytvořen"
-#: StockLocTransfer.php:109
+#: StockLocTransfer.php:178
msgid "Print the Transfer Docket"
msgstr "Tisk Transfer Docket"
-#: StockLocTransfer.php:140
+#: StockLocTransfer.php:209
msgid "Inventory Location Transfer Shipment Reference"
msgstr "Zásoby Umístění Transfer zásilku Reference"
-#: StockLocTransfer.php:229
+#: StockLocTransfer.php:253
+msgid "Upload CSV file of Transfer Items and Quantites"
+msgstr ""
+
+#: StockLocTransfer.php:304
msgid "Add More Items"
msgstr "Přidat další položky"
-#: StockLocTransfer.php:230
+#: StockLocTransfer.php:305
msgid "Create Transfer Shipment"
msgstr "Vytvořit zásilku Transfer"
@@ -26024,7 +26055,7 @@
msgid "Stock Movements"
msgstr "Pohybů zásob"
-#: StockMovements.php:19 StockStatus.php:43 StockUsage.php:57
+#: StockMovements.php:19 StockStatus.php:41 StockUsage.php:57
#: WhereUsedInquiry.php:33
msgid "in units of"
msgstr "v jednotkách"
@@ -26435,7 +26466,7 @@
msgid "The stock item could not be updated because"
msgstr "Skladová položka nelze aktualizovat, protože"
-#: Stocks.php:372 StockStatus.php:74
+#: Stocks.php:372 StockStatus.php:72
msgid "The SQL that was used to update the stock item and failed was"
msgstr "SQL, který byl použit k aktualizaci na skladě a neúspěšný byl"
@@ -26731,47 +26762,47 @@
msgid "Delete This Item"
msgstr "Odstranit tuto položku"
-#: StockStatus.php:33
+#: StockStatus.php:31
msgid "Could not retrieve the requested item"
msgstr "Nepodařilo se načíst požadovanou položku"
-#: StockStatus.php:34
+#: StockStatus.php:32
msgid "The SQL used to retrieve the items was"
msgstr "SQL používá k načtení položek byl"
-#: StockStatus.php:48
+#: StockStatus.php:46
msgid "This is a kitset part and cannot have a stock holding"
msgstr "Jedná se o kitset část a nemůže mít skladového hospodářství"
-#: StockStatus.php:48 StockStatus.php:51 StockStatus.php:54
+#: StockStatus.php:46 StockStatus.php:49 StockStatus.php:52
msgid "only the total quantity on outstanding sales orders is shown"
msgstr "pouze celkové množství, pro vynikající prodejní objednávky je zobrazen"
-#: StockStatus.php:51
+#: StockStatus.php:49
msgid "This is an assembly part and cannot have a stock holding"
msgstr "To je součástí sestavy a nemohou mít skladového hospodářství"
-#: StockStatus.php:54
+#: StockStatus.php:52
msgid "This is an dummy part and cannot have a stock holding"
msgstr "Toto je fiktivní část a nemůže mít skladového hospodářství"
-#: StockStatus.php:161
+#: StockStatus.php:159
msgid "The workorder component demand for this product from"
msgstr "Workorder složka poptávky po tomto výrobku z"
-#: StockStatus.php:198
+#: StockStatus.php:196
msgid "The quantity on work orders for this product to be received into"
msgstr "Množství na pracovních příkazů pro tento produkt mají být přijaty do"
-#: StockStatus.php:306
+#: StockStatus.php:304
msgid "Pricing history for sales of"
msgstr "Historie cen za prodej"
-#: StockStatus.php:347
+#: StockStatus.php:345
msgid "No history of sales of"
msgstr "Neexistuje žádný záznam o prodeji"
-#: StockStatus.php:353
+#: StockStatus.php:351
msgid "Show Usage"
msgstr "Zobrazit Využití"
@@ -33715,10 +33746,6 @@
msgstr "Import Dlouhodobý majetek"
#: Z_ImportFixedAssets.php:48
-msgid "File contains"
-msgstr "Soubor obsahuje"
-
-#: Z_ImportFixedAssets.php:48
msgid "columns, expected"
msgstr "sloupy, očekávané"
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2011-12-15 11:56:25 UTC (rev 4780)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2011-12-17 23:06:55 UTC (rev 4781)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WebERP 4.00/trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 16:31+1300\n"
+"POT-Creation-Date: 2011-12-10 09:04+1300\n"
"PO-Revision-Date: 2011-07-17 13:46+0000\n"
"Last-Translator: Peter Hürlimann <su...@ph...>\n"
"Language-Team: Deutsch <web...@li...>\n"
@@ -894,7 +894,7 @@
#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
-#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:265
+#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
@@ -1541,7 +1541,7 @@
#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
-#: Stocks.php:266 Stocks.php:271 StockStatus.php:306 StockStatus.php:347
+#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
@@ -1952,8 +1952,8 @@
#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
-#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186
-#: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:261
+#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
#: WOSerialNos.php:296 includes/InputSerialItems.php:111
@@ -2334,7 +2334,7 @@
#: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173
#: StockAdjustments.php:85 StockAdjustments.php:359 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:32 StockReorderLevel.php:46
-#: StockStatus.php:59 StockTransfers.php:47 StockTransfers.php:458
+#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:458
#: StockUsage.php:64 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667 Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:313
@@ -2736,7 +2736,7 @@
#: PDFOrdersInvoiced.php:309 PDFOrderStatus.php:278
#: ReorderLevelLocation.php:169 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:53 StockSerialItemResearch.php:80
-#: StockStatus.php:82 StockStatus.php:87 WhereUsedInquiry.php:72
+#: StockStatus.php:80 StockStatus.php:85 WhereUsedInquiry.php:72
#: WorkCentres.php:128 WorkCentres.php:221
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2258
@@ -3267,7 +3267,7 @@
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:185 StockLocTransferReceive.php:427
+#: StockLocTransfer.php:260 StockLocTransferReceive.php:427
#: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787
#: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175
#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315
@@ -3334,7 +3334,7 @@
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
#: RecurringSalesOrders.php:322 SelectCreditItems.php:675
#: SelectOrderItems.php:1336 Shipments.php:405 StockLocMovements.php:94
-#: StockMovements.php:99 StockStatus.php:311 SuppCreditGRNs.php:181
+#: StockMovements.php:99 StockStatus.php:309 SuppCreditGRNs.php:181
#: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267
#: SupplierTenders.php:494 SuppPriceList.php:292
#: includes/DefineLabelClass.php:49 includes/PDFQuotationPageHeader.inc:104
@@ -3351,7 +3351,7 @@
#: PrintCustTransPortrait.php:1067 RecurringSalesOrders.php:323
#: SalesAnalReptCols.php:41 SalesAnalReptCols.php:43 SelectCreditItems.php:677
#: SelectOrderItems.php:1339 StockLocMovements.php:95 StockMovements.php:100
-#: StockStatus.php:312 includes/PDFQuotationPageHeader.inc:105
+#: StockStatus.php:310 includes/PDFQuotationPageHeader.inc:105
#: includes/PDFQuotationPortraitPageHeader.inc:105
#: includes/PDFTransPageHeader.inc:211
msgid "Discount"
@@ -3692,8 +3692,8 @@
#: ShipmentCosting.php:428 ShipmentCosting.php:447 ShipmentCosting.php:461
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
-#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:79
-#: StockLocTransfer.php:101 StockLocTransfer.php:105
+#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:148
+#: StockLocTransfer.php:170 StockLocTransfer.php:174
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
#: StockLocTransferReceive.php:214 StockLocTransferReceive.php:250
@@ -4351,7 +4351,7 @@
"Die Vertragsstückliste kann nicht mehr geändert werden, da der Kunde bereits "
"den Auftrag erteilt hat."
-#: ContractBOM.php:175 PO_Items.php:538
+#: ContractBOM.php:175 PO_Items.php:538 StockLocTransfer.php:75
#: includes/SelectOrderItems_IntoCart.inc:27
#: includes/SelectOrderItems_IntoCart.inc:64
msgid "The item"
@@ -5124,8 +5124,8 @@
#: SelectOrderItems.php:548 SelectOrderItems.php:1523
#: SelectOrderItems.php:1704 SpecialOrder.php:61 SpecialOrder.php:85
#: StockCheck.php:221 StockLocStatus.php:183 StockLocStatus.php:206
-#: StockLocStatus.php:239 StockStatus.php:117 StockStatus.php:141
-#: StockStatus.php:161 StockStatus.php:181 StockStatus.php:198
+#: StockLocStatus.php:239 StockStatus.php:115 StockStatus.php:139
+#: StockStatus.php:159 StockStatus.php:179 StockStatus.php:196
#: SupplierCredit.php:91 SupplierInvoice.php:70
msgid "cannot be retrieved because"
msgstr "kann nicht ermittelt werden weil"
@@ -5905,19 +5905,19 @@
msgstr "Muss beschafft werden"
#: CounterSales.php:2034 CounterSales.php:2219 SelectOrderItems.php:1489
-#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:92
+#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:90
msgid "On Order"
msgstr "Bestellt"
#: CounterSales.php:2035 CounterSales.php:2220 SelectOrderItems.php:1490
-#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:91
+#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:89
#: includes/OutputSerialItems.php:37 includes/PDFStockCheckPageHeader.inc:40
msgid "Available"
msgstr "Verfügbar"
#: CounterSales.php:2064 CounterSales.php:2246 SelectOrderItems.php:1522
#: SelectOrderItems.php:1704 StockCheck.php:221 StockLocStatus.php:183
-#: StockLocStatus.php:206 StockStatus.php:117 StockStatus.php:141
+#: StockLocStatus.php:206 StockStatus.php:115 StockStatus.php:139
msgid "The demand for this product from"
msgstr "Der Bedarf für diesen Artikel vom"
@@ -12905,7 +12905,7 @@
#: ReorderLevel.php:164 SelectProduct.php:78 StockDispatch.php:221
#: StockMovements.php:19 StockQties_csv.php:8 StockQuantityByDate.php:10
#: StockReorderLevel.php:18 StockSerialItemResearch.php:9
-#: StockSerialItems.php:9 StockStatus.php:42 StockTransferControlled.php:14
+#: StockSerialItems.php:9 StockStatus.php:40 StockTransferControlled.php:14
#: SuppLoginSetup.php:24 WWW_Users.php:16
msgid "Inventory"
msgstr "Bestandsführung"
@@ -13183,7 +13183,7 @@
msgid "Bulk Inventory Transfer"
msgstr "Massenumlagerung"
-#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:132
+#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:201
#: StockLocTransferReceive.php:411 StockLocTransferReceive.php:503
#: StockTransfers.php:27 StockTransfers.php:446 StockUsage.php:28
#: SuppCreditGRNs.php:19 SuppInvGRNs.php:16
@@ -15168,10 +15168,11 @@
#: MRPReport.php:724 SelectAsset.php:222 SelectCustomer.php:392
#: SelectCustomer.php:473 SelectOrderItems.php:1380 SelectProduct.php:709
-#: SelectSupplier.php:235 SelectSupplier.php:297 SupplierTenders.php:146
-#: SupplierTenders.php:204 WorkOrderIssue.php:352 WorkOrderReceive.php:676
-#: includes/Add_SerialItemsOut.php:23 includes/Add_SerialItems.php:33
-#: includes/Add_SerialItems.php:184 includes/Add_SerialItems.php:281
+#: SelectSupplier.php:235 SelectSupplier.php:297 StockLocTransfer.php:61
+#: SupplierTenders.php:146 SupplierTenders.php:204 WorkOrderIssue.php:352
+#: WorkOrderReceive.php:676 includes/Add_SerialItemsOut.php:23
+#: includes/Add_SerialItems.php:33 includes/Add_SerialItems.php:184
+#: includes/Add_SerialItems.php:281
#: includes/PDFBankingSummaryPageHeader.inc:19
msgid "of"
msgstr "von"
@@ -15205,7 +15206,7 @@
msgid "Total Qty On Hand"
msgstr "Gesamtbestand"
-#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:9
+#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:7
msgid "Stock Status"
msgstr "Bestandsstatus"
@@ -15330,8 +15331,8 @@
msgid "Supply"
msgstr "Vorrat"
-#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:83
-#: StockStatus.php:90
+#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:81
+#: StockStatus.php:88
msgid "Demand"
msgstr "Bedarf"
@@ -19306,7 +19307,7 @@
msgstr "Datumsart"
#: POReport.php:516 POReport.php:1286 POReport.php:1515 SalesInquiry.php:780
-#: SalesInquiry.php:1087 StockStatus.php:309
+#: SalesInquiry.php:1087 StockStatus.php:307
msgid "Date Range"
msgstr "Zeitraum:"
@@ -19420,7 +19421,7 @@
msgid "Run Inquiry"
msgstr "Abfrage ausführen"
-#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:357
+#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:355
#: StockUsage.php:200
msgid "Search Outstanding Purchase Orders"
msgstr "Offene Bestellungen suchen"
@@ -20974,7 +20975,7 @@
#: PurchData.php:529 SelectProduct.php:402 StockAdjustments.php:464
#: StockCostUpdate.php:189 StockLocStatus.php:108 StockMovements.php:201
-#: StockQuantityByDate.php:70 StockStatus.php:61 StockTransfers.php:559
+#: StockQuantityByDate.php:70 StockStatus.php:59 StockTransfers.php:559
#: StockUsage.php:192
msgid "Show Stock Status"
msgstr "Bestandsstatus anzeigen"
@@ -20987,14 +20988,14 @@
#: PurchData.php:531 SelectProduct.php:405 SelectSalesOrder.php:6
#: StockAdjustments.php:470 StockCostUpdate.php:192 StockMovements.php:203
-#: StockReorderLevel.php:109 StockStatus.php:354 StockTransfers.php:565
+#: StockReorderLevel.php:109 StockStatus.php:352 StockTransfers.php:565
#: StockUsage.php:196
msgid "Search Outstanding Sales Orders"
msgstr "Offene Kundenaufträge suchen"
#: PurchData.php:532 SelectProduct.php:406 StockAdjustments.php:472
#: StockCostUpdate.php:193 StockMovements.php:204 StockReorderLevel.php:110
-#: StockStatus.php:355 StockTransfers.php:567 StockUsage.php:198
+#: StockStatus.php:353 StockTransfers.php:567 StockUsage.php:198
msgid "Search Completed Sales Orders"
msgstr "Abgeschlossene Kundenaufträge suchen"
@@ -21347,7 +21348,7 @@
msgstr "Bericht Wiederbestellbestände"
#: ReorderLevel.php:175 SelectSalesOrder.php:496 StockDispatch.php:248
-#: StockLocMovements.php:18 StockLocStatus.php:32 StockLocTransfer.php:146
+#: StockLocMovements.php:18 StockLocStatus.php:32 StockLocTransfer.php:215
#: StockMovements.php:34 StockTransfers.php:484 StockUsage.php:66
msgid "From Stock Location"
msgstr "Vom Lager"
@@ -24069,7 +24070,7 @@
#: SelectProduct.php:336 StockLocStatus.php:162 StockQuantityByDate.php:107
#: StockReorderLevel.php:54 StockSerialItems.php:108 StockSerialItems.php:111
#: StockSerialItems.php:114 StockSerialItems.php:119 StockSerialItems.php:123
-#: StockSerialItems.php:127 StockStatus.php:88
+#: StockSerialItems.php:127 StockStatus.php:86
msgid "Quantity On Hand"
msgstr "Bestandsmenge"
@@ -25456,7 +25457,7 @@
msgid "Enter Stock Adjustment"
msgstr "Bestandskorrektur erfassen"
-#: StockAdjustments.php:466 StockStatus.php:352 StockTransfers.php:561
+#: StockAdjustments.php:466 StockStatus.php:350 StockTransfers.php:561
msgid "Show Movements"
msgstr "Bewegungen anzeigen"
@@ -25895,7 +25896,7 @@
msgid "The quantity entered for line"
msgstr "Die eingegebene Menge für Zeile"
-#: StockCounts.php:51 StockLocTransfer.php:40 StockLocTransferReceive.php:34
+#: StockCounts.php:51 StockLocTransfer.php:104 StockLocTransferReceive.php:34
msgid "is not numeric"
msgstr "ist nicht numerisch"
@@ -25986,7 +25987,7 @@
msgid "The stock dispatch did not have any items to list"
msgstr "Zur Warenausgangsliste waren keine Positionen auszugeben"
-#: StockDispatch.php:179 StockLocTransfer.php:101
+#: StockDispatch.php:179 StockLocTransfer.php:170
msgid "Unable to enter Location Transfer record for"
msgstr "Die Umlagerungsbuchung konnte nicht eingebucht werden für"
@@ -26034,7 +26035,7 @@
msgid "Dispatch Percent"
msgstr "Umlagerungs-Prozentsatz"
-#: StockDispatch.php:264 StockLocTransfer.php:165 StockTransfers.php:508
+#: StockDispatch.php:264 StockLocTransfer.php:234 StockTransfers.php:508
msgid "To Stock Location"
msgstr "Ziel-Lagerort"
@@ -26103,7 +26104,7 @@
msgid "But after"
msgstr "und nach"
-#: StockLocMovements.php:82 StockMovements.php:86 StockStatus.php:264
+#: StockLocMovements.php:82 StockMovements.php:86 StockStatus.php:262
msgid ""
"The stock movements for the selected criteria could not be retrieved because"
msgstr ""
@@ -26135,7 +26136,7 @@
msgid "Only items where stock is available"
msgstr "Nur Artikel mit Bestand"
-#: StockLocStatus.php:152 StockReorderLevel.php:39 StockStatus.php:73
+#: StockLocStatus.php:152 StockReorderLevel.php:39 StockStatus.php:71
msgid "The stock held at each location cannot be retrieved because"
msgstr ""
"Der Bestand an den einzelnen Lagerorten kann nicht abgerufen werden, weil"
@@ -26145,19 +26146,19 @@
msgid "StockID"
msgstr "Mat.Nr."
-#: StockLocStatus.php:163 StockReorderLevel.php:55 StockStatus.php:89
+#: StockLocStatus.php:163 StockReorderLevel.php:55 StockStatus.php:87
msgid "Re-Order Level"
msgstr "Bestellpunkt"
-#: StockLocStatus.php:239 StockStatus.php:181
+#: StockLocStatus.php:239 StockStatus.php:179
msgid "The quantity on order for this product to be received into"
msgstr "Erwartete Bestellmenge für diesen Artikel ins Lager"
-#: StockLocStatus.php:281 StockLocStatus.php:311 StockStatus.php:222
+#: StockLocStatus.php:281 StockLocStatus.php:311 StockStatus.php:220
msgid "Serial Numbers"
msgstr "Seriennummern"
-#: StockLocStatus.php:283 StockLocStatus.php:313 StockStatus.php:224
+#: StockLocStatus.php:283 StockLocStatus.php:313 StockStatus.php:222
#: WorkOrderEntry.php:541
msgid "Batches"
msgstr "Chargen"
@@ -26174,52 +26175,78 @@
msgid "Please start over now"
msgstr "Bitte beginnen Sie nochmals von vorn"
-#: StockLocTransfer.php:34 StockLocTransfer.php:58
+#: StockLocTransfer.php:37 Z_ImportFixedAssets.php:48
+msgid "File contains"
+msgstr "Die Datei enthält"
+
+#: StockLocTransfer.php:37
+msgid ""
+"columns, but only 2 columns are expected. The comma separated file should "
+"have just two columns the first for the item code and the second for the "
+"quantity to transfer"
+msgstr ""
+
+#: StockLocTransfer.php:54 StockLocTransfer.php:98 StockLocTransfer.php:123
msgid "The part code entered of"
msgstr "Die eingegebene Artikelnummer"
-#: StockLocTransfer.php:34
+#: StockLocTransfer.php:54 StockLocTransfer.php:98
msgid "is not set up in the database"
msgstr "ist nicht in der Datenbank erfasst"
-#: StockLocTransfer.php:34
+#: StockLocTransfer.php:54 StockLocTransfer.php:98
msgid "Only valid parts can be entered for transfers"
msgstr "Nur gültige Artikel können für Umlagerungen angegeben werden"
-#: StockLocTransfer.php:40
+#: StockLocTransfer.php:61 StockLocTransfer.php:109
+#: StockLocTransferReceive.php:34 StockLocTransferReceive.php:38
+msgid "The quantity entered for"
+msgstr "Die eingegebene Menge für"
+
+#: StockLocTransfer.php:61
+#, fuzzy
+msgid "is not numeric."
+msgstr "ist nicht numerisch"
+
+#: StockLocTransfer.php:61 StockLocTransfer.php:104
+msgid "The quantity entered for transfers is expected to be numeric"
+msgstr "Die eingegebene Umlagerungsmenge muss numerisch sein"
+
+#: StockLocTransfer.php:75
+#, fuzzy
+msgid "does not have enough stock available ("
+msgstr "hat nicht genügend für die Umlagerung verfügbaren Bestand"
+
+#: StockLocTransfer.php:75
+#, fuzzy
+msgid "The quantity required to transfer was"
+msgstr "Die fehlerhafte Abfrage war"
+
+#: StockLocTransfer.php:104
msgid "The quantity entered of"
msgstr "Die angegebene Menge von"
-#: StockLocTransfer.php:40
+#: StockLocTransfer.php:104
msgid "for part code"
msgstr "für den Artikel"
-#: StockLocTransfer.php:40
-msgid "The quantity entered for transfers is expected to be numeric"
-msgstr "Die eingegebene Umlagerungsmenge muss numerisch sein"
-
-#: StockLocTransfer.php:45 StockLocTransferReceive.php:34
-#: StockLocTransferReceive.php:38
-msgid "The quantity entered for"
-msgstr "Die eingegebene Menge für"
-
-#: StockLocTransfer.php:45
+#: StockLocTransfer.php:109
msgid "is less than or equal to 0"
msgstr "ist kleiner oder gleich 0"
-#: StockLocTransfer.php:45
+#: StockLocTransfer.php:109
msgid "Please correct this or remove the item"
msgstr "Bitte bitte die Menge korrigieren oder diese Position entfernen"
-#: StockLocTransfer.php:58
+#: StockLocTransfer.php:123
msgid "does not have enough stock available for transfer."
msgstr "hat nicht genügend für die Umlagerung verfügbaren Bestand"
-#: StockLocTransfer.php:67
+#: StockLocTransfer.php:135
msgid "You must enter at least 1 Stock Item to transfer"
msgstr "Sie müssem wenigstens einen Artikel für die Umlagerung angeben"
-#: StockLocTransfer.php:73
+#: StockLocTransfer.php:141
msgid ""
"The transfer must have a different location to receive into and location "
"sent from"
@@ -26227,31 +26254,35 @@
"Für die Umlagerung müssen unterschiedliche Abgangs- und Zugangs-Lagerorte "
"angegeben werden"
-#: StockLocTransfer.php:79
+#: StockLocTransfer.php:148
msgid "Unable to BEGIN Location Transfer transaction"
msgstr "Umlagerungstransaktion konnte nicht begonnen werden"
-#: StockLocTransfer.php:105
+#: StockLocTransfer.php:174
msgid "Unable to COMMIT Location Transfer transaction"
msgstr "Die Umlagerungstransakton konnte nicht beendet werden"
-#: StockLocTransfer.php:108
+#: StockLocTransfer.php:177
msgid "The inventory transfer records have been created successfully"
msgstr "Die Umlagerungssätze wurden erfolgreich angelegt"
-#: StockLocTransfer.php:109
+#: StockLocTransfer.php:178
msgid "Print the Transfer Docket"
msgstr "Umlagerungszettel drucken"
-#: StockLocTransfer.php:140
+#: StockLocTransfer.php:209
msgid "Inventory Location Transfer Shipment Reference"
msgstr "Umlagerung Transportschein"
-#: StockLocTransfer.php:229
+#: StockLocTransfer.php:253
+msgid "Upload CSV file of Transfer Items and Quantites"
+msgstr ""
+
+#: StockLocTransfer.php:304
msgid "Add More Items"
msgstr "Weitere Artikel hinzufügen"
-#: StockLocTransfer.php:230
+#: StockLocTransfer.php:305
msgid "Create Transfer Shipment"
msgstr "Umlagerung anlegen"
@@ -26443,7 +26474,7 @@
msgid "Stock Movements"
msgstr "Warenbewegungen"
-#: StockMovements.php:19 StockStatus.php:43 StockUsage.php:57
+#: StockMovements.php:19 StockStatus.php:41 StockUsage.php:57
#: WhereUsedInquiry.php:33
msgid "in units of"
msgstr "in Einheiten von"
@@ -26870,7 +26901,7 @@
msgid "The stock item could not be updated because"
msgstr "Der Artikelsatz konnte nicht geändert werden, weil"
-#: Stocks.php:372 StockStatus.php:74
+#: Stocks.php:372 StockStatus.php:72
msgid "The SQL that was used to update the stock item and failed was"
msgstr "Die fehlerhafte Abfrage war"
@@ -27164,48 +27195,48 @@
msgid "Delete This Item"
msgstr "Diesen Artikel löschen"
-#: StockStatus.php:33
+#: StockStatus.php:31
msgid "Could not retrieve the requested item"
msgstr "Konnte den gewünschten Artikel nicht finden"
-#: StockStatus.php:34
+#: StockStatus.php:32
msgid "The SQL used to retrieve the items was"
msgstr "Die fehlerhafte Abfrage war"
-#: StockStatus.php:48
+#: StockStatus.php:46
msgid "This is a kitset part and cannot have a stock holding"
msgstr "Dies ist ein Bestellsatz und kann keine Lagerhaltung haben"
-#: StockStatus.php:48 StockStatus.php:51 StockStatus.php:54
+#: StockStatus.php:46 StockStatus.php:49 StockStatus.php:52
msgid "only the total quantity on outstanding sales orders is shown"
msgstr "nur die Gesamtmenge der offenen Auftragspositionen wird angezeigt"
-#: StockStatus.php:51
+#: StockStatus.php:49
msgid "This is an assembly part and cannot have a stock holding"
msgstr "Dies ist eine Baugruppe und kann keine Lagerhaltung haben"
-#: StockStatus.php:54
+#: StockStatus.php:52
msgid "This is an dummy part and cannot have a stock holding"
msgstr "Dies ist eine Dummy-Position und kann keine Lagerhaltung haben"
-#: StockStatus.php:161
+#: StockStatus.php:159
msgid "The workorder component demand for this product from"
msgstr "Der Bedarf aus Fertigungsaufträgen für diesen Artikel aus"
-#: StockStatus.php:198
+#: StockStatus.php:196
msgid "The quantity on work orders for this product to be received into"
msgstr ""
"abzuliefernde Menge aus Fertigungsaufträgen für diesen Artikel ins Lager"
-#: StockStatus.php:306
+#: StockStatus.php:304
msgid "Pricing history for sales of"
msgstr "Preisentwicklung für den Verkauf von"
-#: StockStatus.php:347
+#: StockStatus.php:345
msgid "No history of sales of"
msgstr "Keine Vergangenheitsdaten für"
-#: StockStatus.php:353
+#: StockStatus.php:351
msgid "Show Usage"
msgstr "Verwendung anzeigen"
@@ -34367,10 +34398,6 @@
msgstr "Sachanlagen importieren"
#: Z_ImportFixedAssets.php:48
-msgid "File contains"
-msgstr "Die Datei enthält"
-
-#: Z_ImportFixedAssets.php:48
msgid "columns, expected"
msgstr "Spalten, erwartet wurden"
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2011-12-15 11:56:25 UTC (rev 4780)
+++ trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2011-12-17 23:06:55 UTC (rev 4781)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 16:31+1300\n"
+"POT-Creation-Date: 2011-12-10 09:04+1300\n"
"PO-Revision-Date: 2011-02-08 10:30+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -911,7 +911,7 @@
#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
-#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:265
+#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
@@ -1569,7 +1569,7 @@
#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
-#: Stocks.php:266 Stocks.php:271 StockStatus.php:306 StockStatus.php:347
+#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
@@ -1983,8 +1983,8 @@
#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
-#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186
-#: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:261
+#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
#: WOSerialNos.php:296 includes/InputSerialItems.php:111
@@ -2363,7 +2363,7 @@
#: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173
#: StockAdjustments.php:85 StockAdjustments.php:359 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:32 StockReorderLevel.php:46
-#: StockStatus.php:59 StockTransfers.php:47 StockTransfers.php:458
+#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:458
#: StockUsage.php:64 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667 Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:313
@@ -2772,7 +2772,7 @@
#: PDFOrdersInvoiced.php:309 PDFOrderStatus.php:278
#: ReorderLevelLocation.php:169 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:53 StockSerialItemResearch.php:80
-#: StockStatus.php:82 StockStatus.php:87 WhereUsedInquiry.php:72
+#: StockStatus.php:80 StockStatus.php:85 WhereUsedInquiry.php:72
#: WorkCentres.php:128 WorkCentres.php:221
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2258
@@ -3319,7 +3319,7 @@
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:185 StockLocTransferReceive.php:427
+#: StockLocTransfer.php:260 StockLocTransferReceive.php:427
#: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787
#: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175
#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315
@@ -3386,7 +3386,7 @@
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
#: RecurringSalesOrders.php:322 SelectCreditItems.php:675
#: SelectOrderItems.php:1336 Shipments.php:405 StockLocMovements.php:94
-#: StockMovements.php:99 StockStatus.php:311 SuppCreditGRNs.php:181
+#: StockMovements.php:99 StockStatus.php:309 SuppCreditGRNs.php:181
#: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267
#: SupplierTenders.php:494 SuppPriceList.php:292
#: includes/DefineLabelClass.php:49 includes/PDFQuotationPageHeader.inc:104
@@ -3403,7 +3403,7 @@
#: PrintCustTransPortrait.php:1067 RecurringSalesOrders.php:323
#: SalesAnalReptCols.php:41 SalesAnalReptCols.php:43 SelectCreditItems.php:677
#: SelectOrderItems.php:1339 StockLocMovements.php:95 StockMovements.php:100
-#: StockStatus.php:312 includes/PDFQuotationPageHeader.inc:105
+#: StockStatus.php:310 includes/PDFQuotationPageHeader.inc:105
#: includes/PDFQuotationPortraitPageHeader.inc:105
#: includes/PDFTransPageHeader.inc:211
msgid "Discount"
@@ -3748,8 +3748,8 @@
#: ShipmentCosting.php:428 ShipmentCosting.php:447 ShipmentCosting.php:461
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
-#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:79
-#: StockLocTransfer.php:101 StockLocTransfer.php:105
+#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:148
+#: StockLocTransfer.php:170 StockLocTransfer.php:174
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
#: StockLocTransferReceive.php:214 StockLocTransferReceive.php:250
@@ -4453,7 +4453,7 @@
"Το BOM σύμβαση δεν μπορεί να alterned διότι ο πελάτης έχει τοποθετήσει ήδη "
"τη σειρά"
-#: ContractBOM.php:175 PO_Items.php:538
+#: ContractBOM.php:175 PO_Items.php:538 StockLocTransfer.php:75
#: includes/SelectOrderItems_IntoCart.inc:27
#: includes/SelectOrderItems_IntoCart.inc:64
msgid "The item"
@@ -5252,8 +5252,8 @@
#: SelectOrderItems.php:548 SelectOrderItems.php:1523
#: SelectOrderItems.php:1704 SpecialOrder.php:61 SpecialOrder.php:85
#: StockCheck.php:221 StockLocStatus.php:183 StockLocStatus.php:206
-#: StockLocStatus.php:239 StockStatus.php:117 StockStatus.php:141
-#: StockStatus.php:161 StockStatus.php:181 StockStatus.php:198
+#: StockLocStatus.php:239 StockStatus.php:115 StockStatus.php:139
+#: StockStatus.php:159 StockStatus.php:179 StockStatus.php:196
#: SupplierCredit.php:91 SupplierInvoice.php:70
msgid "cannot be retrieved because"
msgstr "δεν μπορούν να ανακτηθούν επειδή"
@@ -6055,19 +6055,19 @@
msgstr "On Demand"
#: CounterSales.php:2034 CounterSales.php:2219 SelectOrderItems.php:1489
-#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:92
+#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:90
msgid "On Order"
msgstr "Στις Παραγγελία"
#: CounterSales.php:2035 CounterSales.php:2220 SelectOrderItems.php:1490
-#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:91
+#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:89
#: includes/OutputSerialItems.php:37 includes/PDFStockCheckPageHeader.inc:40
msgid "Available"
msgstr "Διαθέσιμο"
#: CounterSales.php:2064 CounterSales.php:2246 SelectOrderItems.php:1522
#: SelectOrderItems.php:1704 StockCheck.php:221 StockLocStatus.php:183
-#: StockLocStatus.php:206 StockStatus.php:117 StockStatus.php:141
+#: StockLocStatus.php:206 StockStatus.php:115 StockStatus.php:139
msgid "The demand for this product from"
msgstr "Η ζήτηση για αυτό το προϊόν από"
@@ -13252,7 +13252,7 @@
#: ReorderLevel.php:164 SelectProduct.php:78 StockDispatch.php:221
#: StockMovements.php:19 StockQties_csv.php:8 StockQuantityByDate.php:10
#: StockReorderLevel.php:18 StockSerialItemResearch.php:9
-#: StockSerialItems.php:9 StockStatus.php:42 StockTransferControlled.php:14
+#: StockSerialItems.php:9 StockStatus.php:40 StockTransferControlled.php:14
#: SuppLoginSetup.php:24 WWW_Users.php:16
msgid "Inventory"
msgstr "Απογραφή"
@@ -13530,7 +13530,7 @@
msgid "Bulk Inventory Transfer"
msgstr "Μαζική Απογραφή Μεταφορά"
-#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:132
+#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:201
#: StockLocTransferReceive.php:411 StockLocTransferReceive.php:503
#: StockTransfers.php:27 StockTransfers.php:446 StockUsage.php:28
#: SuppCreditGRNs.php:19 SuppInvGRNs.php:16
@@ -15529,10 +15529,11 @@
#: MRPReport.php:724 SelectAsset.php:222 SelectCustomer.php:392
#: SelectCustomer.php:473 SelectOrderItems.php:1380 SelectProduct.php:709
-#: SelectSupplier.php:235 SelectSupplier.php:297 SupplierTenders.php:146
-#: SupplierTenders.php:204 WorkOrderIssue.php:352 WorkOrderReceive.php:676
-#: includes/Add_SerialItemsOut.php:23 includes/Add_SerialItems.php:33
-#: includes/Add_SerialItems.php:184 includes/Add_SerialItems.php:281
+#: SelectSupplier.php:235 SelectSupplier.php:297 StockLocTransfer.php:61
+#: SupplierTenders.php:146 SupplierTenders.php:204 WorkOrderIssue.php:352
+#: WorkOrderReceive.php:676 includes/Add_SerialItemsOut.php:23
+#: includes/Add_SerialItems.php:33 includes/Add_SerialItems.php:184
+#: includes/Add_SerialItems.php:281
#: includes/PDFBankingSummaryPageHeader.inc:19
msgid "of"
msgstr "του"
@@ -15566,7 +15567,7 @@
msgid "Total Qty On Hand"
msgstr "Συνολική Ποσότητα για το χέρι"
-#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:9
+#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:7
msgid "Stock Status"
msgstr "Χρηματιστήριο Κατάσταση"
@@ -15688,8 +15689,8 @@
msgid "Supply"
msgstr "Εφοδιασμού"
-#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:83
-#: StockStatus.php:90
+#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:81
+#: StockStatus.php:88
msgid "Demand"
msgstr "Ζήτησης"
@@ -19778,7 +19779,7 @@
msgstr "Ημερομηνία Τύπος"
#: POReport.php:516 POReport.php:1286 POReport.php:1515 SalesInquiry.php:780
-#: SalesInquiry.php:1087 StockStatus.php:309
+#: SalesInquiry.php:1087 StockStatus.php:307
msgid "Date Range"
msgstr "Χρονικό διάστημα"
@@ -19892,7 +19893,7 @@
msgid "Run Inquiry"
msgstr "Εκτέλεση Εξεταστική"
-#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:357
+#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:355
#: StockUsage.php:200
msgid "Search Outstanding Purchase Orders"
msgstr "Αναζήτηση Εκκρεμείς Εντολές Αγοράς"
@@ -21466,7 +21467,7 @@
#: PurchData.php:529 SelectProduct.php:402 StockAdjustments.php:464
#: StockCostUpdate.php:189 StockLocStatus.php:108 StockMovements.php:201
-#: StockQuantityByDate.php:70 StockStatus.php:61 StockTransfers.php:559
+#: StockQuantityByDate.php:70 StockStatus.php:59 StockTransfers.php:559
#: StockUsage.php:192
msgid "Show Stock Status"
msgstr "Εμφάνιση κατάστασης των αποθεμάτων"
@@ -21479,14 +21480,14 @@
#: PurchData.php:531 SelectProduct.php:405 SelectSalesOrder.php:6
#: StockAdjustments.php:470 StockCostUpdate.php:192 StockMovements.php:203
-#: StockReorderLevel.php:109 StockStatus.php:354 StockTransfers.php:565
+#: StockReorderLevel.php:109 StockStatus.php:352 StockTransfers.php:565
#: StockUsage.php:196
msgid "Search Outstanding Sales Orders"
msgstr "Αναζήτηση ε...
[truncated message content] |
|
From: <tim...@us...> - 2011-12-15 11:56:35
|
Revision: 4780
http://web-erp.svn.sourceforge.net/web-erp/?rev=4780&view=rev
Author: tim_schofield
Date: 2011-12-15 11:56:25 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Fix bug in customer branch search sql
Modified Paths:
--------------
trunk/SelectOrderItems.php
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-12-15 09:25:53 UTC (rev 4779)
+++ trunk/SelectOrderItems.php 2011-12-15 11:56:25 UTC (rev 4780)
@@ -110,20 +110,20 @@
locations.locationname,
custbranch.estdeliverydays,
custbranch.salesman
- FROM salesorders
- INNER JOIN debtorsmaster
+ FROM salesorders
+ INNER JOIN debtorsmaster
ON salesorders.debtorno = debtorsmaster.debtorno
- INNER JOIN salestypes
+ INNER JOIN salestypes
ON salesorders.ordertype=salestypes.typeabbrev
- INNER JOIN custbranch
- ON salesorders.debtorno = custbranch.debtorno
+ INNER JOIN custbranch
+ ON salesorders.debtorno = custbranch.debtorno
AND salesorders.branchcode = custbranch.branchcode
INNER JOIN paymentterms
- ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN locations
- ON locations.loccode=salesorders.fromstkloc
+ ON debtorsmaster.paymentterms=paymentterms.termsindicator
+ INNER JOIN locations
+ ON locations.loccode=salesorders.fromstkloc
INNER JOIN currencies
- ON debtorsmaster.currcode=currencies.currabrev
+ ON debtorsmaster.currcode=currencies.currabrev
WHERE salesorders.orderno = '" . $_GET['ModifyOrderNumber'] . "'";
$ErrMsg = _('The order cannot be retrieved because');
@@ -272,8 +272,8 @@
$_SESSION['Items'.$identifier] = new cart;
$_SESSION['PrintedPackingSlip'] =0; /*Of course cos the order aint even started !!*/
- if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])
- AND ($_SESSION['Items'.$identifier]->DebtorNo==''
+ if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])
+ AND ($_SESSION['Items'.$identifier]->DebtorNo==''
OR !isset($_SESSION['Items'.$identifier]->DebtorNo))){
/* need to select a customer for the first time out if authorisation allows it and if a customer
@@ -295,8 +295,8 @@
}
//Customer logins are not allowed to select other customers henc in_array(2,$_SESSION['AllowedPageSecurityTokens'])
-if (isset($_POST['SearchCust'])
- AND $_SESSION['RequireCustomerSelection']==1
+if (isset($_POST['SearchCust'])
+ AND $_SESSION['RequireCustomerSelection']==1
AND in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
if (($_POST['CustKeywords']=='') AND ($_POST['CustCode']=='') AND ($_POST['CustPhone']=='')) {
@@ -305,7 +305,7 @@
//insert wildcard characters in spaces
$_POST['CustKeywords'] = mb_strtoupper(trim($_POST['CustKeywords']));
$SearchString = str_replace(' ', '%', $_POST['CustKeywords']) ;
-
+
$SQL = "SELECT custbranch.brname,
custbranch.contactname,
custbranch.phoneno,
@@ -316,9 +316,8 @@
FROM custbranch
LEFT JOIN debtorsmaster
ON custbranch.debtorno=debtorsmaster.debtorno
- WHERE custbranch.brname " . LIKE . " '%" . $SearchString . "%'
- AND custbranch.debtorno " . LIKE . " '%" . mb_strtoupper(trim($_POST['CustCode'])) . "%'
- AND custbranch.branchcode " . LIKE . " '%" . mb_strtoupper(trim($_POST['CustCode'])) . "%'
+ WHERE custbranch.brname " . LIKE . " '%" . $SearchString . "%'
+ AND custbranch.branchcode " . LIKE . " '%" . mb_strtoupper(trim($_POST['CustCode'])) . "%'
AND custbranch.phoneno " . LIKE . " '%" . trim($_POST['CustPhone']) . "%'";
if ($_SESSION['SalesmanLogin']!=''){
@@ -372,11 +371,11 @@
currencies.decimalplaces
FROM debtorsmaster INNER JOIN holdreasons
ON debtorsmaster.holdreason=holdreasons.reasoncode
- INNER JOIN salestypes
+ INNER JOIN salestypes
ON debtorsmaster.salestype=salestypes.typeabbrev
- INNER JOIN paymentterms
+ INNER JOIN paymentterms
ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN currencies
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtorsmaster.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo. "'";
@@ -426,7 +425,7 @@
ON custbranch.defaultlocation=locations.loccode
WHERE custbranch.branchcode='" . $_SESSION['Items'.$identifier]->Branch . "'
AND custbranch.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "'";
-
+
$ErrMsg = _('The customer branch record of the customer selected') . ': ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('cannot be retrieved because');
$DbgMsg = _('SQL used to retrieve the branch details was') . ':';
$result =DB_query($sql,$db,$ErrMsg,$DbgMsg);
@@ -470,7 +469,7 @@
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'warn');
if ($_SESSION['CheckCreditLimits'] > 0){ /*Check credit limits is 1 for warn and 2 for prohibit sales */
-
+
$_SESSION['Items'.$identifier]->CreditAvailable = GetCreditAvailable($_SESSION['Items'.$identifier]->DebtorNo,$db);
if ($_SESSION['CheckCreditLimits']==1 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){
@@ -486,7 +485,7 @@
prnMsg(_('The') . ' ' . $myrow[0] . ' ' . _('account is currently on hold please contact the credit control personnel to discuss'),'warn');
}
-} elseif (!$_SESSION['Items'.$identifier]->DefaultSalesType
+} elseif (!$_SESSION['Items'.$identifier]->DefaultSalesType
OR $_SESSION['Items'.$identifier]->DefaultSalesType=='') {
#Possible that the check to ensure this account is not on hold has not been done
@@ -499,10 +498,10 @@
debtorsmaster.currcode,
currencies.decimalplaces,
debtorsmaster.customerpoline
- FROM debtorsmaster
+ FROM debtorsmaster
INNER JOIN holdreasons
ON debtorsmaster.holdreason=holdreasons.reasoncode
- INNER JOIN currencies
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
AND debtorsmaster.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "'";
@@ -857,7 +856,7 @@
$ExRate = 1;
}
-
+
/*Process Quick Entry */
/* If enter is pressed on the quick entry screen, the default button may be Recalculate */
if (isset($_POST['SelectingOrderItems'])
@@ -951,8 +950,8 @@
if ($_POST['AssetToDisposeOf'] == 'NoAssetSelected'){ //don't do anything unless an asset is disposed of
prnMsg(_('No asset was selected to dispose of. No assets have been added to this customer order'),'warn');
} else { //need to add the asset to the order
- /*First need to create a stock ID to hold the asset and record the sale - as only stock items can be sold
- * and before that we need to add a disposal stock category - if not already created
+ /*First need to create a stock ID to hold the asset and record the sale - as only stock items can be sold
+ * and before that we need to add a disposal stock category - if not already created
* first off get the details about the asset being disposed of */
$AssetDetailsResult = DB_query("SELECT fixedassets.description,
fixedassets.longdescription,
@@ -963,13 +962,13 @@
ON fixedassetcategories.categoryid=fixedassets.assetcategoryid
WHERE fixedassets.assetid='" . $_POST['AssetToDisposeOf'] . "'",$db);
$AssetRow = DB_fetch_array($AssetDetailsResult);
-
+
/* Check that the stock category for disposal "ASSETS" is defined already */
$AssetCategoryResult = DB_query("SELECT categoryid FROM stockcategory WHERE categoryid='ASSETS'",$db);
if (DB_num_rows($AssetCategoryResult)==0){
- /*Although asset GL posting will come from the asset category - we should set the GL codes to something sensible
+ /*Although asset GL posting will come from the asset category - we should set the GL codes to something sensible
* based on the category of the asset under review at the moment - this may well change for any other assets sold subsequentely */
-
+
/*OK now we can insert the stock category for this asset */
$InsertAssetStockCatResult = DB_query("INSERT INTO stockcategory ( categoryid,
categorydescription,
@@ -977,19 +976,19 @@
VALUES ('ASSETS',
'" . _('Asset Disposals') . "',
'" . $AssetRow['costact'] . "')",$db);
- }
-
+ }
+
/*First check to see that it doesn't exist already assets are of the format "ASSET-" . $AssetID
*/
- $TestAssetExistsAlreadyResult = DB_query("SELECT stockid
- FROM stockmaster
+ $TestAssetExistsAlreadyResult = DB_query("SELECT stockid
+ FROM stockmaster
WHERE stockid ='ASSET-" . $_POST['AssetToDisposeOf'] . "'",
$db);
$j=0;
while (DB_num_rows($TestAssetExistsAlreadyResult)==1) { //then it exists already ... bum
$j++;
- $TestAssetExistsAlreadyResult = DB_query("SELECT stockid
- FROM stockmaster
+ $TestAssetExistsAlreadyResult = DB_query("SELECT stockid
+ FROM stockmaster
WHERE stockid ='ASSET-" . $_POST['AssetToDisposeOf'] . '-' . $j . "'",
$db);
}
@@ -1025,7 +1024,7 @@
/*not forgetting the location records too */
$InsertStkLocRecsResult = DB_query("INSERT INTO locstock (loccode,
stockid)
- SELECT loccode, '" . $AssetStockID . "'
+ SELECT loccode, '" . $AssetStockID . "'
FROM locations",$db);
/*Now the asset has been added to the stock master we can add it to the sales order */
$NewItemDue = date($_SESSION['DefaultDateFormat']);
@@ -1052,9 +1051,9 @@
$_SESSION['Items'.$identifier]->LineItems[$_GET['Delete']]->Quantity = $QuantityAlreadyDelivered;
}
}
-
+
$AlreadyWarnedAboutCredit = false;
-
+
foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine) {
if (isset($_POST['Quantity_' . $OrderLine->LineNumber])){
@@ -1063,17 +1062,17 @@
if (ABS($OrderLine->Price - filter_number_format($_POST['Price_' . $OrderLine->LineNumber]))>0.01){
/*There is a new price being input for the line item */
-
+
$Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]);
$_POST['GPPercent_' . $OrderLine->LineNumber] = (($Price*(1-(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100))) - $OrderLine->StandardCost*$ExRate)/($Price *(1-filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))/100);
-
+
} elseif (ABS($OrderLine->GPPercent - filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]))>=0.01) {
/* A GP % has been input so need to do a recalculation of the price at this new GP Percentage */
-
-
+
+
prnMsg(_('Recalculated the price from the GP % entered - the GP % was') . ' ' . $OrderLine->GPPercent . ' the new GP % is ' . filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]),'info');
-
-
+
+
$Price = ($OrderLine->StandardCost*$ExRate)/(1 -((filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]) + filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))/100));
} else {
$Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]);
@@ -1110,13 +1109,13 @@
OR $OrderLine->Narrative != $Narrative
OR $OrderLine->ItemDue != $_POST['ItemDue_' . $OrderLine->LineNumber]
OR $OrderLine->POLine != $_POST['POLine_' . $OrderLine->LineNumber]) {
-
+
$WithinCreditLimit = true;
-
- if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){
+
+ if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){
/*Check credit limits is 1 for warn breach their credit limit and 2 for prohibit sales */
$DifferenceInOrderValue = ($Quantity*$Price*(1-$DiscountPercentage/100)) - ($OrderLine->Quantity*$OrderLine->Price*(1-$OrderLine->DiscountPercent));
-
+
$_SESSION['Items'.$identifier]->CreditAvailable -= $DifferenceInOrderValue;
if ($_SESSION['CheckCreditLimits']==1 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){
@@ -1129,7 +1128,7 @@
$AlreadyWarnedAboutCredit = true;
}
}
-
+
if ($WithinCreditLimit){
$_SESSION['Items'.$identifier]->update_cart_item($OrderLine->LineNumber,
$Quantity,
@@ -1144,16 +1143,16 @@
} //there are changes to the order line to process
} //page not called from itself - POST variables not set
} // Loop around all items on the order
-
-
+
+
/* Now Run through each line of the order again to work out the appropriate discount from the discount matrix */
$DiscCatsDone = array();
foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine) {
-
+
if ($OrderLine->DiscCat !='' AND ! in_array($OrderLine->DiscCat,$DiscCatsDone)){
$DiscCatsDone[]=$OrderLine->DiscCat;
$QuantityOfDiscCat = 0;
-
+
foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine_2) {
/* add up total quantity of all lines of this DiscCat */
if ($OrderLine_2->DiscCat==$OrderLine->DiscCat){
@@ -1454,7 +1453,7 @@
/* Now show the stock item selection search stuff below */
- if ((!isset($_POST['QuickEntry'])
+ if ((!isset($_POST['QuickEntry'])
AND !isset($_POST['SelectAsset']))){
echo '<input type="hidden" name="PartSearch" value="' . _('Yes Please') . '" />';
@@ -1464,18 +1463,18 @@
// Select the most recently ordered items for quick select
$SixMonthsAgo = DateAdd (Date($_SESSION['DefaultDateFormat']),'m',-6);
- $SQL="SELECT stockmaster.units,
- stockmaster.description,
- stockmaster.stockid,
+ $SQL="SELECT stockmaster.units,
+ stockmaster.description,
+ stockmaster.stockid,
salesorderdetails.stkcode,
- SUM(qtyinvoiced) salesqty
+ SUM(qtyinvoiced) salesqty
FROM `salesorderdetails`INNER JOIN `stockmaster`
ON salesorderdetails.stkcode = stockmaster.stockid
WHERE ActualDispatchDate >= '" . FormatDateForSQL($SixMonthsAgo) . "'
GROUP BY stkcode
ORDER BY salesqty DESC
LIMIT " . $_SESSION['FrequentlyOrderedItems'];
-
+
$result2 = DB_query($SQL,$db);
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ';
echo _('Frequently Ordered Items') . '</p><br />';
@@ -1514,10 +1513,10 @@
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
FROM salesorderdetails,
salesorders
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
- AND salesorderdetails.completed=0
- AND salesorders.quotation=0
+ WHERE salesorders.orderno = salesorderdetails.orderno
+ AND salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0
AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The demand for this product from') . ' ' . $_SESSION['Items'.$identifier]->Location . ' ' .
@@ -1617,7 +1616,7 @@
FROM stockcategory
WHERE stocktype='F' OR stocktype='D'
ORDER BY categorydescription";
-
+
$result1 = DB_query($SQL,$db);
while ($myrow1 = DB_fetch_array($result1)) {
if ($_POST['StockCat']==$myrow1['categoryid']){
@@ -1640,11 +1639,11 @@
echo $_POST['StockCode'];
}
echo '"></td></tr>';
-
+
echo '<tr>
<td style="text-align:center" colspan=1><input tabindex=4 type=submit name="Search" value="' . _('Search Now') . '"></td>
<td style="text-align:center" colspan=1><input tabindex=5 type=submit name="QuickEntry" value="' . _('Use Quick Entry') . '"></td>';
-
+
if (!isset($_POST['PartSearch'])) {
echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.Keywords);}</script>';
}
@@ -1695,11 +1694,11 @@
// 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
+ 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
AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The demand for this product from') . ' ' . $_SESSION['Items'.$identifier]->Location . ' ' . _('cannot be retrieved because');
@@ -1714,9 +1713,9 @@
// Find the quantity on purchase orders
$sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo
- FROM purchorderdetails INNER JOIN purchorders
+ FROM purchorderdetails INNER JOIN purchorders
ON purchorderdetails.orderno=purchorders.orderno
- WHERE purchorderdetails.completed=0
+ WHERE purchorderdetails.completed=0
AND purchorders.status<>'Cancelled'
AND purchorders.status<>'Rejected'
AND purchorders.status<>'Pending'
@@ -1822,12 +1821,12 @@
<input type="submit" name="PartSearch" value="' . _('Search Parts') . '"></div>';
} elseif (isset($_POST['SelectAsset'])){
-
+
echo '<div class="page_help_text"><b>' . _('Use this screen to select an asset to dispose of to this customer') . '</b></div><br />
<table border=1>';
/*do not display colum unless customer requires po line number by sales order line*/
if($_SESSION['Items'.$identifier]->DefaultPOLine ==1){
- echo '<tr><td>' . _('PO Line') . '</td>
+ echo '<tr><td>' . _('PO Line') . '</td>
<td><input type="text" name="poline" size=21 maxlength=20></td></tr>';
}
echo '<tr><td>' . _('Asset to Dispose Of') . ':</td>
@@ -1840,9 +1839,9 @@
echo '</select></td></tr></table>
<br /><div class="centre"><input type="submit" name="AssetDisposalEntered" value="' . _('Add Asset To Order') . '">
<input type="submit" name="PartSearch" value="' . _('Search Parts') . '"></div>';
-
+
} //end of if it is a Quick Entry screen/part search or asset selection form to display
-
+
if ($_SESSION['Items'.$identifier]->ItemsOrdered >=1){
echo '<br /><div class="centre"><input type=submit name="CancelOrder" value="' . _('Cancel Whole Order') . '" onclick="return confirm(\'' . _('Are you sure you wish to cancel this entire order?') . '\');"></div>';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-12-15 11:56:32
|
Revision: 4780
http://web-erp.svn.sourceforge.net/web-erp/?rev=4780&view=rev
Author: tim_schofield
Date: 2011-12-15 11:56:25 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Fix bug in customer branch search sql
Modified Paths:
--------------
trunk/SelectOrderItems.php
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-12-15 09:25:53 UTC (rev 4779)
+++ trunk/SelectOrderItems.php 2011-12-15 11:56:25 UTC (rev 4780)
@@ -110,20 +110,20 @@
locations.locationname,
custbranch.estdeliverydays,
custbranch.salesman
- FROM salesorders
- INNER JOIN debtorsmaster
+ FROM salesorders
+ INNER JOIN debtorsmaster
ON salesorders.debtorno = debtorsmaster.debtorno
- INNER JOIN salestypes
+ INNER JOIN salestypes
ON salesorders.ordertype=salestypes.typeabbrev
- INNER JOIN custbranch
- ON salesorders.debtorno = custbranch.debtorno
+ INNER JOIN custbranch
+ ON salesorders.debtorno = custbranch.debtorno
AND salesorders.branchcode = custbranch.branchcode
INNER JOIN paymentterms
- ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN locations
- ON locations.loccode=salesorders.fromstkloc
+ ON debtorsmaster.paymentterms=paymentterms.termsindicator
+ INNER JOIN locations
+ ON locations.loccode=salesorders.fromstkloc
INNER JOIN currencies
- ON debtorsmaster.currcode=currencies.currabrev
+ ON debtorsmaster.currcode=currencies.currabrev
WHERE salesorders.orderno = '" . $_GET['ModifyOrderNumber'] . "'";
$ErrMsg = _('The order cannot be retrieved because');
@@ -272,8 +272,8 @@
$_SESSION['Items'.$identifier] = new cart;
$_SESSION['PrintedPackingSlip'] =0; /*Of course cos the order aint even started !!*/
- if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])
- AND ($_SESSION['Items'.$identifier]->DebtorNo==''
+ if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])
+ AND ($_SESSION['Items'.$identifier]->DebtorNo==''
OR !isset($_SESSION['Items'.$identifier]->DebtorNo))){
/* need to select a customer for the first time out if authorisation allows it and if a customer
@@ -295,8 +295,8 @@
}
//Customer logins are not allowed to select other customers henc in_array(2,$_SESSION['AllowedPageSecurityTokens'])
-if (isset($_POST['SearchCust'])
- AND $_SESSION['RequireCustomerSelection']==1
+if (isset($_POST['SearchCust'])
+ AND $_SESSION['RequireCustomerSelection']==1
AND in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
if (($_POST['CustKeywords']=='') AND ($_POST['CustCode']=='') AND ($_POST['CustPhone']=='')) {
@@ -305,7 +305,7 @@
//insert wildcard characters in spaces
$_POST['CustKeywords'] = mb_strtoupper(trim($_POST['CustKeywords']));
$SearchString = str_replace(' ', '%', $_POST['CustKeywords']) ;
-
+
$SQL = "SELECT custbranch.brname,
custbranch.contactname,
custbranch.phoneno,
@@ -316,9 +316,8 @@
FROM custbranch
LEFT JOIN debtorsmaster
ON custbranch.debtorno=debtorsmaster.debtorno
- WHERE custbranch.brname " . LIKE . " '%" . $SearchString . "%'
- AND custbranch.debtorno " . LIKE . " '%" . mb_strtoupper(trim($_POST['CustCode'])) . "%'
- AND custbranch.branchcode " . LIKE . " '%" . mb_strtoupper(trim($_POST['CustCode'])) . "%'
+ WHERE custbranch.brname " . LIKE . " '%" . $SearchString . "%'
+ AND custbranch.branchcode " . LIKE . " '%" . mb_strtoupper(trim($_POST['CustCode'])) . "%'
AND custbranch.phoneno " . LIKE . " '%" . trim($_POST['CustPhone']) . "%'";
if ($_SESSION['SalesmanLogin']!=''){
@@ -372,11 +371,11 @@
currencies.decimalplaces
FROM debtorsmaster INNER JOIN holdreasons
ON debtorsmaster.holdreason=holdreasons.reasoncode
- INNER JOIN salestypes
+ INNER JOIN salestypes
ON debtorsmaster.salestype=salestypes.typeabbrev
- INNER JOIN paymentterms
+ INNER JOIN paymentterms
ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN currencies
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtorsmaster.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo. "'";
@@ -426,7 +425,7 @@
ON custbranch.defaultlocation=locations.loccode
WHERE custbranch.branchcode='" . $_SESSION['Items'.$identifier]->Branch . "'
AND custbranch.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "'";
-
+
$ErrMsg = _('The customer branch record of the customer selected') . ': ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('cannot be retrieved because');
$DbgMsg = _('SQL used to retrieve the branch details was') . ':';
$result =DB_query($sql,$db,$ErrMsg,$DbgMsg);
@@ -470,7 +469,7 @@
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'warn');
if ($_SESSION['CheckCreditLimits'] > 0){ /*Check credit limits is 1 for warn and 2 for prohibit sales */
-
+
$_SESSION['Items'.$identifier]->CreditAvailable = GetCreditAvailable($_SESSION['Items'.$identifier]->DebtorNo,$db);
if ($_SESSION['CheckCreditLimits']==1 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){
@@ -486,7 +485,7 @@
prnMsg(_('The') . ' ' . $myrow[0] . ' ' . _('account is currently on hold please contact the credit control personnel to discuss'),'warn');
}
-} elseif (!$_SESSION['Items'.$identifier]->DefaultSalesType
+} elseif (!$_SESSION['Items'.$identifier]->DefaultSalesType
OR $_SESSION['Items'.$identifier]->DefaultSalesType=='') {
#Possible that the check to ensure this account is not on hold has not been done
@@ -499,10 +498,10 @@
debtorsmaster.currcode,
currencies.decimalplaces,
debtorsmaster.customerpoline
- FROM debtorsmaster
+ FROM debtorsmaster
INNER JOIN holdreasons
ON debtorsmaster.holdreason=holdreasons.reasoncode
- INNER JOIN currencies
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
AND debtorsmaster.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "'";
@@ -857,7 +856,7 @@
$ExRate = 1;
}
-
+
/*Process Quick Entry */
/* If enter is pressed on the quick entry screen, the default button may be Recalculate */
if (isset($_POST['SelectingOrderItems'])
@@ -951,8 +950,8 @@
if ($_POST['AssetToDisposeOf'] == 'NoAssetSelected'){ //don't do anything unless an asset is disposed of
prnMsg(_('No asset was selected to dispose of. No assets have been added to this customer order'),'warn');
} else { //need to add the asset to the order
- /*First need to create a stock ID to hold the asset and record the sale - as only stock items can be sold
- * and before that we need to add a disposal stock category - if not already created
+ /*First need to create a stock ID to hold the asset and record the sale - as only stock items can be sold
+ * and before that we need to add a disposal stock category - if not already created
* first off get the details about the asset being disposed of */
$AssetDetailsResult = DB_query("SELECT fixedassets.description,
fixedassets.longdescription,
@@ -963,13 +962,13 @@
ON fixedassetcategories.categoryid=fixedassets.assetcategoryid
WHERE fixedassets.assetid='" . $_POST['AssetToDisposeOf'] . "'",$db);
$AssetRow = DB_fetch_array($AssetDetailsResult);
-
+
/* Check that the stock category for disposal "ASSETS" is defined already */
$AssetCategoryResult = DB_query("SELECT categoryid FROM stockcategory WHERE categoryid='ASSETS'",$db);
if (DB_num_rows($AssetCategoryResult)==0){
- /*Although asset GL posting will come from the asset category - we should set the GL codes to something sensible
+ /*Although asset GL posting will come from the asset category - we should set the GL codes to something sensible
* based on the category of the asset under review at the moment - this may well change for any other assets sold subsequentely */
-
+
/*OK now we can insert the stock category for this asset */
$InsertAssetStockCatResult = DB_query("INSERT INTO stockcategory ( categoryid,
categorydescription,
@@ -977,19 +976,19 @@
VALUES ('ASSETS',
'" . _('Asset Disposals') . "',
'" . $AssetRow['costact'] . "')",$db);
- }
-
+ }
+
/*First check to see that it doesn't exist already assets are of the format "ASSET-" . $AssetID
*/
- $TestAssetExistsAlreadyResult = DB_query("SELECT stockid
- FROM stockmaster
+ $TestAssetExistsAlreadyResult = DB_query("SELECT stockid
+ FROM stockmaster
WHERE stockid ='ASSET-" . $_POST['AssetToDisposeOf'] . "'",
$db);
$j=0;
while (DB_num_rows($TestAssetExistsAlreadyResult)==1) { //then it exists already ... bum
$j++;
- $TestAssetExistsAlreadyResult = DB_query("SELECT stockid
- FROM stockmaster
+ $TestAssetExistsAlreadyResult = DB_query("SELECT stockid
+ FROM stockmaster
WHERE stockid ='ASSET-" . $_POST['AssetToDisposeOf'] . '-' . $j . "'",
$db);
}
@@ -1025,7 +1024,7 @@
/*not forgetting the location records too */
$InsertStkLocRecsResult = DB_query("INSERT INTO locstock (loccode,
stockid)
- SELECT loccode, '" . $AssetStockID . "'
+ SELECT loccode, '" . $AssetStockID . "'
FROM locations",$db);
/*Now the asset has been added to the stock master we can add it to the sales order */
$NewItemDue = date($_SESSION['DefaultDateFormat']);
@@ -1052,9 +1051,9 @@
$_SESSION['Items'.$identifier]->LineItems[$_GET['Delete']]->Quantity = $QuantityAlreadyDelivered;
}
}
-
+
$AlreadyWarnedAboutCredit = false;
-
+
foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine) {
if (isset($_POST['Quantity_' . $OrderLine->LineNumber])){
@@ -1063,17 +1062,17 @@
if (ABS($OrderLine->Price - filter_number_format($_POST['Price_' . $OrderLine->LineNumber]))>0.01){
/*There is a new price being input for the line item */
-
+
$Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]);
$_POST['GPPercent_' . $OrderLine->LineNumber] = (($Price*(1-(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100))) - $OrderLine->StandardCost*$ExRate)/($Price *(1-filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))/100);
-
+
} elseif (ABS($OrderLine->GPPercent - filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]))>=0.01) {
/* A GP % has been input so need to do a recalculation of the price at this new GP Percentage */
-
-
+
+
prnMsg(_('Recalculated the price from the GP % entered - the GP % was') . ' ' . $OrderLine->GPPercent . ' the new GP % is ' . filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]),'info');
-
-
+
+
$Price = ($OrderLine->StandardCost*$ExRate)/(1 -((filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]) + filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))/100));
} else {
$Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]);
@@ -1110,13 +1109,13 @@
OR $OrderLine->Narrative != $Narrative
OR $OrderLine->ItemDue != $_POST['ItemDue_' . $OrderLine->LineNumber]
OR $OrderLine->POLine != $_POST['POLine_' . $OrderLine->LineNumber]) {
-
+
$WithinCreditLimit = true;
-
- if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){
+
+ if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){
/*Check credit limits is 1 for warn breach their credit limit and 2 for prohibit sales */
$DifferenceInOrderValue = ($Quantity*$Price*(1-$DiscountPercentage/100)) - ($OrderLine->Quantity*$OrderLine->Price*(1-$OrderLine->DiscountPercent));
-
+
$_SESSION['Items'.$identifier]->CreditAvailable -= $DifferenceInOrderValue;
if ($_SESSION['CheckCreditLimits']==1 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){
@@ -1129,7 +1128,7 @@
$AlreadyWarnedAboutCredit = true;
}
}
-
+
if ($WithinCreditLimit){
$_SESSION['Items'.$identifier]->update_cart_item($OrderLine->LineNumber,
$Quantity,
@@ -1144,16 +1143,16 @@
} //there are changes to the order line to process
} //page not called from itself - POST variables not set
} // Loop around all items on the order
-
-
+
+
/* Now Run through each line of the order again to work out the appropriate discount from the discount matrix */
$DiscCatsDone = array();
foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine) {
-
+
if ($OrderLine->DiscCat !='' AND ! in_array($OrderLine->DiscCat,$DiscCatsDone)){
$DiscCatsDone[]=$OrderLine->DiscCat;
$QuantityOfDiscCat = 0;
-
+
foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine_2) {
/* add up total quantity of all lines of this DiscCat */
if ($OrderLine_2->DiscCat==$OrderLine->DiscCat){
@@ -1454,7 +1453,7 @@
/* Now show the stock item selection search stuff below */
- if ((!isset($_POST['QuickEntry'])
+ if ((!isset($_POST['QuickEntry'])
AND !isset($_POST['SelectAsset']))){
echo '<input type="hidden" name="PartSearch" value="' . _('Yes Please') . '" />';
@@ -1464,18 +1463,18 @@
// Select the most recently ordered items for quick select
$SixMonthsAgo = DateAdd (Date($_SESSION['DefaultDateFormat']),'m',-6);
- $SQL="SELECT stockmaster.units,
- stockmaster.description,
- stockmaster.stockid,
+ $SQL="SELECT stockmaster.units,
+ stockmaster.description,
+ stockmaster.stockid,
salesorderdetails.stkcode,
- SUM(qtyinvoiced) salesqty
+ SUM(qtyinvoiced) salesqty
FROM `salesorderdetails`INNER JOIN `stockmaster`
ON salesorderdetails.stkcode = stockmaster.stockid
WHERE ActualDispatchDate >= '" . FormatDateForSQL($SixMonthsAgo) . "'
GROUP BY stkcode
ORDER BY salesqty DESC
LIMIT " . $_SESSION['FrequentlyOrderedItems'];
-
+
$result2 = DB_query($SQL,$db);
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ';
echo _('Frequently Ordered Items') . '</p><br />';
@@ -1514,10 +1513,10 @@
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
FROM salesorderdetails,
salesorders
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
- AND salesorderdetails.completed=0
- AND salesorders.quotation=0
+ WHERE salesorders.orderno = salesorderdetails.orderno
+ AND salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
+ AND salesorderdetails.completed=0
+ AND salesorders.quotation=0
AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The demand for this product from') . ' ' . $_SESSION['Items'.$identifier]->Location . ' ' .
@@ -1617,7 +1616,7 @@
FROM stockcategory
WHERE stocktype='F' OR stocktype='D'
ORDER BY categorydescription";
-
+
$result1 = DB_query($SQL,$db);
while ($myrow1 = DB_fetch_array($result1)) {
if ($_POST['StockCat']==$myrow1['categoryid']){
@@ -1640,11 +1639,11 @@
echo $_POST['StockCode'];
}
echo '"></td></tr>';
-
+
echo '<tr>
<td style="text-align:center" colspan=1><input tabindex=4 type=submit name="Search" value="' . _('Search Now') . '"></td>
<td style="text-align:center" colspan=1><input tabindex=5 type=submit name="QuickEntry" value="' . _('Use Quick Entry') . '"></td>';
-
+
if (!isset($_POST['PartSearch'])) {
echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.Keywords);}</script>';
}
@@ -1695,11 +1694,11 @@
// 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
+ 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
AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The demand for this product from') . ' ' . $_SESSION['Items'.$identifier]->Location . ' ' . _('cannot be retrieved because');
@@ -1714,9 +1713,9 @@
// Find the quantity on purchase orders
$sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo
- FROM purchorderdetails INNER JOIN purchorders
+ FROM purchorderdetails INNER JOIN purchorders
ON purchorderdetails.orderno=purchorders.orderno
- WHERE purchorderdetails.completed=0
+ WHERE purchorderdetails.completed=0
AND purchorders.status<>'Cancelled'
AND purchorders.status<>'Rejected'
AND purchorders.status<>'Pending'
@@ -1822,12 +1821,12 @@
<input type="submit" name="PartSearch" value="' . _('Search Parts') . '"></div>';
} elseif (isset($_POST['SelectAsset'])){
-
+
echo '<div class="page_help_text"><b>' . _('Use this screen to select an asset to dispose of to this customer') . '</b></div><br />
<table border=1>';
/*do not display colum unless customer requires po line number by sales order line*/
if($_SESSION['Items'.$identifier]->DefaultPOLine ==1){
- echo '<tr><td>' . _('PO Line') . '</td>
+ echo '<tr><td>' . _('PO Line') . '</td>
<td><input type="text" name="poline" size=21 maxlength=20></td></tr>';
}
echo '<tr><td>' . _('Asset to Dispose Of') . ':</td>
@@ -1840,9 +1839,9 @@
echo '</select></td></tr></table>
<br /><div class="centre"><input type="submit" name="AssetDisposalEntered" value="' . _('Add Asset To Order') . '">
<input type="submit" name="PartSearch" value="' . _('Search Parts') . '"></div>';
-
+
} //end of if it is a Quick Entry screen/part search or asset selection form to display
-
+
if ($_SESSION['Items'.$identifier]->ItemsOrdered >=1){
echo '<br /><div class="centre"><input type=submit name="CancelOrder" value="' . _('Cancel Whole Order') . '" onclick="return confirm(\'' . _('Are you sure you wish to cancel this entire order?') . '\');"></div>';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-15 09:26:02
|
Revision: 4779
http://web-erp.svn.sourceforge.net/web-erp/?rev=4779&view=rev
Author: daintree
Date: 2011-12-15 09:25:53 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/sql/mysql/upgrade3.11.1-4.00.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/UpgradeDatabase.php 2011-12-15 09:25:53 UTC (rev 4779)
@@ -34,6 +34,10 @@
</select></td>
</tr>
</table>';
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+ echo '<div class="centre">
+ <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+ </div>';
} else {
if ($_SESSION['VersionNumber']=='4.00RC1'){
$_SESSION['VersionNumber']='3.12';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/doc/Change.log 2011-12-15 09:25:53 UTC (rev 4779)
@@ -1,5 +1,6 @@
webERP Change Log
+15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
Modified: trunk/sql/mysql/upgrade3.11.1-4.00.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-12-15 09:25:53 UTC (rev 4779)
@@ -1,3 +1,4 @@
+SET FOREIGN_KEY_CHECKS=0;
ALTER TABLE accountgroups CONVERT TO CHARACTER SET utf8;
ALTER TABLE accountsection CONVERT TO CHARACTER SET utf8;
ALTER TABLE areas CONVERT TO CHARACTER SET utf8;
@@ -853,4 +854,5 @@
DROP `netweight`,
DROP `total_amount`;
UPDATE purchdata INNER JOIN unitsofmeasure ON purchdata.suppliersuom=unitsofmeasure.unitid SET suppliersuom = unitsofmeasure.unitname;
-UPDATE config SET confvalue='4.03.8' WHERE confname='VersionNumber';
\ No newline at end of file
+UPDATE config SET confvalue='4.03.8' WHERE confname='VersionNumber';
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-15 09:26:00
|
Revision: 4779
http://web-erp.svn.sourceforge.net/web-erp/?rev=4779&view=rev
Author: daintree
Date: 2011-12-15 09:25:53 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/sql/mysql/upgrade3.11.1-4.00.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/UpgradeDatabase.php 2011-12-15 09:25:53 UTC (rev 4779)
@@ -34,6 +34,10 @@
</select></td>
</tr>
</table>';
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+ echo '<div class="centre">
+ <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+ </div>';
} else {
if ($_SESSION['VersionNumber']=='4.00RC1'){
$_SESSION['VersionNumber']='3.12';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/doc/Change.log 2011-12-15 09:25:53 UTC (rev 4779)
@@ -1,5 +1,6 @@
webERP Change Log
+15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
Modified: trunk/sql/mysql/upgrade3.11.1-4.00.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-12-15 09:25:53 UTC (rev 4779)
@@ -1,3 +1,4 @@
+SET FOREIGN_KEY_CHECKS=0;
ALTER TABLE accountgroups CONVERT TO CHARACTER SET utf8;
ALTER TABLE accountsection CONVERT TO CHARACTER SET utf8;
ALTER TABLE areas CONVERT TO CHARACTER SET utf8;
@@ -853,4 +854,5 @@
DROP `netweight`,
DROP `total_amount`;
UPDATE purchdata INNER JOIN unitsofmeasure ON purchdata.suppliersuom=unitsofmeasure.unitid SET suppliersuom = unitsofmeasure.unitname;
-UPDATE config SET confvalue='4.03.8' WHERE confname='VersionNumber';
\ No newline at end of file
+UPDATE config SET confvalue='4.03.8' WHERE confname='VersionNumber';
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-15 09:11:45
|
Revision: 4778
http://web-erp.svn.sourceforge.net/web-erp/?rev=4778&view=rev
Author: daintree
Date: 2011-12-15 09:11:36 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/SalesGraph.php
trunk/doc/Change.log
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2011-12-15 06:10:56 UTC (rev 4777)
+++ trunk/SalesGraph.php 2011-12-15 09:11:36 UTC (rev 4778)
@@ -270,7 +270,7 @@
}
$graph->SetXTickPos('none');
$graph->SetXTickLabelPos('none');
- $graph->SetBackgroundColor('selection');
+ $graph->SetBackgroundColor('white');
$graph->SetTitleColor('blue');
$graph->SetFileFormat('png');
$graph->SetPlotType($_POST['GraphType']);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-15 06:10:56 UTC (rev 4777)
+++ trunk/doc/Change.log 2011-12-15 09:11:36 UTC (rev 4778)
@@ -1,5 +1,6 @@
webERP Change Log
+15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-15 09:11:45
|
Revision: 4778
http://web-erp.svn.sourceforge.net/web-erp/?rev=4778&view=rev
Author: daintree
Date: 2011-12-15 09:11:36 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/SalesGraph.php
trunk/doc/Change.log
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2011-12-15 06:10:56 UTC (rev 4777)
+++ trunk/SalesGraph.php 2011-12-15 09:11:36 UTC (rev 4778)
@@ -270,7 +270,7 @@
}
$graph->SetXTickPos('none');
$graph->SetXTickLabelPos('none');
- $graph->SetBackgroundColor('selection');
+ $graph->SetBackgroundColor('white');
$graph->SetTitleColor('blue');
$graph->SetFileFormat('png');
$graph->SetPlotType($_POST['GraphType']);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-15 06:10:56 UTC (rev 4777)
+++ trunk/doc/Change.log 2011-12-15 09:11:36 UTC (rev 4778)
@@ -1,5 +1,6 @@
webERP Change Log
+15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-15 06:11:02
|
Revision: 4777
http://web-erp.svn.sourceforge.net/web-erp/?rev=4777&view=rev
Author: daintree
Date: 2011-12-15 06:10:56 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/Shipments.php
trunk/doc/Change.log
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2011-12-14 09:07:52 UTC (rev 4776)
+++ trunk/Shipments.php 2011-12-15 06:10:56 UTC (rev 4777)
@@ -312,7 +312,7 @@
<td>'. _('Vessel Name /Transport Agent'). ': </td>
<td colspan=3><input type="text" name="Vessel" maxlength="50" size="50" value="' . $_SESSION['Shipment']->Vessel . '" /></td>
<td>'._('Voyage Ref / Consignment Note').': </td>
- <td><input type="text name="VoyageRef" maxlength="20" size="20" value="' . $_SESSION['Shipment']->VoyageRef . '" /></td>
+ <td><input type="text" name="VoyageRef" maxlength="20" size="20" value="' . $_SESSION['Shipment']->VoyageRef . '" /></td>
</tr>';
if (isset($_SESSION['Shipment']->ETA)){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-14 09:07:52 UTC (rev 4776)
+++ trunk/doc/Change.log 2011-12-15 06:10:56 UTC (rev 4777)
@@ -1,5 +1,6 @@
webERP Change Log
+15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-15 06:11:02
|
Revision: 4777
http://web-erp.svn.sourceforge.net/web-erp/?rev=4777&view=rev
Author: daintree
Date: 2011-12-15 06:10:56 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/Shipments.php
trunk/doc/Change.log
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2011-12-14 09:07:52 UTC (rev 4776)
+++ trunk/Shipments.php 2011-12-15 06:10:56 UTC (rev 4777)
@@ -312,7 +312,7 @@
<td>'. _('Vessel Name /Transport Agent'). ': </td>
<td colspan=3><input type="text" name="Vessel" maxlength="50" size="50" value="' . $_SESSION['Shipment']->Vessel . '" /></td>
<td>'._('Voyage Ref / Consignment Note').': </td>
- <td><input type="text name="VoyageRef" maxlength="20" size="20" value="' . $_SESSION['Shipment']->VoyageRef . '" /></td>
+ <td><input type="text" name="VoyageRef" maxlength="20" size="20" value="' . $_SESSION['Shipment']->VoyageRef . '" /></td>
</tr>';
if (isset($_SESSION['Shipment']->ETA)){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-14 09:07:52 UTC (rev 4776)
+++ trunk/doc/Change.log 2011-12-15 06:10:56 UTC (rev 4777)
@@ -1,5 +1,6 @@
webERP Change Log
+15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-14 09:08:01
|
Revision: 4776
http://web-erp.svn.sourceforge.net/web-erp/?rev=4776&view=rev
Author: daintree
Date: 2011-12-14 09:07:52 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-14 08:50:36 UTC (rev 4775)
+++ trunk/doc/Change.log 2011-12-14 09:07:52 UTC (rev 4776)
@@ -2,7 +2,7 @@
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
-13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart function
+13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions
11/12/11 Phil: SupplierInvoice.php attempts to post back any cost variances where there is no stock left to apportion the variances to - posting back to stockmoves (so the DailySales.php and other sales inquiry scripts reflect the appropriate GP) and the salesanalysis tables
11/12/11 Phil: DailySalesInquiry.php removed incorrect call to establish new cart object??
10/12/11 Brian May: ConfirmDispatch_Invoice.php corrected SQL that was not calculating the difference to go to the orderdeliverydifferences log in parenthesis first before casting/concatenating to string for the SQL.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-14 09:07:58
|
Revision: 4776
http://web-erp.svn.sourceforge.net/web-erp/?rev=4776&view=rev
Author: daintree
Date: 2011-12-14 09:07:52 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-14 08:50:36 UTC (rev 4775)
+++ trunk/doc/Change.log 2011-12-14 09:07:52 UTC (rev 4776)
@@ -2,7 +2,7 @@
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
-13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart function
+13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions
11/12/11 Phil: SupplierInvoice.php attempts to post back any cost variances where there is no stock left to apportion the variances to - posting back to stockmoves (so the DailySales.php and other sales inquiry scripts reflect the appropriate GP) and the salesanalysis tables
11/12/11 Phil: DailySalesInquiry.php removed incorrect call to establish new cart object??
10/12/11 Brian May: ConfirmDispatch_Invoice.php corrected SQL that was not calculating the difference to go to the orderdeliverydifferences log in parenthesis first before casting/concatenating to string for the SQL.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
15 messages has been excluded from this view by a project administrator.
