From: <dai...@us...> - 2010-10-26 08:09:40
|
Revision: 4109 http://web-erp.svn.sourceforge.net/web-erp/?rev=4109&view=rev Author: daintree Date: 2010-10-26 08:09:34 +0000 (Tue, 26 Oct 2010) Log Message: ----------- Currencies manual Modified Paths: -------------- trunk/SupplierInvoice.php trunk/doc/Manual/ManualCurrencies.html Modified: trunk/SupplierInvoice.php =================================================================== --- trunk/SupplierInvoice.php 2010-10-26 07:43:54 UTC (rev 4108) +++ trunk/SupplierInvoice.php 2010-10-26 08:09:34 UTC (rev 4109) @@ -959,21 +959,21 @@ /* Now the TAX account */ if ($Tax->TaxOvAmount <>0){ $SQL = "INSERT INTO gltrans (type, - typeno, - trandate, - periodno, - account, - narrative, - amount) - VALUES (20, - '" . $InvoiceNo . "', - '" . $SQLInvoiceDate . "', - '" . $PeriodNo . "', - '" . $Tax->TaxGLCode . "', - '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Inv') . ' ' . - $_SESSION['SuppTrans']->SuppReference . ' ' . $Tax->TaxAuthDescription . ' ' . number_format($Tax->TaxRate*100,2) . '% ' . $_SESSION['SuppTrans']->CurrCode . - $Tax->TaxOvAmount . ' @ ' . _('exch rate') . ' ' . $_SESSION['SuppTrans']->ExRate . "', - '" . round( $Tax->TaxOvAmount/ $_SESSION['SuppTrans']->ExRate,2) . "')"; + typeno, + trandate, + periodno, + account, + narrative, + amount) + VALUES (20, + '" . $InvoiceNo . "', + '" . $SQLInvoiceDate . "', + '" . $PeriodNo . "', + '" . $Tax->TaxGLCode . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Inv') . ' ' . + $_SESSION['SuppTrans']->SuppReference . ' ' . $Tax->TaxAuthDescription . ' ' . number_format($Tax->TaxRate*100,2) . '% ' . $_SESSION['SuppTrans']->CurrCode . + $Tax->TaxOvAmount . ' @ ' . _('exch rate') . ' ' . $_SESSION['SuppTrans']->ExRate . "', + '" . round( $Tax->TaxOvAmount/ $_SESSION['SuppTrans']->ExRate,2) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the tax could not be added because'); @@ -986,22 +986,22 @@ /* Now the control account */ $SQL = "INSERT INTO gltrans (type, - typeno, - trandate, - periodno, - account, - narrative, - amount) - VALUES (20, - '" . $InvoiceNo . "', - '" . $SQLInvoiceDate . "', - '" . $PeriodNo . "', - '" . $_SESSION['SuppTrans']->CreditorsAct . "', - '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Inv') . ' ' . - $_SESSION['SuppTrans']->SuppReference . ' ' . $_SESSION['SuppTrans']->CurrCode . - number_format( $_SESSION['SuppTrans']->OvAmount + $TaxTotal,2) . - ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate . "', - '" . -round(($LocalTotal + ( $TaxTotal / $_SESSION['SuppTrans']->ExRate)),2) . "')"; + typeno, + trandate, + periodno, + account, + narrative, + amount) + VALUES (20, + '" . $InvoiceNo . "', + '" . $SQLInvoiceDate . "', + '" . $PeriodNo . "', + '" . $_SESSION['SuppTrans']->CreditorsAct . "', + '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Inv') . ' ' . + $_SESSION['SuppTrans']->SuppReference . ' ' . $_SESSION['SuppTrans']->CurrCode . + number_format( $_SESSION['SuppTrans']->OvAmount + $TaxTotal,2) . + ' @ ' . _('a rate of') . ' ' . $_SESSION['SuppTrans']->ExRate . "', + '" . -round(($LocalTotal + ( $TaxTotal / $_SESSION['SuppTrans']->ExRate)),2) . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the control total could not be added because'); @@ -1014,26 +1014,26 @@ /*Now insert the invoice into the SuppTrans table*/ $SQL = "INSERT INTO supptrans (transno, - type, - supplierno, - suppreference, - trandate, - duedate, - ovamount, - ovgst, - rate, - transtext) - VALUES ( - '". $InvoiceNo . "', - 20 , - '" . $_SESSION['SuppTrans']->SupplierID . "', - '" . $_SESSION['SuppTrans']->SuppReference . "', - '" . $SQLInvoiceDate . "', - '" . FormatDateForSQL($_SESSION['SuppTrans']->DueDate) . "', - '" . round($_SESSION['SuppTrans']->OvAmount,2) . "', - '" . round($TaxTotal,2) . "', - '" . $_SESSION['SuppTrans']->ExRate . "', - '" . $_SESSION['SuppTrans']->Comments . "')"; + type, + supplierno, + suppreference, + trandate, + duedate, + ovamount, + ovgst, + rate, + transtext) + VALUES ( + '". $InvoiceNo . "', + 20 , + '" . $_SESSION['SuppTrans']->SupplierID . "', + '" . $_SESSION['SuppTrans']->SuppReference . "', + '" . $SQLInvoiceDate . "', + '" . FormatDateForSQL($_SESSION['SuppTrans']->DueDate) . "', + '" . round($_SESSION['SuppTrans']->OvAmount,2) . "', + '" . round($TaxTotal,2) . "', + '" . $_SESSION['SuppTrans']->ExRate . "', + '" . $_SESSION['SuppTrans']->Comments . "')"; $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The supplier invoice transaction could not be added to the database because'); @@ -1047,12 +1047,12 @@ foreach ($_SESSION['SuppTrans']->Taxes AS $TaxTotals) { $SQL = "INSERT INTO supptranstaxes (supptransid, - taxauthid, - taxamount) - VALUES ( - '" . $SuppTransID . "', - '" . $TaxTotals->TaxAuthID . "', - '" . $TaxTotals->TaxOvAmount . "')"; + taxauthid, + taxamount) + VALUES ( + '" . $SuppTransID . "', + '" . $TaxTotals->TaxAuthID . "', + '" . $TaxTotals->TaxOvAmount . "')"; $ErrMsg =_('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The supplier transaction taxes records could not be inserted because'); $DbgMsg = _('The following SQL to insert the supplier transaction taxes record was used:'); Modified: trunk/doc/Manual/ManualCurrencies.html =================================================================== --- trunk/doc/Manual/ManualCurrencies.html 2010-10-26 07:43:54 UTC (rev 4108) +++ trunk/doc/Manual/ManualCurrencies.html 2010-10-26 08:09:34 UTC (rev 4109) @@ -5,20 +5,12 @@ <br><br> Any number of currencies can be defined in webERP. Every currency that is transacted with either in sales (AR) or purchasing (AP) needs to be defined in the system. To define currencies go to the Setup tab -> General -> Currency Maintenance. Only a few fields are required to be completed for each currency defined: <ul> -<li>The ISO 4217 code for the currency - this is the international standard 3 character code that is used worldwide to represent the currency. If the code entered exists then it is possible for webERP to retrieve exchange rates from either the European Central Bank or -<br><br> -Credit Status Ratings can be amended and created from the main menu set up tab from the link labelled Credit Status Maintenance. -<br><br> -<font size="+1"><b>Status Code</b></font> -<br><br> -This is any number from 1 to 100. A rating code is required to be held against every customer to identify the credit status of each. The code cannot be changed retrospectively. -<br><br> -<font size="+1"><b>Status Description</b></font> -<br><br> -This field is used in look ups both in the customers amendment/entry and also in the customer selection screen. This is a text field up to 30 characters long. -<br><br> -<font size="+1"><b>Disallow Invoices</b></font> -<br><br> -For all credit ratings set up, this field indicates whether or not the rating is serious enough to prohibit future invoicing to customers set up with this credit rating. +<li>The ISO 4217 code for the currency - this is the international standard 3 character code that is used worldwide to represent the currency. If the code entered exists then it is possible for webERP to retrieve exchange rates from either the European Central Bank. webERP is capable of updating exchange rates daily from the ECB if set to do so under Setup->Configuration. +</li> +<li>The name of the currency can be any description that describes the currency</li> +<lI>The country of the currency can be entered</li> +<li>The name of 100th of a single unit of the currency can be entered. e.g. pence for GBP or cents for USD</li> +<li>The rate. This must be the number of the local currency that can be purchased with one of this currency.</li> +</ul> <!-- Help End: Currencies --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |