Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5745] trunk
|
From: <dai...@us...> - 2012-11-22 09:08:05
|
Revision: 5745
http://sourceforge.net/p/web-erp/reponame/5745
Author: daintree
Date: 2012-11-22 09:08:01 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
New bookmarks ViewTopic for context sensitive manual links - update manual re Counter Sales
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/RecurringSalesOrders.php
trunk/SalesAnalRepts.php
trunk/SelectRecurringSalesOrder.php
trunk/doc/Manual/ManualSalesOrders.html
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-11-21 09:45:28 UTC (rev 5744)
+++ trunk/AccountGroups.php 2012-11-22 09:08:01 UTC (rev 5745)
@@ -7,6 +7,7 @@
$title = _('Account Groups');
$ViewTopic= 'GeneralLedger';
$BookMark = 'AccountGroups';
+
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-11-21 09:45:28 UTC (rev 5744)
+++ trunk/RecurringSalesOrders.php 2012-11-22 09:08:01 UTC (rev 5745)
@@ -6,10 +6,17 @@
/* Session started in header.inc for password checking the session will contain the details of the order from the Cart class object. The details of the order come from SelectOrderItems.php */
/* webERP manual links before header.inc */
-$ViewTopic= "SalesOrders";
-$BookMark = "RecurringSalesOrders";
+$ViewTopic= 'SalesOrders';
+$BookMark = 'RecurringSalesOrders';
+
include('includes/session.inc');
$title = _('Recurring Orders');
+
+
+/* webERP manual links before header.inc */
+$ViewTopic= 'SalesOrders';
+$BookMark = 'RecurringSalesOrders';
+
include('includes/header.inc');
if (empty($_GET['identifier'])) {
Modified: trunk/SalesAnalRepts.php
===================================================================
--- trunk/SalesAnalRepts.php 2012-11-21 09:45:28 UTC (rev 5744)
+++ trunk/SalesAnalRepts.php 2012-11-22 09:08:01 UTC (rev 5745)
@@ -5,6 +5,9 @@
include('includes/session.inc');
$title = _('Sales Analysis Reports Maintenance');
+/* webERP manual links before header.inc */
+$ViewTopic= 'SalesAnalysis';
+$BookMark = 'SalesAnalysis';
include('includes/header.inc');
Modified: trunk/SelectRecurringSalesOrder.php
===================================================================
--- trunk/SelectRecurringSalesOrder.php 2012-11-21 09:45:28 UTC (rev 5744)
+++ trunk/SelectRecurringSalesOrder.php 2012-11-22 09:08:01 UTC (rev 5745)
@@ -3,6 +3,10 @@
include('includes/session.inc');
$title = _('Search Recurring Sales Orders');
+/* webERP manual links before header.inc */
+$ViewTopic= 'SalesOrders';
+$BookMark = 'RecurringSalesOrders';
+
include('includes/header.inc');
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
Modified: trunk/doc/Manual/ManualSalesOrders.html
===================================================================
--- trunk/doc/Manual/ManualSalesOrders.html 2012-11-21 09:45:28 UTC (rev 5744)
+++ trunk/doc/Manual/ManualSalesOrders.html 2012-11-22 09:08:01 UTC (rev 5745)
@@ -84,18 +84,26 @@
<p>If the automatic freight calculations are being used - see the parameters in config.php, the freight cost will be calculated based on the sum of the whole order cubic metres and weight. The best shipping company will also be returned. The user can choose to charge the freight calculated or just use the cheapest freight company. The freight charge calculated can be over-ridden if required.</p>
-<p>Once all details are entered correctly the Place Order button should be clicked. It is important to note that abandoning the order before this button is clicked there have been no updates to the database and nothing is saved. Clicking into some other screen loses the order as entered. Whilst it is perfectly acceptable to have several browser screens open looking at different inquiries at the same time. It is not possible to have two windows entering two separate sales orders at the same time, entries in the one window will over-write the other. <!-- Help End: SelectOrderItems --></p>
+<p>Once all details are entered correctly the Place Order button should be clicked. It is important to note that abandoning the order before this button is clicked there have been no updates to the database and nothing is saved. Clicking into some other screen loses the order as entered. Whilst it is perfectly acceptable to have several browser screens open looking at different inquiries at the same time. It is not possible to have two windows entering two separate sales orders at the same time, entries in the one window will over-write the other.
+<!-- Help End: SelectOrderItems --></p>
+
<h3><a id="SalesOrderCounterSales">Entry of Cash Sales Directly - Counter Sales</a></h3>
-<p>In version 3.12 of webERP a new feature was introduced which allowed for cash sales to be entered directly without first entering an order and then confirming a dispatch to invoice. This feature is known as "counter sales". From the main menu->Sales tab select Enter Counter Sales. Entry is similar to entering an order, by default the quick entry screen allows entry of item codes and quantities but it is also possible to select items by the search functions in much the same way as an order. The tax is calculated and the total amount to pay is shown. This page also expects the payment to be made and entered. The payment entered is automatically allocated to the sale.</p>
+<p>In version 3.12 of webERP a new feature was introduced which allowed for cash sales to be entered directly without first entering an order and then confirming a dispatch to invoice. This feature is known as "counter sales". From the main menu->Sales tab select Enter Counter Sales. Entry is similar to entering an order, by default the quick entry screen allows entry of item codes and quantities but it is also possible to select items by the search functions in much the same way as an order. The tax is calculated and the total amount to pay is shown. This page also expects the payment to be made and entered. The payment entered is automatically allocated to the sale and the invoice and the payment (receipt) are recorded against a defualt counter sale customer and branch - like any other sale. </p>
-<p>Behind the scenes this script produces all the database entries for an order and an invoice with sales analysis, stock movements etc etc all correctly created. The customer (and customer branch) used for the entries is derived from the user's default inventory location.</p>
+<p>Behind the scenes this script produces all the database entries for an order and an invoice with sales analysis, stock movements etc etc all correctly created. The customer (and customer branch) used for the entries is derived from the user's default inventory location. The only limitation is that serialised and lot controlled stock items cannot be sold using the Counter Sales functionality at the moment.</p>
<h3>Setting Up Counter Sales</h3>
-<p>webERP looks at the user's default location and then looks up against the location record to find the cash sales debtor account (and branch) to use for counter sales entered. Each location for which counter sales are required must first be set up with the cash sales customer and branch which is to be used for counter sales entered. Note that the default location of the customer branch is ignored - the user's default location (see Setup->General->User Maintenance - the script webERP/WWW_Users.php) is used as the location and stock movements are all created from this location against the customer specified in the location record (Setup - > Inventory Setup -> Location Maintenance - the script webERP/Locations.php). To specify the customer and branch to use for counter sales for an inventory location (or warehouse), the customer code and branch code must be entered in the format customercode-branchcode in the field provided for this purpose. i.e. the customer code then a hyphen then the branch code.</p><!-- Help Begin: SelectSalesOrder -->
+<p>webERP looks at the user's default location and then looks up against the location record to find the cash sales debtor account (and branch) to use for counter sales entered. Each location for which counter sales are required must first be set up with the cash sales customer and branch which is to be used for counter sales entered. Note that the default location of the customer branch is ignored - the user's default location (see Setup->General->User Maintenance - the script webERP/WWW_Users.php) is used as the location and stock movements are all created from this location against the customer specified in the location record (Setup - > Inventory Setup -> Location Maintenance - the script webERP/Locations.php). To specify the customer and branch to use for counter sales for an inventory location (or warehouse), the customer code and branch code must be entered.</p>
+<h3>Counter Returns</h3>
+
+<p>To produce credit notes in a customer facing situation it was difficult to first create the credit note manually, then enter a negative receipt (payment) against the customer account, then allocate the credit note to the negative receipt (payment). This has all been simplified with this Counter Returns functionality (new script to 4.09.2). This script allows the return of goods or services with the usual stock functionality and the capability to enter a payment to the customer that automatically allocates directly to the credit note.</p>
+
+<!-- Help Begin: SelectSalesOrder -->
+
<h2><a id="ModifyOrder">Modfiying An Order</a></h2>
<p>Only Outstanding sales orders can be modified. Only these orders have any balance of a quantity remaining to be delivered and/or invoiced. Order lines that have been invoiced completely will not be available for modification. New items cannot be added to the order. Pricing cannot be altered if any amount of the line has already been delivered/invoiced. Quantities of an order line cannot be reduced below the quantity of the line already invoiced.</p>
|
