Merge pull request #59 from rafa62/master

Improve help code.

GeneratePickingList.php

@@ -1,17 +1,23 @@
 <?php
-/* Generate Picking List */
+/* Generate a picking list */
 
 include('includes/session.php');
+/* $Title is set in several parts of this script. */
+$ViewTopic = 'Sales';
+$BookMark = 'GeneratePickingList';
 include('includes/SQL_CommonFunctions.inc');
 
-/* Check that the config variable is set for
- * picking notes and get out if not.
- */
+/* Check that the config variable is set for picking notes and get out if not. */
 if ($_SESSION['RequirePickingNote'] == 0) {
 	$Title = _('Picking Lists Not Enabled');
 	include('includes/header.php');
+	echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+		'/images/error.png" title="', // Icon image.
+		$Title, '" /> ', // Icon title.
+		$Title, '</p>';// Page title.
 	echo '<br />';
 	prnMsg(_('The system is not configured for picking lists. A configuration parameter is required where picking slips are required. Please consult your system administrator.'), 'info');
+	/*prnMsg(_('The system is configured to NOT use picking lists. In order for a picking note to occur before an order can be delivered, a configuration parameter must be activated. Please, consult your system administrator.'), 'info');*/
 	include('includes/footer.php');
 	exit;
 }
@@ -20,13 +26,16 @@
 if ((!isset($_GET['TransNo']) or $_GET['TransNo'] == '') and !isset($_POST['TransDate'])) {
 	$Title = _('Select Picking Lists');
 	include('includes/header.php');
+	echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+		'/images/sales.png" title="', // Icon image.
+		_('Search'), '" /> ', // Icon title.
+		$Title, '</p>';// Page title.
 	$SQL = "SELECT locations.loccode,
 			locationname
 		FROM locations
 		INNER JOIN locationusers ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canupd=1";
 	$Result = DB_query($SQL);
-	echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $_SESSION['Theme'] . '/images/sales.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
-	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" name="form">
+	echo '<br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" name="form">
 		<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
 		<table class="selection">
 		<tr>

SelectPickingLists.php

@@ -1,9 +1,9 @@
 <?php
-/* Search Pick Lists */
+/* Select a picking list */
 
 include('includes/session.php');
 $Title = _('Search Pick Lists');
-$ViewTopic = 'orders';
+$ViewTopic = 'Sales';
 $BookMark = 'SelectPickingLists';
 include('includes/header.php');
 

doc/Manual/ManualContracts.html

@@ -1,6 +1,6 @@
 <h1><a id="Contracts">Contract Costing</a></h1>
 
-<h2>Overview</h2>
+<h2><a id="Overview">Overview</a></h2>
 
 <p>The Contracts module allows for construction of costings for specific customer projects where a bill of materials to be taken from inventory for the contract can be defined, together with a costed list of other requirements. By entering a gross profit percentage figure a price can then be arrived at to charge the customer. The contract can then be converted to a quotation. While the contract is at the quotation stage it is possible to modify the stock components and other requirements - the quotation will be updated with the new costing on commital. The quotation can then be resubmitted to the customer.</p>
 

doc/Manual/ManualOutline.php

@@ -135,12 +135,6 @@
                                   'Salesperson code',
                                   'Salesperson name, telephone and fax numbers',
                                   'Salesperson commission rates and breakpoint'),
-    'Currencies'        => array('Currencies',
-                                 'Currency abbreviation',
-                                 'Currency name',
-                                 'Country of currency',
-                                 'Hunredths name',
-                                 'Exchange rates'),
     'SalesTypes'        => array('Sales types/price lists',
                                 'Sales type code',
                                 'Sales type description'),
@@ -153,13 +147,6 @@
                                  'Status code',
                                  'Status description',
                                  'Disallow invoices'),
-    'Tax'               => array('Tax',
-                                 'Tax calculations',
-                                 'Overview',
-                                 'Setting up taxes',
-                                 'Sales only within one Tax Authority example - 2 Tax levels:',
-                                 'Sales only within one Tax Authority example - 3 Tax Levels:',
-                                 'Sales within two Tax Authorities example - 3 tax levels:'),
     'Prices'            => array('Prices and Discounts',
                                  'Pricing overview',
                                  'Maintaining prices',
@@ -205,7 +192,10 @@
                                  'Quotations',
                                  'Recurring orders',
                                  'Counter sales - entering sales directly',
-                                 'Managing discounts by product group and customer group (Matrix)'),
+								 'Managing discounts by product group and customer group (Matrix)'),
+    'Sales'				=> array('Picking Lists',
+								 'Generate/Print Picking Lists',
+								 'Maintain Picking Lists'),
     'PurchaseOrdering'  => array('Purchase ordering',
                                  'Overview',
                                  'Purchase orders',
@@ -235,7 +225,7 @@
                                  'Work order receipts',
                                  'Work order issues',
                                  'Closing work orders'),
-     'QualityAssurance' =>array('Quality Assurance',
+     'QualityAssurance' => array('Quality Assurance',
 								'Overview',
 								'Tests Maintenance',
 								'Product Specifications',
@@ -264,13 +254,29 @@
                                  'EDI',
                                  'EDI setup',
                                  'Sending EDI Invoices'),
+    'PettyCash'         => array('Petty cash management system',
+                                 'Overview',
+                                 'Setup general parameters'),
     'FixedAssets'       => array('Fixed Assets Manager',
                                  'Fixed assets overview',
                                  'Creating a fixed asset',
                                  'Selecting fixed assets',
                                  'Depreciation run',
                                  'Fixed asset schedule',
                                  'Maintenance tasks'),
+    'Currencies'        => array('Currencies',
+                                 'Currency abbreviation',
+                                 'Currency name',
+                                 'Country of currency',
+                                 'Hunredths name',
+                                 'Exchange rates'),
+    'Tax'               => array('Tax',
+                                 'Tax calculations',
+                                 'Overview',
+                                 'Setting up taxes',
+                                 'Sales only within one Tax Authority example - 2 Tax levels:',
+                                 'Sales only within one Tax Authority example - 3 Tax Levels:',
+                                 'Sales within two Tax Authorities example - 3 tax levels:'),
     'ReportBuilder'     => array('SQL Report Writer',
                                  'Report writer introduction',
                                  'Reports administration',
@@ -282,9 +288,6 @@
                                  'Creating a new report - specifying fields to retrieve',
                                  'Creating a new report - entering and arranging criteria',
                                  'Viewing reports'),
-    'PettyCash'         => array('Petty cash management system',
-                                 'Overview',
-                                 'Setup general parameters'),
     'Multilanguage'     => array('Multilanguage',
                                  'Introduction to multilanguage',
                                  'Rebuild the system default language file',
@@ -331,4 +334,4 @@
     )
 );
 
-?>
+?>

doc/Manual/ManualSales.html

@@ -0,0 +1,105 @@
+<h1><a id="Sales">Sales</a></h1>
+
+<div class="floatright"><a class="minitext" href="#top">⬆ Top</a></div>
+<h2>Transactions</h2>
+
+<h3><a id="SelectOrderItems">New Sales Order or Quotation</a></h3>
+<p>This script allows you the entry of sales order items with both quick entry and part search functions. See: <a href="ManualContents.php?ViewTopic=SalesOrders#SalesOrderEntry">Entry of Sales Orders</a>.</p>
+<!--p>TO DO: input data description.</p-->
+
+<h3><a id="CounterSales">Enter Counter Sales</a></h3>
+<p>This script allows sales to be entered against a cash sale customer account defined in the users location record. See: <a href="ManualContents.php?ViewTopic=SalesOrders#SalesOrderCounterSales">Entry of Cash Sales Directly - Counter Sales</a>.</p>
+<!--p>TO DO: input data description.</p-->
+
+<h3><a id="CounterReturns">Enter Counter Returns</a></h3>
+<p>This script allows credits and refunds from the default Counter Sale account for an inventory location. See: <a href="ManualContents.php?ViewTopic=SalesOrders#CounterReturns">Counter Returns</a>.</p>
+<!--p>TO DO: input data description.</p-->
+
+<h3><a id="GeneratePickingList">Generate/Print Picking Lists</a></h3>
+<p>This script allows you to generate a picking list.</p>
+<!--p>TO DO: input data description.</p-->
+
+<h3><a id="SelectSalesOrder">Outstanding Sales Orders/Quotations</a></h3>
+<p>This script allows you to ... See: <a href="ManualContents.php?ViewTopic=SalesOrders#SelectSalesOrder">Selecting an Outstanding Sales Order</a>.</p>
+<!--p>TO DO: input data description.</p-->
+
+<h3><a id="SpecialOrder">Special Order</a></h3>
+<p>This script allows you to ...</p>
+<!--p>TO DO: input data description.</p-->
+
+<h3><a id="SelectRecurringSalesOrder">Recurring Order Template</a></h3>
+<p>This script allows you to ... See: <a href="ManualContents.php?ViewTopic=SalesOrders#RecurringSalesOrders">Recurring Sales Orders</a>.</p>
+<!--p>TO DO: input data description.</p-->
+
+<h3><a id="RecurringSalesOrdersProcess">Process Recurring Orders</a></h3>
+<p>This script allows you to ... See: <a href="ManualContents.php?ViewTopic=SalesOrders#RecurringSalesOrders">Recurring Sales Orders</a>.</p>
+<!--p>TO DO: input data description.</p-->
+<!--BEGIN: Developer messages:
+/* Need to allow this script to run from Cron or windows scheduler */
+/* Get this puppy to run from cron (cd webERP && php -f RecurringSalesOrdersProcess.php "weberpdemo") or direct URL (RecurringSalesOrdersProcess.php?Database=weberpdemo) */
+END: Developer messages.-->
+
+<h3><a id="SelectPickingLists">Maintain Picking Lists</a></h3>
+<p>This script allows you to select a picking list.</p>
+<!--p>TO DO: input data description.</p-->
+
+<div class="floatright"><a class="minitext" href="#top">⬆ Top</a></div>
+
+<h2>Inquiries and Reports</h2>
+<p>The webERP Sales module has the following inquiries and reports:</p>
+
+• Sales Order Inquiry
+
+• Print Price Lists
+
+• Order Status Report
+
+• Orders Invoiced Reports
+
+• Daily Sales Inquiry
+
+• Sales By Sales Type Inquiry
+
+• Sales By Category Inquiry
+
+• Sales By Category By Item Inquiry
+
+• Sales Analysis Reports
+
+• Sales Graphs
+
+• Top Sellers Inquiry
+
+• Order Delivery Differences Report
+
+• Delivery In Full On Time (DIFOT) Report
+
+• Sales Order Detail Or Summary Inquiries
+
+• Top Sales Items Inquiry
+
+• Top Customers Inquiry
+
+• Worst Sales Items Report
+
+• Sales With Low Gross Profit Report
+
+• Sell Through Support Claims Report
+
+<div class="floatright"><a class="minitext" href="#top">⬆ Top</a></div>
+<h2>Maintenance</h2>
+
+<h3><a id="CreateContract">Create Contract</a></h3>
+<p>See: <a href="ManualContents.php?ViewTopic=Contracts#Overview">Contract Costing Overview</a>.</p>
+<p>This script allows you to ... See: <a href="ManualContents.php?ViewTopic=Contracts#CreateContract">Creating a New Contract</a>.</p>
+<!--p>TO DO: input data description.</p-->
+
+<h3><a id="SelectContract">Select Contract</a></h3>
+<p>See: <a href="ManualContents.php?ViewTopic=Contracts#Overview">Contract Costing Overview</a>.</p>
+<p>This script allows you to ... See: <a href="ManualContents.php?ViewTopic=Contracts#SelectContract">Selecting A Contract</a>.</p>
+<!--p>TO DO: input data description.</p-->
+
+<h3><a id="xxx">Sell Through Support Deals</a></h3>
+<p>This script allows you to ...</p>
+<!--p>TO DO: input data description.</p-->
+

includes/MainMenuLinksArray.php

@@ -1,23 +1,23 @@
 <?php
 /* webERP menus with Captions and URLs. */
 
-$ModuleLink = array('orders', 'AR', 'PO', 'AP', 'stock', 'manuf', 'GL', 'FA', 'PC', 'system', 'Utilities');
-$ReportList = array('orders' => 'ord', 'AR' => 'ar', 'PO' => 'prch', 'AP' => 'ap', 'stock' => 'inv', 'manuf' => 'man', 'GL' => 'gl', 'FA' => 'fa', 'PC' => 'pc', 'system' => 'sys', 'Utilities' => 'utils');
+$ModuleLink = array('Sales', 'AR', 'PO', 'AP', 'stock', 'manuf', 'GL', 'FA', 'PC', 'system', 'Utilities');
+$ReportList = array('Sales' => 'ord', 'AR' => 'ar', 'PO' => 'prch', 'AP' => 'ap', 'stock' => 'inv', 'manuf' => 'man', 'GL' => 'gl', 'FA' => 'fa', 'PC' => 'pc', 'system' => 'sys', 'Utilities' => 'utils');
 
 /*The headings showing on the tabs accross the main index used also in WWW_Users for defining what should be visible to the user */
 $ModuleList = array(_('Sales'), _('Receivables'), _('Purchases'), _('Payables'), _('Inventory'), _('Manufacturing'), _('General Ledger'), _('Asset Manager'), _('Petty Cash'), _('Setup'), _('Utilities'));
 
-$MenuItems['orders']['Transactions']['Caption'] = array(_('New Sales Order or Quotation'), _('Enter Counter Sales'), _('Enter Counter Returns'), _('Generate/Print Picking Lists'), _('Outstanding Sales Orders/Quotations'), _('Special Order'), _('Recurring Order Template'), _('Process Recurring Orders'), _('Maintain Picking Lists'));
+$MenuItems['Sales']['Transactions']['Caption'] = array(_('New Sales Order or Quotation'), _('Enter Counter Sales'), _('Enter Counter Returns'), _('Generate/Print Picking Lists'), _('Outstanding Sales Orders/Quotations'), _('Special Order'), _('Recurring Order Template'), _('Process Recurring Orders'), _('Maintain Picking Lists'));
 
-$MenuItems['orders']['Transactions']['URL'] = array('/SelectOrderItems.php?NewOrder=Yes', '/CounterSales.php', '/CounterReturns.php', '/GeneratePickingList.php', '/SelectSalesOrder.php', '/SpecialOrder.php', '/SelectRecurringSalesOrder.php', '/RecurringSalesOrdersProcess.php', '/SelectPickingLists.php');
+$MenuItems['Sales']['Transactions']['URL'] = array('/SelectOrderItems.php?NewOrder=Yes', '/CounterSales.php', '/CounterReturns.php', '/GeneratePickingList.php', '/SelectSalesOrder.php', '/SpecialOrder.php', '/SelectRecurringSalesOrder.php', '/RecurringSalesOrdersProcess.php', '/SelectPickingLists.php');
 
-$MenuItems['orders']['Reports']['Caption'] = array(_('Sales Order Inquiry'), _('Print Price Lists'), _('Order Status Report'), _('Orders Invoiced Reports'), _('Daily Sales Inquiry'), _('Sales By Sales Type Inquiry'), _('Sales By Category Inquiry'), _('Sales By Category By Item Inquiry'), _('Sales Analysis Reports'), _('Sales Graphs'), _('Top Sellers Inquiry'), _('Order Delivery Differences Report'), _('Delivery In Full On Time (DIFOT) Report'), _('Sales Order Detail Or Summary Inquiries'), _('Top Sales Items Inquiry'), _('Top Customers Inquiry'), _('Worst Sales Items Report'), _('Sales With Low Gross Profit Report'), _('Sell Through Support Claims Report'));
+$MenuItems['Sales']['Reports']['Caption'] = array(_('Sales Order Inquiry'), _('Print Price Lists'), _('Order Status Report'), _('Orders Invoiced Reports'), _('Daily Sales Inquiry'), _('Sales By Sales Type Inquiry'), _('Sales By Category Inquiry'), _('Sales By Category By Item Inquiry'), _('Sales Analysis Reports'), _('Sales Graphs'), _('Top Sellers Inquiry'), _('Order Delivery Differences Report'), _('Delivery In Full On Time (DIFOT) Report'), _('Sales Order Detail Or Summary Inquiries'), _('Top Sales Items Inquiry'), _('Top Customers Inquiry'), _('Worst Sales Items Report'), _('Sales With Low Gross Profit Report'), _('Sell Through Support Claims Report'));
 
-$MenuItems['orders']['Reports']['URL'] = array('/SelectCompletedOrder.php', '/PDFPriceList.php', '/PDFOrderStatus.php', '/PDFOrdersInvoiced.php', '/DailySalesInquiry.php', '/SalesByTypePeriodInquiry.php', '/SalesCategoryPeriodInquiry.php', '/StockCategorySalesInquiry.php', '/SalesAnalRepts.php', '/SalesGraph.php', '/SalesTopItemsInquiry.php', '/PDFDeliveryDifferences.php', '/PDFDIFOT.php', '/SalesInquiry.php', '/TopItems.php', '/SalesTopCustomersInquiry.php', '/NoSalesItems.php', '/PDFLowGP.php', '/PDFSellThroughSupportClaim.php');
+$MenuItems['Sales']['Reports']['URL'] = array('/SelectCompletedOrder.php', '/PDFPriceList.php', '/PDFOrderStatus.php', '/PDFOrdersInvoiced.php', '/DailySalesInquiry.php', '/SalesByTypePeriodInquiry.php', '/SalesCategoryPeriodInquiry.php', '/StockCategorySalesInquiry.php', '/SalesAnalRepts.php', '/SalesGraph.php', '/SalesTopItemsInquiry.php', '/PDFDeliveryDifferences.php', '/PDFDIFOT.php', '/SalesInquiry.php', '/TopItems.php', '/SalesTopCustomersInquiry.php', '/NoSalesItems.php', '/PDFLowGP.php', '/PDFSellThroughSupportClaim.php');
 
-$MenuItems['orders']['Maintenance']['Caption'] = array(_('Create Contract'), _('Select Contract'), _('Sell Through Support Deals'));
+$MenuItems['Sales']['Maintenance']['Caption'] = array(_('Create Contract'), _('Select Contract'), _('Sell Through Support Deals'));
 
-$MenuItems['orders']['Maintenance']['URL'] = array('/Contracts.php', '/SelectContract.php', '/SellThroughSupport.php');
+$MenuItems['Sales']['Maintenance']['URL'] = array('/Contracts.php', '/SelectContract.php', '/SellThroughSupport.php');
 
 $MenuItems['AR']['Transactions']['Caption'] = array(_('Select Order to Invoice'), _('Create A Credit Note'), _('Enter Receipts'), _('Allocate Receipts or Credit Notes'));