Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5660] trunk
|
From: <ice...@us...> - 2012-09-12 07:04:57
|
Revision: 5660
http://web-erp.svn.sourceforge.net/web-erp/?rev=5660&view=rev
Author: icedlava
Date: 2012-09-12 07:04:50 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
Manual bookmarks for order related functions.
Modified Paths:
--------------
trunk/CounterSales.php
trunk/DiscountCategories.php
trunk/RecurringSalesOrders.php
trunk/RecurringSalesOrdersProcess.php
trunk/SelectOrderItems.php
trunk/SelectSalesOrder.php
trunk/doc/Manual/ManualSalesOrders.html
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-09-12 06:33:35 UTC (rev 5659)
+++ trunk/CounterSales.php 2012-09-12 07:04:50 UTC (rev 5660)
@@ -9,6 +9,9 @@
include('includes/session.inc');
$title = _('Counter Sales');
+/* webERP manual links before header.inc */
+$ViewTopic= "SalesOrders";
+$BookMark = "SalesOrderCounterSales";
include('includes/header.inc');
include('includes/GetPrice.inc');
Modified: trunk/DiscountCategories.php
===================================================================
--- trunk/DiscountCategories.php 2012-09-12 06:33:35 UTC (rev 5659)
+++ trunk/DiscountCategories.php 2012-09-12 07:04:50 UTC (rev 5660)
@@ -5,7 +5,9 @@
include('includes/session.inc');
$title = _('Discount Categories Maintenance');
-
+/* webERP manual links before header.inc */
+$ViewTopic= "SalesOrders";
+$BookMark = "DiscountMatrix";
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
@@ -140,14 +142,14 @@
if (isset($_POST['search'])) {
if ($_POST['PartID']!='' and $_POST['PartDesc']=='')
- $sql="SELECT stockid, description FROM stockmaster
+ $sql="SELECT stockid, description FROM stockmaster
WHERE stockid " . LIKE . " '%".$_POST['PartID']."%'";
if ($_POST['PartID']=='' and $_POST['PartDesc']!='')
- $sql="SELECT stockid, description FROM stockmaster
+ $sql="SELECT stockid, description FROM stockmaster
WHERE description " . LIKE . " '%".$_POST['PartDesc']."%'";
if ($_POST['PartID']!='' and $_POST['PartDesc']!='')
- $sql="SELECT stockid, description FROM stockmaster
- WHERE stockid " . LIKE . " '%".$_POST['PartID']."%'
+ $sql="SELECT stockid, description FROM stockmaster
+ WHERE stockid " . LIKE . " '%".$_POST['PartID']."%'
AND description " . LIKE . " '%".$_POST['PartDesc']."%'";
$result=DB_query($sql,$db);
if (!isset($_POST['stockID'])) {
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-09-12 06:33:35 UTC (rev 5659)
+++ trunk/RecurringSalesOrders.php 2012-09-12 07:04:50 UTC (rev 5660)
@@ -5,7 +5,9 @@
include('includes/DefineCartClass.php');
/* 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";
include('includes/session.inc');
$title = _('Recurring Orders');
include('includes/header.inc');
@@ -57,7 +59,7 @@
recurringsalesorders.stopdate,
recurringsalesorders.lastrecurrence,
recurringsalesorders.autoinvoice
- FROM recurringsalesorders
+ FROM recurringsalesorders
INNER JOIN debtorsmaster
ON recurringsalesorders.debtorno = debtorsmaster.debtorno
INNER JOIN salestypes
@@ -267,7 +269,7 @@
discountpercent,
narrative)
VALUES ('";
-
+
foreach ($_SESSION['Items'.$identifier]->LineItems as $StockItem) {
$LineItemsSQL = $StartOf_LineItemsSQL .
@@ -278,9 +280,9 @@
'" . filter_number_format($StockItem->DiscountPercent) . "',
'" . $StockItem->Narrative . "')";
$Ins_LineItemResult = DB_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg,true);
-
+
} /* inserted line items into sales order details */
-
+
$result = DB_Txn_Commit($db);
prnmsg(_('The new recurring order template has been added'),'success');
Modified: trunk/RecurringSalesOrdersProcess.php
===================================================================
--- trunk/RecurringSalesOrdersProcess.php 2012-09-12 06:33:35 UTC (rev 5659)
+++ trunk/RecurringSalesOrdersProcess.php 2012-09-12 07:04:50 UTC (rev 5660)
@@ -5,23 +5,25 @@
$AllowAnyone = true;
/* Get this puppy to run from cron (cd webERP && php -f RecurringSalesOrdersProcess.php "weberpdemo") or direct URL (RecurringSalesOrdersProcess.php?Database=weberpdemo) */
-if (isset($_GET['Database'])) {
- $_SESSION['DatabaseName'] = $_GET['Database'];
- $DatabaseName = $_GET['Database'];
- $_POST['CompanyNameField'] = $_GET['Database'];
+if (isset($_GET['Database'])) {
+ $_SESSION['DatabaseName'] = $_GET['Database'];
+ $DatabaseName = $_GET['Database'];
+ $_POST['CompanyNameField'] = $_GET['Database'];
}
if (isset($argc)) {
- if (isset($argv[1])) {
- $_SESSION['DatabaseName'] = $argv[1];
- $DatabaseName = $argv[1];
- $_POST['CompanyNameField'] = $argv[1];
+ if (isset($argv[1])) {
+ $_SESSION['DatabaseName'] = $argv[1];
+ $DatabaseName = $argv[1];
+ $_POST['CompanyNameField'] = $argv[1];
}
}
include('includes/session.inc');
$title = _('Recurring Orders Process');
-
+/* webERP manual links before header.inc */
+$ViewTopic= "SalesOrders";
+$BookMark = "RecurringSalesOrders";
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
include('includes/GetSalesTransGLCodes.inc');
@@ -674,7 +676,7 @@
'" . filter_number_format($CurrencyRate) . "',
'" . $RecurrOrderRow['comments'] . "',
'" . $RecurrOrderRow['shipvia'] . "')";
-
+
$ErrMsg =_('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The debtor transaction record could not be inserted because');
$DbgMsg = _('The following SQL to insert the debtor transaction record was used');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-09-12 06:33:35 UTC (rev 5659)
+++ trunk/SelectOrderItems.php 2012-09-12 07:04:50 UTC (rev 5660)
@@ -13,6 +13,9 @@
} else {
$title = _('Select Order Items');
}
+/* webERP manual links before header.inc */
+$ViewTopic= "SalesOrders";
+$BookMark = "SalesOrderEntry";
include('includes/header.inc');
include('includes/GetPrice.inc');
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2012-09-12 06:33:35 UTC (rev 5659)
+++ trunk/SelectSalesOrder.php 2012-09-12 07:04:50 UTC (rev 5660)
@@ -4,6 +4,9 @@
include('includes/session.inc');
$title = _('Search Outstanding Sales Orders');
+/* webERP manual links before header.inc */
+$ViewTopic= "SalesOrders";
+$BookMark = "SelectSalesOrder";
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/doc/Manual/ManualSalesOrders.html
===================================================================
--- trunk/doc/Manual/ManualSalesOrders.html 2012-09-12 06:33:35 UTC (rev 5659)
+++ trunk/doc/Manual/ManualSalesOrders.html 2012-09-12 07:04:50 UTC (rev 5660)
@@ -38,7 +38,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div><!-- Help Begin: SelectOrderItems -->
-<h2>Entry of Sales Orders</h2>
+<h2><a id="SalesOrderEntry">Entry of Sales Orders</a></h2>
<p>From the main menu, Orders tab, click the Order Entry link.</p>
@@ -86,7 +86,7 @@
<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>Entry of Cash Sales Directly - Counter Sales</h3>
+<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>
@@ -96,7 +96,7 @@
<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 -->
-<h2>Modfiying An Order</h2>
+<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>
@@ -106,7 +106,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
-<h3>Selecting an Outstanding Sales Order</h3>
+<h3><a id="SelectSalesOrder">Selecting an Outstanding Sales Order</a></h3>
<p>There are several ways:</p>
@@ -138,7 +138,7 @@
</div><!-- Help End: Quotations -->
<!-- Help Begin: RecurringSalesOrder -->
-<h2>Recurring Sales Orders</h2>
+<h2><a id="RecurringSalesOrders">Recurring Sales Orders</a></h2>
<p>Orders entered can be defined so as to recurr at a desired frequency entered as:</p>
@@ -183,7 +183,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
-<h2>Discount Matrix</h2>
+<h2><a id="DiscountMatrix">Discount Matrix</a></h2>
<p>webERP has a system called a discount matrix which allows any group of products to be defined and discounts applicable to all items of the group to be set up just once for the whole group of items. Different discounts can be applied to the "discount group" for each sales type (price list). When an item is entered into a sales order the system retrieves the correct price based on the customer's sales type (price list) and then retrieves the appropriate discount based on the quantity of the item and the other items already entered on the order. The discounts retrieved can be over-ridden.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
