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...> - 2012-01-16 09:24:25
|
Revision: 4800
http://web-erp.svn.sourceforge.net/web-erp/?rev=4800&view=rev
Author: daintree
Date: 2012-01-16 09:24:14 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
StockReorderLevel only updates changed fields
Modified Paths:
--------------
trunk/StockReorderLevel.php
trunk/doc/Change.log
Modified: trunk/StockReorderLevel.php
===================================================================
--- trunk/StockReorderLevel.php 2012-01-15 06:53:30 UTC (rev 4799)
+++ trunk/StockReorderLevel.php 2012-01-16 09:24:14 UTC (rev 4800)
@@ -70,10 +70,11 @@
}
if (isset($_POST['UpdateData'])
+ AND $_POST['Old_' . $myrow['loccode']]!= filter_number_format($_POST[$myrow['loccode']])
AND is_numeric(filter_number_format($_POST[$myrow['loccode']]))
- AND $_POST[$myrow['loccode']]>=0){
+ AND filter_number_format($_POST[$myrow['loccode']])>=0){
- $myrow['reorderlevel'] = $_POST[$myrow['loccode']];
+ $myrow['reorderlevel'] = filter_number_format($_POST[$myrow['loccode']]);
$sql = "UPDATE locstock SET reorderlevel = '" . filter_number_format($_POST[$myrow['loccode']]) . "'
WHERE stockid = '" . $StockID . "'
AND loccode = '" . $myrow['loccode'] ."'";
@@ -83,10 +84,13 @@
printf('<td>%s</td>
<td class="number">%s</td>
- <td><input type="text" class="number" name="%s" maxlength="10" size="10" value="%s" /></td>',
+ <td><input type="text" class="number" name="%s" maxlength="10" size="10" value="%s" /></td>
+ <input type="hidden" name="Old_%s" value="%s" />',
$myrow['locationname'],
locale_number_format($myrow['quantity'],$myrow['decimalplaces']),
$myrow['loccode'],
+ $myrow['reorderlevel'],
+ $myrow['loccode'],
$myrow['reorderlevel']);
$j++;
If ($j == 12){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-15 06:53:30 UTC (rev 4799)
+++ trunk/doc/Change.log 2012-01-16 09:24:14 UTC (rev 4800)
@@ -1,5 +1,6 @@
webERP Change Log
+16/1/12 Phil: Made StockReorderLevel.php just update changed fields rather than update all locations even though they may not have changed.
8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
8/1/12 Paul Harness: PcClaimExpensesFromTab.php Use DefaultDateFormat for date in expense entry.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-16 09:24:21
|
Revision: 4800
http://web-erp.svn.sourceforge.net/web-erp/?rev=4800&view=rev
Author: daintree
Date: 2012-01-16 09:24:14 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
StockReorderLevel only updates changed fields
Modified Paths:
--------------
trunk/StockReorderLevel.php
trunk/doc/Change.log
Modified: trunk/StockReorderLevel.php
===================================================================
--- trunk/StockReorderLevel.php 2012-01-15 06:53:30 UTC (rev 4799)
+++ trunk/StockReorderLevel.php 2012-01-16 09:24:14 UTC (rev 4800)
@@ -70,10 +70,11 @@
}
if (isset($_POST['UpdateData'])
+ AND $_POST['Old_' . $myrow['loccode']]!= filter_number_format($_POST[$myrow['loccode']])
AND is_numeric(filter_number_format($_POST[$myrow['loccode']]))
- AND $_POST[$myrow['loccode']]>=0){
+ AND filter_number_format($_POST[$myrow['loccode']])>=0){
- $myrow['reorderlevel'] = $_POST[$myrow['loccode']];
+ $myrow['reorderlevel'] = filter_number_format($_POST[$myrow['loccode']]);
$sql = "UPDATE locstock SET reorderlevel = '" . filter_number_format($_POST[$myrow['loccode']]) . "'
WHERE stockid = '" . $StockID . "'
AND loccode = '" . $myrow['loccode'] ."'";
@@ -83,10 +84,13 @@
printf('<td>%s</td>
<td class="number">%s</td>
- <td><input type="text" class="number" name="%s" maxlength="10" size="10" value="%s" /></td>',
+ <td><input type="text" class="number" name="%s" maxlength="10" size="10" value="%s" /></td>
+ <input type="hidden" name="Old_%s" value="%s" />',
$myrow['locationname'],
locale_number_format($myrow['quantity'],$myrow['decimalplaces']),
$myrow['loccode'],
+ $myrow['reorderlevel'],
+ $myrow['loccode'],
$myrow['reorderlevel']);
$j++;
If ($j == 12){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-15 06:53:30 UTC (rev 4799)
+++ trunk/doc/Change.log 2012-01-16 09:24:14 UTC (rev 4800)
@@ -1,5 +1,6 @@
webERP Change Log
+16/1/12 Phil: Made StockReorderLevel.php just update changed fields rather than update all locations even though they may not have changed.
8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
8/1/12 Paul Harness: PcClaimExpensesFromTab.php Use DefaultDateFormat for date in expense entry.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-15 06:53:36
|
Revision: 4799
http://web-erp.svn.sourceforge.net/web-erp/?rev=4799&view=rev
Author: daintree
Date: 2012-01-15 06:53:30 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
removed db_ in function names replaced with DB_
Modified Paths:
--------------
trunk/includes/Add_SerialItems.php
Modified: trunk/includes/Add_SerialItems.php
===================================================================
--- trunk/includes/Add_SerialItems.php 2012-01-15 06:52:12 UTC (rev 4798)
+++ trunk/includes/Add_SerialItems.php 2012-01-15 06:53:30 UTC (rev 4799)
@@ -112,7 +112,7 @@
}
$SeqItems = DB_query($sql,$db);
- while ($myrow=db_fetch_array($SeqItems)) {
+ while ($myrow=DB_fetch_array($SeqItems)) {
$LineItem->SerialItems[$myrow['serialno']] = new SerialItem ($myrow['serialno'], ($InOutModifier>0?1:-1) );
//force it to Keyed entry for cleanup & manual verification
$_POST['EntryType'] = 'KEYED';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-15 06:53:36
|
Revision: 4799
http://web-erp.svn.sourceforge.net/web-erp/?rev=4799&view=rev
Author: daintree
Date: 2012-01-15 06:53:30 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
removed db_ in function names replaced with DB_
Modified Paths:
--------------
trunk/includes/Add_SerialItems.php
Modified: trunk/includes/Add_SerialItems.php
===================================================================
--- trunk/includes/Add_SerialItems.php 2012-01-15 06:52:12 UTC (rev 4798)
+++ trunk/includes/Add_SerialItems.php 2012-01-15 06:53:30 UTC (rev 4799)
@@ -112,7 +112,7 @@
}
$SeqItems = DB_query($sql,$db);
- while ($myrow=db_fetch_array($SeqItems)) {
+ while ($myrow=DB_fetch_array($SeqItems)) {
$LineItem->SerialItems[$myrow['serialno']] = new SerialItem ($myrow['serialno'], ($InOutModifier>0?1:-1) );
//force it to Keyed entry for cleanup & manual verification
$_POST['EntryType'] = 'KEYED';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-15 06:52:19
|
Revision: 4798
http://web-erp.svn.sourceforge.net/web-erp/?rev=4798&view=rev
Author: daintree
Date: 2012-01-15 06:52:12 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
removed db_ in function names replaced with DB_
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/Credit_Invoice.php
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-01-13 07:17:29 UTC (rev 4797)
+++ trunk/ConfirmDispatch_Invoice.php 2012-01-15 06:52:12 UTC (rev 4798)
@@ -160,9 +160,9 @@
$DbgMsg = _('The SQL that failed was');
$LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2012-01-13 07:17:29 UTC (rev 4797)
+++ trunk/Credit_Invoice.php 2012-01-15 06:52:12 UTC (rev 4798)
@@ -127,9 +127,9 @@
$LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg, $DbgMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
$LineNumber = $_SESSION['CreditItems']->LineCounter;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-15 06:52:19
|
Revision: 4798
http://web-erp.svn.sourceforge.net/web-erp/?rev=4798&view=rev
Author: daintree
Date: 2012-01-15 06:52:12 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
removed db_ in function names replaced with DB_
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/Credit_Invoice.php
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-01-13 07:17:29 UTC (rev 4797)
+++ trunk/ConfirmDispatch_Invoice.php 2012-01-15 06:52:12 UTC (rev 4798)
@@ -160,9 +160,9 @@
$DbgMsg = _('The SQL that failed was');
$LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2012-01-13 07:17:29 UTC (rev 4797)
+++ trunk/Credit_Invoice.php 2012-01-15 06:52:12 UTC (rev 4798)
@@ -127,9 +127,9 @@
$LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg, $DbgMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
$LineNumber = $_SESSION['CreditItems']->LineCounter;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-13 07:17:48
|
Revision: 4797
http://web-erp.svn.sourceforge.net/web-erp/?rev=4797&view=rev
Author: daintree
Date: 2012-01-13 07:17:29 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
fix db_query to DB_query
Modified Paths:
--------------
trunk/CounterSales.php
trunk/OrderDetails.php
trunk/PDFTopItems.php
trunk/PO_OrderDetails.php
trunk/PrintCheque.php
trunk/RecurringSalesOrders.php
trunk/RecurringSalesOrdersProcess.php
trunk/ReorderLevelLocation.php
trunk/SelectOrderItems.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/StockDispatch.php
trunk/SuppPriceList.php
trunk/UpgradeDatabase.php
trunk/includes/ConnectDB.inc
trunk/includes/Contract_Readin.php
trunk/includes/LanguagesArray.php
trunk/includes/PO_ReadInOrder.inc
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/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 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/CounterSales.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -2075,7 +2075,7 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
$PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
@@ -2089,8 +2089,8 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
@@ -2257,9 +2257,9 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
- $PurchRow = db_fetch_row($PurchResult);
+ $PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
$PurchQty = $PurchRow[0];
} else {
@@ -2271,9 +2271,9 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/OrderDetails.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -145,9 +145,9 @@
$ErrMsg = _('The line items of the order cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the line items, that failed was');
- $LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg, $DbgMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg, $DbgMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
$OrderTotal = 0;
$OrderTotalVolume = 0;
@@ -170,7 +170,7 @@
<th>' . _('Last Del') . '</th>
</tr>';
$k=0;
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
Modified: trunk/PDFTopItems.php
===================================================================
--- trunk/PDFTopItems.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/PDFTopItems.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -91,8 +91,8 @@
$sqloh = "SELECT sum(quantity)as qty
FROM locstock
WHERE stockid='" . $myrow['stkcode'] . "'";
- $oh = db_query($sqloh, $db);
- $ohRow = db_fetch_row($oh);
+ $oh = DB_query($sqloh, $db);
+ $ohRow = DB_fetch_row($oh);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 1, $YPos, 80, $FontSize, $myrow['stkcode']);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 100, $YPos, 100, $FontSize, $myrow['description']);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 330, $YPos, 30, $FontSize, locale_number_format($myrow['totalinvoiced'],$myrow['decimalplaces']), 'right');
Modified: trunk/PO_OrderDetails.php
===================================================================
--- trunk/PO_OrderDetails.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/PO_OrderDetails.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -137,7 +137,7 @@
ON purchorderdetails.itemcode=stockmaster.stockid
WHERE purchorderdetails.orderno = '" . $_GET['OrderNo'] ."'";
-$LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
+$LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
echo '<table colspan="8" class="selection" cellpadding="0">';
@@ -157,7 +157,7 @@
$OrderTotal=0;
$RecdTotal=0;
-while ($myrow=db_fetch_array($LineItemsResult)) {
+while ($myrow=DB_fetch_array($LineItemsResult)) {
$OrderTotal += ($myrow['quantityord'] * $myrow['unitprice']);
$RecdTotal += ($myrow['quantityrecd'] * $myrow['unitprice']);
Modified: trunk/PrintCheque.php
===================================================================
--- trunk/PrintCheque.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/PrintCheque.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -15,7 +15,7 @@
$PageNumber=1;
$line_height=12;
-$result = db_query("SELECT hundredsname,
+$result = DB_query("SELECT hundredsname,
decimalplaces,
currency
FROM currencies
@@ -28,7 +28,7 @@
exit;
}
-$CurrencyRow = db_fetch_array($result);
+$CurrencyRow = DB_fetch_array($result);
$HundredsName = $CurrencyRow['hundredsname'];
$CurrDecimalPlaces = $CurrencyRow['decimalplaces'];
$CurrencyName = mb_strtolower($CurrencyRow['currency']);
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/RecurringSalesOrders.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -123,10 +123,10 @@
AND recurrsalesorderdetails.recurrorderno ='" . $_GET['ModifyRecurringSalesOrder'] . "'";
$ErrMsg = _('The line items of the order cannot be retrieved because');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
+ if (DB_num_rows($LineItemsResult)>0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
Modified: trunk/RecurringSalesOrdersProcess.php
===================================================================
--- trunk/RecurringSalesOrdersProcess.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/RecurringSalesOrdersProcess.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -158,11 +158,11 @@
WHERE recurrsalesorderdetails.recurrorderno ='" . $RecurrOrderRow['recurrorderno'] . "'";
$ErrMsg = _('The line items of the recurring order cannot be retrieved because');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
$LineCounter = 0;
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
$OrderTotal =0; //intialise
$OrderLineTotal =0;
Modified: trunk/ReorderLevelLocation.php
===================================================================
--- trunk/ReorderLevelLocation.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/ReorderLevelLocation.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -122,16 +122,16 @@
$sqloh="SELECT sum(quantity)as qty
FROM locstock
WHERE stockid='" . $myrow['stockid'] . "'";
- $oh = db_query($sqloh,$db);
- $ohRow = db_fetch_row($oh);
+ $oh = DB_query($sqloh,$db);
+ $ohRow = DB_fetch_row($oh);
//get On Hand in Location
$sqlohin="SELECT SUM(quantity) AS qty
FROM `locstock`
WHERE stockid='" . $myrow['stockid'] . "'
AND locstock.loccode = '" . $_POST['StockLocation'] . "'";
- $ohin = db_query($sqlohin,$db);
- $ohinRow = db_fetch_row($ohin);
+ $ohin = DB_query($sqlohin,$db);
+ $ohinRow = DB_fetch_row($ohin);
echo'<td>'.$myrow['stockid'].'</td>
<td>'.$myrow['description'].'</td>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/SelectOrderItems.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -218,10 +218,10 @@
ORDER BY salesorderdetails.orderlineno";
$ErrMsg = _('The line items of the order cannot be retrieved because');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
+ if (DB_num_rows($LineItemsResult)>0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($myrow['completed']==0){
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
@@ -1539,9 +1539,9 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
- $PurchRow = db_fetch_row($PurchResult);
+ $PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
$PurchQty = $PurchRow[0];
} else {
@@ -1553,8 +1553,8 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
@@ -1723,9 +1723,9 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
- $PurchRow = db_fetch_row($PurchResult);
+ $PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
$PurchQty = $PurchRow[0];
} else {
@@ -1737,9 +1737,9 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
Modified: trunk/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/ShipmentCosting.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -119,9 +119,9 @@
purchorderdetails.itemdescription";
$ErrMsg = _('The lines on the shipment could not be retrieved from the database');
-$LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
+$LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
-if (db_num_rows($LineItemsResult) > 0) {
+if (DB_num_rows($LineItemsResult) > 0) {
if (isset($_POST['Close'])){
while ($myrow=DB_fetch_array($LineItemsResult)){
@@ -548,7 +548,7 @@
$RowCounter =0;
$TotalItemShipmentChgs =0;
-while ($myrow=db_fetch_array($ChargesResult)) {
+while ($myrow=DB_fetch_array($ChargesResult)) {
if ($k==1){
@@ -624,7 +624,7 @@
$RowCounter =0;
$TotalGeneralShipmentChgs =0;
-while ($myrow=db_fetch_array($ChargesResult)) {
+while ($myrow=DB_fetch_array($ChargesResult)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/Shipments.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -100,7 +100,7 @@
ON purchorderdetails.orderno=purchorders.orderno
WHERE purchorderdetails.shiptref='" . $_GET['SelectedShipment'] . "'";
$ErrMsg = _('The lines on the shipment cannot be retrieved because'). ' - ' . DB_error_msg($db);
- $LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
if (DB_num_rows($GetShiptHdrResult)==0) {
prnMsg ( _('Unable to locate lines for Shipment') . ' '. $_GET['SelectedShipment'] . ' ' . _('in the database'), 'error');
@@ -108,9 +108,9 @@
exit();
}
- if (db_num_rows($LineItemsResult) > 0) {
+ if (DB_num_rows($LineItemsResult) > 0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($myrow['stdcostunit']==0){
$StandardCost =$myrow['stdcost'];
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/StockDispatch.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -36,14 +36,14 @@
// from location
$ErrMsg = _('Could not retrieve location name from the database');
$sqlfrom="SELECT locationname FROM `locations` where loccode='" . $_POST['FromLocation'] . "'";
- $result = db_query($sqlfrom,$db,$ErrMsg);
- $Row = db_fetch_row($result);
+ $result = DB_query($sqlfrom,$db,$ErrMsg);
+ $Row = DB_fetch_row($result);
$FromLocation=$Row['0'];
// to location
$sqlto="SELECT locationname FROM `locations` where loccode='" . $_POST['ToLocation'] . "'";
- $resultto = db_query($sqlto,$db,$ErrMsg);
- $RowTo = db_fetch_row($resultto);
+ $resultto = DB_query($sqlto,$db,$ErrMsg);
+ $RowTo = DB_fetch_row($resultto);
$ToLocation=$RowTo['0'];
// Creates WHERE clause for stock categories. StockCat is defined as an array so can choose
Modified: trunk/SuppPriceList.php
===================================================================
--- trunk/SuppPriceList.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/SuppPriceList.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -26,8 +26,8 @@
FROM suppliers INNER JOIN currencies
ON suppliers.currcode=currencies.currabrev
WHERE supplierid='" . $_POST['supplier'] . "'";
- $resultsup = db_query($sqlsup,$db);
- $RowSup = db_fetch_array($resultsup);
+ $resultsup = DB_query($sqlsup,$db);
+ $RowSup = DB_fetch_array($resultsup);
$SupplierName=$RowSup['suppname'];
$CurrCode =$RowSup['currcode'];
$CurrDecimalPlaces=$RowSup['currdecimalplaces'];
@@ -39,7 +39,7 @@
WHERE categoryid ='" . $_POST['category'] . "'";
$resultcat = DB_query($sqlcat,$db);
- $RowCat = db_fetch_row($resultcat);
+ $RowCat = DB_fetch_row($resultcat);
$Categoryname=$RowCat['0'];
} else {
$Categoryname='ALL';
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/UpgradeDatabase.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -129,8 +129,9 @@
case '4.06.2':
case '4.06.3':
case '4.06.4':
+ case '4.06.5':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.5':
+ case '4.06.6':
break;
} //end switch
}
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/ConnectDB.inc 2012-01-13 07:17:29 UTC (rev 4797)
@@ -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.5'; //must update manually every time there is a DB change
+$Version='4.06.6'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/includes/Contract_Readin.php
===================================================================
--- trunk/includes/Contract_Readin.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/Contract_Readin.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -67,10 +67,10 @@
$ErrMsg = _('The bill of material cannot be retrieved because');
$DbgMsg = _('The SQL statement that was used to retrieve the contract bill of material was');
- $ContractBOMResult = db_query($ContractBOMsql,$db,$ErrMsg,$DbgMsg);
+ $ContractBOMResult = DB_query($ContractBOMsql,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($ContractBOMResult) > 0) {
- while ($myrow=db_fetch_array($ContractBOMResult)) {
+ while ($myrow=DB_fetch_array($ContractBOMResult)) {
$_SESSION['Contract'.$identifier]->Add_To_ContractBOM($myrow['stockid'],
$myrow['description'],
$myrow['workcentreadded'],
@@ -91,10 +91,10 @@
$ErrMsg = _('The other contract requirementscannot be retrieved because');
$DbgMsg = _('The SQL statement that was used to retrieve the other contract requirments was');
- $ContractReqtsResult = db_query($ContractReqtsSQL,$db,$ErrMsg,$DbgMsg);
+ $ContractReqtsResult = DB_query($ContractReqtsSQL,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($ContractReqtsResult) > 0) {
- while ($myrow=db_fetch_array($ContractReqtsResult)) {
+ while ($myrow=DB_fetch_array($ContractReqtsResult)) {
$_SESSION['Contract'.$identifier]->Add_To_ContractRequirements($myrow['requirement'],
$myrow['quantity'],
$myrow['costperunit'],
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/LanguagesArray.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -41,8 +41,8 @@
$LanguagesArray['et_EE.utf8']['DecimalPoint'] = ',';
$LanguagesArray['et_EE.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['fa_IR.utf8']['LanguageName'] = _('Arabic');
-$LanguagesArray['fa_IR.utf8']['WindowsLocale'] = 'arabic';
+$LanguagesArray['fa_IR.utf8']['LanguageName'] = _('Persian');
+$LanguagesArray['fa_IR.utf8']['WindowsLocale'] = 'persian';
$LanguagesArray['fa_IR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['fa_IR.utf8']['ThousandsSeparator'] = '.';
Modified: trunk/includes/PO_ReadInOrder.inc
===================================================================
--- trunk/includes/PO_ReadInOrder.inc 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/PO_ReadInOrder.inc 2012-01-13 07:17:29 UTC (rev 4797)
@@ -162,11 +162,11 @@
$ErrMsg = _('The lines on the purchase order cannot be retrieved because');
$DbgMsg = _('The SQL statement that was used to retrieve the purchase order lines was');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($LineItemsResult) > 0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if (is_null($myrow['glcode'])){
$GLCode = '';
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 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2012-01-13 07:17:29 UTC (rev 4797)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 19:41+1300\n"
+"POT-Creation-Date: 2012-01-07 14:17+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -385,7 +385,7 @@
#: 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:1399
-#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
+#: Shipments.php:439 Shippers.php:144 SpecialOrder.php:656
#: 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
@@ -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:538 ShipmentCosting.php:615 Shipments.php:491
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:490
#: 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:183 UpgradeDatabase.php:186
-#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195
-#: UpgradeDatabase.php:198 UpgradeDatabase.php:201 UpgradeDatabase.php:204
-#: UpgradeDatabase.php:207 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:184 UpgradeDatabase.php:187
+#: UpgradeDatabase.php:190 UpgradeDatabase.php:193 UpgradeDatabase.php:196
+#: UpgradeDatabase.php:199 UpgradeDatabase.php:202 UpgradeDatabase.php:205
+#: UpgradeDatabase.php:208 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
@@ -1936,8 +1936,8 @@
#: 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
+#: ShipmentCosting.php:150 Shipments.php:400 Shipments.php:402
+#: Shipments.php:403 Shipments.php:487 Shipments.php:489 SpecialOrder.php:617
#: 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
@@ -2386,7 +2386,7 @@
#: 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
+#: Shipments.php:401 Shipments.php:488 Shipt_Select.php:193
#: StockLocTransferReceive.php:432 SupplierTenders.php:491 TopItems.php:180
#: WorkOrderCosting.php:90 WorkOrderEntry.php:624 WorkOrderIssue.php:693
#: WorkOrderIssue.php:763 includes/DefineLabelClass.php:21
@@ -3275,8 +3275,8 @@
msgstr "Popis položky"
#: ConfirmDispatch_Invoice.php:279 GoodsReceived.php:100 GoodsReceived.php:104
-#: PDFOrdersInvoiced.php:349 PDFOrderStatus.php:320 Shipments.php:401
-#: Shipments.php:488
+#: PDFOrdersInvoiced.php:349 PDFOrderStatus.php:320 Shipments.php:400
+#: Shipments.php:487
msgid "Ordered"
msgstr "Objednáno"
@@ -3305,7 +3305,7 @@
#: PrintCustTransPortrait.php:911 PrintCustTransPortrait.php:1009
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
#: RecurringSalesOrders.php:322 SelectCreditItems.php:676
-#: SelectOrderItems.php:1337 Shipments.php:405 StockLocMovements.php:94
+#: SelectOrderItems.php:1337 Shipments.php:404 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
@@ -3669,13 +3669,13 @@
#: SupplierAllocations.php:117 SupplierAllocations.php:139
#: SupplierAllocations.php:157 SupplierAllocations.php:181
#: SupplierAllocations.php:215 SupplierAllocations.php:236
-#: SupplierCredit.php:730 SupplierCredit.php:759 SupplierCredit.php:784
-#: SupplierCredit.php:818 SupplierCredit.php:852 SupplierCredit.php:884
-#: SupplierCredit.php:921 SupplierCredit.php:946 SupplierCredit.php:958
-#: SupplierCredit.php:994 SupplierCredit.php:1034 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
+#: SupplierCredit.php:725 SupplierCredit.php:754 SupplierCredit.php:779
+#: SupplierCredit.php:813 SupplierCredit.php:847 SupplierCredit.php:879
+#: SupplierCredit.php:916 SupplierCredit.php:941 SupplierCredit.php:953
+#: SupplierCredit.php:989 SupplierCredit.php:1029 SupplierCredit.php:1055
+#: SupplierCredit.php:1087 SupplierCredit.php:1111 SupplierCredit.php:1143
+#: SupplierCredit.php:1159 SupplierCredit.php:1172 SupplierCredit.php:1179
+#: SupplierCredit.php:1201 SupplierCredit.php:1255 SupplierCredit.php:1283
#: 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
@@ -3777,14 +3777,14 @@
#: 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
-#: SupplierCredit.php:784 SupplierCredit.php:818 SupplierCredit.php:852
-#: SupplierCredit.php:884 SupplierCredit.php:921 SupplierCredit.php:946
-#: SupplierCredit.php:958 SupplierCredit.php:994 SupplierCredit.php:1034
-#: 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:660 SupplierInvoice.php:733
+#: SupplierAllocations.php:236 SupplierCredit.php:725 SupplierCredit.php:754
+#: SupplierCredit.php:779 SupplierCredit.php:813 SupplierCredit.php:847
+#: SupplierCredit.php:879 SupplierCredit.php:916 SupplierCredit.php:941
+#: SupplierCredit.php:953 SupplierCredit.php:989 SupplierCredit.php:1029
+#: SupplierCredit.php:1055 SupplierCredit.php:1087 SupplierCredit.php:1111
+#: SupplierCredit.php:1143 SupplierCredit.php:1159 SupplierCredit.php:1172
+#: SupplierCredit.php:1179 SupplierCredit.php:1201 SupplierCredit.php:1255
+#: SupplierCredit.php:1283 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
@@ -3919,8 +3919,8 @@
#: 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
+#: SelectOrderItems.php:702 SelectProduct.php:386 Shipments.php:398
+#: Shipments.php:485 SuppCreditGRNs.php:174 SuppInvGRNs.php:302
#: TaxGroups.php:286 includes/PDFDeliveryDifferencesPageHeader.inc:41
#: includes/PDFDIFOTPageHeader.inc:40 includes/PDFOstdgGRNsPageHeader.inc:37
msgid "Order"
@@ -4136,7 +4136,7 @@
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:1383
+#: SupplierCredit.php:1227 SupplierCredit.php:1315 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"
@@ -4954,9 +4954,9 @@
msgid "The locations for the item"
msgstr "Místa pro položku"
-#: 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:762 SupplierInvoice.php:820
+#: Contracts.php:490 Factors.php:80 Stocks.php:560 SupplierCredit.php:754
+#: SupplierCredit.php:813 SupplierCredit.php:1201 SupplierCredit.php:1255
+#: SupplierCredit.php:1283 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"
@@ -6018,7 +6018,7 @@
#: Credit_Invoice.php:271 PDFOrdersInvoiced.php:350 PDFOrderStatus.php:321
#: ReverseGRN.php:388 SalesInquiry.php:836 ShipmentCosting.php:149
-#: ShipmentCosting.php:151 Shipments.php:404
+#: ShipmentCosting.php:151 Shipments.php:403
msgid "Invoiced"
msgstr "Fakturováno"
@@ -6193,7 +6193,7 @@
msgid "Credit Note number"
msgstr "Dobropis číslo"
-#: Credit_Invoice.php:1428 GoodsReceived.php:722 SupplierCredit.php:1333
+#: Credit_Invoice.php:1428 GoodsReceived.php:722 SupplierCredit.php:1328
#: SupplierInvoice.php:1491 WorkOrderIssue.php:352 WorkOrderReceive.php:676
#: Z_BottomUpCosts.php:33
msgid "has been processed"
@@ -7451,7 +7451,7 @@
msgstr "Celkem Zůstatek"
#: CustomerInquiry.php:137 CustomerReceipt.php:964 PrintCustStatements.php:358
-#: SalesPeople.php:206 Shipments.php:406 Stocks.php:979 Stocks.php:981
+#: SalesPeople.php:206 Shipments.php:405 Stocks.php:979 Stocks.php:981
#: SupplierInquiry.php:143 includes/PDFAgedDebtorsPageHeader.inc:50
#: includes/PDFAgedSuppliersPageHeader.inc:36
msgid "Current"
@@ -7817,8 +7817,8 @@
#: CustomerReceipt.php:897 GoodsReceived.php:102 GoodsReceived.php:106
#: GoodsReceived.php:112 POReport.php:629 POReport.php:1358 ReverseGRN.php:386
-#: ReverseGRN.php:387 ShipmentCosting.php:150 Shipments.php:403
-#: Shipments.php:490 StockDispatch.php:379 StockDispatch.php:386
+#: ReverseGRN.php:387 ShipmentCosting.php:150 Shipments.php:402
+#: Shipments.php:489 StockDispatch.php:379 StockDispatch.php:386
#: SuppCreditGRNs.php:178
msgid "Received"
msgstr "Přijaté"
@@ -8243,7 +8243,7 @@
#: CustomerTransInquiry.php:51 FixedAssetRegister.php:78
#: FixedAssetRegister.php:349 PcReportTab.php:136 PcReportTab.php:256
#: SalesAnalRepts.php:430 SalesAnalRepts.php:458 SalesAnalRepts.php:487
-#: SalesAnalRepts.php:506 ShipmentCosting.php:56 Shipments.php:308
+#: SalesAnalRepts.php:506 ShipmentCosting.php:56 Shipments.php:307
#: StockDispatch.php:383 StockLocTransferReceive.php:209
#: StockTransfers.php:340 SuppContractChgs.php:72 SuppCreditGRNs.php:168
#: SuppFixedAssetChgs.php:70 SupplierTransInquiry.php:50 SuppShiptChgs.php:77
@@ -8442,7 +8442,7 @@
msgstr "Alloc"
#: CustWhereAlloc.php:128 EmailCustTrans.php:12 SalesInquiry.php:1080
-#: SupplierCredit.php:1113 Z_CheckAllocs.php:85
+#: SupplierCredit.php:1108 Z_CheckAllocs.php:85
msgid "Credit Note"
msgstr "Dobropis"
@@ -8841,7 +8841,7 @@
msgid "Select A Different Order"
msgstr "Vyberte různém pořadí"
-#: DeliveryDetails.php:804 Shipments.php:491 SpecialOrder.php:616
+#: DeliveryDetails.php:804 Shipments.php:490 SpecialOrder.php:616
msgid "Delivery"
msgstr "Dodání"
@@ -9068,8 +9068,8 @@
#: DiscountCategories.php:203 InventoryPlanningPrefSupplier.php:72
#: PDFPriceList.php:358 SalesTopItemsInquiry.php:217 SelectWorkOrder.php:313
-#: ShipmentCosting.php:148 ShipmentCosting.php:539 Shipments.php:400
-#: Shipments.php:487 StockUsage.php:57 SuppCreditGRNs.php:266
+#: ShipmentCosting.php:148 ShipmentCosting.php:539 Shipments.php:399
+#: Shipments.php:486 StockUsage.php:57 SuppCreditGRNs.php:266
#: SuppInvGRNs.php:254 WorkOrderCosting.php:87 WorkOrderCosting.php:119
#: WorkOrderIssue.php:530 WorkOrderIssue.php:596 WorkOrderReceive.php:742
#: WorkOrderStatus.php:49 WorkOrderStatus.php:95
@@ -12631,8 +12631,8 @@
msgid "cost"
msgstr "Cena"
-#: GoodsReceived.php:618 ReverseGRN.php:175 SupplierCredit.php:1231
-#: SupplierCredit.php:1319 SupplierInvoice.php:1382 SupplierInvoice.php:1469
+#: GoodsReceived.php:618 ReverseGRN.php:175 SupplierCredit.php:1226
+#: SupplierCredit.php:1314 SupplierInvoice.php:1382 SupplierInvoice.php:1469
msgid ""
"CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE The fixed asset "
"transaction could not be inserted because"
@@ -20630,7 +20630,7 @@
msgid "Preferred Supplier"
msgstr "Preferované dodavatele"
-#: PurchData.php:524 Shipments.php:523 StockAdjustments.php:426
+#: PurchData.php:524 Shipments.php:522 StockAdjustments.php:426
#: TaxGroups.php:395 WOSerialNos.php:268 WWW_Access.php:233
#, php-format
msgid "Add"
@@ -21270,8 +21270,8 @@
"Chcete-li obrátit GRN, která byla fakturována Nejprve musí být připsána"
#: ReverseGRN.php:383 SuppCreditGRNs.php:80 SuppCreditGRNs.php:173
-#: SuppCreditGRNs.php:265 SupplierCredit.php:314 SupplierCredit.php:991
-#: SupplierCredit.php:1030 SupplierCredit.php:1056 SupplierInvoice.php:849
+#: SuppCreditGRNs.php:265 SupplierCredit.php:314 SupplierCredit.php:986
+#: SupplierCredit.php:1025 SupplierCredit.php:1051 SupplierInvoice.php:849
#: SupplierInvoice.php:916 SupplierInvoice.php:964 SupplierInvoice.php:1001
#: SupplierInvoice.php:1026 includes/PDFOstdgGRNsPageHeader.inc:36
msgid "GRN"
@@ -24136,7 +24136,7 @@
#: ShipmentCosting.php:38 ShipmentCosting.php:42 ShipmentCosting.php:54
#: ShipmentCosting.php:77 ShipmentCosting.php:97 ShipmentCosting.php:152
#: ShipmentCosting.php:153 ShipmentCosting.php:704 Shipments.php:54
-#: Shipments.php:306 Shipt_Select.php:292 SupplierCredit.php:351
+#: Shipments.php:305 Shipt_Select.php:292 SupplierCredit.php:351
#: SupplierInvoice.php:331 SuppShiptChgs.php:80
msgid "Shipment"
msgstr "Zásilka"
@@ -24161,7 +24161,7 @@
msgid "Voyage Ref"
msgstr "Voyage Ref"
-#: ShipmentCosting.php:65 Shipments.php:324
+#: ShipmentCosting.php:65 Shipments.php:323
msgid "Expected Arrival Date (ETA)"
msgstr "Očekávané Datum příjezdu (ETA)"
@@ -24174,7 +24174,7 @@
msgstr "Ne Obecné náklady existují záznamy o přepravě"
#: ShipmentCosting.php:81 ShipmentCosting.php:101 Shipments.php:58
-#: Shipments.php:108
+#: Shipments.php:106
msgid "in the database"
msgstr "v databázi"
@@ -24211,12 +24211,12 @@
msgid "Variance"
msgstr "Odchylka"
-#: ShipmentCosting.php:249 SupplierCredit.php:884 SupplierInvoice.php:883
+#: ShipmentCosting.php:249 SupplierCredit.php:879 SupplierInvoice.php:883
#: SupplierInvoice.php:1233
msgid "The quantity on hand could not be retrieved from the database"
msgstr "Množství, na straně se nepodařilo získat z databáze"
-#: ShipmentCosting.php:250 SupplierCredit.php:885 SupplierInvoice.php:884
+#: ShipmentCosting.php:250 SupplierCredit.php:880 SupplierInvoice.php:884
#: SupplierInvoice.php:1234
msgid "The following SQL to retrieve the total stock quantity was used"
msgstr "Následující SQL získat celkové populace množství bylo použito"
@@ -24245,11 +24245,11 @@
msgid "The GL entry for the shipment average cost adjustment for"
msgstr "Záznam GL za cenu přepravy průměrná úprava pro"
-#: ShipmentCosting.php:328 SupplierCredit.php:958 SupplierInvoice.php:1338
+#: ShipmentCosting.php:328 SupplierCredit.php:953 SupplierInvoice.php:1338
msgid "The cost could not be updated because"
msgstr "Náklady by neměly být aktualizovány, protože"
-#: ShipmentCosting.php:329 SupplierCredit.php:959 SupplierInvoice.php:1339
+#: ShipmentCosting.php:329 SupplierCredit.php:954 SupplierInvoice.php:1339
msgid "The following SQL to update the cost was used"
msgstr "Následující SQL aktualizovat náklady byly použity"
@@ -24402,32 +24402,32 @@
"shipment are possible"
msgstr "Vybrané zásilky je již uzavřen a žádné další úpravy jsou možné zásilky"
-#: Shipments.php:104
+#: Shipments.php:102
msgid "The lines on the shipment cannot be retrieved because"
msgstr "Linky na přepravu nelze získat, protože"
-#: Shipments.php:108
+#: Shipments.php:106
msgid "Unable to locate lines for Shipment"
msgstr "Nelze nalézt linky na přepravě"
-#: Shipments.php:157
+#: Shipments.php:155
msgid "The supplier details for the shipment could not be retrieved because"
msgstr "Dodavatel podrobnosti pro přepravu se nepodařilo získat, protože"
-#: Shipments.php:179
+#: Shipments.php:177
msgid ""
"The date of expected arrival of the shipment must be entered in the format"
msgstr "Datum očekávaného příjezdu zásilky musí být zadáno ve formátu"
-#: Shipments.php:182
+#: Shipments.php:180
msgid "An expected arrival of the shipment must be a date after today"
msgstr "Očekávaný příjezd zásilky musí být datum, po dnes"
-#: Shipments.php:188
+#: Shipments.php:186
msgid "A reference to the vessel of more than 2 characters is expected"
msgstr "Odkaz na plavidla o více než 2 znaků se očekává, že"
-#: Shipments.php:191
+#: Shipments.php:189
msgid ""
"A reference to the voyage (or HAWB in the case of air-freight) of more than "
"2 characters is expected"
@@ -24435,7 +24435,7 @@
"Odkaz na cestě (nebo HAWB v případě vzduch-nákladní dopravy) o více než 2 "
"znaků se očekává, že"
-#: Shipments.php:195
+#: Shipments.php:193
msgid ""
"Cannot add purchase order lines to the shipment unless the shipment is first "
"initiated - hit update to setup the shipment first"
@@ -24443,41 +24443,41 @@
"Nelze přidat řádky objednávky k přepravě, pokud dodávka je první zahájila - "
"hit aktualizace nastavení zásilka poprvé"
-#: Shipments.php:244
+#: Shipments.php:242
msgid ""
"Updated the shipment record and delivery dates of order lines as necessary"
msgstr ""
"Aktualizováno zásilky záznam a termíny dodání objednávky linek podle potřeby"
-#: Shipments.php:312
+#: Shipments.php:311
msgid "Vessel Name /Transport Agent"
msgstr "Jméno plavidla / Transport Agent"
-#: Shipments.php:314
+#: Shipments.php:313
msgid "Voyage Ref / Consignment Note"
msgstr "Voyage Ref / nákladního listu"
-#: Shipments.php:330
+#: Shipments.php:329
msgid "Into"
msgstr "Do"
-#: Shipments.php:355
+#: Shipments.php:354
msgid "Stock Location"
msgstr "Umístění skladu"
-#: Shipments.php:396
+#: Shipments.php:395
msgid "Order Lines On This Shipment"
msgstr "Aby Lines Na této zásilky"
-#: Shipments.php:406 includes/PDFOstdgGRNsPageHeader.inc:42
+#: Shipments.php:405 includes/PDFOstdgGRNsPageHeader.inc:42
msgid "Std Cost"
msgstr "Std nákladů"
-#: Shipments.php:448
+#: Shipments.php:447
msgid "Update Shipment Details"
msgstr "Aktualizace podrobnosti o zásilce"
-#: Shipments.php:482
+#: Shipments.php:481
msgid "Possible Order Lines To Add To This Shipment"
msgstr "Možné Objednejte Linky Chcete-li přidat do této zásilky"
@@ -27798,7 +27798,7 @@
msgid "Enter Credit Note"
msgstr "Zadejte dobropis"
-#: SupplierCredit.php:651
+#: SupplierCredit.php:646
msgid ""
"The credit note as entered cannot be processed because the total amount of "
"the credit note is less than or equal to 0"
@@ -27806,11 +27806,11 @@
"Dobropis, jak je uvedena nelze zpracovat, protože celková částka dobropisu "
"je menší nebo roven 0"
-#: SupplierCredit.php:651
+#: SupplierCredit.php:646
msgid "Credit notes are expected to be entered as positive amounts to credit"
msgstr "Dobropisů by měly být zapsány jako pozitivní částky úvěru"
-#: SupplierCredit.php:654
+#: SupplierCredit.php:649
msgid ""
"The credit note as entered cannot be processed because the there is no "
"suppliers credit note number or reference entered"
@@ -27818,28 +27818,28 @@
"Dobropis, jak je uvedena nelze zpracovat, protože není tam žádný dodavatele "
"dobropis číslo nebo referenční zadané"
-#: SupplierCredit.php:654
+#: SupplierCredit.php:649
msgid "The supplier credit note number must be entered"
msgstr "Dodavatel dobropis číslo musí být uvedeno"
-#: SupplierCredit.php:657
+#: SupplierCredit.php:652
msgid ""
"The credit note as entered cannot be processed because the date entered is "
"not in the format"
msgstr ""
"Dobropis, jak je uvedena nelze zpracovat, protože data vstupu není ve formátu"
-#: SupplierCredit.php:660
+#: SupplierCredit.php:655
msgid ""
"The credit note as entered cannot be processed because the date is after "
"today"
msgstr "Dobropis, jak je uvedena nelze zpracovat, protože datum je po dnešku"
-#: SupplierCredit.php:660
+#: SupplierCredit.php:655
msgid "Purchase credit notes are expected to have a date prior to or today"
msgstr "Nákup dobropisů se očekává, že data před nebo dnes"
-#: SupplierCredit.php:663
+#: SupplierCredit.php:658
msgid ""
"The credit note as entered cannot be processed because the exchange rate for "
"the credit note has been entered as a negative or zero number"
@@ -27847,39 +27847,39 @@
"Dobropis, jak je uvedena nelze zpracovat, protože směnný kurz pro dobropis "
"byl zadán jako záporné číslo nebo nula"
-#: SupplierCredit.php:663 SupplierInvoice.php:646
+#: SupplierCredit.php:658 SupplierInvoice.php:646
msgid ""
"The exchange rate is expected to show how many of the suppliers currency "
"there are in 1 of the local currency"
msgstr ""
"Kurz se očekává, ukázat, jak mnoho dodavatelů měny jsou v 1 z místní měny"
-#: SupplierCredit.php:665
+#: SupplierCredit.php:660
msgid ""
"The credit note total as entered is less than the sum of the shipment charges"
msgstr "Dobropis Celková jak je zadaný, je menší než součet zásilky poplatků"
-#: SupplierCredit.php:665
+#: SupplierCredit.php:660
msgid "the general ledger entries (if any) and the charges for goods received"
msgstr "hlavní knihy položky (pokud existuje) a poplatky za přijetí zboží"
-#: SupplierCredit.php:665
+#: SupplierCredit.php:660
msgid "There must be a mistake somewhere"
msgstr "Tam musí být nějaká chyba někde"
-#: SupplierCredit.php:665
+#: SupplierCredit.php:660
msgid "the credit note as entered will not be processed"
msgstr "dobropisu, jak je uvedena nebudou zpracovány"
-#: SupplierCredit.php:730 SupplierCredit.php:852 SupplierCredit.php:1060
+#: SupplierCredit.php:725 SupplierCredit.php:847 SupplierCredit.php:1055
#: SupplierInvoice.php:733 SupplierInvoice.php:853 SupplierInvoice.php:1029
msgid "The general ledger transaction could not be added because"
msgstr "Hlavní knihy transakce nelze přidat, protože"
-#: SupplierCredit.php:732 SupplierCredit.php:760 SupplierCredit.php:785
-#: SupplierCredit.php:820 SupplierCredit.php:854 SupplierCredit.php:922
-#: SupplierCredit.php:947 SupplierCredit.php:995 SupplierCredit.php:1035
-#: SupplierCredit.php:1061 SupplierCredit.php:1094 SupplierCredit.php:1117
+#: SupplierCredit.php:727 SupplierCredit.php:755 SupplierCredit.php:780
+#: SupplierCredit.php:815 SupplierCredit.php:849 SupplierCredit.php:917
+#: SupplierCredit.php:942 SupplierCredit.php:990 SupplierCredit.php:1030
+#: SupplierCredit.php:1056 SupplierCredit.php:1089 SupplierCredit.php:1112
#: SupplierInvoice.php:734 SupplierInvoice.php:764 SupplierInvoice.php:789
#: SupplierInvoice.php:821 SupplierInvoice.php:854 SupplierInvoice.php:920
#: SupplierInvoice.php:946 SupplierInvoice.php:968 SupplierInvoice.php:1006
@@ -27887,47 +27887,47 @@
msgid "The following SQL to insert the GL transaction was used"
msgstr "Následující SQL vložit transakce GL byla použita"
-#: SupplierCredit.php:756
+#: SupplierCredit.php:751
msgid "Shipment credit against"
msgstr "Zásilka úvěru proti"
-#: SupplierCredit.php:759 SupplierInvoice.php:761
+#: SupplierCredit.php:754 SupplierInvoice.php:761
msgid "The general ledger transaction for the shipment"
msgstr "Hlavní knihy transakce pro zásilku"
-#: SupplierCredit.php:782
+#: SupplierCredit.php:777
msgid "Asset Credit"
msgstr "Kreditní Asset"
-#: SupplierCredit.php:784 SupplierInvoice.php:788
+#: SupplierCredit.php:779 SupplierInvoice.php:788
msgid ""
"The general ledger transaction for the asset addition could not be added "
"because"
msgstr "Hlavní knihy transakci aktiva navíc nelze přidat, protože"
-#: SupplierCredit.php:815 SupplierInvoice.php:818
+#: SupplierCredit.php:810 SupplierInvoice.php:818
msgid "Contract charge against"
msgstr "Smlouvy obvinění proti"
-#: SupplierCredit.php:818 SupplierInvoice.php:820
+#: SupplierCredit.php:813 SupplierInvoice.php:820
msgid "The general ledger transaction for the contract"
msgstr "Hlavní knihy transakce pro smlouvu"
-#: SupplierCredit.php:849 SupplierCredit.php:918
+#: SupplierCredit.php:844 SupplierCredit.php:913
msgid "GRN Credit Note"
msgstr "GRN dobropis"
-#: SupplierCredit.php:849 SupplierInvoice.php:850
+#: SupplierCredit.php:844 SupplierInvoice.php:850
msgid "std cost of"
msgstr "std náklady"
-#: SupplierCredit.php:918 SupplierCredit.php:991 SupplierInvoice.php:916
+#: SupplierCredit.php:913 SupplierCredit.php:986 SupplierInvoice.php:916
#: SupplierInvoice.php:964
msgid "price var of"
msgstr "cena var z"
-#: SupplierCredit.php:921 SupplierCredit.php:946 SupplierCredit.php:994
-#: SupplierCredit.php:1034 SupplierInvoice.php:919 SupplierInvoice.php:945
+#: SupplierCredit.php:916 SupplierCredit.php:941 SupplierCredit.php:989
+#: SupplierCredit.php:1029 SupplierInvoice.php:919 SupplierInvoice.php:945
#: SupplierInvoice.php:967 SupplierInvoice.php:1004
msgid ""
"The general ledger transaction could not be added for the price variance of "
@@ -27935,93 +27935,93 @@
msgstr ""
"Hlavní knihy transakce nemohl být přidán za cenu rozptyl na skladě, protože"
-#: SupplierCredit.php:941 SupplierInvoice.php:940
+#: SupplierCredit.php:936 SupplierInvoice.php:940
msgid "Average Cost Adj"
msgstr "Průměrná cena Adj"
-#: SupplierCredit.php:1030 SupplierInvoice.php:1001
+#: SupplierCredit.php:1025 SupplierInvoice.php:1001
msgid "price var"
msgstr "cena var"
-#: SupplierCredit.php:1056 SupplierCredit.php:1089 SupplierCredit.php:1113
+#: SupplierCredit.php:1051 SupplierCredit.php:1084 SupplierCredit.php:1108
#: SupplierInvoice.php:1026 SupplierInvoice.php:1086
msgid "a rate of"
msgstr "rychlost"
-#: SupplierCredit.php:1071
+#: SupplierCredit.php:1066
msgid "The total posted to the credit accounts is"
msgstr "Celková vyslán na úvěrových účtů je"
-#: SupplierCredit.php:1071 SupplierInvoice.php:1039
+#: SupplierCredit.php:1066 SupplierInvoice.php:1039
msgid "but the sum of OvAmount converted at ExRate"
msgstr "ale součet OvAmount převeden na ExRate"
-#: SupplierCredit.php:1089
+#: SupplierCredit.php:1084
msgid "Credit note"
msgstr "Dobropis"
-#: SupplierCredit.php:1092 SupplierInvoice.php:1063
+#: SupplierCredit.php:1087 SupplierInvoice.php:1063
msgid "The general ledger transaction for the tax could not be added because"
msgstr "Hlavní knihy transakci daň nelze přidat, protože"
-#: SupplierCredit.php:1116 SupplierInvoice.php:1089
+#: SupplierCredit.php:1111 SupplierInvoice.php:1089
msgid ""
"The general ledger transaction for the control total could not be added "
"because"
msgstr "Hlavní knihy transakce pro kontrolu celkové nelze přidat, protože"
-#: SupplierCredit.php:1148
+#: SupplierCredit.php:1143
msgid ""
"The supplier credit note transaction could not be added to the database "
"because"
msgstr "Dodavatel dobropis transakce nemůže být přidány do databáze, protože"
-#: SupplierCredit.php:1149
+#: SupplierCredit.php:1144
msgid "The following SQL to insert the supplier credit note was used"
msgstr "Následující SQL vložit dodavatele dobropis byl použit"
-#: SupplierCredit.php:1164 SupplierInvoice.php:1138
+#: SupplierCredit.php:1159 SupplierInvoice.php:1138
msgid "The supplier transaction taxes records could not be inserted because"
msgstr "Dodavatel transakčních daní záznamy nemohly být zařazeny, protože"
-#: SupplierCredit.php:1165 SupplierInvoice.php:1139
+#: SupplierCredit.php:1160 SupplierInvoice.php:1139
msgid ""
"The following SQL to insert the supplier transaction taxes record was used:"
msgstr ""
"Následující SQL vložit na dodavatele transakčních daní záznam byl použit:"
-#: SupplierCredit.php:1177
+#: SupplierCredit.php:1172
msgid ""
"The quantity credited of the purchase order line could not be updated because"
msgstr ""
"Množství připočítán line objednávky se nepodařilo aktualizovat, protože"
-#: SupplierCredit.php:1178 SupplierInvoice.php:1158
+#: SupplierCredit.php:1173 SupplierInvoice.php:1158
msgid "The following SQL to update the purchase order details was used"
msgstr "Následující SQL aktualizovat údaje objednávky bylo použito"
-#: SupplierCredit.php:1184
+#: SupplierCredit.php:1179
msgid ""
"The quantity credited off the goods received record could not be updated "
"because"
msgstr ""
"Množství připsána mimo zboží, které obdrží záznam nelze aktualizovat, protože"
-#: SupplierCredit.php:1185
+#: SupplierCredit.php:1180
msgid "The following SQL to update the GRN quantity credited was used"
msgstr "Následující SQL aktualizovat množství GRN připsána byla použita"
-#: SupplierCredit.php:1206 SupplierCredit.php:1260 SupplierInvoice.php:1184
+#: SupplierCredit.php:1201 SupplierCredit.php:1255 SupplierInvoice.php:1184
#: SupplierInvoice.php:1409
msgid "The shipment charge record for the shipment"
msgstr "Zásilka poplatek záznam pro přepravu"
-#: SupplierCredit.php:1207 SupplierCredit.php:1261 SupplierInvoice.php:1186
+#: SupplierCredit.php:1202 SupplierCredit.php:1256 SupplierInvoice.php:1186
#: SupplierInvoice.php:1412
msgid "The following SQL to insert the Shipment charge record was used"
msgstr "Následující SQL vložit poplatku zásilku záznam byl použit"
-#: SupplierCredit.php:1238
+#: SupplierCredit.php:1233
msgid ""
"CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE. The fixed asset "
"cost was not able to be updated because:"
@@ -28029,21 +28029,21 @@
"Critical Error! POZNÁMKA DOWN této chyby a hledat pomoc. Investičního "
"majetku náklady nemohl být aktualizován, protože:"
-#: SupplierCredit.php:1239
+#: SupplierCredit.php:1234
msgid ""
"The following SQL was used to attempt the update of the fixed asset cost:"
msgstr ""
"Následující SQL byl použit k pokusu aktualizace dlouhodobého majetku náklady:"
-#: SupplierCredit.php:1288 SupplierInvoice.php:1439
+#: SupplierCredit.php:1283 SupplierInvoice.php:1439
msgid "The contract charge record for contract"
msgstr "Smlouva poplatek záznam pro smlouvy"
-#: SupplierCredit.php:1289 SupplierInvoice.php:1440
+#: SupplierCredit.php:1284 SupplierInvoice.php:1440
msgid "The following SQL to insert the contract charge record was used"
msgstr "Následující SQL vložit smlouvy poplatek záznam byl použit"
-#: SupplierCredit.php:1326
+#: SupplierCredit.php:1321
msgid ""
"CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE. The fixed asset "
"cost was not able to be updated because:"
@@ -28051,15 +28051,15 @@
"Critical Error! POZNÁMKA DOWN této chyby a hledat pomoc. Investičního "
"majetku náklady nemohl být aktualizován, protože:"
-#: SupplierCredit.php:1327 SupplierInvoice.php:1391
+#: SupplierCredit.php:1322 SupplierInvoice.php:1391
msgid "The following SQL was used to attempt the update of the asset cost:"
msgstr "Následující SQL byl použit k pokusu aktualizace aktiva nákladů:"
-#: SupplierCredit.php:1333
+#: SupplierCredit.php:1328
msgid "Supplier credit note number"
msgstr "Dodavatel dobropis číslo"
-#: SupplierCredit.php:1334
+#: SupplierCredit.php:1329
msgid "Enter another Credit Note for this Supplier"
msgstr "Zadejte jiný Poznámka Zásluhu na tom dodavatele"
@@ -31135,7 +31135,7 @@
"systému. Přečtěte si prosím pozorně všechny poznámky, aby bylo zajištěno, že "
"se očekává, že"
-#: UpgradeDatabase.php:138
+#: UpgradeDatabase.php:139
msgid ""
"Only mysql upgrades are performed seamlessly at this time. Your database "
"will need to be manually updated"
@@ -31143,66 +31143,66 @@
"Pouze mysql upgrady jsou prováděny plynule v této době. Databáze bude třeba "
"ručně aktualizované"
-#: UpgradeDatabase.php:152
+#: UpgradeDatabase.php:153
msgid "Applying"
msgstr "Uplatnění"
-#: UpgradeDatabase.php:180 Z_Upgrade_3.10-3.11.php:59 Z_Upgrade3.10.php:29
+#: UpgradeDatabase.php:181 Z_Upgrade_3.10-3.11.php:59 Z_Upgrade3.10.php:29
#: Z_Upgrade3.10.php:34 Z_Upgrade3.10.php:46 Z_Upgrade3.10.php:51
#: Z_Upgrade3.10.php:60 Z_Upgrade3.10.php:65 Z_Upgrade3.10.php:74
#: Z_Upgrade3.10.php:79 Z_Upgrade_3.11-4.00.php:59
msgid "Success"
msgstr "Úspěch"
-#: UpgradeDatabase.php:183
+#: UpgradeDatabase.php:184
#, fuzzy
msgid "Foreign Key already removed"
msgstr "je již odstraněna"
-#: UpgradeDatabase.php:186 Z_Upgrade_3.10-3.11.php:63
+#: UpgradeDatabase.php:187 Z_Upgrade_3.10-3.11.php:63
#: Z_Upgrade_3.11-4.00.php:63
msgid "Table has already been created"
msgstr "Tabulka již byla vytvořena"
-#: UpgradeDatabase.php:189
+#: UpgradeDatabase.php:190
#, fuzzy
msgid "Column has already been changed"
msgstr "Sloupec již byla vytvořena"
-#: UpgradeDatabase.php:192 Z_Upgrade_3.10-3.11.php:67
+#: UpgradeDatabase.php:193 Z_Upgrade_3.10-3.11.php:67
#: Z_Upgrade_3.11-4.00.php:67
msgid "Column has already been created"
msgstr "Sloupec již byla vytvořena"
-#: UpgradeDatabase.php:195 Z_Upgrade_3.10-3.11.php:71
+#: UpgradeDatabase.php:196 Z_Upgrade_3.10-3.11.php:71
#: Z_Upgrade_3.11-4.00.php:71
msgid "Index already exists"
msgstr "Index již existuje"
-#: UpgradeDatabase.php:198 Z_Upgrade_3.10-3.11.php:75
+#: UpgradeDatabase.php:199 Z_Upgrade_3.10-3.11.php:75
#: Z_Upgrade_3.11-4.00.php:75
msgid "Entry has already been done"
msgstr "Vstup již bylo učiněno"
-#: UpgradeDatabase.php:201
+#: UpgradeDatabase.php:202
msgid "SQL syntax error. The SQL error message is"
msgstr "SQL chyba syntaxe. Chyba SQL zpráva"
-#: UpgradeDatabase.php:204 Z_Upgrade_3.10-3.11.php:79
+#: UpgradeDatabase.php:205 Z_Upgrade_3.10-3.11.php:79
#: Z_Upgrade_3.11-4.00.php:79
msgid "Primary key already exists"
msgstr "Primární klíč již existuje"
-#: UpgradeDatabase.php:207
+#: UpgradeDatabase.php:208
msgid "Index already dropped previously"
msgstr "Index již klesl dříve"
-#: UpgradeDatabase.php:210 Z_Upgrade_3.10-3.11.php:82
+#: UpgradeDatabase.php:211 Z_Upgrade_3.10-3.11.php:82
#: Z_Upgrade_3.11-4.00.php:82
msgid "Failure"
msgstr "Selhání"
-#: UpgradeDatabase.php:210 Z_Upgrade_3.10-3.11.php:83
+#: UpgradeDatabase.php:211 Z_Upgrade_3.10-3.11.php:83
#: Z_Upgrade_3.11-4.00.php:83
msgid "Error number"
msgstr "Číslo chyby"
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 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2012-01-13 07:17:29 UTC (rev 4797)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WebERP 4.00/trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 19:41+1300\n"
+"POT-Creation-Date: 2012-01-07 14:17+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"
@@ -381,7 +381,7 @@
#: 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:1399
-#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
+#: Shipments.php:439 Shippers.php:144 SpecialOrder.php:656
#: 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
@@ -681,7 +681,7 @@
#: PaymentAllocations.php:66 PcAssignCashToTab.php:220
#: PcAuthorizeExpenses.php:88 PDFRemittanceAdvice.php:300
#: PrintCustTrans.php:822 PrintCustTransPortrait.php:867 ReverseGRN.php:386
-#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:491
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:490
#: StockDispatch.php:189 StockDispatch.php:201 StockLocMovements.php:90
#: StockMovements.php:94 StockSerialItemResearch.php:81
#: SupplierAllocations.php:455 SupplierAllocations.php:568
@@ -695,10 +695,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: Stocks.php:1019 UpgradeDatabase.php:183 UpgradeDatabase.php:186
-#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195
-#: UpgradeDatabase.php:198 UpgradeDatabase.php:201 UpgradeDatabase.php:204
-#: UpgradeDatabase.php:207 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:184 UpgradeDatabase.php:187
+#: UpgradeDatabase.php:190 UpgradeDatabase.php:193 UpgradeDatabase.php:196
+#: UpgradeDatabase.php:199 UpgradeDatabase.php:202 Up...
[truncated message content] |
|
From: <dai...@us...> - 2012-01-13 07:17:45
|
Revision: 4797
http://web-erp.svn.sourceforge.net/web-erp/?rev=4797&view=rev
Author: daintree
Date: 2012-01-13 07:17:29 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
fix db_query to DB_query
Modified Paths:
--------------
trunk/CounterSales.php
trunk/OrderDetails.php
trunk/PDFTopItems.php
trunk/PO_OrderDetails.php
trunk/PrintCheque.php
trunk/RecurringSalesOrders.php
trunk/RecurringSalesOrdersProcess.php
trunk/ReorderLevelLocation.php
trunk/SelectOrderItems.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/StockDispatch.php
trunk/SuppPriceList.php
trunk/UpgradeDatabase.php
trunk/includes/ConnectDB.inc
trunk/includes/Contract_Readin.php
trunk/includes/LanguagesArray.php
trunk/includes/PO_ReadInOrder.inc
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/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 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/CounterSales.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -2075,7 +2075,7 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
$PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
@@ -2089,8 +2089,8 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
@@ -2257,9 +2257,9 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
- $PurchRow = db_fetch_row($PurchResult);
+ $PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
$PurchQty = $PurchRow[0];
} else {
@@ -2271,9 +2271,9 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/OrderDetails.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -145,9 +145,9 @@
$ErrMsg = _('The line items of the order cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the line items, that failed was');
- $LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg, $DbgMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg, $DbgMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
$OrderTotal = 0;
$OrderTotalVolume = 0;
@@ -170,7 +170,7 @@
<th>' . _('Last Del') . '</th>
</tr>';
$k=0;
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
Modified: trunk/PDFTopItems.php
===================================================================
--- trunk/PDFTopItems.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/PDFTopItems.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -91,8 +91,8 @@
$sqloh = "SELECT sum(quantity)as qty
FROM locstock
WHERE stockid='" . $myrow['stkcode'] . "'";
- $oh = db_query($sqloh, $db);
- $ohRow = db_fetch_row($oh);
+ $oh = DB_query($sqloh, $db);
+ $ohRow = DB_fetch_row($oh);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 1, $YPos, 80, $FontSize, $myrow['stkcode']);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 100, $YPos, 100, $FontSize, $myrow['description']);
$LeftOvers = $pdf->addTextWrap($Left_Margin + 330, $YPos, 30, $FontSize, locale_number_format($myrow['totalinvoiced'],$myrow['decimalplaces']), 'right');
Modified: trunk/PO_OrderDetails.php
===================================================================
--- trunk/PO_OrderDetails.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/PO_OrderDetails.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -137,7 +137,7 @@
ON purchorderdetails.itemcode=stockmaster.stockid
WHERE purchorderdetails.orderno = '" . $_GET['OrderNo'] ."'";
-$LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
+$LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
echo '<table colspan="8" class="selection" cellpadding="0">';
@@ -157,7 +157,7 @@
$OrderTotal=0;
$RecdTotal=0;
-while ($myrow=db_fetch_array($LineItemsResult)) {
+while ($myrow=DB_fetch_array($LineItemsResult)) {
$OrderTotal += ($myrow['quantityord'] * $myrow['unitprice']);
$RecdTotal += ($myrow['quantityrecd'] * $myrow['unitprice']);
Modified: trunk/PrintCheque.php
===================================================================
--- trunk/PrintCheque.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/PrintCheque.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -15,7 +15,7 @@
$PageNumber=1;
$line_height=12;
-$result = db_query("SELECT hundredsname,
+$result = DB_query("SELECT hundredsname,
decimalplaces,
currency
FROM currencies
@@ -28,7 +28,7 @@
exit;
}
-$CurrencyRow = db_fetch_array($result);
+$CurrencyRow = DB_fetch_array($result);
$HundredsName = $CurrencyRow['hundredsname'];
$CurrDecimalPlaces = $CurrencyRow['decimalplaces'];
$CurrencyName = mb_strtolower($CurrencyRow['currency']);
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/RecurringSalesOrders.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -123,10 +123,10 @@
AND recurrsalesorderdetails.recurrorderno ='" . $_GET['ModifyRecurringSalesOrder'] . "'";
$ErrMsg = _('The line items of the order cannot be retrieved because');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
+ if (DB_num_rows($LineItemsResult)>0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
Modified: trunk/RecurringSalesOrdersProcess.php
===================================================================
--- trunk/RecurringSalesOrdersProcess.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/RecurringSalesOrdersProcess.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -158,11 +158,11 @@
WHERE recurrsalesorderdetails.recurrorderno ='" . $RecurrOrderRow['recurrorderno'] . "'";
$ErrMsg = _('The line items of the recurring order cannot be retrieved because');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
$LineCounter = 0;
- if (db_num_rows($LineItemsResult)>0) {
+ if (DB_num_rows($LineItemsResult)>0) {
$OrderTotal =0; //intialise
$OrderLineTotal =0;
Modified: trunk/ReorderLevelLocation.php
===================================================================
--- trunk/ReorderLevelLocation.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/ReorderLevelLocation.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -122,16 +122,16 @@
$sqloh="SELECT sum(quantity)as qty
FROM locstock
WHERE stockid='" . $myrow['stockid'] . "'";
- $oh = db_query($sqloh,$db);
- $ohRow = db_fetch_row($oh);
+ $oh = DB_query($sqloh,$db);
+ $ohRow = DB_fetch_row($oh);
//get On Hand in Location
$sqlohin="SELECT SUM(quantity) AS qty
FROM `locstock`
WHERE stockid='" . $myrow['stockid'] . "'
AND locstock.loccode = '" . $_POST['StockLocation'] . "'";
- $ohin = db_query($sqlohin,$db);
- $ohinRow = db_fetch_row($ohin);
+ $ohin = DB_query($sqlohin,$db);
+ $ohinRow = DB_fetch_row($ohin);
echo'<td>'.$myrow['stockid'].'</td>
<td>'.$myrow['description'].'</td>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/SelectOrderItems.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -218,10 +218,10 @@
ORDER BY salesorderdetails.orderlineno";
$ErrMsg = _('The line items of the order cannot be retrieved because');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg);
- if (db_num_rows($LineItemsResult)>0) {
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg);
+ if (DB_num_rows($LineItemsResult)>0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($myrow['completed']==0){
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
@@ -1539,9 +1539,9 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
- $PurchRow = db_fetch_row($PurchResult);
+ $PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
$PurchQty = $PurchRow[0];
} else {
@@ -1553,8 +1553,8 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
@@ -1723,9 +1723,9 @@
AND purchorderdetails.itemcode='" . $myrow['stockid'] . "'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $PurchResult = db_query($sql,$db,$ErrMsg);
+ $PurchResult = DB_query($sql,$db,$ErrMsg);
- $PurchRow = db_fetch_row($PurchResult);
+ $PurchRow = DB_fetch_row($PurchResult);
if ($PurchRow[0]!=null){
$PurchQty = $PurchRow[0];
} else {
@@ -1737,9 +1737,9 @@
FROM woitems
WHERE stockid='" . $myrow['stockid'] ."'";
$ErrMsg = _('The order details for this product cannot be retrieved because');
- $WoResult = db_query($sql,$db,$ErrMsg);
+ $WoResult = DB_query($sql,$db,$ErrMsg);
- $WoRow = db_fetch_row($WoResult);
+ $WoRow = DB_fetch_row($WoResult);
if ($WoRow[0]!=null){
$WoQty = $WoRow[0];
} else {
Modified: trunk/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/ShipmentCosting.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -119,9 +119,9 @@
purchorderdetails.itemdescription";
$ErrMsg = _('The lines on the shipment could not be retrieved from the database');
-$LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
+$LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
-if (db_num_rows($LineItemsResult) > 0) {
+if (DB_num_rows($LineItemsResult) > 0) {
if (isset($_POST['Close'])){
while ($myrow=DB_fetch_array($LineItemsResult)){
@@ -548,7 +548,7 @@
$RowCounter =0;
$TotalItemShipmentChgs =0;
-while ($myrow=db_fetch_array($ChargesResult)) {
+while ($myrow=DB_fetch_array($ChargesResult)) {
if ($k==1){
@@ -624,7 +624,7 @@
$RowCounter =0;
$TotalGeneralShipmentChgs =0;
-while ($myrow=db_fetch_array($ChargesResult)) {
+while ($myrow=DB_fetch_array($ChargesResult)) {
if ($k==1){
echo '<tr class="EvenTableRows">';
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/Shipments.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -100,7 +100,7 @@
ON purchorderdetails.orderno=purchorders.orderno
WHERE purchorderdetails.shiptref='" . $_GET['SelectedShipment'] . "'";
$ErrMsg = _('The lines on the shipment cannot be retrieved because'). ' - ' . DB_error_msg($db);
- $LineItemsResult = db_query($LineItemsSQL,$db, $ErrMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
if (DB_num_rows($GetShiptHdrResult)==0) {
prnMsg ( _('Unable to locate lines for Shipment') . ' '. $_GET['SelectedShipment'] . ' ' . _('in the database'), 'error');
@@ -108,9 +108,9 @@
exit();
}
- if (db_num_rows($LineItemsResult) > 0) {
+ if (DB_num_rows($LineItemsResult) > 0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if ($myrow['stdcostunit']==0){
$StandardCost =$myrow['stdcost'];
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/StockDispatch.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -36,14 +36,14 @@
// from location
$ErrMsg = _('Could not retrieve location name from the database');
$sqlfrom="SELECT locationname FROM `locations` where loccode='" . $_POST['FromLocation'] . "'";
- $result = db_query($sqlfrom,$db,$ErrMsg);
- $Row = db_fetch_row($result);
+ $result = DB_query($sqlfrom,$db,$ErrMsg);
+ $Row = DB_fetch_row($result);
$FromLocation=$Row['0'];
// to location
$sqlto="SELECT locationname FROM `locations` where loccode='" . $_POST['ToLocation'] . "'";
- $resultto = db_query($sqlto,$db,$ErrMsg);
- $RowTo = db_fetch_row($resultto);
+ $resultto = DB_query($sqlto,$db,$ErrMsg);
+ $RowTo = DB_fetch_row($resultto);
$ToLocation=$RowTo['0'];
// Creates WHERE clause for stock categories. StockCat is defined as an array so can choose
Modified: trunk/SuppPriceList.php
===================================================================
--- trunk/SuppPriceList.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/SuppPriceList.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -26,8 +26,8 @@
FROM suppliers INNER JOIN currencies
ON suppliers.currcode=currencies.currabrev
WHERE supplierid='" . $_POST['supplier'] . "'";
- $resultsup = db_query($sqlsup,$db);
- $RowSup = db_fetch_array($resultsup);
+ $resultsup = DB_query($sqlsup,$db);
+ $RowSup = DB_fetch_array($resultsup);
$SupplierName=$RowSup['suppname'];
$CurrCode =$RowSup['currcode'];
$CurrDecimalPlaces=$RowSup['currdecimalplaces'];
@@ -39,7 +39,7 @@
WHERE categoryid ='" . $_POST['category'] . "'";
$resultcat = DB_query($sqlcat,$db);
- $RowCat = db_fetch_row($resultcat);
+ $RowCat = DB_fetch_row($resultcat);
$Categoryname=$RowCat['0'];
} else {
$Categoryname='ALL';
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/UpgradeDatabase.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -129,8 +129,9 @@
case '4.06.2':
case '4.06.3':
case '4.06.4':
+ case '4.06.5':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.5':
+ case '4.06.6':
break;
} //end switch
}
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/ConnectDB.inc 2012-01-13 07:17:29 UTC (rev 4797)
@@ -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.5'; //must update manually every time there is a DB change
+$Version='4.06.6'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/includes/Contract_Readin.php
===================================================================
--- trunk/includes/Contract_Readin.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/Contract_Readin.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -67,10 +67,10 @@
$ErrMsg = _('The bill of material cannot be retrieved because');
$DbgMsg = _('The SQL statement that was used to retrieve the contract bill of material was');
- $ContractBOMResult = db_query($ContractBOMsql,$db,$ErrMsg,$DbgMsg);
+ $ContractBOMResult = DB_query($ContractBOMsql,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($ContractBOMResult) > 0) {
- while ($myrow=db_fetch_array($ContractBOMResult)) {
+ while ($myrow=DB_fetch_array($ContractBOMResult)) {
$_SESSION['Contract'.$identifier]->Add_To_ContractBOM($myrow['stockid'],
$myrow['description'],
$myrow['workcentreadded'],
@@ -91,10 +91,10 @@
$ErrMsg = _('The other contract requirementscannot be retrieved because');
$DbgMsg = _('The SQL statement that was used to retrieve the other contract requirments was');
- $ContractReqtsResult = db_query($ContractReqtsSQL,$db,$ErrMsg,$DbgMsg);
+ $ContractReqtsResult = DB_query($ContractReqtsSQL,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($ContractReqtsResult) > 0) {
- while ($myrow=db_fetch_array($ContractReqtsResult)) {
+ while ($myrow=DB_fetch_array($ContractReqtsResult)) {
$_SESSION['Contract'.$identifier]->Add_To_ContractRequirements($myrow['requirement'],
$myrow['quantity'],
$myrow['costperunit'],
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/LanguagesArray.php 2012-01-13 07:17:29 UTC (rev 4797)
@@ -41,8 +41,8 @@
$LanguagesArray['et_EE.utf8']['DecimalPoint'] = ',';
$LanguagesArray['et_EE.utf8']['ThousandsSeparator'] = '.';
-$LanguagesArray['fa_IR.utf8']['LanguageName'] = _('Arabic');
-$LanguagesArray['fa_IR.utf8']['WindowsLocale'] = 'arabic';
+$LanguagesArray['fa_IR.utf8']['LanguageName'] = _('Persian');
+$LanguagesArray['fa_IR.utf8']['WindowsLocale'] = 'persian';
$LanguagesArray['fa_IR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['fa_IR.utf8']['ThousandsSeparator'] = '.';
Modified: trunk/includes/PO_ReadInOrder.inc
===================================================================
--- trunk/includes/PO_ReadInOrder.inc 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/includes/PO_ReadInOrder.inc 2012-01-13 07:17:29 UTC (rev 4797)
@@ -162,11 +162,11 @@
$ErrMsg = _('The lines on the purchase order cannot be retrieved because');
$DbgMsg = _('The SQL statement that was used to retrieve the purchase order lines was');
- $LineItemsResult = db_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg);
+ $LineItemsResult = DB_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($LineItemsResult) > 0) {
- while ($myrow=db_fetch_array($LineItemsResult)) {
+ while ($myrow=DB_fetch_array($LineItemsResult)) {
if (is_null($myrow['glcode'])){
$GLCode = '';
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 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2012-01-13 07:17:29 UTC (rev 4797)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 19:41+1300\n"
+"POT-Creation-Date: 2012-01-07 14:17+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -385,7 +385,7 @@
#: 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:1399
-#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
+#: Shipments.php:439 Shippers.php:144 SpecialOrder.php:656
#: 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
@@ -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:538 ShipmentCosting.php:615 Shipments.php:491
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:490
#: 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:183 UpgradeDatabase.php:186
-#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195
-#: UpgradeDatabase.php:198 UpgradeDatabase.php:201 UpgradeDatabase.php:204
-#: UpgradeDatabase.php:207 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:184 UpgradeDatabase.php:187
+#: UpgradeDatabase.php:190 UpgradeDatabase.php:193 UpgradeDatabase.php:196
+#: UpgradeDatabase.php:199 UpgradeDatabase.php:202 UpgradeDatabase.php:205
+#: UpgradeDatabase.php:208 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
@@ -1936,8 +1936,8 @@
#: 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
+#: ShipmentCosting.php:150 Shipments.php:400 Shipments.php:402
+#: Shipments.php:403 Shipments.php:487 Shipments.php:489 SpecialOrder.php:617
#: 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
@@ -2386,7 +2386,7 @@
#: 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
+#: Shipments.php:401 Shipments.php:488 Shipt_Select.php:193
#: StockLocTransferReceive.php:432 SupplierTenders.php:491 TopItems.php:180
#: WorkOrderCosting.php:90 WorkOrderEntry.php:624 WorkOrderIssue.php:693
#: WorkOrderIssue.php:763 includes/DefineLabelClass.php:21
@@ -3275,8 +3275,8 @@
msgstr "Popis položky"
#: ConfirmDispatch_Invoice.php:279 GoodsReceived.php:100 GoodsReceived.php:104
-#: PDFOrdersInvoiced.php:349 PDFOrderStatus.php:320 Shipments.php:401
-#: Shipments.php:488
+#: PDFOrdersInvoiced.php:349 PDFOrderStatus.php:320 Shipments.php:400
+#: Shipments.php:487
msgid "Ordered"
msgstr "Objednáno"
@@ -3305,7 +3305,7 @@
#: PrintCustTransPortrait.php:911 PrintCustTransPortrait.php:1009
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
#: RecurringSalesOrders.php:322 SelectCreditItems.php:676
-#: SelectOrderItems.php:1337 Shipments.php:405 StockLocMovements.php:94
+#: SelectOrderItems.php:1337 Shipments.php:404 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
@@ -3669,13 +3669,13 @@
#: SupplierAllocations.php:117 SupplierAllocations.php:139
#: SupplierAllocations.php:157 SupplierAllocations.php:181
#: SupplierAllocations.php:215 SupplierAllocations.php:236
-#: SupplierCredit.php:730 SupplierCredit.php:759 SupplierCredit.php:784
-#: SupplierCredit.php:818 SupplierCredit.php:852 SupplierCredit.php:884
-#: SupplierCredit.php:921 SupplierCredit.php:946 SupplierCredit.php:958
-#: SupplierCredit.php:994 SupplierCredit.php:1034 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
+#: SupplierCredit.php:725 SupplierCredit.php:754 SupplierCredit.php:779
+#: SupplierCredit.php:813 SupplierCredit.php:847 SupplierCredit.php:879
+#: SupplierCredit.php:916 SupplierCredit.php:941 SupplierCredit.php:953
+#: SupplierCredit.php:989 SupplierCredit.php:1029 SupplierCredit.php:1055
+#: SupplierCredit.php:1087 SupplierCredit.php:1111 SupplierCredit.php:1143
+#: SupplierCredit.php:1159 SupplierCredit.php:1172 SupplierCredit.php:1179
+#: SupplierCredit.php:1201 SupplierCredit.php:1255 SupplierCredit.php:1283
#: 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
@@ -3777,14 +3777,14 @@
#: 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
-#: SupplierCredit.php:784 SupplierCredit.php:818 SupplierCredit.php:852
-#: SupplierCredit.php:884 SupplierCredit.php:921 SupplierCredit.php:946
-#: SupplierCredit.php:958 SupplierCredit.php:994 SupplierCredit.php:1034
-#: 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:660 SupplierInvoice.php:733
+#: SupplierAllocations.php:236 SupplierCredit.php:725 SupplierCredit.php:754
+#: SupplierCredit.php:779 SupplierCredit.php:813 SupplierCredit.php:847
+#: SupplierCredit.php:879 SupplierCredit.php:916 SupplierCredit.php:941
+#: SupplierCredit.php:953 SupplierCredit.php:989 SupplierCredit.php:1029
+#: SupplierCredit.php:1055 SupplierCredit.php:1087 SupplierCredit.php:1111
+#: SupplierCredit.php:1143 SupplierCredit.php:1159 SupplierCredit.php:1172
+#: SupplierCredit.php:1179 SupplierCredit.php:1201 SupplierCredit.php:1255
+#: SupplierCredit.php:1283 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
@@ -3919,8 +3919,8 @@
#: 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
+#: SelectOrderItems.php:702 SelectProduct.php:386 Shipments.php:398
+#: Shipments.php:485 SuppCreditGRNs.php:174 SuppInvGRNs.php:302
#: TaxGroups.php:286 includes/PDFDeliveryDifferencesPageHeader.inc:41
#: includes/PDFDIFOTPageHeader.inc:40 includes/PDFOstdgGRNsPageHeader.inc:37
msgid "Order"
@@ -4136,7 +4136,7 @@
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:1383
+#: SupplierCredit.php:1227 SupplierCredit.php:1315 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"
@@ -4954,9 +4954,9 @@
msgid "The locations for the item"
msgstr "Místa pro položku"
-#: 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:762 SupplierInvoice.php:820
+#: Contracts.php:490 Factors.php:80 Stocks.php:560 SupplierCredit.php:754
+#: SupplierCredit.php:813 SupplierCredit.php:1201 SupplierCredit.php:1255
+#: SupplierCredit.php:1283 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"
@@ -6018,7 +6018,7 @@
#: Credit_Invoice.php:271 PDFOrdersInvoiced.php:350 PDFOrderStatus.php:321
#: ReverseGRN.php:388 SalesInquiry.php:836 ShipmentCosting.php:149
-#: ShipmentCosting.php:151 Shipments.php:404
+#: ShipmentCosting.php:151 Shipments.php:403
msgid "Invoiced"
msgstr "Fakturováno"
@@ -6193,7 +6193,7 @@
msgid "Credit Note number"
msgstr "Dobropis číslo"
-#: Credit_Invoice.php:1428 GoodsReceived.php:722 SupplierCredit.php:1333
+#: Credit_Invoice.php:1428 GoodsReceived.php:722 SupplierCredit.php:1328
#: SupplierInvoice.php:1491 WorkOrderIssue.php:352 WorkOrderReceive.php:676
#: Z_BottomUpCosts.php:33
msgid "has been processed"
@@ -7451,7 +7451,7 @@
msgstr "Celkem Zůstatek"
#: CustomerInquiry.php:137 CustomerReceipt.php:964 PrintCustStatements.php:358
-#: SalesPeople.php:206 Shipments.php:406 Stocks.php:979 Stocks.php:981
+#: SalesPeople.php:206 Shipments.php:405 Stocks.php:979 Stocks.php:981
#: SupplierInquiry.php:143 includes/PDFAgedDebtorsPageHeader.inc:50
#: includes/PDFAgedSuppliersPageHeader.inc:36
msgid "Current"
@@ -7817,8 +7817,8 @@
#: CustomerReceipt.php:897 GoodsReceived.php:102 GoodsReceived.php:106
#: GoodsReceived.php:112 POReport.php:629 POReport.php:1358 ReverseGRN.php:386
-#: ReverseGRN.php:387 ShipmentCosting.php:150 Shipments.php:403
-#: Shipments.php:490 StockDispatch.php:379 StockDispatch.php:386
+#: ReverseGRN.php:387 ShipmentCosting.php:150 Shipments.php:402
+#: Shipments.php:489 StockDispatch.php:379 StockDispatch.php:386
#: SuppCreditGRNs.php:178
msgid "Received"
msgstr "Přijaté"
@@ -8243,7 +8243,7 @@
#: CustomerTransInquiry.php:51 FixedAssetRegister.php:78
#: FixedAssetRegister.php:349 PcReportTab.php:136 PcReportTab.php:256
#: SalesAnalRepts.php:430 SalesAnalRepts.php:458 SalesAnalRepts.php:487
-#: SalesAnalRepts.php:506 ShipmentCosting.php:56 Shipments.php:308
+#: SalesAnalRepts.php:506 ShipmentCosting.php:56 Shipments.php:307
#: StockDispatch.php:383 StockLocTransferReceive.php:209
#: StockTransfers.php:340 SuppContractChgs.php:72 SuppCreditGRNs.php:168
#: SuppFixedAssetChgs.php:70 SupplierTransInquiry.php:50 SuppShiptChgs.php:77
@@ -8442,7 +8442,7 @@
msgstr "Alloc"
#: CustWhereAlloc.php:128 EmailCustTrans.php:12 SalesInquiry.php:1080
-#: SupplierCredit.php:1113 Z_CheckAllocs.php:85
+#: SupplierCredit.php:1108 Z_CheckAllocs.php:85
msgid "Credit Note"
msgstr "Dobropis"
@@ -8841,7 +8841,7 @@
msgid "Select A Different Order"
msgstr "Vyberte různém pořadí"
-#: DeliveryDetails.php:804 Shipments.php:491 SpecialOrder.php:616
+#: DeliveryDetails.php:804 Shipments.php:490 SpecialOrder.php:616
msgid "Delivery"
msgstr "Dodání"
@@ -9068,8 +9068,8 @@
#: DiscountCategories.php:203 InventoryPlanningPrefSupplier.php:72
#: PDFPriceList.php:358 SalesTopItemsInquiry.php:217 SelectWorkOrder.php:313
-#: ShipmentCosting.php:148 ShipmentCosting.php:539 Shipments.php:400
-#: Shipments.php:487 StockUsage.php:57 SuppCreditGRNs.php:266
+#: ShipmentCosting.php:148 ShipmentCosting.php:539 Shipments.php:399
+#: Shipments.php:486 StockUsage.php:57 SuppCreditGRNs.php:266
#: SuppInvGRNs.php:254 WorkOrderCosting.php:87 WorkOrderCosting.php:119
#: WorkOrderIssue.php:530 WorkOrderIssue.php:596 WorkOrderReceive.php:742
#: WorkOrderStatus.php:49 WorkOrderStatus.php:95
@@ -12631,8 +12631,8 @@
msgid "cost"
msgstr "Cena"
-#: GoodsReceived.php:618 ReverseGRN.php:175 SupplierCredit.php:1231
-#: SupplierCredit.php:1319 SupplierInvoice.php:1382 SupplierInvoice.php:1469
+#: GoodsReceived.php:618 ReverseGRN.php:175 SupplierCredit.php:1226
+#: SupplierCredit.php:1314 SupplierInvoice.php:1382 SupplierInvoice.php:1469
msgid ""
"CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE The fixed asset "
"transaction could not be inserted because"
@@ -20630,7 +20630,7 @@
msgid "Preferred Supplier"
msgstr "Preferované dodavatele"
-#: PurchData.php:524 Shipments.php:523 StockAdjustments.php:426
+#: PurchData.php:524 Shipments.php:522 StockAdjustments.php:426
#: TaxGroups.php:395 WOSerialNos.php:268 WWW_Access.php:233
#, php-format
msgid "Add"
@@ -21270,8 +21270,8 @@
"Chcete-li obrátit GRN, která byla fakturována Nejprve musí být připsána"
#: ReverseGRN.php:383 SuppCreditGRNs.php:80 SuppCreditGRNs.php:173
-#: SuppCreditGRNs.php:265 SupplierCredit.php:314 SupplierCredit.php:991
-#: SupplierCredit.php:1030 SupplierCredit.php:1056 SupplierInvoice.php:849
+#: SuppCreditGRNs.php:265 SupplierCredit.php:314 SupplierCredit.php:986
+#: SupplierCredit.php:1025 SupplierCredit.php:1051 SupplierInvoice.php:849
#: SupplierInvoice.php:916 SupplierInvoice.php:964 SupplierInvoice.php:1001
#: SupplierInvoice.php:1026 includes/PDFOstdgGRNsPageHeader.inc:36
msgid "GRN"
@@ -24136,7 +24136,7 @@
#: ShipmentCosting.php:38 ShipmentCosting.php:42 ShipmentCosting.php:54
#: ShipmentCosting.php:77 ShipmentCosting.php:97 ShipmentCosting.php:152
#: ShipmentCosting.php:153 ShipmentCosting.php:704 Shipments.php:54
-#: Shipments.php:306 Shipt_Select.php:292 SupplierCredit.php:351
+#: Shipments.php:305 Shipt_Select.php:292 SupplierCredit.php:351
#: SupplierInvoice.php:331 SuppShiptChgs.php:80
msgid "Shipment"
msgstr "Zásilka"
@@ -24161,7 +24161,7 @@
msgid "Voyage Ref"
msgstr "Voyage Ref"
-#: ShipmentCosting.php:65 Shipments.php:324
+#: ShipmentCosting.php:65 Shipments.php:323
msgid "Expected Arrival Date (ETA)"
msgstr "Očekávané Datum příjezdu (ETA)"
@@ -24174,7 +24174,7 @@
msgstr "Ne Obecné náklady existují záznamy o přepravě"
#: ShipmentCosting.php:81 ShipmentCosting.php:101 Shipments.php:58
-#: Shipments.php:108
+#: Shipments.php:106
msgid "in the database"
msgstr "v databázi"
@@ -24211,12 +24211,12 @@
msgid "Variance"
msgstr "Odchylka"
-#: ShipmentCosting.php:249 SupplierCredit.php:884 SupplierInvoice.php:883
+#: ShipmentCosting.php:249 SupplierCredit.php:879 SupplierInvoice.php:883
#: SupplierInvoice.php:1233
msgid "The quantity on hand could not be retrieved from the database"
msgstr "Množství, na straně se nepodařilo získat z databáze"
-#: ShipmentCosting.php:250 SupplierCredit.php:885 SupplierInvoice.php:884
+#: ShipmentCosting.php:250 SupplierCredit.php:880 SupplierInvoice.php:884
#: SupplierInvoice.php:1234
msgid "The following SQL to retrieve the total stock quantity was used"
msgstr "Následující SQL získat celkové populace množství bylo použito"
@@ -24245,11 +24245,11 @@
msgid "The GL entry for the shipment average cost adjustment for"
msgstr "Záznam GL za cenu přepravy průměrná úprava pro"
-#: ShipmentCosting.php:328 SupplierCredit.php:958 SupplierInvoice.php:1338
+#: ShipmentCosting.php:328 SupplierCredit.php:953 SupplierInvoice.php:1338
msgid "The cost could not be updated because"
msgstr "Náklady by neměly být aktualizovány, protože"
-#: ShipmentCosting.php:329 SupplierCredit.php:959 SupplierInvoice.php:1339
+#: ShipmentCosting.php:329 SupplierCredit.php:954 SupplierInvoice.php:1339
msgid "The following SQL to update the cost was used"
msgstr "Následující SQL aktualizovat náklady byly použity"
@@ -24402,32 +24402,32 @@
"shipment are possible"
msgstr "Vybrané zásilky je již uzavřen a žádné další úpravy jsou možné zásilky"
-#: Shipments.php:104
+#: Shipments.php:102
msgid "The lines on the shipment cannot be retrieved because"
msgstr "Linky na přepravu nelze získat, protože"
-#: Shipments.php:108
+#: Shipments.php:106
msgid "Unable to locate lines for Shipment"
msgstr "Nelze nalézt linky na přepravě"
-#: Shipments.php:157
+#: Shipments.php:155
msgid "The supplier details for the shipment could not be retrieved because"
msgstr "Dodavatel podrobnosti pro přepravu se nepodařilo získat, protože"
-#: Shipments.php:179
+#: Shipments.php:177
msgid ""
"The date of expected arrival of the shipment must be entered in the format"
msgstr "Datum očekávaného příjezdu zásilky musí být zadáno ve formátu"
-#: Shipments.php:182
+#: Shipments.php:180
msgid "An expected arrival of the shipment must be a date after today"
msgstr "Očekávaný příjezd zásilky musí být datum, po dnes"
-#: Shipments.php:188
+#: Shipments.php:186
msgid "A reference to the vessel of more than 2 characters is expected"
msgstr "Odkaz na plavidla o více než 2 znaků se očekává, že"
-#: Shipments.php:191
+#: Shipments.php:189
msgid ""
"A reference to the voyage (or HAWB in the case of air-freight) of more than "
"2 characters is expected"
@@ -24435,7 +24435,7 @@
"Odkaz na cestě (nebo HAWB v případě vzduch-nákladní dopravy) o více než 2 "
"znaků se očekává, že"
-#: Shipments.php:195
+#: Shipments.php:193
msgid ""
"Cannot add purchase order lines to the shipment unless the shipment is first "
"initiated - hit update to setup the shipment first"
@@ -24443,41 +24443,41 @@
"Nelze přidat řádky objednávky k přepravě, pokud dodávka je první zahájila - "
"hit aktualizace nastavení zásilka poprvé"
-#: Shipments.php:244
+#: Shipments.php:242
msgid ""
"Updated the shipment record and delivery dates of order lines as necessary"
msgstr ""
"Aktualizováno zásilky záznam a termíny dodání objednávky linek podle potřeby"
-#: Shipments.php:312
+#: Shipments.php:311
msgid "Vessel Name /Transport Agent"
msgstr "Jméno plavidla / Transport Agent"
-#: Shipments.php:314
+#: Shipments.php:313
msgid "Voyage Ref / Consignment Note"
msgstr "Voyage Ref / nákladního listu"
-#: Shipments.php:330
+#: Shipments.php:329
msgid "Into"
msgstr "Do"
-#: Shipments.php:355
+#: Shipments.php:354
msgid "Stock Location"
msgstr "Umístění skladu"
-#: Shipments.php:396
+#: Shipments.php:395
msgid "Order Lines On This Shipment"
msgstr "Aby Lines Na této zásilky"
-#: Shipments.php:406 includes/PDFOstdgGRNsPageHeader.inc:42
+#: Shipments.php:405 includes/PDFOstdgGRNsPageHeader.inc:42
msgid "Std Cost"
msgstr "Std nákladů"
-#: Shipments.php:448
+#: Shipments.php:447
msgid "Update Shipment Details"
msgstr "Aktualizace podrobnosti o zásilce"
-#: Shipments.php:482
+#: Shipments.php:481
msgid "Possible Order Lines To Add To This Shipment"
msgstr "Možné Objednejte Linky Chcete-li přidat do této zásilky"
@@ -27798,7 +27798,7 @@
msgid "Enter Credit Note"
msgstr "Zadejte dobropis"
-#: SupplierCredit.php:651
+#: SupplierCredit.php:646
msgid ""
"The credit note as entered cannot be processed because the total amount of "
"the credit note is less than or equal to 0"
@@ -27806,11 +27806,11 @@
"Dobropis, jak je uvedena nelze zpracovat, protože celková částka dobropisu "
"je menší nebo roven 0"
-#: SupplierCredit.php:651
+#: SupplierCredit.php:646
msgid "Credit notes are expected to be entered as positive amounts to credit"
msgstr "Dobropisů by měly být zapsány jako pozitivní částky úvěru"
-#: SupplierCredit.php:654
+#: SupplierCredit.php:649
msgid ""
"The credit note as entered cannot be processed because the there is no "
"suppliers credit note number or reference entered"
@@ -27818,28 +27818,28 @@
"Dobropis, jak je uvedena nelze zpracovat, protože není tam žádný dodavatele "
"dobropis číslo nebo referenční zadané"
-#: SupplierCredit.php:654
+#: SupplierCredit.php:649
msgid "The supplier credit note number must be entered"
msgstr "Dodavatel dobropis číslo musí být uvedeno"
-#: SupplierCredit.php:657
+#: SupplierCredit.php:652
msgid ""
"The credit note as entered cannot be processed because the date entered is "
"not in the format"
msgstr ""
"Dobropis, jak je uvedena nelze zpracovat, protože data vstupu není ve formátu"
-#: SupplierCredit.php:660
+#: SupplierCredit.php:655
msgid ""
"The credit note as entered cannot be processed because the date is after "
"today"
msgstr "Dobropis, jak je uvedena nelze zpracovat, protože datum je po dnešku"
-#: SupplierCredit.php:660
+#: SupplierCredit.php:655
msgid "Purchase credit notes are expected to have a date prior to or today"
msgstr "Nákup dobropisů se očekává, že data před nebo dnes"
-#: SupplierCredit.php:663
+#: SupplierCredit.php:658
msgid ""
"The credit note as entered cannot be processed because the exchange rate for "
"the credit note has been entered as a negative or zero number"
@@ -27847,39 +27847,39 @@
"Dobropis, jak je uvedena nelze zpracovat, protože směnný kurz pro dobropis "
"byl zadán jako záporné číslo nebo nula"
-#: SupplierCredit.php:663 SupplierInvoice.php:646
+#: SupplierCredit.php:658 SupplierInvoice.php:646
msgid ""
"The exchange rate is expected to show how many of the suppliers currency "
"there are in 1 of the local currency"
msgstr ""
"Kurz se očekává, ukázat, jak mnoho dodavatelů měny jsou v 1 z místní měny"
-#: SupplierCredit.php:665
+#: SupplierCredit.php:660
msgid ""
"The credit note total as entered is less than the sum of the shipment charges"
msgstr "Dobropis Celková jak je zadaný, je menší než součet zásilky poplatků"
-#: SupplierCredit.php:665
+#: SupplierCredit.php:660
msgid "the general ledger entries (if any) and the charges for goods received"
msgstr "hlavní knihy položky (pokud existuje) a poplatky za přijetí zboží"
-#: SupplierCredit.php:665
+#: SupplierCredit.php:660
msgid "There must be a mistake somewhere"
msgstr "Tam musí být nějaká chyba někde"
-#: SupplierCredit.php:665
+#: SupplierCredit.php:660
msgid "the credit note as entered will not be processed"
msgstr "dobropisu, jak je uvedena nebudou zpracovány"
-#: SupplierCredit.php:730 SupplierCredit.php:852 SupplierCredit.php:1060
+#: SupplierCredit.php:725 SupplierCredit.php:847 SupplierCredit.php:1055
#: SupplierInvoice.php:733 SupplierInvoice.php:853 SupplierInvoice.php:1029
msgid "The general ledger transaction could not be added because"
msgstr "Hlavní knihy transakce nelze přidat, protože"
-#: SupplierCredit.php:732 SupplierCredit.php:760 SupplierCredit.php:785
-#: SupplierCredit.php:820 SupplierCredit.php:854 SupplierCredit.php:922
-#: SupplierCredit.php:947 SupplierCredit.php:995 SupplierCredit.php:1035
-#: SupplierCredit.php:1061 SupplierCredit.php:1094 SupplierCredit.php:1117
+#: SupplierCredit.php:727 SupplierCredit.php:755 SupplierCredit.php:780
+#: SupplierCredit.php:815 SupplierCredit.php:849 SupplierCredit.php:917
+#: SupplierCredit.php:942 SupplierCredit.php:990 SupplierCredit.php:1030
+#: SupplierCredit.php:1056 SupplierCredit.php:1089 SupplierCredit.php:1112
#: SupplierInvoice.php:734 SupplierInvoice.php:764 SupplierInvoice.php:789
#: SupplierInvoice.php:821 SupplierInvoice.php:854 SupplierInvoice.php:920
#: SupplierInvoice.php:946 SupplierInvoice.php:968 SupplierInvoice.php:1006
@@ -27887,47 +27887,47 @@
msgid "The following SQL to insert the GL transaction was used"
msgstr "Následující SQL vložit transakce GL byla použita"
-#: SupplierCredit.php:756
+#: SupplierCredit.php:751
msgid "Shipment credit against"
msgstr "Zásilka úvěru proti"
-#: SupplierCredit.php:759 SupplierInvoice.php:761
+#: SupplierCredit.php:754 SupplierInvoice.php:761
msgid "The general ledger transaction for the shipment"
msgstr "Hlavní knihy transakce pro zásilku"
-#: SupplierCredit.php:782
+#: SupplierCredit.php:777
msgid "Asset Credit"
msgstr "Kreditní Asset"
-#: SupplierCredit.php:784 SupplierInvoice.php:788
+#: SupplierCredit.php:779 SupplierInvoice.php:788
msgid ""
"The general ledger transaction for the asset addition could not be added "
"because"
msgstr "Hlavní knihy transakci aktiva navíc nelze přidat, protože"
-#: SupplierCredit.php:815 SupplierInvoice.php:818
+#: SupplierCredit.php:810 SupplierInvoice.php:818
msgid "Contract charge against"
msgstr "Smlouvy obvinění proti"
-#: SupplierCredit.php:818 SupplierInvoice.php:820
+#: SupplierCredit.php:813 SupplierInvoice.php:820
msgid "The general ledger transaction for the contract"
msgstr "Hlavní knihy transakce pro smlouvu"
-#: SupplierCredit.php:849 SupplierCredit.php:918
+#: SupplierCredit.php:844 SupplierCredit.php:913
msgid "GRN Credit Note"
msgstr "GRN dobropis"
-#: SupplierCredit.php:849 SupplierInvoice.php:850
+#: SupplierCredit.php:844 SupplierInvoice.php:850
msgid "std cost of"
msgstr "std náklady"
-#: SupplierCredit.php:918 SupplierCredit.php:991 SupplierInvoice.php:916
+#: SupplierCredit.php:913 SupplierCredit.php:986 SupplierInvoice.php:916
#: SupplierInvoice.php:964
msgid "price var of"
msgstr "cena var z"
-#: SupplierCredit.php:921 SupplierCredit.php:946 SupplierCredit.php:994
-#: SupplierCredit.php:1034 SupplierInvoice.php:919 SupplierInvoice.php:945
+#: SupplierCredit.php:916 SupplierCredit.php:941 SupplierCredit.php:989
+#: SupplierCredit.php:1029 SupplierInvoice.php:919 SupplierInvoice.php:945
#: SupplierInvoice.php:967 SupplierInvoice.php:1004
msgid ""
"The general ledger transaction could not be added for the price variance of "
@@ -27935,93 +27935,93 @@
msgstr ""
"Hlavní knihy transakce nemohl být přidán za cenu rozptyl na skladě, protože"
-#: SupplierCredit.php:941 SupplierInvoice.php:940
+#: SupplierCredit.php:936 SupplierInvoice.php:940
msgid "Average Cost Adj"
msgstr "Průměrná cena Adj"
-#: SupplierCredit.php:1030 SupplierInvoice.php:1001
+#: SupplierCredit.php:1025 SupplierInvoice.php:1001
msgid "price var"
msgstr "cena var"
-#: SupplierCredit.php:1056 SupplierCredit.php:1089 SupplierCredit.php:1113
+#: SupplierCredit.php:1051 SupplierCredit.php:1084 SupplierCredit.php:1108
#: SupplierInvoice.php:1026 SupplierInvoice.php:1086
msgid "a rate of"
msgstr "rychlost"
-#: SupplierCredit.php:1071
+#: SupplierCredit.php:1066
msgid "The total posted to the credit accounts is"
msgstr "Celková vyslán na úvěrových účtů je"
-#: SupplierCredit.php:1071 SupplierInvoice.php:1039
+#: SupplierCredit.php:1066 SupplierInvoice.php:1039
msgid "but the sum of OvAmount converted at ExRate"
msgstr "ale součet OvAmount převeden na ExRate"
-#: SupplierCredit.php:1089
+#: SupplierCredit.php:1084
msgid "Credit note"
msgstr "Dobropis"
-#: SupplierCredit.php:1092 SupplierInvoice.php:1063
+#: SupplierCredit.php:1087 SupplierInvoice.php:1063
msgid "The general ledger transaction for the tax could not be added because"
msgstr "Hlavní knihy transakci daň nelze přidat, protože"
-#: SupplierCredit.php:1116 SupplierInvoice.php:1089
+#: SupplierCredit.php:1111 SupplierInvoice.php:1089
msgid ""
"The general ledger transaction for the control total could not be added "
"because"
msgstr "Hlavní knihy transakce pro kontrolu celkové nelze přidat, protože"
-#: SupplierCredit.php:1148
+#: SupplierCredit.php:1143
msgid ""
"The supplier credit note transaction could not be added to the database "
"because"
msgstr "Dodavatel dobropis transakce nemůže být přidány do databáze, protože"
-#: SupplierCredit.php:1149
+#: SupplierCredit.php:1144
msgid "The following SQL to insert the supplier credit note was used"
msgstr "Následující SQL vložit dodavatele dobropis byl použit"
-#: SupplierCredit.php:1164 SupplierInvoice.php:1138
+#: SupplierCredit.php:1159 SupplierInvoice.php:1138
msgid "The supplier transaction taxes records could not be inserted because"
msgstr "Dodavatel transakčních daní záznamy nemohly být zařazeny, protože"
-#: SupplierCredit.php:1165 SupplierInvoice.php:1139
+#: SupplierCredit.php:1160 SupplierInvoice.php:1139
msgid ""
"The following SQL to insert the supplier transaction taxes record was used:"
msgstr ""
"Následující SQL vložit na dodavatele transakčních daní záznam byl použit:"
-#: SupplierCredit.php:1177
+#: SupplierCredit.php:1172
msgid ""
"The quantity credited of the purchase order line could not be updated because"
msgstr ""
"Množství připočítán line objednávky se nepodařilo aktualizovat, protože"
-#: SupplierCredit.php:1178 SupplierInvoice.php:1158
+#: SupplierCredit.php:1173 SupplierInvoice.php:1158
msgid "The following SQL to update the purchase order details was used"
msgstr "Následující SQL aktualizovat údaje objednávky bylo použito"
-#: SupplierCredit.php:1184
+#: SupplierCredit.php:1179
msgid ""
"The quantity credited off the goods received record could not be updated "
"because"
msgstr ""
"Množství připsána mimo zboží, které obdrží záznam nelze aktualizovat, protože"
-#: SupplierCredit.php:1185
+#: SupplierCredit.php:1180
msgid "The following SQL to update the GRN quantity credited was used"
msgstr "Následující SQL aktualizovat množství GRN připsána byla použita"
-#: SupplierCredit.php:1206 SupplierCredit.php:1260 SupplierInvoice.php:1184
+#: SupplierCredit.php:1201 SupplierCredit.php:1255 SupplierInvoice.php:1184
#: SupplierInvoice.php:1409
msgid "The shipment charge record for the shipment"
msgstr "Zásilka poplatek záznam pro přepravu"
-#: SupplierCredit.php:1207 SupplierCredit.php:1261 SupplierInvoice.php:1186
+#: SupplierCredit.php:1202 SupplierCredit.php:1256 SupplierInvoice.php:1186
#: SupplierInvoice.php:1412
msgid "The following SQL to insert the Shipment charge record was used"
msgstr "Následující SQL vložit poplatku zásilku záznam byl použit"
-#: SupplierCredit.php:1238
+#: SupplierCredit.php:1233
msgid ""
"CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE. The fixed asset "
"cost was not able to be updated because:"
@@ -28029,21 +28029,21 @@
"Critical Error! POZNÁMKA DOWN této chyby a hledat pomoc. Investičního "
"majetku náklady nemohl být aktualizován, protože:"
-#: SupplierCredit.php:1239
+#: SupplierCredit.php:1234
msgid ""
"The following SQL was used to attempt the update of the fixed asset cost:"
msgstr ""
"Následující SQL byl použit k pokusu aktualizace dlouhodobého majetku náklady:"
-#: SupplierCredit.php:1288 SupplierInvoice.php:1439
+#: SupplierCredit.php:1283 SupplierInvoice.php:1439
msgid "The contract charge record for contract"
msgstr "Smlouva poplatek záznam pro smlouvy"
-#: SupplierCredit.php:1289 SupplierInvoice.php:1440
+#: SupplierCredit.php:1284 SupplierInvoice.php:1440
msgid "The following SQL to insert the contract charge record was used"
msgstr "Následující SQL vložit smlouvy poplatek záznam byl použit"
-#: SupplierCredit.php:1326
+#: SupplierCredit.php:1321
msgid ""
"CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE. The fixed asset "
"cost was not able to be updated because:"
@@ -28051,15 +28051,15 @@
"Critical Error! POZNÁMKA DOWN této chyby a hledat pomoc. Investičního "
"majetku náklady nemohl být aktualizován, protože:"
-#: SupplierCredit.php:1327 SupplierInvoice.php:1391
+#: SupplierCredit.php:1322 SupplierInvoice.php:1391
msgid "The following SQL was used to attempt the update of the asset cost:"
msgstr "Následující SQL byl použit k pokusu aktualizace aktiva nákladů:"
-#: SupplierCredit.php:1333
+#: SupplierCredit.php:1328
msgid "Supplier credit note number"
msgstr "Dodavatel dobropis číslo"
-#: SupplierCredit.php:1334
+#: SupplierCredit.php:1329
msgid "Enter another Credit Note for this Supplier"
msgstr "Zadejte jiný Poznámka Zásluhu na tom dodavatele"
@@ -31135,7 +31135,7 @@
"systému. Přečtěte si prosím pozorně všechny poznámky, aby bylo zajištěno, že "
"se očekává, že"
-#: UpgradeDatabase.php:138
+#: UpgradeDatabase.php:139
msgid ""
"Only mysql upgrades are performed seamlessly at this time. Your database "
"will need to be manually updated"
@@ -31143,66 +31143,66 @@
"Pouze mysql upgrady jsou prováděny plynule v této době. Databáze bude třeba "
"ručně aktualizované"
-#: UpgradeDatabase.php:152
+#: UpgradeDatabase.php:153
msgid "Applying"
msgstr "Uplatnění"
-#: UpgradeDatabase.php:180 Z_Upgrade_3.10-3.11.php:59 Z_Upgrade3.10.php:29
+#: UpgradeDatabase.php:181 Z_Upgrade_3.10-3.11.php:59 Z_Upgrade3.10.php:29
#: Z_Upgrade3.10.php:34 Z_Upgrade3.10.php:46 Z_Upgrade3.10.php:51
#: Z_Upgrade3.10.php:60 Z_Upgrade3.10.php:65 Z_Upgrade3.10.php:74
#: Z_Upgrade3.10.php:79 Z_Upgrade_3.11-4.00.php:59
msgid "Success"
msgstr "Úspěch"
-#: UpgradeDatabase.php:183
+#: UpgradeDatabase.php:184
#, fuzzy
msgid "Foreign Key already removed"
msgstr "je již odstraněna"
-#: UpgradeDatabase.php:186 Z_Upgrade_3.10-3.11.php:63
+#: UpgradeDatabase.php:187 Z_Upgrade_3.10-3.11.php:63
#: Z_Upgrade_3.11-4.00.php:63
msgid "Table has already been created"
msgstr "Tabulka již byla vytvořena"
-#: UpgradeDatabase.php:189
+#: UpgradeDatabase.php:190
#, fuzzy
msgid "Column has already been changed"
msgstr "Sloupec již byla vytvořena"
-#: UpgradeDatabase.php:192 Z_Upgrade_3.10-3.11.php:67
+#: UpgradeDatabase.php:193 Z_Upgrade_3.10-3.11.php:67
#: Z_Upgrade_3.11-4.00.php:67
msgid "Column has already been created"
msgstr "Sloupec již byla vytvořena"
-#: UpgradeDatabase.php:195 Z_Upgrade_3.10-3.11.php:71
+#: UpgradeDatabase.php:196 Z_Upgrade_3.10-3.11.php:71
#: Z_Upgrade_3.11-4.00.php:71
msgid "Index already exists"
msgstr "Index již existuje"
-#: UpgradeDatabase.php:198 Z_Upgrade_3.10-3.11.php:75
+#: UpgradeDatabase.php:199 Z_Upgrade_3.10-3.11.php:75
#: Z_Upgrade_3.11-4.00.php:75
msgid "Entry has already been done"
msgstr "Vstup již bylo učiněno"
-#: UpgradeDatabase.php:201
+#: UpgradeDatabase.php:202
msgid "SQL syntax error. The SQL error message is"
msgstr "SQL chyba syntaxe. Chyba SQL zpráva"
-#: UpgradeDatabase.php:204 Z_Upgrade_3.10-3.11.php:79
+#: UpgradeDatabase.php:205 Z_Upgrade_3.10-3.11.php:79
#: Z_Upgrade_3.11-4.00.php:79
msgid "Primary key already exists"
msgstr "Primární klíč již existuje"
-#: UpgradeDatabase.php:207
+#: UpgradeDatabase.php:208
msgid "Index already dropped previously"
msgstr "Index již klesl dříve"
-#: UpgradeDatabase.php:210 Z_Upgrade_3.10-3.11.php:82
+#: UpgradeDatabase.php:211 Z_Upgrade_3.10-3.11.php:82
#: Z_Upgrade_3.11-4.00.php:82
msgid "Failure"
msgstr "Selhání"
-#: UpgradeDatabase.php:210 Z_Upgrade_3.10-3.11.php:83
+#: UpgradeDatabase.php:211 Z_Upgrade_3.10-3.11.php:83
#: Z_Upgrade_3.11-4.00.php:83
msgid "Error number"
msgstr "Číslo chyby"
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 2012-01-10 08:20:13 UTC (rev 4796)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2012-01-13 07:17:29 UTC (rev 4797)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WebERP 4.00/trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-03 19:41+1300\n"
+"POT-Creation-Date: 2012-01-07 14:17+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"
@@ -381,7 +381,7 @@
#: 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:1399
-#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
+#: Shipments.php:439 Shippers.php:144 SpecialOrder.php:656
#: 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
@@ -681,7 +681,7 @@
#: PaymentAllocations.php:66 PcAssignCashToTab.php:220
#: PcAuthorizeExpenses.php:88 PDFRemittanceAdvice.php:300
#: PrintCustTrans.php:822 PrintCustTransPortrait.php:867 ReverseGRN.php:386
-#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:491
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:490
#: StockDispatch.php:189 StockDispatch.php:201 StockLocMovements.php:90
#: StockMovements.php:94 StockSerialItemResearch.php:81
#: SupplierAllocations.php:455 SupplierAllocations.php:568
@@ -695,10 +695,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: Stocks.php:1019 UpgradeDatabase.php:183 UpgradeDatabase.php:186
-#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195
-#: UpgradeDatabase.php:198 UpgradeDatabase.php:201 UpgradeDatabase.php:204
-#: UpgradeDatabase.php:207 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:184 UpgradeDatabase.php:187
+#: UpgradeDatabase.php:190 UpgradeDatabase.php:193 UpgradeDatabase.php:196
+#: UpgradeDatabase.php:199 UpgradeDatabase.php:202 Up...
[truncated message content] |
|
From: <dai...@us...> - 2012-01-10 08:20:25
|
Revision: 4796
http://web-erp.svn.sourceforge.net/web-erp/?rev=4796&view=rev
Author: daintree
Date: 2012-01-10 08:20:13 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
debugged api
Modified Paths:
--------------
trunk/api/api_xml-rpc.php
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-01-09 07:19:07 UTC (rev 4795)
+++ trunk/api/api_xml-rpc.php 2012-01-10 08:20:13 UTC (rev 4796)
@@ -632,7 +632,7 @@
/*E*/$GetPaymentMethodsList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
- $GetPaymentmethodsList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+ $GetPaymentMethodsList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetPaymentMethodsList($xmlrpcmsg){
ob_start('ob_file_callback');
@@ -2931,10 +2931,10 @@
"function" => "xmlrpc_GetPaymentMethodsList",
"signature" => $GetPaymentMethodsList_sig,
"docstring" => $GetPaymentMethodsList_doc),
- "weberp.xmlrpc_GetPaymentMethodsDetails" => array(
- "function" => "xmlrpc_GetPaymentMethodsDetails",
- "signature" => $GetPaymentMethodsDetails_sig,
- "docstring" => $GetPaymentMrthodsDetails_doc),
+ "weberp.xmlrpc_GetPaymentMethodDetails" => array(
+ "function" => "xmlrpc_GetPaymentMethodDetails",
+ "signature" => $GetPaymentMethodDetails_sig,
+ "docstring" => $GetPaymentMethodDetails_doc),
"weberp.xmlrpc_InsertStockItem" => array(
"function" => "xmlrpc_InsertStockItem",
"signature" => $InsertStockItem_sig,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-10 08:20:24
|
Revision: 4796
http://web-erp.svn.sourceforge.net/web-erp/?rev=4796&view=rev
Author: daintree
Date: 2012-01-10 08:20:13 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
debugged api
Modified Paths:
--------------
trunk/api/api_xml-rpc.php
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-01-09 07:19:07 UTC (rev 4795)
+++ trunk/api/api_xml-rpc.php 2012-01-10 08:20:13 UTC (rev 4796)
@@ -632,7 +632,7 @@
/*E*/$GetPaymentMethodsList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
- $GetPaymentmethodsList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+ $GetPaymentMethodsList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetPaymentMethodsList($xmlrpcmsg){
ob_start('ob_file_callback');
@@ -2931,10 +2931,10 @@
"function" => "xmlrpc_GetPaymentMethodsList",
"signature" => $GetPaymentMethodsList_sig,
"docstring" => $GetPaymentMethodsList_doc),
- "weberp.xmlrpc_GetPaymentMethodsDetails" => array(
- "function" => "xmlrpc_GetPaymentMethodsDetails",
- "signature" => $GetPaymentMethodsDetails_sig,
- "docstring" => $GetPaymentMrthodsDetails_doc),
+ "weberp.xmlrpc_GetPaymentMethodDetails" => array(
+ "function" => "xmlrpc_GetPaymentMethodDetails",
+ "signature" => $GetPaymentMethodDetails_sig,
+ "docstring" => $GetPaymentMethodDetails_doc),
"weberp.xmlrpc_InsertStockItem" => array(
"function" => "xmlrpc_InsertStockItem",
"signature" => $InsertStockItem_sig,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-09 07:19:14
|
Revision: 4795
http://web-erp.svn.sourceforge.net/web-erp/?rev=4795&view=rev
Author: daintree
Date: 2012-01-09 07:19:07 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
;
Modified Paths:
--------------
trunk/api/api_paymentterms.php
trunk/api/api_xml-rpc.php
trunk/doc/Change.log
Modified: trunk/api/api_paymentterms.php
===================================================================
--- trunk/api/api_paymentterms.php 2012-01-09 05:20:15 UTC (rev 4794)
+++ trunk/api/api_paymentterms.php 2012-01-09 07:19:07 UTC (rev 4795)
@@ -45,12 +45,14 @@
*/
function GetPaymentMethodsList($User, $Password) {
$Errors = array();
- $db = db($User, $Password);
- if (gettype($db)=='integer') {
- $Errors[0]=NoAuthorisation;
- return $Errors;
+ if (!isset($db)) {
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
}
- $sql = 'SELECT paymentid FROM paymentmethods';
+ $sql = "SELECT paymentid FROM paymentmethods";
$result = DB_query($sql, $db);
$i=0;
while ($myrow=DB_fetch_array($result)) {
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-01-09 05:20:15 UTC (rev 4794)
+++ trunk/api/api_xml-rpc.php 2012-01-09 07:19:07 UTC (rev 4795)
@@ -1731,19 +1731,17 @@
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group IDs.');
-/*E*/ $GetTaxgroupList_sig = array(array($xmlrpcStruct),
+/*E*/$GetTaxgroupList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$GetTaxgroupList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxgroupList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1761,20 +1759,19 @@
$Parameter[2]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group details.');
-/*E*/ $GetTaxgroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*E*/$GetTaxgroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
$GetTaxgroupDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
-/*x*/ }
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1786,19 +1783,17 @@
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group IDs.');
-/*E*/ $GetTaxAuthorityList_sig = array(array($xmlrpcStruct),
+/*E*/$GetTaxAuthorityList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$GetTaxAuthorityList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxAuthorityList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1822,14 +1817,11 @@
function xmlrpc_GetTaxAuthorityDetails($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
-/*x*/ }
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1847,20 +1839,19 @@
$Parameter[2]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax authority tax rates.');
-/*E*/ $GetTaxAuthorityRates_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*E*/$GetTaxAuthorityRates_sig = array(array($xmlrpcStruct,$xmlrpcString),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
$GetTaxAuthorityRates_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxAuthorityRates($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1882,14 +1873,11 @@
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
$GetTaxGroupTaxes_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
- function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
+ function xmlrpc_GetTaxGroupTaxes($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
/*x*/ }
ob_end_flush();
@@ -1913,13 +1901,11 @@
function xmlrpc_GetCustomerTypeList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-09 05:20:15 UTC (rev 4794)
+++ trunk/doc/Change.log 2012-01-09 07:19:07 UTC (rev 4795)
@@ -3,6 +3,9 @@
8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
8/1/12 Paul Harness: PcClaimExpensesFromTab.php Use DefaultDateFormat for date in expense entry.
+
+Release 4.06.6
+
7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-09 07:19:14
|
Revision: 4795
http://web-erp.svn.sourceforge.net/web-erp/?rev=4795&view=rev
Author: daintree
Date: 2012-01-09 07:19:07 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
;
Modified Paths:
--------------
trunk/api/api_paymentterms.php
trunk/api/api_xml-rpc.php
trunk/doc/Change.log
Modified: trunk/api/api_paymentterms.php
===================================================================
--- trunk/api/api_paymentterms.php 2012-01-09 05:20:15 UTC (rev 4794)
+++ trunk/api/api_paymentterms.php 2012-01-09 07:19:07 UTC (rev 4795)
@@ -45,12 +45,14 @@
*/
function GetPaymentMethodsList($User, $Password) {
$Errors = array();
- $db = db($User, $Password);
- if (gettype($db)=='integer') {
- $Errors[0]=NoAuthorisation;
- return $Errors;
+ if (!isset($db)) {
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
}
- $sql = 'SELECT paymentid FROM paymentmethods';
+ $sql = "SELECT paymentid FROM paymentmethods";
$result = DB_query($sql, $db);
$i=0;
while ($myrow=DB_fetch_array($result)) {
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-01-09 05:20:15 UTC (rev 4794)
+++ trunk/api/api_xml-rpc.php 2012-01-09 07:19:07 UTC (rev 4795)
@@ -1731,19 +1731,17 @@
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group IDs.');
-/*E*/ $GetTaxgroupList_sig = array(array($xmlrpcStruct),
+/*E*/$GetTaxgroupList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$GetTaxgroupList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxgroupList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1761,20 +1759,19 @@
$Parameter[2]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group details.');
-/*E*/ $GetTaxgroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*E*/$GetTaxgroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
$GetTaxgroupDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
-/*x*/ }
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1786,19 +1783,17 @@
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group IDs.');
-/*E*/ $GetTaxAuthorityList_sig = array(array($xmlrpcStruct),
+/*E*/$GetTaxAuthorityList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$GetTaxAuthorityList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxAuthorityList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1822,14 +1817,11 @@
function xmlrpc_GetTaxAuthorityDetails($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
-/*x*/ }
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1847,20 +1839,19 @@
$Parameter[2]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax authority tax rates.');
-/*E*/ $GetTaxAuthorityRates_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*E*/$GetTaxAuthorityRates_sig = array(array($xmlrpcStruct,$xmlrpcString),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
$GetTaxAuthorityRates_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetTaxAuthorityRates($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
@@ -1882,14 +1873,11 @@
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
$GetTaxGroupTaxes_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
- function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
+ function xmlrpc_GetTaxGroupTaxes($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
-/*x*/ } else {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
/*x*/ }
ob_end_flush();
@@ -1913,13 +1901,11 @@
function xmlrpc_GetCustomerTypeList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCustomerTypeList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-09 05:20:15 UTC (rev 4794)
+++ trunk/doc/Change.log 2012-01-09 07:19:07 UTC (rev 4795)
@@ -3,6 +3,9 @@
8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
8/1/12 Paul Harness: PcClaimExpensesFromTab.php Use DefaultDateFormat for date in expense entry.
+
+Release 4.06.6
+
7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-09 05:20:21
|
Revision: 4794
http://web-erp.svn.sourceforge.net/web-erp/?rev=4794&view=rev
Author: daintree
Date: 2012-01-09 05:20:15 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Paul Harness corrections to petty cash scripts
Modified Paths:
--------------
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/doc/Change.log
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/PcAuthorizeExpenses.php 2012-01-09 05:20:15 UTC (rev 4794)
@@ -253,8 +253,8 @@
if (isset($_POST[$myrow['counterindex']])){
echo'<td>'.ConvertSQLDate(Date('Y-m-d')).'</td>';
}else{
- $Authoriser=ConvertSQLDate($myrow['authorized']);
- if(($Authoriser!='00/00/0000')){
+ //compare against raw SQL format date, then convert for display.
+ if(($myrow['authorized']!='0000-00-00')){
echo'<td>'.ConvertSQLDate($myrow['authorized']).'</td>';
}else{
echo '<td align=right><input type="checkbox" name="'.$myrow['counterindex'].'" /></td>';
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/PcClaimExpensesFromTab.php 2012-01-09 05:20:15 UTC (rev 4794)
@@ -327,7 +327,7 @@
}//end of Get Edit
if (!isset($_POST['Date'])) {
- $_POST['Date']=Date('d/m/Y');
+ $_POST['Date']=Date($_SESSION['DefaultDateFormat']);
}
echo '<tr><td>' . _('Date Of Expense') . ':</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/doc/Change.log 2012-01-09 05:20:15 UTC (rev 4794)
@@ -1,5 +1,8 @@
webERP Change Log
+8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
+8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
+8/1/12 Paul Harness: PcClaimExpensesFromTab.php Use DefaultDateFormat for date in expense entry.
7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-09 05:20:21
|
Revision: 4794
http://web-erp.svn.sourceforge.net/web-erp/?rev=4794&view=rev
Author: daintree
Date: 2012-01-09 05:20:15 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Paul Harness corrections to petty cash scripts
Modified Paths:
--------------
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/doc/Change.log
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/PcAuthorizeExpenses.php 2012-01-09 05:20:15 UTC (rev 4794)
@@ -253,8 +253,8 @@
if (isset($_POST[$myrow['counterindex']])){
echo'<td>'.ConvertSQLDate(Date('Y-m-d')).'</td>';
}else{
- $Authoriser=ConvertSQLDate($myrow['authorized']);
- if(($Authoriser!='00/00/0000')){
+ //compare against raw SQL format date, then convert for display.
+ if(($myrow['authorized']!='0000-00-00')){
echo'<td>'.ConvertSQLDate($myrow['authorized']).'</td>';
}else{
echo '<td align=right><input type="checkbox" name="'.$myrow['counterindex'].'" /></td>';
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/PcClaimExpensesFromTab.php 2012-01-09 05:20:15 UTC (rev 4794)
@@ -327,7 +327,7 @@
}//end of Get Edit
if (!isset($_POST['Date'])) {
- $_POST['Date']=Date('d/m/Y');
+ $_POST['Date']=Date($_SESSION['DefaultDateFormat']);
}
echo '<tr><td>' . _('Date Of Expense') . ':</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-09 05:11:13 UTC (rev 4793)
+++ trunk/doc/Change.log 2012-01-09 05:20:15 UTC (rev 4794)
@@ -1,5 +1,8 @@
webERP Change Log
+8/1/12 Phil: Added new api functions to get tax group taxes, list tax authorities, get tax authority details and get tax authority tax rates, also to list and get payment methods
+8/1/12 Paul Harness: PcAuthorizeExpenses.php Compare date against SQL raw date format, then convert for display when deciding to display authorize checkbox.
+8/1/12 Paul Harness: PcClaimExpensesFromTab.php Use DefaultDateFormat for date in expense entry.
7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-09 05:11:20
|
Revision: 4793
http://web-erp.svn.sourceforge.net/web-erp/?rev=4793&view=rev
Author: daintree
Date: 2012-01-09 05:11:13 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
additional API functions
Modified Paths:
--------------
trunk/api/api_paymentterms.php
trunk/api/api_taxgroups.php
trunk/api/api_xml-rpc.php
Modified: trunk/api/api_paymentterms.php
===================================================================
--- trunk/api/api_paymentterms.php 2012-01-07 01:04:29 UTC (rev 4792)
+++ trunk/api/api_paymentterms.php 2012-01-09 05:11:13 UTC (rev 4793)
@@ -40,5 +40,43 @@
$result = DB_query($sql, $db);
return DB_fetch_array($result);
}
+/* This function returns a list of the payment methods
+ * currently setup on webERP
+ */
+ function GetPaymentMethodsList($User, $Password) {
+ $Errors = array();
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ $sql = 'SELECT paymentid FROM paymentmethods';
+ $result = DB_query($sql, $db);
+ $i=0;
+ while ($myrow=DB_fetch_array($result)) {
+ $PaymentMethodsList[$i]=$myrow[0];
+ $i++;
+ }
+ return $PaymentMethodsList;
+ }
+/* This function takes as a parameter a payment method code
+ * and returns an array containing the details of the selected
+ * payment method.
+ */
+
+ function GetPaymentMethodDetails($PaymentMethod, $User, $Password) {
+ $Errors = array();
+ if (!isset($db)) {
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ }
+ $sql = "SELECT * FROM paymentmethods WHERE paymentid='".$PaymentMethod."'";
+ $result = DB_query($sql, $db);
+ return DB_fetch_array($result);
+ }
+
?>
\ No newline at end of file
Modified: trunk/api/api_taxgroups.php
===================================================================
--- trunk/api/api_taxgroups.php 2012-01-07 01:04:29 UTC (rev 4792)
+++ trunk/api/api_taxgroups.php 2012-01-09 05:11:13 UTC (rev 4793)
@@ -38,4 +38,77 @@
$result = DB_query($sql, $db);
return DB_fetch_array($result);
}
+
+ /* This function takes as a parameter a tax group id
+ * and returns an array containing the taxes in the selected
+ * tax group.
+ */
+
+ function GetTaxGroupTaxes($TaxGroup, $User, $Password) {
+ $Errors = array();
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ $sql = "SELECT * FROM taxgrouptaxes WHERE taxgroupid='".$TaxGroup."'";
+ $result = DB_query($sql, $db);
+ return DB_fetch_array($result);
+ }
+
+/* This function returns a list of the tax authority ids
+ * currently setup on webERP
+ */
+ function GetTaxAuthorityList($User, $Password) {
+ $Errors = array();
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ $sql = 'SELECT taxid FROM taxauthorities';
+ $result = DB_query($sql, $db);
+ $i=0;
+ while ($myrow=DB_fetch_array($result)) {
+ $TaxAuthList[$i]=$myrow[0];
+ $i++;
+ }
+ return $TaxAuthList;
+ }
+
+/* This function takes as a parameter a tax authority id
+ * and returns an array containing the details of the selected
+ * tax authority.
+ */
+
+ function GetTaxAuthorityDetails($TaxAuthority, $User, $Password) {
+ $Errors = array();
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ $sql = "SELECT * FROM taxauthorities WHERE taxid='".$TaxAuthority."'";
+ $result = DB_query($sql, $db);
+ return DB_fetch_array($result);
+ }
+
+/* This function takes as a parameter a tax authority id
+ * and returns an array containing the rate of tax fpr the selected
+ * tax authority.
+ */
+
+ function GetTaxAuthorityRates($TaxAuthority, $User, $Password) {
+ $Errors = array();
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ $sql = "SELECT * FROM taxauthrates WHERE taxauthority='".$TaxAuthority."'";
+ $result = DB_query($sql, $db);
+ return DB_fetch_array($result);
+ }
+
+
?>
\ No newline at end of file
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-01-07 01:04:29 UTC (rev 4792)
+++ trunk/api/api_xml-rpc.php 2012-01-09 05:11:13 UTC (rev 4793)
@@ -4,7 +4,7 @@
* Must be a better way of doing this, but at
* least it works */
}
-
+ /* Note api_php.php includes api */
include 'api_php.php';
include '../xmlrpc/lib/xmlrpc.inc';
@@ -619,10 +619,68 @@
return $rtn;
}
+ unset($Description);
+ unset($Parameter);
+ unset($ReturnValue);
+
+ $Description = _('This function returns a list of payment method codes.');
+ $Parameter[0]['name'] = _('User name');
+ $Parameter[0]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[1]['name'] = _('User password');
+ $Parameter[1]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('This function returns an array of payment method codes.');
+
+/*E*/$GetPaymentMethodsList_sig = array(array($xmlrpcStruct),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+ $GetPaymentmethodsList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetPaymentMethodsList($xmlrpcmsg){
+ ob_start('ob_file_callback');
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetPaymentMethodsList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetPaymentMethodsList( '', '')));
+/*x*/ }
+ ob_end_flush();
+ return $rtn;
+ }
+
unset($Description);
unset($Parameter);
unset($ReturnValue);
+ $Description = _('This function takes a payment method code and returns details of that payment method.');
+ $Parameter[0]['name'] = _('Payment method code');
+ $Parameter[0]['description'] = _('A payment method code as returned by the GetPaymentMethodsList function.');
+ $Parameter[1]['name'] = _('User name');
+ $Parameter[1]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[2]['name'] = _('User password');
+ $Parameter[2]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('This function returns an array of payment terms details.');
+
+/*E*/$GetPaymentMethodDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
+ $GetPaymentMethodDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetPaymentMethodDetails($xmlrpcmsg){
+ ob_start('ob_file_callback');
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
+/*x*/ {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetPaymentMethodDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetPaymentMethodDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*x*/ }
+ ob_end_flush();
+ return $rtn;
+ }
+
+
+ unset($Description);
+ unset($Parameter);
+ unset($ReturnValue);
+
$Description = _('This function inserts a new stock item into webERP, including updating the locstock table.');
$Parameter[0]['name'] = _('Stock Item Details');
$Parameter[0]['description'] = _('Key/value pairs of data to insert. The key must be identical with the database field name.');
@@ -1721,10 +1779,127 @@
return $rtn;
}
+ $Description = _('This function returns a list of tax authority IDs.');
+ $Parameter[0]['name'] = _('User name');
+ $Parameter[0]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[1]['name'] = _('User password');
+ $Parameter[1]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('This function returns an array of tax group IDs.');
+
+/*E*/ $GetTaxAuthorityList_sig = array(array($xmlrpcStruct),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+ $GetTaxAuthorityList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetTaxAuthorityList($xmlrpcmsg){
+ ob_start('ob_file_callback');
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
+/*x*/ {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList( '', '')));
+/*x*/ }
+ ob_end_flush();
+ return $rtn;
+ }
+
unset($Description);
unset($Parameter);
unset($ReturnValue);
+ $Description = _('This function takes a tax authority ID and returns details of that tax authority.');
+ $Parameter[0]['name'] = _('Tax Authority ID');
+ $Parameter[0]['description'] = _('A tax Authority ID as returned by the GetTaxAuthorityList function.');
+ $Parameter[1]['name'] = _('User name');
+ $Parameter[1]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[2]['name'] = _('User password');
+ $Parameter[2]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('This function returns an array of tax authority details.');
+
+/*E*/$GetTaxAuthorityDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
+ $GetTaxAuthorityDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetTaxAuthorityDetails($xmlrpcmsg){
+ ob_start('ob_file_callback');
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
+/*x*/ {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*x*/ }
+ ob_end_flush();
+ return $rtn;
+ }
+
+ unset($Description);
+ unset($Parameter);
+ unset($ReturnValue);
+
+ $Description = _('This function takes a tax authority ID and returns the rates of tax for the authority.');
+ $Parameter[0]['name'] = _('Tax Authority ID');
+ $Parameter[0]['description'] = _('A tax Authority ID as returned by the GetTaxAuthorityList function.');
+ $Parameter[1]['name'] = _('User name');
+ $Parameter[1]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[2]['name'] = _('User password');
+ $Parameter[2]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('This function returns an array of tax authority tax rates.');
+
+/*E*/ $GetTaxAuthorityRates_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
+ $GetTaxAuthorityRates_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetTaxAuthorityRates($xmlrpcmsg){
+ ob_start('ob_file_callback');
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
+/*x*/ {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*x*/ }
+ ob_end_flush();
+ return $rtn;
+ }
+
+ unset($Description);
+ unset($Parameter);
+ unset($ReturnValue);
+
+ $Description = _('This function takes a tax group ID and returns the taxes that belong to that tax group.');
+ $Parameter[0]['name'] = _('Tax Group ID');
+ $Parameter[0]['description'] = _('A tax group ID as returned by the GetTaxgroupList function.');
+ $Parameter[1]['name'] = _('User name');
+ $Parameter[1]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[2]['name'] = _('User password');
+ $Parameter[2]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('This function returns an array of tax group details.');
+
+/*E*/$GetTaxGroupTaxes_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
+ $GetTaxGroupTaxes_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
+ ob_start('ob_file_callback');
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
+/*x*/ {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*x*/ }
+ ob_end_flush();
+ return $rtn;
+ }
+
+ unset($Description);
+ unset($Parameter);
+ unset($ReturnValue);
+
$Description = _('This function returns a list of customer types.');
$Parameter[0]['name'] = _('User name');
$Parameter[0]['description'] = _('A valid weberp username. This user should have security access to this data.');
@@ -2766,6 +2941,14 @@
"function" => "xmlrpc_GetPaymentTermsDetails",
"signature" => $GetPaymentTermsDetails_sig,
"docstring" => $GetPaymentTermsDetails_doc),
+ "weberp.xmlrpc_GetPaymentMethodsList" => array(
+ "function" => "xmlrpc_GetPaymentMethodsList",
+ "signature" => $GetPaymentMethodsList_sig,
+ "docstring" => $GetPaymentMethodsList_doc),
+ "weberp.xmlrpc_GetPaymentMethodsDetails" => array(
+ "function" => "xmlrpc_GetPaymentMethodsDetails",
+ "signature" => $GetPaymentMethodsDetails_sig,
+ "docstring" => $GetPaymentMrthodsDetails_doc),
"weberp.xmlrpc_InsertStockItem" => array(
"function" => "xmlrpc_InsertStockItem",
"signature" => $InsertStockItem_sig,
@@ -2918,6 +3101,22 @@
"function" => "xmlrpc_GetTaxgroupDetails",
"signature" => $GetTaxgroupDetails_sig,
"docstring" => $GetTaxgroupDetails_doc),
+ "weberp.xmlrpc_GetTaxGroupTaxes" => array(
+ "function" => "xmlrpc_GetTaxGroupTaxes",
+ "signature" => $GetTaxGroupTaxes_sig,
+ "docstring" => $GetTaxGroupTaxes_doc),
+ "weberp.xmlrpc_GetTaxAuthorityList" => array(
+ "function" => "xmlrpc_GetTaxAuthorityList",
+ "signature" => $GetTaxAuthorityList_sig,
+ "docstring" => $GetTaxAuthorityList_doc),
+ "weberp.xmlrpc_GetTaxAuthorityDetails" => array(
+ "function" => "xmlrpc_GetTaxAuthorityDetails",
+ "signature" => $GetTaxAuthorityDetails_sig,
+ "docstring" => $GetTaxAuthorityDetails_doc),
+ "weberp.xmlrpc_GetTaxAuthorityRates" => array(
+ "function" => "xmlrpc_GetTaxAuthorityRates",
+ "signature" => $GetTaxAuthorityRates_sig,
+ "docstring" => $GetTaxAuthorityRates_doc),
"weberp.xmlrpc_GetCustomerTypeList" => array(
"function" => "xmlrpc_GetCustomerTypeList",
"signature" => $GetCustomerTypeList_sig,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-09 05:11:19
|
Revision: 4793
http://web-erp.svn.sourceforge.net/web-erp/?rev=4793&view=rev
Author: daintree
Date: 2012-01-09 05:11:13 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
additional API functions
Modified Paths:
--------------
trunk/api/api_paymentterms.php
trunk/api/api_taxgroups.php
trunk/api/api_xml-rpc.php
Modified: trunk/api/api_paymentterms.php
===================================================================
--- trunk/api/api_paymentterms.php 2012-01-07 01:04:29 UTC (rev 4792)
+++ trunk/api/api_paymentterms.php 2012-01-09 05:11:13 UTC (rev 4793)
@@ -40,5 +40,43 @@
$result = DB_query($sql, $db);
return DB_fetch_array($result);
}
+/* This function returns a list of the payment methods
+ * currently setup on webERP
+ */
+ function GetPaymentMethodsList($User, $Password) {
+ $Errors = array();
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ $sql = 'SELECT paymentid FROM paymentmethods';
+ $result = DB_query($sql, $db);
+ $i=0;
+ while ($myrow=DB_fetch_array($result)) {
+ $PaymentMethodsList[$i]=$myrow[0];
+ $i++;
+ }
+ return $PaymentMethodsList;
+ }
+/* This function takes as a parameter a payment method code
+ * and returns an array containing the details of the selected
+ * payment method.
+ */
+
+ function GetPaymentMethodDetails($PaymentMethod, $User, $Password) {
+ $Errors = array();
+ if (!isset($db)) {
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ }
+ $sql = "SELECT * FROM paymentmethods WHERE paymentid='".$PaymentMethod."'";
+ $result = DB_query($sql, $db);
+ return DB_fetch_array($result);
+ }
+
?>
\ No newline at end of file
Modified: trunk/api/api_taxgroups.php
===================================================================
--- trunk/api/api_taxgroups.php 2012-01-07 01:04:29 UTC (rev 4792)
+++ trunk/api/api_taxgroups.php 2012-01-09 05:11:13 UTC (rev 4793)
@@ -38,4 +38,77 @@
$result = DB_query($sql, $db);
return DB_fetch_array($result);
}
+
+ /* This function takes as a parameter a tax group id
+ * and returns an array containing the taxes in the selected
+ * tax group.
+ */
+
+ function GetTaxGroupTaxes($TaxGroup, $User, $Password) {
+ $Errors = array();
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ $sql = "SELECT * FROM taxgrouptaxes WHERE taxgroupid='".$TaxGroup."'";
+ $result = DB_query($sql, $db);
+ return DB_fetch_array($result);
+ }
+
+/* This function returns a list of the tax authority ids
+ * currently setup on webERP
+ */
+ function GetTaxAuthorityList($User, $Password) {
+ $Errors = array();
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ $sql = 'SELECT taxid FROM taxauthorities';
+ $result = DB_query($sql, $db);
+ $i=0;
+ while ($myrow=DB_fetch_array($result)) {
+ $TaxAuthList[$i]=$myrow[0];
+ $i++;
+ }
+ return $TaxAuthList;
+ }
+
+/* This function takes as a parameter a tax authority id
+ * and returns an array containing the details of the selected
+ * tax authority.
+ */
+
+ function GetTaxAuthorityDetails($TaxAuthority, $User, $Password) {
+ $Errors = array();
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ $sql = "SELECT * FROM taxauthorities WHERE taxid='".$TaxAuthority."'";
+ $result = DB_query($sql, $db);
+ return DB_fetch_array($result);
+ }
+
+/* This function takes as a parameter a tax authority id
+ * and returns an array containing the rate of tax fpr the selected
+ * tax authority.
+ */
+
+ function GetTaxAuthorityRates($TaxAuthority, $User, $Password) {
+ $Errors = array();
+ $db = db($User, $Password);
+ if (gettype($db)=='integer') {
+ $Errors[0]=NoAuthorisation;
+ return $Errors;
+ }
+ $sql = "SELECT * FROM taxauthrates WHERE taxauthority='".$TaxAuthority."'";
+ $result = DB_query($sql, $db);
+ return DB_fetch_array($result);
+ }
+
+
?>
\ No newline at end of file
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-01-07 01:04:29 UTC (rev 4792)
+++ trunk/api/api_xml-rpc.php 2012-01-09 05:11:13 UTC (rev 4793)
@@ -4,7 +4,7 @@
* Must be a better way of doing this, but at
* least it works */
}
-
+ /* Note api_php.php includes api */
include 'api_php.php';
include '../xmlrpc/lib/xmlrpc.inc';
@@ -619,10 +619,68 @@
return $rtn;
}
+ unset($Description);
+ unset($Parameter);
+ unset($ReturnValue);
+
+ $Description = _('This function returns a list of payment method codes.');
+ $Parameter[0]['name'] = _('User name');
+ $Parameter[0]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[1]['name'] = _('User password');
+ $Parameter[1]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('This function returns an array of payment method codes.');
+
+/*E*/$GetPaymentMethodsList_sig = array(array($xmlrpcStruct),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+ $GetPaymentmethodsList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetPaymentMethodsList($xmlrpcmsg){
+ ob_start('ob_file_callback');
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetPaymentMethodsList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetPaymentMethodsList( '', '')));
+/*x*/ }
+ ob_end_flush();
+ return $rtn;
+ }
+
unset($Description);
unset($Parameter);
unset($ReturnValue);
+ $Description = _('This function takes a payment method code and returns details of that payment method.');
+ $Parameter[0]['name'] = _('Payment method code');
+ $Parameter[0]['description'] = _('A payment method code as returned by the GetPaymentMethodsList function.');
+ $Parameter[1]['name'] = _('User name');
+ $Parameter[1]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[2]['name'] = _('User password');
+ $Parameter[2]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('This function returns an array of payment terms details.');
+
+/*E*/$GetPaymentMethodDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
+ $GetPaymentMethodDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetPaymentMethodDetails($xmlrpcmsg){
+ ob_start('ob_file_callback');
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
+/*x*/ {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetPaymentMethodDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetPaymentMethodDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*x*/ }
+ ob_end_flush();
+ return $rtn;
+ }
+
+
+ unset($Description);
+ unset($Parameter);
+ unset($ReturnValue);
+
$Description = _('This function inserts a new stock item into webERP, including updating the locstock table.');
$Parameter[0]['name'] = _('Stock Item Details');
$Parameter[0]['description'] = _('Key/value pairs of data to insert. The key must be identical with the database field name.');
@@ -1721,10 +1779,127 @@
return $rtn;
}
+ $Description = _('This function returns a list of tax authority IDs.');
+ $Parameter[0]['name'] = _('User name');
+ $Parameter[0]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[1]['name'] = _('User password');
+ $Parameter[1]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('This function returns an array of tax group IDs.');
+
+/*E*/ $GetTaxAuthorityList_sig = array(array($xmlrpcStruct),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+ $GetTaxAuthorityList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetTaxAuthorityList($xmlrpcmsg){
+ ob_start('ob_file_callback');
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
+/*x*/ {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityList( '', '')));
+/*x*/ }
+ ob_end_flush();
+ return $rtn;
+ }
+
unset($Description);
unset($Parameter);
unset($ReturnValue);
+ $Description = _('This function takes a tax authority ID and returns details of that tax authority.');
+ $Parameter[0]['name'] = _('Tax Authority ID');
+ $Parameter[0]['description'] = _('A tax Authority ID as returned by the GetTaxAuthorityList function.');
+ $Parameter[1]['name'] = _('User name');
+ $Parameter[1]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[2]['name'] = _('User password');
+ $Parameter[2]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('This function returns an array of tax authority details.');
+
+/*E*/$GetTaxAuthorityDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
+ $GetTaxAuthorityDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetTaxAuthorityDetails($xmlrpcmsg){
+ ob_start('ob_file_callback');
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
+/*x*/ {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*x*/ }
+ ob_end_flush();
+ return $rtn;
+ }
+
+ unset($Description);
+ unset($Parameter);
+ unset($ReturnValue);
+
+ $Description = _('This function takes a tax authority ID and returns the rates of tax for the authority.');
+ $Parameter[0]['name'] = _('Tax Authority ID');
+ $Parameter[0]['description'] = _('A tax Authority ID as returned by the GetTaxAuthorityList function.');
+ $Parameter[1]['name'] = _('User name');
+ $Parameter[1]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[2]['name'] = _('User password');
+ $Parameter[2]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('This function returns an array of tax authority tax rates.');
+
+/*E*/ $GetTaxAuthorityRates_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
+ $GetTaxAuthorityRates_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetTaxAuthorityRates($xmlrpcmsg){
+ ob_start('ob_file_callback');
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
+/*x*/ {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityRates($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*x*/ }
+ ob_end_flush();
+ return $rtn;
+ }
+
+ unset($Description);
+ unset($Parameter);
+ unset($ReturnValue);
+
+ $Description = _('This function takes a tax group ID and returns the taxes that belong to that tax group.');
+ $Parameter[0]['name'] = _('Tax Group ID');
+ $Parameter[0]['description'] = _('A tax group ID as returned by the GetTaxgroupList function.');
+ $Parameter[1]['name'] = _('User name');
+ $Parameter[1]['description'] = _('A valid weberp username. This user should have security access to this data.');
+ $Parameter[2]['name'] = _('User password');
+ $Parameter[2]['description'] = _('The weberp password associated with this user name. ');
+ $ReturnValue[0] = _('This function returns an array of tax group details.');
+
+/*E*/$GetTaxGroupTaxes_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
+ $GetTaxGroupTaxes_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+
+ function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
+ ob_start('ob_file_callback');
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
+/*x*/ {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupTaxes($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*x*/ }
+ ob_end_flush();
+ return $rtn;
+ }
+
+ unset($Description);
+ unset($Parameter);
+ unset($ReturnValue);
+
$Description = _('This function returns a list of customer types.');
$Parameter[0]['name'] = _('User name');
$Parameter[0]['description'] = _('A valid weberp username. This user should have security access to this data.');
@@ -2766,6 +2941,14 @@
"function" => "xmlrpc_GetPaymentTermsDetails",
"signature" => $GetPaymentTermsDetails_sig,
"docstring" => $GetPaymentTermsDetails_doc),
+ "weberp.xmlrpc_GetPaymentMethodsList" => array(
+ "function" => "xmlrpc_GetPaymentMethodsList",
+ "signature" => $GetPaymentMethodsList_sig,
+ "docstring" => $GetPaymentMethodsList_doc),
+ "weberp.xmlrpc_GetPaymentMethodsDetails" => array(
+ "function" => "xmlrpc_GetPaymentMethodsDetails",
+ "signature" => $GetPaymentMethodsDetails_sig,
+ "docstring" => $GetPaymentMrthodsDetails_doc),
"weberp.xmlrpc_InsertStockItem" => array(
"function" => "xmlrpc_InsertStockItem",
"signature" => $InsertStockItem_sig,
@@ -2918,6 +3101,22 @@
"function" => "xmlrpc_GetTaxgroupDetails",
"signature" => $GetTaxgroupDetails_sig,
"docstring" => $GetTaxgroupDetails_doc),
+ "weberp.xmlrpc_GetTaxGroupTaxes" => array(
+ "function" => "xmlrpc_GetTaxGroupTaxes",
+ "signature" => $GetTaxGroupTaxes_sig,
+ "docstring" => $GetTaxGroupTaxes_doc),
+ "weberp.xmlrpc_GetTaxAuthorityList" => array(
+ "function" => "xmlrpc_GetTaxAuthorityList",
+ "signature" => $GetTaxAuthorityList_sig,
+ "docstring" => $GetTaxAuthorityList_doc),
+ "weberp.xmlrpc_GetTaxAuthorityDetails" => array(
+ "function" => "xmlrpc_GetTaxAuthorityDetails",
+ "signature" => $GetTaxAuthorityDetails_sig,
+ "docstring" => $GetTaxAuthorityDetails_doc),
+ "weberp.xmlrpc_GetTaxAuthorityRates" => array(
+ "function" => "xmlrpc_GetTaxAuthorityRates",
+ "signature" => $GetTaxAuthorityRates_sig,
+ "docstring" => $GetTaxAuthorityRates_doc),
"weberp.xmlrpc_GetCustomerTypeList" => array(
"function" => "xmlrpc_GetCustomerTypeList",
"signature" => $GetCustomerTypeList_sig,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-07 01:04:35
|
Revision: 4792
http://web-erp.svn.sourceforge.net/web-erp/?rev=4792&view=rev
Author: daintree
Date: 2012-01-07 01:04:29 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/Currencies.php
trunk/Shipments.php
trunk/SupplierCredit.php
trunk/SupplierInvoice.php
trunk/doc/Change.log
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/Currencies.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -69,7 +69,7 @@
prnMsg(_('The number of decimal places to display for amounts in this currency must be numeric'),'error');
$Errors[$i] = 'DecimalPlaces';
$i++;
- }elseif (filter_number_format($_POST['DecimalPlaces'])<=0){
+ }elseif (filter_number_format($_POST['DecimalPlaces'])<0){
$InputError = 1;
prnMsg(_('The number of decimal places to display for amounts in this currency must be positive or zero'),'error');
$Errors[$i] = 'DecimalPlaces';
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/Shipments.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -17,7 +17,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') .
'" alt="" />' . ' ' . $title . '</p>';
-if (!isset($_SESSION['SupplierID']) AND !isset($_SESSION['Shipment'])){
+if (!isset($_SESSION['SupplierID']) AND !isset($_SESSION['Shipment']) AND !isset($_GET['SelectedShipment'])){
prnMsg( _('To set up a shipment') . ', ' . _('the supplier must first be selected from the Select Supplier page'), 'error');
echo '<table class="selection">
<tr><td class="menu_group_item">
@@ -78,8 +78,6 @@
$_SESSION['Shipment']->Vessel = $myrow['vessel'];
$_SESSION['Shipment']->VoyageRef = $myrow['voyageref'];
-
-
/*now populate the shipment details records */
$LineItemsSQL = "SELECT purchorderdetails.podetailitem,
@@ -195,7 +193,7 @@
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){
+ if ($InputError==0 AND !isset($_GET['Add'])){ //don't update vessel and voyage on adding a new PO line to the shipment
$_SESSION['Shipment']->Vessel = $_POST['Vessel'];
$_SESSION['Shipment']->VoyageRef = $_POST['VoyageRef'];
}
@@ -289,6 +287,7 @@
$myrow['quantityord'],
$myrow['quantityrecd'],
$StandardCost,
+ $myrow['decimalplaces'],
$db);
}
@@ -323,9 +322,9 @@
echo '<tr><td>'. _('Expected Arrival Date (ETA)'). ': </td>';
if (isset($_SESSION['Shipment']->ETA)) {
- echo '<td><input type="text class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . $ETA . '" /></td>';
+ echo '<td><input type="text" name="ETA" class="date" alt='.$_SESSION['DefaultDateFormat'].' maxlength="10" size="10" value="' . $ETA . '" /></td>';
} else {
- echo '<td><input type="text class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>';
+ echo '<td><input type="text" class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>';
}
echo '<td>'. _('Into').' ';
@@ -467,8 +466,8 @@
INNER JOIN stockmaster
ON purchorderdetails.itemcode=stockmaster.stockid
WHERE qtyinvoiced=0
- AND purchorderdetails.completed=0
- AND purchorders.status='Authorised'
+ AND purchorders.status <> 'Cancelled'
+ AND purchorders.status <> 'Rejected'
AND purchorders.supplierno ='" . $_SESSION['Shipment']->SupplierID . "'
AND purchorderdetails.shiptref=0
AND purchorders.intostocklocation='" . $_POST['StockLocation'] . "'";
Modified: trunk/SupplierCredit.php
===================================================================
--- trunk/SupplierCredit.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/SupplierCredit.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -612,7 +612,7 @@
/*First do input reasonableness checks
then do the updates and inserts to process the credit note entered */
-
+ $TaxTotal =0;
foreach ($_SESSION['SuppTrans']->Taxes as $Tax) {
/*Set the tax rate to what was entered */
@@ -637,14 +637,9 @@
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = filter_number_format($_POST['TaxAmount' . $Tax->TaxCalculationOrder]);
}
+ $TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount
}
-/*Need to recalc the taxtotal */
- $TaxTotal=0;
- foreach ($_SESSION['SuppTrans']->Taxes as $Tax){
- $TaxTotal += $Tax->TaxOvAmount;
- }
-
$InputError = False;
if ( $TaxTotal + $_SESSION['SuppTrans']->OvAmount <= 0){
$InputError = True;
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/SupplierInvoice.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -584,11 +584,11 @@
<input type="submit" name="PostInvoice" value="' . _('Enter Invoice') . '" />
</div>';
-} else { //do the postings -and dont show the button to process
+} else { // $_POST['PostInvoice'] is set so do the postings -and dont show the button to process
/*First do input reasonableness checks
then do the updates and inserts to process the invoice entered */
-
+ $TaxTotal =0;
foreach ($_SESSION['SuppTrans']->Taxes as $Tax) {
/*Set the tax rate to what was entered */
if (isset($_POST['TaxRate' . $Tax->TaxCalculationOrder])){
@@ -596,23 +596,23 @@
}
if ($_POST['OverRideTax']=='Auto' OR !isset($_POST['OverRideTax'])){
/*Now recaluclate the tax depending on the method */
+ /*Now recaluclate the tax depending on the method */
if ($Tax->TaxOnTax ==1){
+
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * ($_SESSION['SuppTrans']->OvAmount + $TaxTotal);
+
} else { /*Calculate tax without the tax on tax */
+
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * $_SESSION['SuppTrans']->OvAmount;
+
}
} else { /*Tax being entered manually accept the taxamount entered as is*/
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = filter_number_format($_POST['TaxAmount' . $Tax->TaxCalculationOrder]);
}
+ $TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount;
}
-/*Need to recalc the taxtotal */
- $TaxTotal=0;
- foreach ($_SESSION['SuppTrans']->Taxes as $Tax){
- $TaxTotal += $Tax->TaxOvAmount;
- }
-
$InputError = False;
if ( $TaxTotal + $_SESSION['SuppTrans']->OvAmount < 0){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/doc/Change.log 2012-01-07 01:04:29 UTC (rev 4792)
@@ -1,5 +1,9 @@
webERP Change Log
+7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
+7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
+5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
+
3/1/12 Release 4.06.5
30/12/11 Phil: install/index.php now checks for the existence of config.php before attempting to run the installation script
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-07 01:04:35
|
Revision: 4792
http://web-erp.svn.sourceforge.net/web-erp/?rev=4792&view=rev
Author: daintree
Date: 2012-01-07 01:04:29 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/Currencies.php
trunk/Shipments.php
trunk/SupplierCredit.php
trunk/SupplierInvoice.php
trunk/doc/Change.log
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/Currencies.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -69,7 +69,7 @@
prnMsg(_('The number of decimal places to display for amounts in this currency must be numeric'),'error');
$Errors[$i] = 'DecimalPlaces';
$i++;
- }elseif (filter_number_format($_POST['DecimalPlaces'])<=0){
+ }elseif (filter_number_format($_POST['DecimalPlaces'])<0){
$InputError = 1;
prnMsg(_('The number of decimal places to display for amounts in this currency must be positive or zero'),'error');
$Errors[$i] = 'DecimalPlaces';
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/Shipments.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -17,7 +17,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') .
'" alt="" />' . ' ' . $title . '</p>';
-if (!isset($_SESSION['SupplierID']) AND !isset($_SESSION['Shipment'])){
+if (!isset($_SESSION['SupplierID']) AND !isset($_SESSION['Shipment']) AND !isset($_GET['SelectedShipment'])){
prnMsg( _('To set up a shipment') . ', ' . _('the supplier must first be selected from the Select Supplier page'), 'error');
echo '<table class="selection">
<tr><td class="menu_group_item">
@@ -78,8 +78,6 @@
$_SESSION['Shipment']->Vessel = $myrow['vessel'];
$_SESSION['Shipment']->VoyageRef = $myrow['voyageref'];
-
-
/*now populate the shipment details records */
$LineItemsSQL = "SELECT purchorderdetails.podetailitem,
@@ -195,7 +193,7 @@
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){
+ if ($InputError==0 AND !isset($_GET['Add'])){ //don't update vessel and voyage on adding a new PO line to the shipment
$_SESSION['Shipment']->Vessel = $_POST['Vessel'];
$_SESSION['Shipment']->VoyageRef = $_POST['VoyageRef'];
}
@@ -289,6 +287,7 @@
$myrow['quantityord'],
$myrow['quantityrecd'],
$StandardCost,
+ $myrow['decimalplaces'],
$db);
}
@@ -323,9 +322,9 @@
echo '<tr><td>'. _('Expected Arrival Date (ETA)'). ': </td>';
if (isset($_SESSION['Shipment']->ETA)) {
- echo '<td><input type="text class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . $ETA . '" /></td>';
+ echo '<td><input type="text" name="ETA" class="date" alt='.$_SESSION['DefaultDateFormat'].' maxlength="10" size="10" value="' . $ETA . '" /></td>';
} else {
- echo '<td><input type="text class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>';
+ echo '<td><input type="text" class="date" alt='.$_SESSION['DefaultDateFormat'].' name="ETA" maxlength="10" size="10" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>';
}
echo '<td>'. _('Into').' ';
@@ -467,8 +466,8 @@
INNER JOIN stockmaster
ON purchorderdetails.itemcode=stockmaster.stockid
WHERE qtyinvoiced=0
- AND purchorderdetails.completed=0
- AND purchorders.status='Authorised'
+ AND purchorders.status <> 'Cancelled'
+ AND purchorders.status <> 'Rejected'
AND purchorders.supplierno ='" . $_SESSION['Shipment']->SupplierID . "'
AND purchorderdetails.shiptref=0
AND purchorders.intostocklocation='" . $_POST['StockLocation'] . "'";
Modified: trunk/SupplierCredit.php
===================================================================
--- trunk/SupplierCredit.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/SupplierCredit.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -612,7 +612,7 @@
/*First do input reasonableness checks
then do the updates and inserts to process the credit note entered */
-
+ $TaxTotal =0;
foreach ($_SESSION['SuppTrans']->Taxes as $Tax) {
/*Set the tax rate to what was entered */
@@ -637,14 +637,9 @@
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = filter_number_format($_POST['TaxAmount' . $Tax->TaxCalculationOrder]);
}
+ $TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount
}
-/*Need to recalc the taxtotal */
- $TaxTotal=0;
- foreach ($_SESSION['SuppTrans']->Taxes as $Tax){
- $TaxTotal += $Tax->TaxOvAmount;
- }
-
$InputError = False;
if ( $TaxTotal + $_SESSION['SuppTrans']->OvAmount <= 0){
$InputError = True;
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/SupplierInvoice.php 2012-01-07 01:04:29 UTC (rev 4792)
@@ -584,11 +584,11 @@
<input type="submit" name="PostInvoice" value="' . _('Enter Invoice') . '" />
</div>';
-} else { //do the postings -and dont show the button to process
+} else { // $_POST['PostInvoice'] is set so do the postings -and dont show the button to process
/*First do input reasonableness checks
then do the updates and inserts to process the invoice entered */
-
+ $TaxTotal =0;
foreach ($_SESSION['SuppTrans']->Taxes as $Tax) {
/*Set the tax rate to what was entered */
if (isset($_POST['TaxRate' . $Tax->TaxCalculationOrder])){
@@ -596,23 +596,23 @@
}
if ($_POST['OverRideTax']=='Auto' OR !isset($_POST['OverRideTax'])){
/*Now recaluclate the tax depending on the method */
+ /*Now recaluclate the tax depending on the method */
if ($Tax->TaxOnTax ==1){
+
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * ($_SESSION['SuppTrans']->OvAmount + $TaxTotal);
+
} else { /*Calculate tax without the tax on tax */
+
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * $_SESSION['SuppTrans']->OvAmount;
+
}
} else { /*Tax being entered manually accept the taxamount entered as is*/
$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = filter_number_format($_POST['TaxAmount' . $Tax->TaxCalculationOrder]);
}
+ $TaxTotal += $_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount;
}
-/*Need to recalc the taxtotal */
- $TaxTotal=0;
- foreach ($_SESSION['SuppTrans']->Taxes as $Tax){
- $TaxTotal += $Tax->TaxOvAmount;
- }
-
$InputError = False;
if ( $TaxTotal + $_SESSION['SuppTrans']->OvAmount < 0){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-03 06:35:27 UTC (rev 4791)
+++ trunk/doc/Change.log 2012-01-07 01:04:29 UTC (rev 4792)
@@ -1,5 +1,9 @@
webERP Change Log
+7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
+7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
+5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
+
3/1/12 Release 4.06.5
30/12/11 Phil: install/index.php now checks for the existence of config.php before attempting to run the installation script
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-01-03 06:35:37
|
Revision: 4791
http://web-erp.svn.sourceforge.net/web-erp/?rev=4791&view=rev
Author: daintree
Date: 2012-01-03 06:35:27 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/api/api_login.php
trunk/api/api_xml-rpc.php
trunk/doc/Change.log
trunk/doc/INSTALL.txt
trunk/doc/Manual/ManualAPIFunctions.php
trunk/includes/ConnectDB.inc
trunk/install/index.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/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/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/UpgradeDatabase.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -128,8 +128,9 @@
case '4.06.1':
case '4.06.2':
case '4.06.3':
+ case '4.06.4':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.4':
+ case '4.06.5':
break;
} //end switch
}
Modified: trunk/api/api_login.php
===================================================================
--- trunk/api/api_login.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/api/api_login.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -100,7 +100,7 @@
* function should be called when a successful login occurs.
*/
-function DoSetup()
+function DoSetup()
{
global $PathPrefix;
if (isset($_SESSION['db']) AND $_SESSION['db'] != '' )
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/api/api_xml-rpc.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -29,8 +29,8 @@
function xmlrpc_Login($xmlrpcmsg) {
ob_start('ob_file_callback');
$rtn = new xmlrpcresp(php_xmlrpc_encode(LoginAPI($xmlrpcmsg->getParam(0)->scalarval(),
- $xmlrpcmsg->getParam(1)->scalarval(),
- $xmlrpcmsg->getParam(2)->scalarval())));
+ $xmlrpcmsg->getParam(1)->scalarval(),
+ $xmlrpcmsg->getParam(2)->scalarval())));
ob_end_flush();
return $rtn;
}
@@ -73,8 +73,8 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $InsertCustomer_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
-/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+/*E*/$InsertCustomer_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
+/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$InsertCustomer_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_InsertCustomer($xmlrpcmsg){
@@ -109,7 +109,7 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $InsertBranch_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
+/*E*/$InsertBranch_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$InsertBranch_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
@@ -358,19 +358,17 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $GetCurrencyList_sig = array(array($xmlrpcStruct),
-/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+/*E*/$GetCurrencyList_sig = array(array($xmlrpcStruct),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$GetCurrencyList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetCurrencyList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/doc/Change.log 2012-01-03 06:35:27 UTC (rev 4791)
@@ -1,6 +1,8 @@
webERP Change Log
+3/1/12 Release 4.06.5
+30/12/11 Phil: install/index.php now checks for the existence of config.php before attempting to run the installation script
29/12/11 Phil: includes/SelectOrderItems_intoCart.inc and includes/DefineCartClass.php fix line numbers for order lines
28/12/11 Release 4.06.4
Modified: trunk/doc/INSTALL.txt
===================================================================
--- trunk/doc/INSTALL.txt 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/doc/INSTALL.txt 2012-01-03 06:35:27 UTC (rev 4791)
@@ -107,11 +107,7 @@
Extract the webERP archive under the web server root directory. This will create the webERP directory under the web server root directory and put all the scripts in that directory.
-At this point you may wish to add an extra layer of security by restricting
-access to the webERP system. This is in addition to webERP's own security
-system, so you may wish to skip it, but it is recommended to add this extra layer. In your
-.../htdocs/webERP directory (or wherever your webERP's root directory is)
-amend the file .htaccess thus:
+At this point you may wish to add an extra layer of security by restricting access to the webERP system. This is in addition to webERP's own security system, so you may wish to skip it, but it is recommended to add this extra layer. In your .../htdocs/webERP directory (or wherever your webERP's root directory is) amend the file .htaccess thus:
php_flag magic_quotes_gpc off
php_flag register_globals off
@@ -195,16 +191,10 @@
Note: The scripts provided are created using mysqldump and contain comments. Unfortunately, phpMyAdmin doesn't like these comments so it is recommended to follow the instructions below.
-WebERP expects each company that it manages to have a separate database. For
-example, if you have a company called MyCompany, then it will expect a database
-called mycompany (note that it must all be lower case). Before you start,
-ensure that you have no such database on your system, if you do then you will
-either have to remove it, rename it, or choose a different name for your
-company for the purposes of WebERP. The simplest tool is webmin, or you could
-use phpMyAdmin.
+WebERP expects each company that it manages to have a separate database. For example, if you have a company called MyCompany, then it will expect a database called mycompany (note that it must all be lower case). Before you start, ensure that you have no such database on your system, if you do then you will either have to remove it, rename it, or choose a different name for your
+company for the purposes of WebERP. The simplest tool is webmin, or you could use phpMyAdmin.
-Once you have confirmed that you are ready to create a database you are
-now ready to go ahead, two scripts are provided to ease the database creation.
+Once you have confirmed that you are ready to create a database you are now ready to go ahead, two scripts are provided to ease the database creation.
1. weberp-demo.sql This has a minimal amount of demonstration data in a bogus company set up so that transactions can be tried to see how the system works.
2. weberp-new.sql This script has only the basic data necessary to start a new company system off. If you wish to set up your company on webERP then this is the script to use. weberp-new.sql you will need to create a database first (using phpMyAdmin for example) or add the following sql commands to this script
@@ -212,8 +202,7 @@
COLLATE utf8_unicode_ci;
USE mycompanyname
-Instead of mycompanyname use the name of your company. Note that the name of
-the database must all be in lower case.
+Instead of mycompanyname use the name of your company. Note that the name of the database must all be in lower case.
This creates a weberp database and populates it with only the very basic data to start off.
The files weberp-demo.sql and weberp-new.sql should be in webERP/sql/mysql directory.
@@ -224,11 +213,9 @@
shell > mysql --user=weberp_db_user --p mysql < /path_to_the_sql_script/weberp-new.sql
-as required. You will be prompted for the mysql password that you created
-earlier.
+as required. You will be prompted for the mysql password that you created earlier.
-Use webmin (or your favourite MySQL administration program) to confirm that
-the mycompanyname database now exists.
+Use webmin (or your favourite MySQL administration program) to confirm that the mycompanyname database now exists.
In the directory .../webERP/companies you will find a directory called
weberpdemo. You will now need to make a copy of all the files in that directory
@@ -236,11 +223,12 @@
3. Editing config.php
-The webERP archive no longer comes with a config.php file. There is now a
-web-based installer that is activated when there is no config.php file. Simply browse to your webERP installation with the URL http://yourdomain/webERP/ in your browser,
-enter the web access password if you amended the .htaccess file as discussed
-above, accept all cookies, and complete the installation form.
+The webERP archive no longer comes with a config.php file. There is now a web-based installer that is activated when there is no config.php file. Simply browse to your webERP installation with the URL
+http://yourdomain/webERP/ in your browser,
+
+enter the web access password if you amended the .htaccess file as discussed above, accept all cookies, and complete the installation form.
+
You will need to ensure that the directory where you have installed is writable by the system user that the web-server runs as - otherwise the installer will not be able to write the new config.php file.
In step 4 uncheck "Install Tables", because that was done above, and
@@ -259,6 +247,8 @@
Alternatively, config.php may be created by copying config.distrib.php to config.php and then editing the new config.php file with the parameters required for your installation. If you have created the config.php using the web interface
then you may now skip to step 4.
+Note: Once you have installed webERP it is important to remove the installer files by deleting the install directory and all the scripts underneath it. It is also wise to change the permissions on the config.php file to ensure that it can no longer be written to by the web-server.
+
config.php contains a series of user defined variables that determine how the system behaves. Critically it contains the user and password of the database connection and the type of database server being used. There is no going forward without the system being provided with this data. It is important to ensure there are no trailing characters at the end of this file - this is a common installation pitfall since some editors add a character at the end of the file.
The contents of the config.php file appears as follows for reference purposes. The actual file config.php under the webERP directory with all the other scripts must be edited and saved. As you can see the file is well commented, the critical items are the computer $host, the $dbType, the $dbuser and the $dbpassword - other variables can in most cases be left at their defaults. Note that the sha1 encryption requires the PHP version 4.3 or greater - if you are using a prior version of php - not recommended - you could try md5 encryption. Lines commencing with // are comments and not interpreted by PHP. (Note: In prior versions a variable $DatabaseName used to be required in config.php this is no longer required as the webERP database names available are derived from the directory names under webERP/companies/ - when you create a new database using weberp-new.sql you must also copy the directory structure for the company weberp to another directory under webERP/companies with the same name as the database created. If you are using the demo data and the webERP/sql/mysql/weberp-demo.sql script then the database is created as weberp and the company directory weberp already exists under webERP/companies)
@@ -317,9 +307,6 @@
//$CryptFunction = ""; // Plain Text
-
-
-
4. Logging In For the First Time
Open a browser and enter the URL for the web server directory where webERP is installed if the broswer is on the same machine as the server perhaps
@@ -345,7 +332,7 @@
uploads the logo to the required place - the logo must be a .jpg - the logo file is used for invoices and statements and should be smaller than 50KB
To this go to:
-http://youdomain/webERP/Z_MakeNewCompany.php
+http://yourdomain/webERP/Z_MakeNewCompany.php
Ensure that "Create Database?" is not ticked. Click on "Proceed".
It is imperative to go through each of the screens from the setup tab and enter the appropriate information. Particularly the company information and the configuration settings. Each of these settings together with the narrative explaining what each of the settings does should be reviewed in detail before starting off with the system.
@@ -369,7 +356,6 @@
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Copyright weberp.org 2010 - Contact: in...@we...
\ No newline at end of file
Modified: trunk/doc/Manual/ManualAPIFunctions.php
===================================================================
--- trunk/doc/Manual/ManualAPIFunctions.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/doc/Manual/ManualAPIFunctions.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -3,8 +3,12 @@
/* $Id: ManualAPIFunctions.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
$PageSecurity = 1;
-$PathPrefix= $_SERVER['HTTP_HOST'].$rootpath.'/../../';
-//include('../../includes/session.inc');
+
+//$PathPrefix= $_SERVER['HTTP_HOST'].$rootpath.'/../../';
+//$PathPrefix= '/../';
+
+include('../../includes/session.inc');
+
include('../../xmlrpc/lib/xmlrpc.inc');
include('../../api/api_errorcodes.php');
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/includes/ConnectDB.inc 2012-01-03 06:35:27 UTC (rev 4791)
@@ -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.4'; //must update manually every time there is a DB change
+$Version='4.06.5'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/install/index.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -2,6 +2,12 @@
/* $Id$*/
error_reporting(E_ALL);
ini_set('display_errors', 'On');
+
+if (file_exists('../config.php')) {
+ echo '<br />A configuration webERP installation already exists - the file config.php in the webERP installation has been created and must be removed before this utility can be re-run';
+ exit;
+}
+
// Start a session
if(!defined('SESSION_STARTED')) {
session_name('ba_session_id');
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-28 22:31:24 UTC (rev 4790)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2012-01-03 06:35:27 UTC (rev 4791)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 10:44+1300\n"
+"POT-Creation-Date: 2012-01-03 19:41+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:2026
-#: CounterSales.php:2152 Credit_Invoice.php:255 CreditStatus.php:21
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2020
+#: CounterSales.php:2146 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
@@ -699,10 +699,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: 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
+#: Stocks.php:1019 UpgradeDatabase.php:183 UpgradeDatabase.php:186
+#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195
+#: UpgradeDatabase.php:198 UpgradeDatabase.php:201 UpgradeDatabase.php:204
+#: UpgradeDatabase.php:207 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,8 +888,8 @@
#: 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:1366
-#: CounterSales.php:1380 Credit_Invoice.php:697 Credit_Invoice.php:718
+#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1360
+#: CounterSales.php:1374 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
@@ -1157,7 +1157,7 @@
msgstr "ID uživatele"
#: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298
-#: CounterSales.php:2158 CounterSales.php:2161 CustomerTransInquiry.php:31
+#: CounterSales.php:2152 CounterSales.php:2155 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
@@ -1223,8 +1223,8 @@
msgid "Table"
msgstr "Tabulka"
-#: AuditTrail.php:167 api/api_xml-rpc.php:314 api/api_xml-rpc.php:729
-#: api/api_xml-rpc.php:1914
+#: AuditTrail.php:167 api/api_xml-rpc.php:314 api/api_xml-rpc.php:727
+#: api/api_xml-rpc.php:1912
msgid "Field Name"
msgstr "Název pole"
@@ -1918,7 +1918,7 @@
#: 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:742
-#: CounterSales.php:2037 CounterSales.php:2222 CounterSales.php:2348
+#: CounterSales.php:2031 CounterSales.php:2216 CounterSales.php:2342
#: 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
@@ -1958,8 +1958,8 @@
#: includes/PDFStockCheckPageHeader.inc:44
#: includes/PDFStockNegativesHeader.inc:33
#: includes/PDFStockTransferHeader.inc:39 includes/PDFTransPageHeader.inc:209
-#: includes/PO_PDFOrderPageHeader.inc:78 api/api_xml-rpc.php:2260
-#: api/api_xml-rpc.php:2306 api/api_xml-rpc.php:2502
+#: includes/PO_PDFOrderPageHeader.inc:78 api/api_xml-rpc.php:2258
+#: api/api_xml-rpc.php:2304 api/api_xml-rpc.php:2500
msgid "Quantity"
msgstr "Množství"
@@ -2097,7 +2097,7 @@
msgstr "Stavět"
#: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856
-#: CounterSales.php:2033 CounterSales.php:2218 PO_SelectOSPurchOrder.php:236
+#: CounterSales.php:2027 CounterSales.php:2212 PO_SelectOSPurchOrder.php:236
#: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70
#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:551
#: SelectOrderItems.php:1488 SelectOrderItems.php:1672
@@ -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:2031
-#: CounterSales.php:2216 CreditStatus.php:152 CreditStatus.php:241
+#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2025
+#: CounterSales.php:2210 CreditStatus.php:152 CreditStatus.php:241
#: EmailConfirmation.php:192 FixedAssetCategories.php:163
#: FixedAssetDepreciation.php:86 FixedAssetRegister.php:83
#: FixedAssetRegister.php:372 FixedAssetTransfer.php:50
@@ -2205,7 +2205,7 @@
#: includes/PDFStockLocTransferHeader.inc:49
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:207
-#: includes/PDFTransPageHeaderPortrait.inc:262 api/api_xml-rpc.php:3046
+#: includes/PDFTransPageHeaderPortrait.inc:262 api/api_xml-rpc.php:3044
msgid "Description"
msgstr "Popis"
@@ -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:2183
+#: Contracts.php:756 Contracts.php:759 CounterSales.php:2177
#: CustomerReceipt.php:1106 CustomerReceipt.php:1109
#: DiscountCategories.php:104 DiscountCategories.php:106
#: DiscountCategories.php:110 DiscountCategories.php:112
@@ -2324,7 +2324,7 @@
msgstr "Skladový kód"
#: BOMInquiry.php:37 BOMs.php:844 ContractBOM.php:334 Contracts.php:764
-#: CounterSales.php:2187 CustomerReceipt.php:1116 FixedAssetTransfer.php:72
+#: CounterSales.php:2181 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:979
#: SelectCustomer.php:369 SelectGLAccount.php:96 SelectOrderItems.php:595
@@ -2361,7 +2361,7 @@
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:2030 CounterSales.php:2215 CustomerBranches.php:367
+#: CounterSales.php:2024 CounterSales.php:2209 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
@@ -2379,7 +2379,7 @@
msgstr "Kód"
#: BOMInquiry.php:115 BOMs.php:857 ConfirmDispatch_Invoice.php:280
-#: ContractBOM.php:347 CounterSales.php:2032 CounterSales.php:2217
+#: ContractBOM.php:347 CounterSales.php:2026 CounterSales.php:2211
#: 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
@@ -2664,7 +2664,7 @@
msgid "The SQL used to retrieve description of the parent part was"
msgstr "SQL slouží k získání popisu mateřské část byla"
-#: BOMs.php:405 ConfirmDispatch_Invoice.php:1021 CounterSales.php:1414
+#: BOMs.php:405 ConfirmDispatch_Invoice.php:1021 CounterSales.php:1408
#: Credit_Invoice.php:753 Credit_Invoice.php:781 SelectCreditItems.php:1454
#: Stocks.php:940 Stocks.php:942
msgid "Assembly"
@@ -2714,8 +2714,8 @@
#: 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
-#: api/api_xml-rpc.php:2304 api/api_xml-rpc.php:2500
+#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2256
+#: api/api_xml-rpc.php:2302 api/api_xml-rpc.php:2498
msgid "Location"
msgstr "Umístění"
@@ -2834,7 +2834,7 @@
#: DiscountMatrix.php:160 PricesByCost.php:262 Prices.php:223
#: SalesAnalRepts.php:32 SalesAnalRepts.php:34 SalesGLPostings.php:112
#: SalesGLPostings.php:224 SalesGLPostings.php:354 SelectOrderItems.php:713
-#: api/api_xml-rpc.php:931 api/api_xml-rpc.php:974
+#: api/api_xml-rpc.php:929 api/api_xml-rpc.php:972
msgid "Sales Type"
msgstr "Prodej Typ"
@@ -3115,7 +3115,7 @@
msgid "Back to Confirmation of Dispatch"
msgstr "Zpět na Potvrzení o odeslání"
-#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1251
+#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1245
#: 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
@@ -3231,7 +3231,7 @@
#: ConfirmDispatch_Invoice.php:277 ContractBOM.php:235 ContractCosting.php:79
#: ContractCosting.php:85 Contracts.php:959 CounterSales.php:740
-#: CounterSales.php:2347 Credit_Invoice.php:269 DeliveryDetails.php:825
+#: CounterSales.php:2341 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
@@ -3312,7 +3312,7 @@
#: includes/DefineLabelClass.php:49 includes/PDFQuotationPageHeader.inc:104
#: includes/PDFQuotationPortraitPageHeader.inc:104
#: includes/PDFTransPageHeaderPortrait.inc:267
-#: includes/PO_PDFOrderPageHeader.inc:81 api/api_xml-rpc.php:933
+#: includes/PO_PDFOrderPageHeader.inc:81 api/api_xml-rpc.php:931
msgid "Price"
msgstr "Cena"
@@ -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: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
+#: ContractCosting.php:415 CounterSales.php:1247 CounterSales.php:1287
+#: CounterSales.php:1303 CounterSales.php:1340 CounterSales.php:1359
+#: CounterSales.php:1373 CounterSales.php:1414 CounterSales.php:1424
+#: CounterSales.php:1506 CounterSales.php:1527 CounterSales.php:1689
+#: CounterSales.php:1711 CounterSales.php:1736 CounterSales.php:1757
+#: CounterSales.php:1783 CounterSales.php:1806 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
@@ -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: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
+#: ContractCosting.php:415 CounterSales.php:1247 CounterSales.php:1287
+#: CounterSales.php:1303 CounterSales.php:1340 CounterSales.php:1359
+#: CounterSales.php:1373 CounterSales.php:1414 CounterSales.php:1424
+#: CounterSales.php:1506 CounterSales.php:1527 CounterSales.php:1689
+#: CounterSales.php:1711 CounterSales.php:1736 CounterSales.php:1757
+#: CounterSales.php:1783 CounterSales.php:1806 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
@@ -3811,33 +3811,33 @@
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:1253
+#: ConfirmDispatch_Invoice.php:750 CounterSales.php:1247
#: 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:1254
+#: ConfirmDispatch_Invoice.php:751 CounterSales.php:1248
#: 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:1293
+#: ConfirmDispatch_Invoice.php:792 CounterSales.php:1287
#: 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:1294
+#: ConfirmDispatch_Invoice.php:793 CounterSales.php:1288
#: 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:1309
+#: ConfirmDispatch_Invoice.php:808 CounterSales.php:1303
#: Credit_Invoice.php:596 RecurringSalesOrdersProcess.php:692
#: 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:1310
+#: ConfirmDispatch_Invoice.php:809 CounterSales.php:1304
#: Credit_Invoice.php:597 RecurringSalesOrdersProcess.php:693
#: SelectCreditItems.php:1145
msgid ""
@@ -3872,35 +3872,35 @@
msgid "Cannot retrieve the mbflag"
msgstr "Nelze načíst mbflag"
-#: ConfirmDispatch_Invoice.php:939 CounterSales.php:1330
+#: ConfirmDispatch_Invoice.php:939 CounterSales.php:1324
#: 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:1330
+#: ConfirmDispatch_Invoice.php:939 CounterSales.php:1324
msgid "Could not retrieve current location stock"
msgstr "Nepodařilo se získat aktuální polohu vozidla"
-#: ConfirmDispatch_Invoice.php:955 CounterSales.php:1346
+#: ConfirmDispatch_Invoice.php:955 CounterSales.php:1340
#: 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:1347 Credit_Invoice.php:676 GoodsReceived.php:486
+#: CounterSales.php:1341 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:1365
+#: ConfirmDispatch_Invoice.php:973 CounterSales.php:1359
#: 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:1365
+#: ConfirmDispatch_Invoice.php:973 CounterSales.php:1359
#: Credit_Invoice.php:696 EDIMessageFormat.php:43 EDISendInvoices.php:105
#: FixedAssetCategories.php:90 FixedAssetCategories.php:109
#: PricesBasedOnMarkUp.php:334 PricesBasedOnMarkUp.php:350
@@ -3910,11 +3910,11 @@
msgid "because"
msgstr "protože"
-#: ConfirmDispatch_Invoice.php:987 CounterSales.php:1379
+#: ConfirmDispatch_Invoice.php:987 CounterSales.php:1373
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:1414
+#: ConfirmDispatch_Invoice.php:1021 CounterSales.php:1408
#: 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,12 +3926,12 @@
msgid "Order"
msgstr "Objednávka"
-#: ConfirmDispatch_Invoice.php:1027 CounterSales.php:1420
+#: ConfirmDispatch_Invoice.php:1027 CounterSales.php:1414
#: 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:1420
+#: ConfirmDispatch_Invoice.php:1027 CounterSales.php:1414
#: Credit_Invoice.php:787 SelectCreditItems.php:1461 ShipmentCosting.php:397
#: SupplierAllocations.php:139 includes/PDFPaymentRun_PymtFooter.php:57
#: includes/PDFPaymentRun_PymtFooter.php:88
@@ -3942,7 +3942,7 @@
msgid "could not be inserted because"
msgstr "nemůže být vložen, protože"
-#: ConfirmDispatch_Invoice.php:1028 CounterSales.php:1421
+#: ConfirmDispatch_Invoice.php:1028 CounterSales.php:1415
#: Credit_Invoice.php:788 SelectCreditItems.php:1462
msgid ""
"The following SQL to insert the assembly components stock movement records "
@@ -3950,7 +3950,7 @@
msgstr ""
"Následující SQL vložit součásti sestavy záznamy pohyb zásob byla použita"
-#: ConfirmDispatch_Invoice.php:1037 CounterSales.php:1430
+#: ConfirmDispatch_Invoice.php:1037 CounterSales.php:1424
#: Credit_Invoice.php:797 SelectCreditItems.php:1471
msgid ""
"Location stock record could not be updated for an assembly component because"
@@ -3958,7 +3958,7 @@
"Umístění skladové evidenci nemohlo být aktualizovány pro montáž komponent, "
"protože"
-#: ConfirmDispatch_Invoice.php:1038 CounterSales.php:1431
+#: ConfirmDispatch_Invoice.php:1038 CounterSales.php:1425
msgid ""
"The following SQL to update the locations stock record for the component was "
"used"
@@ -3966,7 +3966,7 @@
"Následující SQL aktualizovat umístění skladové účetnictví pro složka byla "
"použita"
-#: ConfirmDispatch_Invoice.php:1120 CounterSales.php:1512
+#: ConfirmDispatch_Invoice.php:1120 CounterSales.php:1506
#: Credit_Invoice.php:872 Credit_Invoice.php:970 Credit_Invoice.php:1008
#: Credit_Invoice.php:1048 RecurringSalesOrdersProcess.php:361
#: ReverseGRN.php:248 SelectCreditItems.php:1212 SelectCreditItems.php:1285
@@ -3974,7 +3974,7 @@
msgstr "Pohyb zásob záznamy nemohly být zařazeny, protože"
#: ConfirmDispatch_Invoice.php:1121 ContractCosting.php:360
-#: CounterSales.php:1513 Credit_Invoice.php:873 Credit_Invoice.php:971
+#: CounterSales.php:1507 Credit_Invoice.php:873 Credit_Invoice.php:971
#: Credit_Invoice.php:1009 GoodsReceived.php:517
#: RecurringSalesOrdersProcess.php:362 ReverseGRN.php:249
#: SelectCreditItems.php:1286 WorkOrderIssue.php:192 WorkOrderReceive.php:350
@@ -3982,14 +3982,14 @@
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:1533
+#: ConfirmDispatch_Invoice.php:1141 CounterSales.php:1527
#: 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:1534
+#: ConfirmDispatch_Invoice.php:1142 CounterSales.php:1528
#: Credit_Invoice.php:1072 RecurringSalesOrdersProcess.php:383
#: SelectCreditItems.php:1307
msgid ""
@@ -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:1612
+#: ConfirmDispatch_Invoice.php:1214 CounterSales.php:1606
#: 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:1613
+#: ConfirmDispatch_Invoice.php:1215 CounterSales.php:1607
#: Credit_Invoice.php:1101 RecurringSalesOrdersProcess.php:422
#: 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:1670
+#: ConfirmDispatch_Invoice.php:1271 CounterSales.php:1664
#: 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:1671
+#: ConfirmDispatch_Invoice.php:1272 CounterSales.php:1665
#: Credit_Invoice.php:1213 RecurringSalesOrdersProcess.php:481
#: 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:1695
+#: ConfirmDispatch_Invoice.php:1297 CounterSales.php:1689
#: 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,9 +4061,9 @@
#: 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:1696
-#: CounterSales.php:1718 CounterSales.php:1743 CounterSales.php:1764
-#: CounterSales.php:1813 Credit_Invoice.php:1244 Credit_Invoice.php:1284
+#: ContractCosting.php:249 ContractCosting.php:267 CounterSales.php:1690
+#: CounterSales.php:1712 CounterSales.php:1737 CounterSales.php:1758
+#: CounterSales.php:1807 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
@@ -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:1717
+#: ConfirmDispatch_Invoice.php:1320 CounterSales.php:1711
msgid ""
"The stock side of the cost of sales GL posting could not be inserted because"
msgstr ""
"Populace straně náklady na prodej GL vysílání nemohly být zařazeny, protože"
-#: ConfirmDispatch_Invoice.php:1347 CounterSales.php:1742
+#: ConfirmDispatch_Invoice.php:1347 CounterSales.php:1736
#: RecurringSalesOrdersProcess.php:508
msgid "The sales GL posting could not be inserted because"
msgstr "Prodeje GL vysílání nemohly být zařazeny, protože"
-#: ConfirmDispatch_Invoice.php:1369 CounterSales.php:1763
+#: ConfirmDispatch_Invoice.php:1369 CounterSales.php:1757
#: RecurringSalesOrdersProcess.php:535
msgid "The sales discount GL posting could not be inserted because"
msgstr "Prodejní slevy GL vysílání nemohly být zařazeny, protože"
@@ -4149,12 +4149,12 @@
msgid "The following SQL to update the fixed asset record was used"
msgstr "Následující SQL k aktualizaci dlouhodobého majetku záznam byl použit"
-#: ConfirmDispatch_Invoice.php:1547 CounterSales.php:1789
+#: ConfirmDispatch_Invoice.php:1547 CounterSales.php:1783
#: RecurringSalesOrdersProcess.php:602
msgid "The total debtor GL posting could not be inserted because"
msgstr "Celková dlužník GL vysílání nemohly být zařazeny, protože"
-#: ConfirmDispatch_Invoice.php:1548 CounterSales.php:1790
+#: ConfirmDispatch_Invoice.php:1548 CounterSales.php:1784
#: RecurringSalesOrdersProcess.php:603
msgid ""
"The following SQL to insert the total debtors control GLTrans record was used"
@@ -4165,24 +4165,24 @@
msgid "The freight GL posting could not be inserted because"
msgstr "Nákladní GL vysílání nemohly být zařazeny, protože"
-#: ConfirmDispatch_Invoice.php:1594 CounterSales.php:1812
+#: ConfirmDispatch_Invoice.php:1594 CounterSales.php:1806
#: Credit_Invoice.php:1412 RecurringSalesOrdersProcess.php:575
#: SelectCreditItems.php:1945
msgid "The tax GL posting could not be inserted because"
msgstr "Daň GL vysílání nemohly být zařazeny, protože"
-#: ConfirmDispatch_Invoice.php:1611 CounterSales.php:1980
+#: ConfirmDispatch_Invoice.php:1611 CounterSales.php:1974
#: RecurringSalesOrdersProcess.php:698 Z_DeleteInvoice.php:146
msgid "Invoice number"
msgstr "Číslo faktury"
-#: ConfirmDispatch_Invoice.php:1611 CounterSales.php:1980
+#: ConfirmDispatch_Invoice.php:1611 CounterSales.php:1974
#: RecurringSalesOrdersProcess.php:698 SelectCreditItems.php:1960
msgid "processed"
msgstr "zpracované"
#: ConfirmDispatch_Invoice.php:1616 ConfirmDispatch_Invoice.php:1618
-#: ContractBOM.php:293 CounterSales.php:1985 CounterSales.php:1987
+#: ContractBOM.php:293 CounterSales.php:1979 CounterSales.php:1981
#: 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
@@ -4197,16 +4197,16 @@
msgstr "Tisk"
#: ConfirmDispatch_Invoice.php:1616 ConfirmDispatch_Invoice.php:1618
-#: CounterSales.php:1985 CounterSales.php:1987
+#: CounterSales.php:1979 CounterSales.php:1981
msgid "Print this invoice"
msgstr "Vytisknout tuto fakturu"
-#: ConfirmDispatch_Invoice.php:1616 CounterSales.php:1985
+#: ConfirmDispatch_Invoice.php:1616 CounterSales.php:1979
#: SystemParameters.php:455
msgid "Landscape"
msgstr "Terén"
-#: ConfirmDispatch_Invoice.php:1618 CounterSales.php:1987
+#: ConfirmDispatch_Invoice.php:1618 CounterSales.php:1981
#: SystemParameters.php:456
msgid "Portrait"
msgstr "Portrét"
@@ -4331,7 +4331,7 @@
#: ContractBOM.php:204 CounterSales.php:442 PO_Items.php:629
#: SelectOrderItems.php:918 includes/SelectOrderItems_IntoCart.inc:59
-#: includes/SelectOrderItems_IntoCart.inc:163
+#: includes/SelectOrderItems_IntoCart.inc:164
msgid "The item code"
msgstr "Položku kód"
@@ -4389,7 +4389,7 @@
msgid "Enter text extracts in the description"
msgstr "Zadejte text extrakty v popisu"
-#: ContractBOM.php:324 CounterSales.php:2183 PO_Items.php:1050
+#: ContractBOM.php:324 CounterSales.php:2177 PO_Items.php:1050
#: SelectCompletedOrder.php:529 SelectCreditItems.php:972
#: SelectOrderItems.php:1638 SelectSalesOrder.php:565 SelectWorkOrder.php:179
msgid "Enter extract of the Stock Code"
@@ -4404,7 +4404,7 @@
msgid "Image"
msgstr "Obrázek"
-#: ContractBOM.php:368 CounterSales.php:2045 FixedAssetItems.php:485
+#: ContractBOM.php:368 CounterSales.php:2039 FixedAssetItems.php:485
#: FixedAssetItems.php:489 PO_Items.php:1096 SalesCategories.php:249
#: SelectCreditItems.php:1018 SelectOrderItems.php:1501
#: SelectOrderItems.php:1679 Stocks.php:834 Stocks.php:838
@@ -5054,7 +5054,7 @@
msgstr "Zákazník vybraný záznam"
#: Contracts.php:714 CounterSales.php:120 CounterSales.php:154
-#: CounterSales.php:2066 CounterSales.php:2247 DeliveryDetails.php:146
+#: CounterSales.php:2060 CounterSales.php:2241 DeliveryDetails.php:146
#: PO_Header.php:407 PO_Header.php:478 SelectCreditItems.php:179
#: SelectOrderItems.php:382 SelectOrderItems.php:429 SelectOrderItems.php:508
#: SelectOrderItems.php:548 SelectOrderItems.php:1524
@@ -5417,12 +5417,12 @@
msgid "This sale has been cancelled as requested"
msgstr "Tento prodej byl zrušen, jak požaduje"
-#: CounterSales.php:215 CounterSales.php:1989
+#: CounterSales.php:215 CounterSales.php:1983
msgid "Start a new Counter Sale"
msgstr "Začít novou Counter Prodej"
-#: CounterSales.php:222 CounterSales.php:1041 CounterSales.php:1837
-#: CounterSales.php:1856 CounterSales.php:1906 CounterSales.php:1941
+#: CounterSales.php:222 CounterSales.php:1041 CounterSales.php:1831
+#: CounterSales.php:1850 CounterSales.php:1900 CounterSales.php:1935
msgid "Counter Sale"
msgstr "Counter Prodej"
@@ -5726,7 +5726,7 @@
msgid "for"
msgstr "pro"
-#: CounterSales.php:1234 DeliveryDetails.php:564 DeliveryDetails.php:776
+#: CounterSales.php:1232 DeliveryDetails.php:564 DeliveryDetails.php:776
#: EmailConfirmation.php:169 FTP_RadioBeacon.php:185 FTP_RadioBeacon.php:288
#: PO_AuthoriseMyOrders.php:58 PO_OrderDetails.php:27 POReport.php:490
#: POReport.php:499 POReport.php:735 POReport.php:1264 POReport.php:1273
@@ -5740,54 +5740,54 @@
msgid "Order Number"
msgstr "Číslo objednávky"
-#: CounterSales.php:1234 DeliveryDetails.php:562 DeliveryDetails.php:564
+#: CounterSales.php:1232 DeliveryDetails.php:562 DeliveryDetails.php:564
#: SpecialOrder.php:560
msgid "has been entered"
msgstr "byly vloženy"
-#: CounterSales.php:1839
+#: CounterSales.php:1833
msgid ""
"The SQL that failed to insert the GL transaction for the bank account debit "
"was"
msgstr ""
"SQL, které se nepodařilo vložit GL transakce na vrub bankovního účtu bylo"
-#: CounterSales.php:1840 CustomerReceipt.php:460
+#: CounterSales.php:1834 CustomerReceipt.php:460
msgid "Cannot insert a GL transaction for the bank account debit"
msgstr "Nelze vložit transakce GL na vrub bankovního účtu"
-#: CounterSales.php:1858 CustomerReceipt.php:509
+#: CounterSales.php:1852 CustomerReceipt.php:509
msgid ""
"The SQL that failed to insert the GL transaction for the debtors account "
"credit was"
msgstr ""
"SQL, které se nepodařilo vložit GL transakce pro dlužníky účet byl úvěr"
-#: CounterSales.php:1859 CustomerReceipt.php:510
+#: CounterSales.php:1853 CustomerReceipt.php:510
msgid "Cannot insert a GL transaction for the debtors account credit"
msgstr "Nelze vložit GL transakce pro dlužníky účet kreditní"
-#: CounterSales.php:1914 CustomerReceipt.php:487
+#: CounterSales.php:1908 CustomerReceipt.php:487
msgid "The SQL that failed to insert the bank account transaction was"
msgstr "SQL, které se nepodařilo vložit na bankovní účet, transakce byla"
-#: CounterSales.php:1915 CustomerReceipt.php:488
+#: CounterSales.php:1909 CustomerReceipt.php:488
msgid "Cannot insert a bank transaction"
msgstr "Nelze vložit bankovní transakce"
-#: CounterSales.php:1943 CustomerReceipt.php:419
+#: CounterSales.php:1937 CustomerReceipt.php:419
msgid "The SQL that failed to insert the customer receipt transaction was"
msgstr "SQL, které se nepodařilo vložit zákazníkovi přijetí transakce"
-#: CounterSales.php:1944 CustomerReceipt.php:420
+#: CounterSales.php:1938 CustomerReceipt.php:420
msgid "Cannot insert a receipt transaction against the customer because"
msgstr "Nelze vložit přijetí transakce vůči zákazníkovi, protože"
-#: CounterSales.php:1953 CustomerReceipt.php:428
+#: CounterSales.php:1947 CustomerReceipt.php:428
msgid "The SQL that failed to update the date of the last payment received was"
msgstr "SQL, které se nepodařilo aktualizovat datum poslední obdržela platbu,"
-#: CounterSales.php:1954 CustomerReceipt.php:429
+#: CounterSales.php:1948 CustomerReceipt.php:429
msgid ""
"Cannot update the customer record for the date of the last payment received "
"because"
@@ -5795,27 +5795,27 @@
"Nelze aktualizovat záznam zákazníka na datum poslední platby, kterou "
"obdrželo, protože"
-#: CounterSales.php:1967
+#: CounterSales.php:1961
msgid ""
"The SQL that failed to insert the allocation of the receipt to the invoice "
"was"
msgstr "SQL, které se nepodařilo vložit rozdělení obdržení faktury"
-#: CounterSales.php:1968
+#: CounterSales.php:1962
msgid ""
"Cannot insert the customer allocation of the receipt to the invoice because"
msgstr "Nelze vložit přidělování zákazníků po obdržení k faktuře, protože"
-#: CounterSales.php:2006 SelectCreditItems.php:938 SelectOrderItems.php:1460
+#: CounterSales.php:2000 SelectCreditItems.php:938 SelectOrderItems.php:1460
msgid "Yes Please"
msgstr "Ano, prosím"
-#: CounterSales.php:2027 CounterSales.php:2028 SelectOrderItems.php:1481
+#: CounterSales.php:2021 CounterSales.php:2022 SelectOrderItems.php:1481
#: SelectOrderItems.php:1482 SystemParameters.php:405
msgid "Frequently Ordered Items"
msgstr "Často objednané položky"
-#: CounterSales.php:2028 SelectOrderItems.php:1482
+#: CounterSales.php:2022 SelectOrderItems.php:1482
msgid ""
", shows the most frequently ordered items in the last 6 months. You can "
"choose from this list, or search further for other items"
@@ -5823,43 +5823,43 @@
", Ukazuje nejčastěji objednaného zboží v posledních 6 měsících. Můžete si "
"vybrat z tohoto seznamu, nebo hledat další za další položky"
-#: CounterSales.php:2034 CounterSales.php:2219 SelectOrderItems.php:1489
+#: CounterSales.php:2028 CounterSales.php:2213 SelectOrderItems.php:1489
#: SelectOrderItems.php:1673
msgid "On Demand"
msgstr "On Demand"
-#: CounterSales.php:2035 CounterSales.php:2220 SelectOrderItems.php:1490
+#: CounterSales.php:2029 CounterSales.php:2214 SelectOrderItems.php:1490
#: SelectOrderItems.php:1674 StockLocStatus.php:166 StockStatus.php:90
msgid "On Order"
msgstr "Na objednávku"
-#: CounterSales.php:2036 CounterSales.php:2221 SelectOrderItems.php:1491
+#: CounterSales.php:2030 CounterSales.php:2215 SelectOrderItems.php:1491
#: SelectOrderItems.php:1675 StockLocStatus.php:165 StockStatus.php:89
#: includes/OutputSerialItems.php:37 includes/PDFStockCheckPageHeader.inc:40
msgid "Available"
msgstr "K dispozici"
-#: CounterSales.php:2065 CounterSales.php:2247 SelectOrderItems.php:1523
+#: CounterSales.php:2059 CounterSales.php:2241 SelectOrderItems.php:1523
#: SelectOrderItems.php:1705 StockCheck.php:221 StockLocStatus.php:183
#: StockLocStatus.php:206 StockStatus.php:115 StockStatus.php:139
msgid "The demand for this product from"
msgstr "Poptávka po tomto produktu ze"
-#: CounterSales.php:2083 CounterSales.php:2097 CounterSales.php:2265
-#: CounterSales.php:2279 SelectOrderItems.php:1541 SelectOrderItems.php:1555
+#: CounterSales.php:2077 CounterSales.php:2091 CounterSales.php:2259
+#: CounterSales.php:2273 SelectOrderItems.php:1541 SelectOrderItems.php:1555
#: SelectOrderItems.php:1725 SelectOrderItems.php:1739
msgid "The order details for this product cannot be retrieved because"
msgstr "Podrobnosti objednávky pro tento produkt není možné získat, protože"
-#: CounterSales.php:2146 CounterSales.php:2211 CounterSales.php:2334
+#: CounterSales.php:2140 CounterSales.php:2205 CounterSales.php:2328
msgid "Add to Sale"
msgstr "Přidat k prodeji"
-#: CounterSales.php:2153 CounterSales.php:2154
+#: CounterSales.php:2147 CounterSales.php:2148
msgid "Search for Items"
msgstr "Hledání položky"
-#: CounterSales.php:2154 SelectOrderItems.php:1606
+#: CounterSales.php:2148 SelectOrderItems.php:1606
msgid ""
", Searches the database for items, you can narrow the results by selecting a "
"stock category, or just enter a partial item description or partial item code"
@@ -5867,58 +5867,58 @@
", Vyhledávání v databázi pro položky, můžete zúžit výsledky výběrem akcií "
"kategorie, nebo stačí zadat dílčí položky popis nebo dílčí položky kód"
-#: CounterSales.php:2155 SelectOrderItems.php:1607
+#: CounterSales.php:2149 SelectOrderItems.php:1607
msgid "Select a Stock Category"
msgstr "Vyberte kategorii skladem"
-#: CounterSales.php:2180 SelectOrderItems.php:1631
+#: CounterSales.php:2174 SelectOrderItems.php:1631
msgid "Enter partial Description"
msgstr "Zadejte část Popis"
-#: CounterSales.php:2188 SelectOrderItems.php:1646
+#: CounterSales.php:2182 SelectOrderItems.php:1646
msgid "Use Quick Entry"
msgstr "Použití rychlé zadávání"
-#: CounterSales.php:2199 SelectOrderItems.php:1659
+#: CounterSales.php:2193 SelectOrderItems.php:1659
msgid ""
"Select an item by entering the quantity required. Click Order when ready."
msgstr ""
"Vyberte položku zadáním požadované množství. Klepněte na tlačítko Objednat "
"kdy připraven."
-#: CounterSales.php:2210 CounterSales.php:2333 SelectOrderItems.php:1665
+#: CounterSales.php:2204 CounterSales.php:2327 SelectOrderItems.php:1665
#: SelectOrderItems.php:1785
msgid "Prev"
msgstr "Předcházející"
-#: CounterSales.php:2212 CounterSales.php:2335 MRPReport.php:738
+#: CounterSales.php:2206 CounterSales.php:2329 MRPReport.php:738
#: SelectAsset.php:236 SelectCustomer.php:406 SelectCustomer.php:487
#: SelectOrderItems.php:1667 SelectOrderItems.php:1787 SelectProduct.php:723
#: SelectSupplier.php:249 SelectSupplier.php:311
msgid "Next"
msgstr "Další"
-#: CounterSales.php:2343
+#: CounterSales.php:2337
msgid "Use this form to add items quickly if the item codes are already known"
msgstr ""
"Pomocí tohoto formuláře můžete přidat položky rychle, pokud je položka kódy "
"jsou již známy"
-#: CounterSales.php:2368 SelectCreditItems.php:981 SelectCreditItems.php:1032
+#: CounterSales.php:2362 SelectCreditItems.php:981 SelectCreditItems.php:1032
#: SelectOrderItems.php:1795 SelectOrderItems.php:1821
msgid "Quick Entry"
msgstr "Rychlé zadávání"
-#: CounterSales.php:2369 SelectCreditItems.php:1050 SelectOrderItems.php:1822
+#: CounterSales.php:2363 SelectCreditItems.php:1050 SelectOrderItems.php:1822
#: SelectOrderItems.php:1842
msgid "Search Parts"
msgstr "Hledat díly"
-#: CounterSales.php:2373
+#: CounterSales.php:2367
msgid "Cancel Sale"
msgstr "Zrušit Prodej"
-#: CounterSales.php:2373
+#: CounterSales.php:2367
msgid "Are you sure you wish to cancel this sale?"
msgstr "Jste si jisti, že chcete zrušit tento prodej?"
@@ -14126,7 +14126,7 @@
"Ověřte si, že daňová provincie jsou nastaveny pro všechny lokality odeslání"
#: Locations.php:358 Locations.php:463 Locations.php:475
-#: api/api_xml-rpc.php:828
+#: api/api_xml-rpc.php:826
msgid "Location Code"
msgstr "Umístění kódu"
@@ -20899,8 +20899,8 @@
msgstr ""
"Nepodařilo se načíst daně provincii místo, odkud byl příkaz splněn, protože:"
-#: RecurringSalesOrdersProcess.php:273 includes/DefineCartClass.php:312
-#: includes/DefineCartClass.php:349 includes/DefineCartClass.php:400
+#: RecurringSalesOrdersProcess.php:273 includes/DefineCartClass.php:313
+#: includes/DefineCartClass.php:350 includes/DefineCartClass.php:401
#: includes/DefineSuppTransClass.php:72
msgid "The taxes and rates for this item could not be retrieved because"
msgstr "Poplatků a dávek pro tuto položku se nepodařilo získat, protože"
@@ -22291,7 +22291,7 @@
msgid "Salesman Code"
msgstr "Kód prodejce"
-#: SalesInquiry.php:965 api/api_xml-rpc.php:1609
+#: SalesInquiry.php:965 api/api_xml-rpc.php:1607
msgid "Salesman Name"
msgstr "Jméno prodejce"
@@ -24065,7 +24065,7 @@
msgid "The work order number entered MUST be numeric"
msgstr "Práce, aby zadané číslo musí být číslo"
-#: SelectWorkOrder.php:26 api/api_xml-rpc.php:2300 api/api_xml-rpc.php:2496
+#: SelectWorkOrder.php:26 api/api_xml-rpc.php:2298 api/api_xml-rpc.php:2494
msgid "Work Order Number"
msgstr "Práce Pořadové číslo"
@@ -25726,7 +25726,7 @@
msgstr "Stavu zásob v každém místě, nemůže získat, protože"
#: StockLocStatus.php:160 StockSerialItemResearch.php:75
-#: api/api_xml-rpc.php:2043
+#: api/api_xml-rpc.php:2041
msgid "StockID"
msgstr "StockID"
@@ -28780,11 +28780,11 @@
msgid "Items to offer from"
msgstr "Položky, které nabízí od"
-#: SupplierTenders.php:263 api/api_xml-rpc.php:696 api/api_xml-rpc.php:764
-#: api/api_xml-rpc.php:795 api/api_xml-rpc.php:826 api/api_xml-rpc.php:865
-#: api/api_xml-rpc.php:896 api/api_xml-rpc.php:927 api/api_xml-rpc.php:970
-#: api/api_xml-rpc.php:2220 api/api_xml-rpc.php:2256 api/api_xml-rpc.php:2302
-#: api/api_xml-rpc.php:...
[truncated message content] |
|
From: <dai...@us...> - 2012-01-03 06:35:37
|
Revision: 4791
http://web-erp.svn.sourceforge.net/web-erp/?rev=4791&view=rev
Author: daintree
Date: 2012-01-03 06:35:27 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/api/api_login.php
trunk/api/api_xml-rpc.php
trunk/doc/Change.log
trunk/doc/INSTALL.txt
trunk/doc/Manual/ManualAPIFunctions.php
trunk/includes/ConnectDB.inc
trunk/install/index.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/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/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/UpgradeDatabase.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -128,8 +128,9 @@
case '4.06.1':
case '4.06.2':
case '4.06.3':
+ case '4.06.4':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.4':
+ case '4.06.5':
break;
} //end switch
}
Modified: trunk/api/api_login.php
===================================================================
--- trunk/api/api_login.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/api/api_login.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -100,7 +100,7 @@
* function should be called when a successful login occurs.
*/
-function DoSetup()
+function DoSetup()
{
global $PathPrefix;
if (isset($_SESSION['db']) AND $_SESSION['db'] != '' )
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/api/api_xml-rpc.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -29,8 +29,8 @@
function xmlrpc_Login($xmlrpcmsg) {
ob_start('ob_file_callback');
$rtn = new xmlrpcresp(php_xmlrpc_encode(LoginAPI($xmlrpcmsg->getParam(0)->scalarval(),
- $xmlrpcmsg->getParam(1)->scalarval(),
- $xmlrpcmsg->getParam(2)->scalarval())));
+ $xmlrpcmsg->getParam(1)->scalarval(),
+ $xmlrpcmsg->getParam(2)->scalarval())));
ob_end_flush();
return $rtn;
}
@@ -73,8 +73,8 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $InsertCustomer_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
-/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+/*E*/$InsertCustomer_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
+/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$InsertCustomer_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_InsertCustomer($xmlrpcmsg){
@@ -109,7 +109,7 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $InsertBranch_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
+/*E*/$InsertBranch_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$InsertBranch_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
@@ -358,19 +358,17 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $GetCurrencyList_sig = array(array($xmlrpcStruct),
-/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
+/*E*/$GetCurrencyList_sig = array(array($xmlrpcStruct),
+/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$GetCurrencyList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_GetCurrencyList($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 2)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList($xmlrpcmsg->getParam( 0 )->scalarval( ),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
-/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList( '', '')));
-/*x*/ }
+/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ } else {
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList( '', '')));
+/*x*/ }
ob_end_flush();
return $rtn;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/doc/Change.log 2012-01-03 06:35:27 UTC (rev 4791)
@@ -1,6 +1,8 @@
webERP Change Log
+3/1/12 Release 4.06.5
+30/12/11 Phil: install/index.php now checks for the existence of config.php before attempting to run the installation script
29/12/11 Phil: includes/SelectOrderItems_intoCart.inc and includes/DefineCartClass.php fix line numbers for order lines
28/12/11 Release 4.06.4
Modified: trunk/doc/INSTALL.txt
===================================================================
--- trunk/doc/INSTALL.txt 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/doc/INSTALL.txt 2012-01-03 06:35:27 UTC (rev 4791)
@@ -107,11 +107,7 @@
Extract the webERP archive under the web server root directory. This will create the webERP directory under the web server root directory and put all the scripts in that directory.
-At this point you may wish to add an extra layer of security by restricting
-access to the webERP system. This is in addition to webERP's own security
-system, so you may wish to skip it, but it is recommended to add this extra layer. In your
-.../htdocs/webERP directory (or wherever your webERP's root directory is)
-amend the file .htaccess thus:
+At this point you may wish to add an extra layer of security by restricting access to the webERP system. This is in addition to webERP's own security system, so you may wish to skip it, but it is recommended to add this extra layer. In your .../htdocs/webERP directory (or wherever your webERP's root directory is) amend the file .htaccess thus:
php_flag magic_quotes_gpc off
php_flag register_globals off
@@ -195,16 +191,10 @@
Note: The scripts provided are created using mysqldump and contain comments. Unfortunately, phpMyAdmin doesn't like these comments so it is recommended to follow the instructions below.
-WebERP expects each company that it manages to have a separate database. For
-example, if you have a company called MyCompany, then it will expect a database
-called mycompany (note that it must all be lower case). Before you start,
-ensure that you have no such database on your system, if you do then you will
-either have to remove it, rename it, or choose a different name for your
-company for the purposes of WebERP. The simplest tool is webmin, or you could
-use phpMyAdmin.
+WebERP expects each company that it manages to have a separate database. For example, if you have a company called MyCompany, then it will expect a database called mycompany (note that it must all be lower case). Before you start, ensure that you have no such database on your system, if you do then you will either have to remove it, rename it, or choose a different name for your
+company for the purposes of WebERP. The simplest tool is webmin, or you could use phpMyAdmin.
-Once you have confirmed that you are ready to create a database you are
-now ready to go ahead, two scripts are provided to ease the database creation.
+Once you have confirmed that you are ready to create a database you are now ready to go ahead, two scripts are provided to ease the database creation.
1. weberp-demo.sql This has a minimal amount of demonstration data in a bogus company set up so that transactions can be tried to see how the system works.
2. weberp-new.sql This script has only the basic data necessary to start a new company system off. If you wish to set up your company on webERP then this is the script to use. weberp-new.sql you will need to create a database first (using phpMyAdmin for example) or add the following sql commands to this script
@@ -212,8 +202,7 @@
COLLATE utf8_unicode_ci;
USE mycompanyname
-Instead of mycompanyname use the name of your company. Note that the name of
-the database must all be in lower case.
+Instead of mycompanyname use the name of your company. Note that the name of the database must all be in lower case.
This creates a weberp database and populates it with only the very basic data to start off.
The files weberp-demo.sql and weberp-new.sql should be in webERP/sql/mysql directory.
@@ -224,11 +213,9 @@
shell > mysql --user=weberp_db_user --p mysql < /path_to_the_sql_script/weberp-new.sql
-as required. You will be prompted for the mysql password that you created
-earlier.
+as required. You will be prompted for the mysql password that you created earlier.
-Use webmin (or your favourite MySQL administration program) to confirm that
-the mycompanyname database now exists.
+Use webmin (or your favourite MySQL administration program) to confirm that the mycompanyname database now exists.
In the directory .../webERP/companies you will find a directory called
weberpdemo. You will now need to make a copy of all the files in that directory
@@ -236,11 +223,12 @@
3. Editing config.php
-The webERP archive no longer comes with a config.php file. There is now a
-web-based installer that is activated when there is no config.php file. Simply browse to your webERP installation with the URL http://yourdomain/webERP/ in your browser,
-enter the web access password if you amended the .htaccess file as discussed
-above, accept all cookies, and complete the installation form.
+The webERP archive no longer comes with a config.php file. There is now a web-based installer that is activated when there is no config.php file. Simply browse to your webERP installation with the URL
+http://yourdomain/webERP/ in your browser,
+
+enter the web access password if you amended the .htaccess file as discussed above, accept all cookies, and complete the installation form.
+
You will need to ensure that the directory where you have installed is writable by the system user that the web-server runs as - otherwise the installer will not be able to write the new config.php file.
In step 4 uncheck "Install Tables", because that was done above, and
@@ -259,6 +247,8 @@
Alternatively, config.php may be created by copying config.distrib.php to config.php and then editing the new config.php file with the parameters required for your installation. If you have created the config.php using the web interface
then you may now skip to step 4.
+Note: Once you have installed webERP it is important to remove the installer files by deleting the install directory and all the scripts underneath it. It is also wise to change the permissions on the config.php file to ensure that it can no longer be written to by the web-server.
+
config.php contains a series of user defined variables that determine how the system behaves. Critically it contains the user and password of the database connection and the type of database server being used. There is no going forward without the system being provided with this data. It is important to ensure there are no trailing characters at the end of this file - this is a common installation pitfall since some editors add a character at the end of the file.
The contents of the config.php file appears as follows for reference purposes. The actual file config.php under the webERP directory with all the other scripts must be edited and saved. As you can see the file is well commented, the critical items are the computer $host, the $dbType, the $dbuser and the $dbpassword - other variables can in most cases be left at their defaults. Note that the sha1 encryption requires the PHP version 4.3 or greater - if you are using a prior version of php - not recommended - you could try md5 encryption. Lines commencing with // are comments and not interpreted by PHP. (Note: In prior versions a variable $DatabaseName used to be required in config.php this is no longer required as the webERP database names available are derived from the directory names under webERP/companies/ - when you create a new database using weberp-new.sql you must also copy the directory structure for the company weberp to another directory under webERP/companies with the same name as the database created. If you are using the demo data and the webERP/sql/mysql/weberp-demo.sql script then the database is created as weberp and the company directory weberp already exists under webERP/companies)
@@ -317,9 +307,6 @@
//$CryptFunction = ""; // Plain Text
-
-
-
4. Logging In For the First Time
Open a browser and enter the URL for the web server directory where webERP is installed if the broswer is on the same machine as the server perhaps
@@ -345,7 +332,7 @@
uploads the logo to the required place - the logo must be a .jpg - the logo file is used for invoices and statements and should be smaller than 50KB
To this go to:
-http://youdomain/webERP/Z_MakeNewCompany.php
+http://yourdomain/webERP/Z_MakeNewCompany.php
Ensure that "Create Database?" is not ticked. Click on "Proceed".
It is imperative to go through each of the screens from the setup tab and enter the appropriate information. Particularly the company information and the configuration settings. Each of these settings together with the narrative explaining what each of the settings does should be reviewed in detail before starting off with the system.
@@ -369,7 +356,6 @@
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Copyright weberp.org 2010 - Contact: in...@we...
\ No newline at end of file
Modified: trunk/doc/Manual/ManualAPIFunctions.php
===================================================================
--- trunk/doc/Manual/ManualAPIFunctions.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/doc/Manual/ManualAPIFunctions.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -3,8 +3,12 @@
/* $Id: ManualAPIFunctions.php 3152 2009-12-11 14:28:49Z tim_schofield $ */
$PageSecurity = 1;
-$PathPrefix= $_SERVER['HTTP_HOST'].$rootpath.'/../../';
-//include('../../includes/session.inc');
+
+//$PathPrefix= $_SERVER['HTTP_HOST'].$rootpath.'/../../';
+//$PathPrefix= '/../';
+
+include('../../includes/session.inc');
+
include('../../xmlrpc/lib/xmlrpc.inc');
include('../../api/api_errorcodes.php');
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/includes/ConnectDB.inc 2012-01-03 06:35:27 UTC (rev 4791)
@@ -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.4'; //must update manually every time there is a DB change
+$Version='4.06.5'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2011-12-28 22:31:24 UTC (rev 4790)
+++ trunk/install/index.php 2012-01-03 06:35:27 UTC (rev 4791)
@@ -2,6 +2,12 @@
/* $Id$*/
error_reporting(E_ALL);
ini_set('display_errors', 'On');
+
+if (file_exists('../config.php')) {
+ echo '<br />A configuration webERP installation already exists - the file config.php in the webERP installation has been created and must be removed before this utility can be re-run';
+ exit;
+}
+
// Start a session
if(!defined('SESSION_STARTED')) {
session_name('ba_session_id');
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-28 22:31:24 UTC (rev 4790)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2012-01-03 06:35:27 UTC (rev 4791)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 10:44+1300\n"
+"POT-Creation-Date: 2012-01-03 19:41+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:2026
-#: CounterSales.php:2152 Credit_Invoice.php:255 CreditStatus.php:21
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2020
+#: CounterSales.php:2146 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
@@ -699,10 +699,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: 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
+#: Stocks.php:1019 UpgradeDatabase.php:183 UpgradeDatabase.php:186
+#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195
+#: UpgradeDatabase.php:198 UpgradeDatabase.php:201 UpgradeDatabase.php:204
+#: UpgradeDatabase.php:207 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,8 +888,8 @@
#: 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:1366
-#: CounterSales.php:1380 Credit_Invoice.php:697 Credit_Invoice.php:718
+#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1360
+#: CounterSales.php:1374 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
@@ -1157,7 +1157,7 @@
msgstr "ID uživatele"
#: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298
-#: CounterSales.php:2158 CounterSales.php:2161 CustomerTransInquiry.php:31
+#: CounterSales.php:2152 CounterSales.php:2155 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
@@ -1223,8 +1223,8 @@
msgid "Table"
msgstr "Tabulka"
-#: AuditTrail.php:167 api/api_xml-rpc.php:314 api/api_xml-rpc.php:729
-#: api/api_xml-rpc.php:1914
+#: AuditTrail.php:167 api/api_xml-rpc.php:314 api/api_xml-rpc.php:727
+#: api/api_xml-rpc.php:1912
msgid "Field Name"
msgstr "Název pole"
@@ -1918,7 +1918,7 @@
#: 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:742
-#: CounterSales.php:2037 CounterSales.php:2222 CounterSales.php:2348
+#: CounterSales.php:2031 CounterSales.php:2216 CounterSales.php:2342
#: 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
@@ -1958,8 +1958,8 @@
#: includes/PDFStockCheckPageHeader.inc:44
#: includes/PDFStockNegativesHeader.inc:33
#: includes/PDFStockTransferHeader.inc:39 includes/PDFTransPageHeader.inc:209
-#: includes/PO_PDFOrderPageHeader.inc:78 api/api_xml-rpc.php:2260
-#: api/api_xml-rpc.php:2306 api/api_xml-rpc.php:2502
+#: includes/PO_PDFOrderPageHeader.inc:78 api/api_xml-rpc.php:2258
+#: api/api_xml-rpc.php:2304 api/api_xml-rpc.php:2500
msgid "Quantity"
msgstr "Množství"
@@ -2097,7 +2097,7 @@
msgstr "Stavět"
#: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856
-#: CounterSales.php:2033 CounterSales.php:2218 PO_SelectOSPurchOrder.php:236
+#: CounterSales.php:2027 CounterSales.php:2212 PO_SelectOSPurchOrder.php:236
#: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70
#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:551
#: SelectOrderItems.php:1488 SelectOrderItems.php:1672
@@ -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:2031
-#: CounterSales.php:2216 CreditStatus.php:152 CreditStatus.php:241
+#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2025
+#: CounterSales.php:2210 CreditStatus.php:152 CreditStatus.php:241
#: EmailConfirmation.php:192 FixedAssetCategories.php:163
#: FixedAssetDepreciation.php:86 FixedAssetRegister.php:83
#: FixedAssetRegister.php:372 FixedAssetTransfer.php:50
@@ -2205,7 +2205,7 @@
#: includes/PDFStockLocTransferHeader.inc:49
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:207
-#: includes/PDFTransPageHeaderPortrait.inc:262 api/api_xml-rpc.php:3046
+#: includes/PDFTransPageHeaderPortrait.inc:262 api/api_xml-rpc.php:3044
msgid "Description"
msgstr "Popis"
@@ -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:2183
+#: Contracts.php:756 Contracts.php:759 CounterSales.php:2177
#: CustomerReceipt.php:1106 CustomerReceipt.php:1109
#: DiscountCategories.php:104 DiscountCategories.php:106
#: DiscountCategories.php:110 DiscountCategories.php:112
@@ -2324,7 +2324,7 @@
msgstr "Skladový kód"
#: BOMInquiry.php:37 BOMs.php:844 ContractBOM.php:334 Contracts.php:764
-#: CounterSales.php:2187 CustomerReceipt.php:1116 FixedAssetTransfer.php:72
+#: CounterSales.php:2181 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:979
#: SelectCustomer.php:369 SelectGLAccount.php:96 SelectOrderItems.php:595
@@ -2361,7 +2361,7 @@
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:2030 CounterSales.php:2215 CustomerBranches.php:367
+#: CounterSales.php:2024 CounterSales.php:2209 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
@@ -2379,7 +2379,7 @@
msgstr "Kód"
#: BOMInquiry.php:115 BOMs.php:857 ConfirmDispatch_Invoice.php:280
-#: ContractBOM.php:347 CounterSales.php:2032 CounterSales.php:2217
+#: ContractBOM.php:347 CounterSales.php:2026 CounterSales.php:2211
#: 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
@@ -2664,7 +2664,7 @@
msgid "The SQL used to retrieve description of the parent part was"
msgstr "SQL slouží k získání popisu mateřské část byla"
-#: BOMs.php:405 ConfirmDispatch_Invoice.php:1021 CounterSales.php:1414
+#: BOMs.php:405 ConfirmDispatch_Invoice.php:1021 CounterSales.php:1408
#: Credit_Invoice.php:753 Credit_Invoice.php:781 SelectCreditItems.php:1454
#: Stocks.php:940 Stocks.php:942
msgid "Assembly"
@@ -2714,8 +2714,8 @@
#: 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
-#: api/api_xml-rpc.php:2304 api/api_xml-rpc.php:2500
+#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2256
+#: api/api_xml-rpc.php:2302 api/api_xml-rpc.php:2498
msgid "Location"
msgstr "Umístění"
@@ -2834,7 +2834,7 @@
#: DiscountMatrix.php:160 PricesByCost.php:262 Prices.php:223
#: SalesAnalRepts.php:32 SalesAnalRepts.php:34 SalesGLPostings.php:112
#: SalesGLPostings.php:224 SalesGLPostings.php:354 SelectOrderItems.php:713
-#: api/api_xml-rpc.php:931 api/api_xml-rpc.php:974
+#: api/api_xml-rpc.php:929 api/api_xml-rpc.php:972
msgid "Sales Type"
msgstr "Prodej Typ"
@@ -3115,7 +3115,7 @@
msgid "Back to Confirmation of Dispatch"
msgstr "Zpět na Potvrzení o odeslání"
-#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1251
+#: ConfirmDispatchControlled_Invoice.php:66 CounterSales.php:1245
#: 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
@@ -3231,7 +3231,7 @@
#: ConfirmDispatch_Invoice.php:277 ContractBOM.php:235 ContractCosting.php:79
#: ContractCosting.php:85 Contracts.php:959 CounterSales.php:740
-#: CounterSales.php:2347 Credit_Invoice.php:269 DeliveryDetails.php:825
+#: CounterSales.php:2341 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
@@ -3312,7 +3312,7 @@
#: includes/DefineLabelClass.php:49 includes/PDFQuotationPageHeader.inc:104
#: includes/PDFQuotationPortraitPageHeader.inc:104
#: includes/PDFTransPageHeaderPortrait.inc:267
-#: includes/PO_PDFOrderPageHeader.inc:81 api/api_xml-rpc.php:933
+#: includes/PO_PDFOrderPageHeader.inc:81 api/api_xml-rpc.php:931
msgid "Price"
msgstr "Cena"
@@ -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: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
+#: ContractCosting.php:415 CounterSales.php:1247 CounterSales.php:1287
+#: CounterSales.php:1303 CounterSales.php:1340 CounterSales.php:1359
+#: CounterSales.php:1373 CounterSales.php:1414 CounterSales.php:1424
+#: CounterSales.php:1506 CounterSales.php:1527 CounterSales.php:1689
+#: CounterSales.php:1711 CounterSales.php:1736 CounterSales.php:1757
+#: CounterSales.php:1783 CounterSales.php:1806 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
@@ -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: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
+#: ContractCosting.php:415 CounterSales.php:1247 CounterSales.php:1287
+#: CounterSales.php:1303 CounterSales.php:1340 CounterSales.php:1359
+#: CounterSales.php:1373 CounterSales.php:1414 CounterSales.php:1424
+#: CounterSales.php:1506 CounterSales.php:1527 CounterSales.php:1689
+#: CounterSales.php:1711 CounterSales.php:1736 CounterSales.php:1757
+#: CounterSales.php:1783 CounterSales.php:1806 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
@@ -3811,33 +3811,33 @@
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:1253
+#: ConfirmDispatch_Invoice.php:750 CounterSales.php:1247
#: 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:1254
+#: ConfirmDispatch_Invoice.php:751 CounterSales.php:1248
#: 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:1293
+#: ConfirmDispatch_Invoice.php:792 CounterSales.php:1287
#: 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:1294
+#: ConfirmDispatch_Invoice.php:793 CounterSales.php:1288
#: 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:1309
+#: ConfirmDispatch_Invoice.php:808 CounterSales.php:1303
#: Credit_Invoice.php:596 RecurringSalesOrdersProcess.php:692
#: 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:1310
+#: ConfirmDispatch_Invoice.php:809 CounterSales.php:1304
#: Credit_Invoice.php:597 RecurringSalesOrdersProcess.php:693
#: SelectCreditItems.php:1145
msgid ""
@@ -3872,35 +3872,35 @@
msgid "Cannot retrieve the mbflag"
msgstr "Nelze načíst mbflag"
-#: ConfirmDispatch_Invoice.php:939 CounterSales.php:1330
+#: ConfirmDispatch_Invoice.php:939 CounterSales.php:1324
#: 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:1330
+#: ConfirmDispatch_Invoice.php:939 CounterSales.php:1324
msgid "Could not retrieve current location stock"
msgstr "Nepodařilo se získat aktuální polohu vozidla"
-#: ConfirmDispatch_Invoice.php:955 CounterSales.php:1346
+#: ConfirmDispatch_Invoice.php:955 CounterSales.php:1340
#: 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:1347 Credit_Invoice.php:676 GoodsReceived.php:486
+#: CounterSales.php:1341 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:1365
+#: ConfirmDispatch_Invoice.php:973 CounterSales.php:1359
#: 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:1365
+#: ConfirmDispatch_Invoice.php:973 CounterSales.php:1359
#: Credit_Invoice.php:696 EDIMessageFormat.php:43 EDISendInvoices.php:105
#: FixedAssetCategories.php:90 FixedAssetCategories.php:109
#: PricesBasedOnMarkUp.php:334 PricesBasedOnMarkUp.php:350
@@ -3910,11 +3910,11 @@
msgid "because"
msgstr "protože"
-#: ConfirmDispatch_Invoice.php:987 CounterSales.php:1379
+#: ConfirmDispatch_Invoice.php:987 CounterSales.php:1373
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:1414
+#: ConfirmDispatch_Invoice.php:1021 CounterSales.php:1408
#: 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,12 +3926,12 @@
msgid "Order"
msgstr "Objednávka"
-#: ConfirmDispatch_Invoice.php:1027 CounterSales.php:1420
+#: ConfirmDispatch_Invoice.php:1027 CounterSales.php:1414
#: 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:1420
+#: ConfirmDispatch_Invoice.php:1027 CounterSales.php:1414
#: Credit_Invoice.php:787 SelectCreditItems.php:1461 ShipmentCosting.php:397
#: SupplierAllocations.php:139 includes/PDFPaymentRun_PymtFooter.php:57
#: includes/PDFPaymentRun_PymtFooter.php:88
@@ -3942,7 +3942,7 @@
msgid "could not be inserted because"
msgstr "nemůže být vložen, protože"
-#: ConfirmDispatch_Invoice.php:1028 CounterSales.php:1421
+#: ConfirmDispatch_Invoice.php:1028 CounterSales.php:1415
#: Credit_Invoice.php:788 SelectCreditItems.php:1462
msgid ""
"The following SQL to insert the assembly components stock movement records "
@@ -3950,7 +3950,7 @@
msgstr ""
"Následující SQL vložit součásti sestavy záznamy pohyb zásob byla použita"
-#: ConfirmDispatch_Invoice.php:1037 CounterSales.php:1430
+#: ConfirmDispatch_Invoice.php:1037 CounterSales.php:1424
#: Credit_Invoice.php:797 SelectCreditItems.php:1471
msgid ""
"Location stock record could not be updated for an assembly component because"
@@ -3958,7 +3958,7 @@
"Umístění skladové evidenci nemohlo být aktualizovány pro montáž komponent, "
"protože"
-#: ConfirmDispatch_Invoice.php:1038 CounterSales.php:1431
+#: ConfirmDispatch_Invoice.php:1038 CounterSales.php:1425
msgid ""
"The following SQL to update the locations stock record for the component was "
"used"
@@ -3966,7 +3966,7 @@
"Následující SQL aktualizovat umístění skladové účetnictví pro složka byla "
"použita"
-#: ConfirmDispatch_Invoice.php:1120 CounterSales.php:1512
+#: ConfirmDispatch_Invoice.php:1120 CounterSales.php:1506
#: Credit_Invoice.php:872 Credit_Invoice.php:970 Credit_Invoice.php:1008
#: Credit_Invoice.php:1048 RecurringSalesOrdersProcess.php:361
#: ReverseGRN.php:248 SelectCreditItems.php:1212 SelectCreditItems.php:1285
@@ -3974,7 +3974,7 @@
msgstr "Pohyb zásob záznamy nemohly být zařazeny, protože"
#: ConfirmDispatch_Invoice.php:1121 ContractCosting.php:360
-#: CounterSales.php:1513 Credit_Invoice.php:873 Credit_Invoice.php:971
+#: CounterSales.php:1507 Credit_Invoice.php:873 Credit_Invoice.php:971
#: Credit_Invoice.php:1009 GoodsReceived.php:517
#: RecurringSalesOrdersProcess.php:362 ReverseGRN.php:249
#: SelectCreditItems.php:1286 WorkOrderIssue.php:192 WorkOrderReceive.php:350
@@ -3982,14 +3982,14 @@
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:1533
+#: ConfirmDispatch_Invoice.php:1141 CounterSales.php:1527
#: 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:1534
+#: ConfirmDispatch_Invoice.php:1142 CounterSales.php:1528
#: Credit_Invoice.php:1072 RecurringSalesOrdersProcess.php:383
#: SelectCreditItems.php:1307
msgid ""
@@ -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:1612
+#: ConfirmDispatch_Invoice.php:1214 CounterSales.php:1606
#: 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:1613
+#: ConfirmDispatch_Invoice.php:1215 CounterSales.php:1607
#: Credit_Invoice.php:1101 RecurringSalesOrdersProcess.php:422
#: 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:1670
+#: ConfirmDispatch_Invoice.php:1271 CounterSales.php:1664
#: 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:1671
+#: ConfirmDispatch_Invoice.php:1272 CounterSales.php:1665
#: Credit_Invoice.php:1213 RecurringSalesOrdersProcess.php:481
#: 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:1695
+#: ConfirmDispatch_Invoice.php:1297 CounterSales.php:1689
#: 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,9 +4061,9 @@
#: 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:1696
-#: CounterSales.php:1718 CounterSales.php:1743 CounterSales.php:1764
-#: CounterSales.php:1813 Credit_Invoice.php:1244 Credit_Invoice.php:1284
+#: ContractCosting.php:249 ContractCosting.php:267 CounterSales.php:1690
+#: CounterSales.php:1712 CounterSales.php:1737 CounterSales.php:1758
+#: CounterSales.php:1807 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
@@ -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:1717
+#: ConfirmDispatch_Invoice.php:1320 CounterSales.php:1711
msgid ""
"The stock side of the cost of sales GL posting could not be inserted because"
msgstr ""
"Populace straně náklady na prodej GL vysílání nemohly být zařazeny, protože"
-#: ConfirmDispatch_Invoice.php:1347 CounterSales.php:1742
+#: ConfirmDispatch_Invoice.php:1347 CounterSales.php:1736
#: RecurringSalesOrdersProcess.php:508
msgid "The sales GL posting could not be inserted because"
msgstr "Prodeje GL vysílání nemohly být zařazeny, protože"
-#: ConfirmDispatch_Invoice.php:1369 CounterSales.php:1763
+#: ConfirmDispatch_Invoice.php:1369 CounterSales.php:1757
#: RecurringSalesOrdersProcess.php:535
msgid "The sales discount GL posting could not be inserted because"
msgstr "Prodejní slevy GL vysílání nemohly být zařazeny, protože"
@@ -4149,12 +4149,12 @@
msgid "The following SQL to update the fixed asset record was used"
msgstr "Následující SQL k aktualizaci dlouhodobého majetku záznam byl použit"
-#: ConfirmDispatch_Invoice.php:1547 CounterSales.php:1789
+#: ConfirmDispatch_Invoice.php:1547 CounterSales.php:1783
#: RecurringSalesOrdersProcess.php:602
msgid "The total debtor GL posting could not be inserted because"
msgstr "Celková dlužník GL vysílání nemohly být zařazeny, protože"
-#: ConfirmDispatch_Invoice.php:1548 CounterSales.php:1790
+#: ConfirmDispatch_Invoice.php:1548 CounterSales.php:1784
#: RecurringSalesOrdersProcess.php:603
msgid ""
"The following SQL to insert the total debtors control GLTrans record was used"
@@ -4165,24 +4165,24 @@
msgid "The freight GL posting could not be inserted because"
msgstr "Nákladní GL vysílání nemohly být zařazeny, protože"
-#: ConfirmDispatch_Invoice.php:1594 CounterSales.php:1812
+#: ConfirmDispatch_Invoice.php:1594 CounterSales.php:1806
#: Credit_Invoice.php:1412 RecurringSalesOrdersProcess.php:575
#: SelectCreditItems.php:1945
msgid "The tax GL posting could not be inserted because"
msgstr "Daň GL vysílání nemohly být zařazeny, protože"
-#: ConfirmDispatch_Invoice.php:1611 CounterSales.php:1980
+#: ConfirmDispatch_Invoice.php:1611 CounterSales.php:1974
#: RecurringSalesOrdersProcess.php:698 Z_DeleteInvoice.php:146
msgid "Invoice number"
msgstr "Číslo faktury"
-#: ConfirmDispatch_Invoice.php:1611 CounterSales.php:1980
+#: ConfirmDispatch_Invoice.php:1611 CounterSales.php:1974
#: RecurringSalesOrdersProcess.php:698 SelectCreditItems.php:1960
msgid "processed"
msgstr "zpracované"
#: ConfirmDispatch_Invoice.php:1616 ConfirmDispatch_Invoice.php:1618
-#: ContractBOM.php:293 CounterSales.php:1985 CounterSales.php:1987
+#: ContractBOM.php:293 CounterSales.php:1979 CounterSales.php:1981
#: 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
@@ -4197,16 +4197,16 @@
msgstr "Tisk"
#: ConfirmDispatch_Invoice.php:1616 ConfirmDispatch_Invoice.php:1618
-#: CounterSales.php:1985 CounterSales.php:1987
+#: CounterSales.php:1979 CounterSales.php:1981
msgid "Print this invoice"
msgstr "Vytisknout tuto fakturu"
-#: ConfirmDispatch_Invoice.php:1616 CounterSales.php:1985
+#: ConfirmDispatch_Invoice.php:1616 CounterSales.php:1979
#: SystemParameters.php:455
msgid "Landscape"
msgstr "Terén"
-#: ConfirmDispatch_Invoice.php:1618 CounterSales.php:1987
+#: ConfirmDispatch_Invoice.php:1618 CounterSales.php:1981
#: SystemParameters.php:456
msgid "Portrait"
msgstr "Portrét"
@@ -4331,7 +4331,7 @@
#: ContractBOM.php:204 CounterSales.php:442 PO_Items.php:629
#: SelectOrderItems.php:918 includes/SelectOrderItems_IntoCart.inc:59
-#: includes/SelectOrderItems_IntoCart.inc:163
+#: includes/SelectOrderItems_IntoCart.inc:164
msgid "The item code"
msgstr "Položku kód"
@@ -4389,7 +4389,7 @@
msgid "Enter text extracts in the description"
msgstr "Zadejte text extrakty v popisu"
-#: ContractBOM.php:324 CounterSales.php:2183 PO_Items.php:1050
+#: ContractBOM.php:324 CounterSales.php:2177 PO_Items.php:1050
#: SelectCompletedOrder.php:529 SelectCreditItems.php:972
#: SelectOrderItems.php:1638 SelectSalesOrder.php:565 SelectWorkOrder.php:179
msgid "Enter extract of the Stock Code"
@@ -4404,7 +4404,7 @@
msgid "Image"
msgstr "Obrázek"
-#: ContractBOM.php:368 CounterSales.php:2045 FixedAssetItems.php:485
+#: ContractBOM.php:368 CounterSales.php:2039 FixedAssetItems.php:485
#: FixedAssetItems.php:489 PO_Items.php:1096 SalesCategories.php:249
#: SelectCreditItems.php:1018 SelectOrderItems.php:1501
#: SelectOrderItems.php:1679 Stocks.php:834 Stocks.php:838
@@ -5054,7 +5054,7 @@
msgstr "Zákazník vybraný záznam"
#: Contracts.php:714 CounterSales.php:120 CounterSales.php:154
-#: CounterSales.php:2066 CounterSales.php:2247 DeliveryDetails.php:146
+#: CounterSales.php:2060 CounterSales.php:2241 DeliveryDetails.php:146
#: PO_Header.php:407 PO_Header.php:478 SelectCreditItems.php:179
#: SelectOrderItems.php:382 SelectOrderItems.php:429 SelectOrderItems.php:508
#: SelectOrderItems.php:548 SelectOrderItems.php:1524
@@ -5417,12 +5417,12 @@
msgid "This sale has been cancelled as requested"
msgstr "Tento prodej byl zrušen, jak požaduje"
-#: CounterSales.php:215 CounterSales.php:1989
+#: CounterSales.php:215 CounterSales.php:1983
msgid "Start a new Counter Sale"
msgstr "Začít novou Counter Prodej"
-#: CounterSales.php:222 CounterSales.php:1041 CounterSales.php:1837
-#: CounterSales.php:1856 CounterSales.php:1906 CounterSales.php:1941
+#: CounterSales.php:222 CounterSales.php:1041 CounterSales.php:1831
+#: CounterSales.php:1850 CounterSales.php:1900 CounterSales.php:1935
msgid "Counter Sale"
msgstr "Counter Prodej"
@@ -5726,7 +5726,7 @@
msgid "for"
msgstr "pro"
-#: CounterSales.php:1234 DeliveryDetails.php:564 DeliveryDetails.php:776
+#: CounterSales.php:1232 DeliveryDetails.php:564 DeliveryDetails.php:776
#: EmailConfirmation.php:169 FTP_RadioBeacon.php:185 FTP_RadioBeacon.php:288
#: PO_AuthoriseMyOrders.php:58 PO_OrderDetails.php:27 POReport.php:490
#: POReport.php:499 POReport.php:735 POReport.php:1264 POReport.php:1273
@@ -5740,54 +5740,54 @@
msgid "Order Number"
msgstr "Číslo objednávky"
-#: CounterSales.php:1234 DeliveryDetails.php:562 DeliveryDetails.php:564
+#: CounterSales.php:1232 DeliveryDetails.php:562 DeliveryDetails.php:564
#: SpecialOrder.php:560
msgid "has been entered"
msgstr "byly vloženy"
-#: CounterSales.php:1839
+#: CounterSales.php:1833
msgid ""
"The SQL that failed to insert the GL transaction for the bank account debit "
"was"
msgstr ""
"SQL, které se nepodařilo vložit GL transakce na vrub bankovního účtu bylo"
-#: CounterSales.php:1840 CustomerReceipt.php:460
+#: CounterSales.php:1834 CustomerReceipt.php:460
msgid "Cannot insert a GL transaction for the bank account debit"
msgstr "Nelze vložit transakce GL na vrub bankovního účtu"
-#: CounterSales.php:1858 CustomerReceipt.php:509
+#: CounterSales.php:1852 CustomerReceipt.php:509
msgid ""
"The SQL that failed to insert the GL transaction for the debtors account "
"credit was"
msgstr ""
"SQL, které se nepodařilo vložit GL transakce pro dlužníky účet byl úvěr"
-#: CounterSales.php:1859 CustomerReceipt.php:510
+#: CounterSales.php:1853 CustomerReceipt.php:510
msgid "Cannot insert a GL transaction for the debtors account credit"
msgstr "Nelze vložit GL transakce pro dlužníky účet kreditní"
-#: CounterSales.php:1914 CustomerReceipt.php:487
+#: CounterSales.php:1908 CustomerReceipt.php:487
msgid "The SQL that failed to insert the bank account transaction was"
msgstr "SQL, které se nepodařilo vložit na bankovní účet, transakce byla"
-#: CounterSales.php:1915 CustomerReceipt.php:488
+#: CounterSales.php:1909 CustomerReceipt.php:488
msgid "Cannot insert a bank transaction"
msgstr "Nelze vložit bankovní transakce"
-#: CounterSales.php:1943 CustomerReceipt.php:419
+#: CounterSales.php:1937 CustomerReceipt.php:419
msgid "The SQL that failed to insert the customer receipt transaction was"
msgstr "SQL, které se nepodařilo vložit zákazníkovi přijetí transakce"
-#: CounterSales.php:1944 CustomerReceipt.php:420
+#: CounterSales.php:1938 CustomerReceipt.php:420
msgid "Cannot insert a receipt transaction against the customer because"
msgstr "Nelze vložit přijetí transakce vůči zákazníkovi, protože"
-#: CounterSales.php:1953 CustomerReceipt.php:428
+#: CounterSales.php:1947 CustomerReceipt.php:428
msgid "The SQL that failed to update the date of the last payment received was"
msgstr "SQL, které se nepodařilo aktualizovat datum poslední obdržela platbu,"
-#: CounterSales.php:1954 CustomerReceipt.php:429
+#: CounterSales.php:1948 CustomerReceipt.php:429
msgid ""
"Cannot update the customer record for the date of the last payment received "
"because"
@@ -5795,27 +5795,27 @@
"Nelze aktualizovat záznam zákazníka na datum poslední platby, kterou "
"obdrželo, protože"
-#: CounterSales.php:1967
+#: CounterSales.php:1961
msgid ""
"The SQL that failed to insert the allocation of the receipt to the invoice "
"was"
msgstr "SQL, které se nepodařilo vložit rozdělení obdržení faktury"
-#: CounterSales.php:1968
+#: CounterSales.php:1962
msgid ""
"Cannot insert the customer allocation of the receipt to the invoice because"
msgstr "Nelze vložit přidělování zákazníků po obdržení k faktuře, protože"
-#: CounterSales.php:2006 SelectCreditItems.php:938 SelectOrderItems.php:1460
+#: CounterSales.php:2000 SelectCreditItems.php:938 SelectOrderItems.php:1460
msgid "Yes Please"
msgstr "Ano, prosím"
-#: CounterSales.php:2027 CounterSales.php:2028 SelectOrderItems.php:1481
+#: CounterSales.php:2021 CounterSales.php:2022 SelectOrderItems.php:1481
#: SelectOrderItems.php:1482 SystemParameters.php:405
msgid "Frequently Ordered Items"
msgstr "Často objednané položky"
-#: CounterSales.php:2028 SelectOrderItems.php:1482
+#: CounterSales.php:2022 SelectOrderItems.php:1482
msgid ""
", shows the most frequently ordered items in the last 6 months. You can "
"choose from this list, or search further for other items"
@@ -5823,43 +5823,43 @@
", Ukazuje nejčastěji objednaného zboží v posledních 6 měsících. Můžete si "
"vybrat z tohoto seznamu, nebo hledat další za další položky"
-#: CounterSales.php:2034 CounterSales.php:2219 SelectOrderItems.php:1489
+#: CounterSales.php:2028 CounterSales.php:2213 SelectOrderItems.php:1489
#: SelectOrderItems.php:1673
msgid "On Demand"
msgstr "On Demand"
-#: CounterSales.php:2035 CounterSales.php:2220 SelectOrderItems.php:1490
+#: CounterSales.php:2029 CounterSales.php:2214 SelectOrderItems.php:1490
#: SelectOrderItems.php:1674 StockLocStatus.php:166 StockStatus.php:90
msgid "On Order"
msgstr "Na objednávku"
-#: CounterSales.php:2036 CounterSales.php:2221 SelectOrderItems.php:1491
+#: CounterSales.php:2030 CounterSales.php:2215 SelectOrderItems.php:1491
#: SelectOrderItems.php:1675 StockLocStatus.php:165 StockStatus.php:89
#: includes/OutputSerialItems.php:37 includes/PDFStockCheckPageHeader.inc:40
msgid "Available"
msgstr "K dispozici"
-#: CounterSales.php:2065 CounterSales.php:2247 SelectOrderItems.php:1523
+#: CounterSales.php:2059 CounterSales.php:2241 SelectOrderItems.php:1523
#: SelectOrderItems.php:1705 StockCheck.php:221 StockLocStatus.php:183
#: StockLocStatus.php:206 StockStatus.php:115 StockStatus.php:139
msgid "The demand for this product from"
msgstr "Poptávka po tomto produktu ze"
-#: CounterSales.php:2083 CounterSales.php:2097 CounterSales.php:2265
-#: CounterSales.php:2279 SelectOrderItems.php:1541 SelectOrderItems.php:1555
+#: CounterSales.php:2077 CounterSales.php:2091 CounterSales.php:2259
+#: CounterSales.php:2273 SelectOrderItems.php:1541 SelectOrderItems.php:1555
#: SelectOrderItems.php:1725 SelectOrderItems.php:1739
msgid "The order details for this product cannot be retrieved because"
msgstr "Podrobnosti objednávky pro tento produkt není možné získat, protože"
-#: CounterSales.php:2146 CounterSales.php:2211 CounterSales.php:2334
+#: CounterSales.php:2140 CounterSales.php:2205 CounterSales.php:2328
msgid "Add to Sale"
msgstr "Přidat k prodeji"
-#: CounterSales.php:2153 CounterSales.php:2154
+#: CounterSales.php:2147 CounterSales.php:2148
msgid "Search for Items"
msgstr "Hledání položky"
-#: CounterSales.php:2154 SelectOrderItems.php:1606
+#: CounterSales.php:2148 SelectOrderItems.php:1606
msgid ""
", Searches the database for items, you can narrow the results by selecting a "
"stock category, or just enter a partial item description or partial item code"
@@ -5867,58 +5867,58 @@
", Vyhledávání v databázi pro položky, můžete zúžit výsledky výběrem akcií "
"kategorie, nebo stačí zadat dílčí položky popis nebo dílčí položky kód"
-#: CounterSales.php:2155 SelectOrderItems.php:1607
+#: CounterSales.php:2149 SelectOrderItems.php:1607
msgid "Select a Stock Category"
msgstr "Vyberte kategorii skladem"
-#: CounterSales.php:2180 SelectOrderItems.php:1631
+#: CounterSales.php:2174 SelectOrderItems.php:1631
msgid "Enter partial Description"
msgstr "Zadejte část Popis"
-#: CounterSales.php:2188 SelectOrderItems.php:1646
+#: CounterSales.php:2182 SelectOrderItems.php:1646
msgid "Use Quick Entry"
msgstr "Použití rychlé zadávání"
-#: CounterSales.php:2199 SelectOrderItems.php:1659
+#: CounterSales.php:2193 SelectOrderItems.php:1659
msgid ""
"Select an item by entering the quantity required. Click Order when ready."
msgstr ""
"Vyberte položku zadáním požadované množství. Klepněte na tlačítko Objednat "
"kdy připraven."
-#: CounterSales.php:2210 CounterSales.php:2333 SelectOrderItems.php:1665
+#: CounterSales.php:2204 CounterSales.php:2327 SelectOrderItems.php:1665
#: SelectOrderItems.php:1785
msgid "Prev"
msgstr "Předcházející"
-#: CounterSales.php:2212 CounterSales.php:2335 MRPReport.php:738
+#: CounterSales.php:2206 CounterSales.php:2329 MRPReport.php:738
#: SelectAsset.php:236 SelectCustomer.php:406 SelectCustomer.php:487
#: SelectOrderItems.php:1667 SelectOrderItems.php:1787 SelectProduct.php:723
#: SelectSupplier.php:249 SelectSupplier.php:311
msgid "Next"
msgstr "Další"
-#: CounterSales.php:2343
+#: CounterSales.php:2337
msgid "Use this form to add items quickly if the item codes are already known"
msgstr ""
"Pomocí tohoto formuláře můžete přidat položky rychle, pokud je položka kódy "
"jsou již známy"
-#: CounterSales.php:2368 SelectCreditItems.php:981 SelectCreditItems.php:1032
+#: CounterSales.php:2362 SelectCreditItems.php:981 SelectCreditItems.php:1032
#: SelectOrderItems.php:1795 SelectOrderItems.php:1821
msgid "Quick Entry"
msgstr "Rychlé zadávání"
-#: CounterSales.php:2369 SelectCreditItems.php:1050 SelectOrderItems.php:1822
+#: CounterSales.php:2363 SelectCreditItems.php:1050 SelectOrderItems.php:1822
#: SelectOrderItems.php:1842
msgid "Search Parts"
msgstr "Hledat díly"
-#: CounterSales.php:2373
+#: CounterSales.php:2367
msgid "Cancel Sale"
msgstr "Zrušit Prodej"
-#: CounterSales.php:2373
+#: CounterSales.php:2367
msgid "Are you sure you wish to cancel this sale?"
msgstr "Jste si jisti, že chcete zrušit tento prodej?"
@@ -14126,7 +14126,7 @@
"Ověřte si, že daňová provincie jsou nastaveny pro všechny lokality odeslání"
#: Locations.php:358 Locations.php:463 Locations.php:475
-#: api/api_xml-rpc.php:828
+#: api/api_xml-rpc.php:826
msgid "Location Code"
msgstr "Umístění kódu"
@@ -20899,8 +20899,8 @@
msgstr ""
"Nepodařilo se načíst daně provincii místo, odkud byl příkaz splněn, protože:"
-#: RecurringSalesOrdersProcess.php:273 includes/DefineCartClass.php:312
-#: includes/DefineCartClass.php:349 includes/DefineCartClass.php:400
+#: RecurringSalesOrdersProcess.php:273 includes/DefineCartClass.php:313
+#: includes/DefineCartClass.php:350 includes/DefineCartClass.php:401
#: includes/DefineSuppTransClass.php:72
msgid "The taxes and rates for this item could not be retrieved because"
msgstr "Poplatků a dávek pro tuto položku se nepodařilo získat, protože"
@@ -22291,7 +22291,7 @@
msgid "Salesman Code"
msgstr "Kód prodejce"
-#: SalesInquiry.php:965 api/api_xml-rpc.php:1609
+#: SalesInquiry.php:965 api/api_xml-rpc.php:1607
msgid "Salesman Name"
msgstr "Jméno prodejce"
@@ -24065,7 +24065,7 @@
msgid "The work order number entered MUST be numeric"
msgstr "Práce, aby zadané číslo musí být číslo"
-#: SelectWorkOrder.php:26 api/api_xml-rpc.php:2300 api/api_xml-rpc.php:2496
+#: SelectWorkOrder.php:26 api/api_xml-rpc.php:2298 api/api_xml-rpc.php:2494
msgid "Work Order Number"
msgstr "Práce Pořadové číslo"
@@ -25726,7 +25726,7 @@
msgstr "Stavu zásob v každém místě, nemůže získat, protože"
#: StockLocStatus.php:160 StockSerialItemResearch.php:75
-#: api/api_xml-rpc.php:2043
+#: api/api_xml-rpc.php:2041
msgid "StockID"
msgstr "StockID"
@@ -28780,11 +28780,11 @@
msgid "Items to offer from"
msgstr "Položky, které nabízí od"
-#: SupplierTenders.php:263 api/api_xml-rpc.php:696 api/api_xml-rpc.php:764
-#: api/api_xml-rpc.php:795 api/api_xml-rpc.php:826 api/api_xml-rpc.php:865
-#: api/api_xml-rpc.php:896 api/api_xml-rpc.php:927 api/api_xml-rpc.php:970
-#: api/api_xml-rpc.php:2220 api/api_xml-rpc.php:2256 api/api_xml-rpc.php:2302
-#: api/api_xml-rpc.php:...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-28 22:31:30
|
Revision: 4790
http://web-erp.svn.sourceforge.net/web-erp/?rev=4790&view=rev
Author: daintree
Date: 2011-12-28 22:31:24 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-28 22:26:27 UTC (rev 4789)
+++ trunk/doc/Change.log 2011-12-28 22:31:24 UTC (rev 4790)
@@ -1,5 +1,8 @@
webERP Change Log
+
+29/12/11 Phil: includes/SelectOrderItems_intoCart.inc and includes/DefineCartClass.php fix line numbers for order lines
+
28/12/11 Release 4.06.4
28/12/11 Phil: SelectCreditItems.php SelectOrderItems.php CounterSales.php includes/DefineCartClass.php fixes for ExistingOrder . $identifier
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-28 22:31:30
|
Revision: 4790
http://web-erp.svn.sourceforge.net/web-erp/?rev=4790&view=rev
Author: daintree
Date: 2011-12-28 22:31:24 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-28 22:26:27 UTC (rev 4789)
+++ trunk/doc/Change.log 2011-12-28 22:31:24 UTC (rev 4790)
@@ -1,5 +1,8 @@
webERP Change Log
+
+29/12/11 Phil: includes/SelectOrderItems_intoCart.inc and includes/DefineCartClass.php fix line numbers for order lines
+
28/12/11 Release 4.06.4
28/12/11 Phil: SelectCreditItems.php SelectOrderItems.php CounterSales.php includes/DefineCartClass.php fixes for ExistingOrder . $identifier
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-28 22:26:33
|
Revision: 4789
http://web-erp.svn.sourceforge.net/web-erp/?rev=4789&view=rev
Author: daintree
Date: 2011-12-28 22:26:27 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/CounterSales.php
trunk/includes/DefineCartClass.php
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-12-27 21:47:35 UTC (rev 4788)
+++ trunk/CounterSales.php 2011-12-28 22:26:27 UTC (rev 4789)
@@ -1008,7 +1008,7 @@
// *************************************************************************
// S T A R T O F I N V O I C E S Q L P R O C E S S I N G
// *************************************************************************
-
+ $result = DB_Txn_Begin($db);
/*First add the order to the database - it only exists in the session currently! */
$OrderNo = GetNextTransNo(30, $db);
@@ -1086,7 +1086,7 @@
* and it is a real order (not just a quotation)*/
if ($StockItem->MBflag=='M'
- and $_SESSION['AutoCreateWOs']==1){ //oh yeah its all on!
+ AND $_SESSION['AutoCreateWOs']==1){ //oh yeah its all on!
//now get the data required to test to see if we need to make a new WO
$QOHResult = DB_query("SELECT SUM(quantity) FROM locstock WHERE stockid='" . $StockItem->StockID . "'",$db);
@@ -1229,8 +1229,6 @@
}//end if auto create WOs in on
} /* end inserted line items into sales order details */
- $result = DB_Txn_Commit($db);
-
prnMsg(_('Order Number') . ' ' . $OrderNo . ' ' . _('has been entered'),'success');
/* End of insertion of new sales order */
@@ -1241,10 +1239,6 @@
$InvoiceNo = GetNextTransNo(10, $db);
$PeriodNo = GetPeriod(Date($_SESSION['DefaultDateFormat']), $db);
- /*Start an SQL transaction */
-
- DB_Txn_Begin($db);
-
$DefaultDispatchDate = Date('Y-m-d');
/*Update order header for invoice charged on */
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-12-27 21:47:35 UTC (rev 4788)
+++ trunk/includes/DefineCartClass.php 2011-12-28 22:26:27 UTC (rev 4789)
@@ -60,6 +60,7 @@
var $TaxTotals;
var $TaxGLCodes;
var $BuyerName;
+ var $SpecialInstructions;
function Cart(){
/*Constructor function initialises a new shopping cart */
@@ -157,7 +158,7 @@
discountpercent,
itemdue,
poline)
- VALUES(" . $this->LineCounter . ",
+ VALUES(" . $LineNumber . ",
" . $_SESSION['ExistingOrder' . $identifier] . ",
'" . trim(mb_strtoupper($StockID)) ."',
" . $Qty . ",
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2011-12-27 21:47:35 UTC (rev 4788)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2011-12-28 22:26:27 UTC (rev 4789)
@@ -78,9 +78,9 @@
if ($_SESSION['ExistingOrder' . $identifier]!=0){
$UpdateDB = 'Yes';
- $result = DB_query("SELECT MAX(orderlineno) AS newlineno FROM salesorderdetails WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'",$db);
+ $result = DB_query("SELECT MAX(orderlineno) AS newlineno FROM salesorderdetails WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'",$db);
$MaxNumRow = DB_fetch_row($result);
- if ($MaxNumRow[0] != '' AND $MaxNumRow[0] > 0) {
+ if ($MaxNumRow[0] != '' AND $MaxNumRow[0] >= 0) {
$NewLineNo = $MaxNumRow[0]+1;
} else {
$NewLineNo = 0;
@@ -89,7 +89,7 @@
$UpdateDB = 'No';
$NewLineNo = -1; /* this is ok b/c CartClass will change to the correct line no */
}
-
+
if (isset($StockItem) and $myItemRow['discountcategory'] != '' ){
$DiscCatsDone[$Counter]=$StockItem->DiscCat;
$QuantityOfDiscCat =0;
@@ -115,8 +115,8 @@
if ($_SESSION['Items'.$identifier]->SpecialInstructions) {
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'warn');
}
- if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){ /*Check credit limits is 1 for warn
- and 2 for prohibit sales */
+ if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){
+ /*Check credit limits is 1 for warn and 2 for prohibit sales */
$_SESSION['Items'.$identifier]->CreditAvailable -= round(($NewItemQty * $Price * (1- $Discount)),$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
if ($_SESSION['CheckCreditLimits']==1 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){
@@ -156,7 +156,8 @@
$myItemRow['standardcost'],
$myItemRow['eoq'],
$myItemRow['nextserialno'],
- $ExRate);
+ $ExRate,
+ $identifier);
}
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-28 22:26:33
|
Revision: 4789
http://web-erp.svn.sourceforge.net/web-erp/?rev=4789&view=rev
Author: daintree
Date: 2011-12-28 22:26:27 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/CounterSales.php
trunk/includes/DefineCartClass.php
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-12-27 21:47:35 UTC (rev 4788)
+++ trunk/CounterSales.php 2011-12-28 22:26:27 UTC (rev 4789)
@@ -1008,7 +1008,7 @@
// *************************************************************************
// S T A R T O F I N V O I C E S Q L P R O C E S S I N G
// *************************************************************************
-
+ $result = DB_Txn_Begin($db);
/*First add the order to the database - it only exists in the session currently! */
$OrderNo = GetNextTransNo(30, $db);
@@ -1086,7 +1086,7 @@
* and it is a real order (not just a quotation)*/
if ($StockItem->MBflag=='M'
- and $_SESSION['AutoCreateWOs']==1){ //oh yeah its all on!
+ AND $_SESSION['AutoCreateWOs']==1){ //oh yeah its all on!
//now get the data required to test to see if we need to make a new WO
$QOHResult = DB_query("SELECT SUM(quantity) FROM locstock WHERE stockid='" . $StockItem->StockID . "'",$db);
@@ -1229,8 +1229,6 @@
}//end if auto create WOs in on
} /* end inserted line items into sales order details */
- $result = DB_Txn_Commit($db);
-
prnMsg(_('Order Number') . ' ' . $OrderNo . ' ' . _('has been entered'),'success');
/* End of insertion of new sales order */
@@ -1241,10 +1239,6 @@
$InvoiceNo = GetNextTransNo(10, $db);
$PeriodNo = GetPeriod(Date($_SESSION['DefaultDateFormat']), $db);
- /*Start an SQL transaction */
-
- DB_Txn_Begin($db);
-
$DefaultDispatchDate = Date('Y-m-d');
/*Update order header for invoice charged on */
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-12-27 21:47:35 UTC (rev 4788)
+++ trunk/includes/DefineCartClass.php 2011-12-28 22:26:27 UTC (rev 4789)
@@ -60,6 +60,7 @@
var $TaxTotals;
var $TaxGLCodes;
var $BuyerName;
+ var $SpecialInstructions;
function Cart(){
/*Constructor function initialises a new shopping cart */
@@ -157,7 +158,7 @@
discountpercent,
itemdue,
poline)
- VALUES(" . $this->LineCounter . ",
+ VALUES(" . $LineNumber . ",
" . $_SESSION['ExistingOrder' . $identifier] . ",
'" . trim(mb_strtoupper($StockID)) ."',
" . $Qty . ",
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2011-12-27 21:47:35 UTC (rev 4788)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2011-12-28 22:26:27 UTC (rev 4789)
@@ -78,9 +78,9 @@
if ($_SESSION['ExistingOrder' . $identifier]!=0){
$UpdateDB = 'Yes';
- $result = DB_query("SELECT MAX(orderlineno) AS newlineno FROM salesorderdetails WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'",$db);
+ $result = DB_query("SELECT MAX(orderlineno) AS newlineno FROM salesorderdetails WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'",$db);
$MaxNumRow = DB_fetch_row($result);
- if ($MaxNumRow[0] != '' AND $MaxNumRow[0] > 0) {
+ if ($MaxNumRow[0] != '' AND $MaxNumRow[0] >= 0) {
$NewLineNo = $MaxNumRow[0]+1;
} else {
$NewLineNo = 0;
@@ -89,7 +89,7 @@
$UpdateDB = 'No';
$NewLineNo = -1; /* this is ok b/c CartClass will change to the correct line no */
}
-
+
if (isset($StockItem) and $myItemRow['discountcategory'] != '' ){
$DiscCatsDone[$Counter]=$StockItem->DiscCat;
$QuantityOfDiscCat =0;
@@ -115,8 +115,8 @@
if ($_SESSION['Items'.$identifier]->SpecialInstructions) {
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'warn');
}
- if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){ /*Check credit limits is 1 for warn
- and 2 for prohibit sales */
+ if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){
+ /*Check credit limits is 1 for warn and 2 for prohibit sales */
$_SESSION['Items'.$identifier]->CreditAvailable -= round(($NewItemQty * $Price * (1- $Discount)),$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
if ($_SESSION['CheckCreditLimits']==1 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){
@@ -156,7 +156,8 @@
$myItemRow['standardcost'],
$myItemRow['eoq'],
$myItemRow['nextserialno'],
- $ExRate);
+ $ExRate,
+ $identifier);
}
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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] |
15 messages has been excluded from this view by a project administrator.
