Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7308] trunk
|
From: <rc...@us...> - 2015-05-19 14:13:57
|
Revision: 7308
http://sourceforge.net/p/web-erp/reponame/7308
Author: rchacon
Date: 2015-05-19 14:13:54 +0000 (Tue, 19 May 2015)
Log Message:
-----------
Add documentation and help for users in Locations.php and ManualInventory.html.
Modified Paths:
--------------
trunk/Locations.php
trunk/doc/Change.log
trunk/doc/Manual/ManualInventory.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2015-05-19 12:34:08 UTC (rev 7307)
+++ trunk/Locations.php 2015-05-19 14:13:54 UTC (rev 7308)
@@ -633,12 +633,14 @@
<tr>
<td>' . _('Facsimile No') . ':' . '</td>
<td><input name="Fax" type="tel" pattern="[0-9+\-\s()]*" value="' . $_POST['Fax'] . '" size="31" maxlength="30" title="' . _('The fax number should consist of numbers, parentheses, spaces or the + character') . '"/></td>
- </tr>
- <tr>
- <td>' . _('Email') . ':' . '</td>
- <td><input name="Email" type="email" value="' . $_POST['Email'] . '" size="31" maxlength="55" /></td>
- </tr>
- <tr>
+ </tr>';
+ // Email address:
+ echo '<tr title="', _('The email address should be an email format such as ad...@we...'), '">
+ <td><label for="Email">', _('Email'), ':</label></td>
+ <td><input id="Email" maxlength="55" name="Email" size="31" type="email" value="', $_POST['Email'], '" /></td>
+ </tr>';
+ // Tax Province:
+ echo '<tr>
<td>' . _('Tax Province') . ':' . '</td>
<td><select name="TaxProvince">';
@@ -719,4 +721,4 @@
}//end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-05-19 12:34:08 UTC (rev 7307)
+++ trunk/doc/Change.log 2015-05-19 14:13:54 UTC (rev 7308)
@@ -1,4 +1,7 @@
webERP Change Log
+
+19/5/15 RChacon: Add documentation and help for users in Locations.php and ManualInventory.html.
+
17/5/15 Version 4.12.3
17/5/15 Phil: Made currencies delete check first for bank accounts set up using the currency - as reported by Ricard
Modified: trunk/doc/Manual/ManualInventory.html
===================================================================
--- trunk/doc/Manual/ManualInventory.html 2015-05-19 12:34:08 UTC (rev 7307)
+++ trunk/doc/Manual/ManualInventory.html 2015-05-19 14:13:54 UTC (rev 7308)
@@ -522,36 +522,38 @@
<p>When creating a purchase order, the inventory location that it is required for is specified. The inventory location address and contact details defined here are used as the default addresses available for delivery of goods ordered on purchase orders.</p>
<dl>
- <!--dt><Location Code</dt>
- <dd>.</dd>
+ <dt>Location Code</dt>
+ <dd>Enter up to five characters for the inventory location code.</dd>
<dt>Location Name</dt>
- <dd>.</dd>
+ <dd>The inventory location name could be either a warehouse or a factory.</dd>
<dt>Contact for deliveries</dt>
+ <dd>This field is for the name of the responsible person to contact for this inventory location.</dd>
+ <!--dt>Delivery Address 1 (Building)</dt>
<dd>.</dd>
- <dt>Delivery Address 1 (Building)</dt>
+ <dt>Delivery Address 2 (Street)</dt>
<dd>.</dd>
- <dt>Delivery Address 2 (Street):</dt>
+ <dt>Delivery Address 3 (Suburb)</dt>
<dd>.</dd>
- <dt>Delivery Address 3 (Suburb):</dt>
+ <dt>Delivery Address 4 (City)</dt>
<dd>.</dd>
- <dt>Delivery Address 4 (City):</dt>
+ <dt>Delivery Address 5 (Zip Code)</dt>
<dd>.</dd>
- <dt>Delivery Address 5 (Zip Code):</dt>
- <dd>.</dd>
<dt>Country</dt>
- <dd>.</dd>
- <dt>Telephone No:</dt>
- <dd>.</dd>
- <dt>Facsimile No:</dt>
- <dd>.</dd>
- <dt>Email:</dt>
<dd>.</dd-->
- <dt>Tax Province:</dt>
+ <dt>Telephone No</dt>
+ <dd>The phone number should consist of numbers, spaces, parentheses, or the + character.</dd>
+ <dt>Facsimile No</dt>
+ <dd>The fax number should consist of numbers, spaces, parentheses, or the + character.</dd>
+ <dt>Email</dt>
+ <dd>The email address should be an email format such as ad...@we....</dd>
+ <dt>Tax Province</dt>
<dd>Since the location represents the physical location from where goods/services are supplied it is important for determining the tax applicable on a sale. The governing tax authority must specified with the location record. It is used in the calculation of the applicable rate of tax in conjunction with the tax authority of the customer branch being delivered to and the tax level of the item being sold.</dd>
<dt><a id="DefaultCounterSalesCustomerCode">Default Counter Sales Customer Code</a></dt>
- <dd>The counter sales functionality looks at the default inventory location for a user and when that user enters a counter sale it uses the customer account and customer branch defined against the inventory location record. Consider a business with locations in Melbourne Australia and one in Anahaim USA - it is unlikely that a user based in Anaheim would be making a counter sale in Melbourne! Each location can have a customer account (and branch) defined for it's counter sales. These customers are expected to be cash only customers as the counter sales functionality expects the cash to be taken at the time of the sale. Not a substitute for proper Point of Sale - but suitable for occassional Counter Sales.</dd>
+ <dd>The counter sales functionality looks at the default inventory location for a user and when that user enters a counter sale it uses the customer account and customer branch defined against the inventory location record. Consider a business with locations in Melbourne Australia and one in Anahaim USA - it is unlikely that a user based in Anaheim would be making a counter sale in Melbourne! Each location can have a customer account (and branch) defined for it's counter sales. These customers are expected to be cash only customers as the counter sales functionality expects the cash to be taken at the time of the sale. Not a substitute for proper Point of Sale - but suitable for occassional Counter Sales.<br />
+ If counter sales are being used for this location then an existing customer account code needs to be entered here. All sales created from the counter sales will be recorded against this customer account.</dd>
<dt>Counter Sales Branch Code</dt>
- <dd>See <a href="#DefaultCounterSalesCustomerCode">Default Counter Sales Customer Code</a>.</dd>
+ <dd>If counter sales are being used for this location then an existing customer branch code for the customer account code entered above needs to be entered here. All sales created from the counter sales will be recorded against this branch.<br />
+ See <a href="#DefaultCounterSalesCustomerCode">Default Counter Sales Customer Code</a>.</dd>
<!--dt>Allow internal requests?:</dt>
<dd>.</dd-->
<dt>Use for Work Order Productions?</dt>
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-05-19 12:34:08 UTC (rev 7307)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-05-19 14:13:54 UTC (rev 7308)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 13:40+1200\n"
-"PO-Revision-Date: 2015-05-17 20:11-0600\n"
+"PO-Revision-Date: 2015-05-19 07:25-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -29557,7 +29557,7 @@
#: ShopParameters.php:233
msgid "Shop Manager Email"
-msgstr ""
+msgstr "Correo-e del gerente de tienda"
#: ShopParameters.php:235
msgid "Enter the email address of the webSHOP manager."
|
