Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7644] trunk
|
From: <rc...@us...> - 2016-10-11 15:52:22
|
Revision: 7644
http://sourceforge.net/p/web-erp/reponame/7644
Author: rchacon
Date: 2016-10-11 15:52:19 +0000 (Tue, 11 Oct 2016)
Log Message:
-----------
In CompanyPreferences.php, add label tag and id attribute to ease the input of CurrencyDefault. In Currencies.php, add link to the input of CurrencyDefault. In SystemParameters.php, fix link to manual. In doc/Manual/ManualCreatingNewSystem.html, fix links and content.
Modified Paths:
--------------
trunk/CompanyPreferences.php
trunk/Currencies.php
trunk/SystemParameters.php
trunk/doc/Manual/ManualCreatingNewSystem.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/upgrade4.13-4.13.1.sql
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2016-10-07 09:21:45 UTC (rev 7643)
+++ trunk/CompanyPreferences.php 2016-10-11 15:52:19 UTC (rev 7644)
@@ -1,11 +1,9 @@
<?php
+/* $Id$ */
+/* Defines the settings applicable for the company, including name, address, tax authority reference, whether GL integration used etc. */
-/* $Id$*/
-
include('includes/session.inc');
-
$Title = _('Company Preferences');
-/* webERP manual links before header.inc */
$ViewTopic= 'CreatingNewSystem';
$BookMark = 'CompanyParameters';
include('includes/header.inc');
@@ -234,8 +232,8 @@
include('includes/CurrenciesArray.php'); // To get the currency name from the currency code.
echo '<tr>
- <td>' . _('Home Currency') . ':</td>
- <td><select tabindex="13" name="CurrencyDefault">';
+ <td><label for="CurrencyDefault">', _('Home Currency'), ':</label></td>
+ <td><select id="CurrencyDefault" name="CurrencyDefault" tabindex="13" >';
while ($myrow = DB_fetch_array($result)) {
if ($_POST['CurrencyDefault']==$myrow['currabrev']){
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2016-10-07 09:21:45 UTC (rev 7643)
+++ trunk/Currencies.php 2016-10-11 15:52:19 UTC (rev 7644)
@@ -389,7 +389,7 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?&SelectedCurrency=' . urlencode($myrow['currabrev']) . '">' . _('Edit') . '</a></td>
- <td colspan="2">' . _('Functional Currency') . '</td>
+ <td colspan="2"><a href="CompanyPreferences.php#CurrencyDefault">' . _('Functional Currency') . '</a></td>
</tr>',
$ImageFile,
$myrow['currabrev'],
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2016-10-07 09:21:45 UTC (rev 7643)
+++ trunk/SystemParameters.php 2016-10-11 15:52:19 UTC (rev 7644)
@@ -3,16 +3,16 @@
/* This script is for maintenance of the system parameters. */
include('includes/session.inc');
-
-$Title = _('System Parameters');// Screen identificator.
-$ViewTopic= 'GettingStarted';// Filename's id in ManualContents.php's TOC.
-$BookMark = 'SystemConfiguration';// Anchor's id in the manual's html document.
+$Title = _('System Parameters');
+$ViewTopic = 'CreatingNewSystem';
+$BookMark = 'SystemParameters';
include('includes/header.inc');
-echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/maintenance.png" title="' .// Title icon.
- $Title . '" />' .// Icon title.
- $Title . '</p>';// Page title.
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/maintenance.png" title="', // Icon image.
+ $Title, '" /> ', // Icon title.
+ $Title, '</p>';// Page title.
+
include('includes/CountriesArray.php');
if (isset($_POST['submit'])) {
Modified: trunk/doc/Manual/ManualCreatingNewSystem.html
===================================================================
--- trunk/doc/Manual/ManualCreatingNewSystem.html 2016-10-07 09:21:45 UTC (rev 7643)
+++ trunk/doc/Manual/ManualCreatingNewSystem.html 2016-10-11 15:52:19 UTC (rev 7644)
@@ -60,30 +60,33 @@
For GL integration at the sales level the posting codes for sales for a specific sales type, sales area and stock category need to be defined from Setup > Sales GL Interface Postings. For Stock GL integration then the cost of sales posting codes for a specific sales type, sales area and stock catgeory also need to be set up from Setup > COGS GL Interface Postings (COGS = Cost Of Goods Sold). If appropriate GL codes are not specified the system will automatically create a new GL account number 1 for the postings to be made to. If you have this account keep appearing then this is a good sign that default posting codes are not created.</p>
<!-- Help End: CompanyPreferences -->
- <!-- Help Begin: SystemConfiguration -->
+ <!-- Help Begin: SystemParameters -->
<div class="floatright"> <a class="minitext" href="#top">⬆ Top</a></div>
-<h2><a id="SystemConfiguration">System Configuration</a></h2>
+<h2><a id="SystemParameters">System Parameters</a></h2>
<p>
From the setup tab the main system configuration parameters can be set from the link "Configuration Settings". Narrative is shown alongside each parameter to give the user an idea of where the setting is used.</p>
<table border="1" width="100%">
+<thead>
<tr>
<th style="width:20%;">Parameter</th>
<th>Description</th>
</tr>
+</thead>
+<tbody>
<tr>
- <td>Default Date Format (for input and to appear on reports)</td>
-
- <td>The default date format for entry of dates and display use d/m/Y for England/Australia/NZ or m/d/Y for US and Canada</td>
+ <td align="center" colspan="2"><b>General Settings</b></td>
</tr>
-
<tr>
- <td>New Users Default Theme:</td>
-
- <td>The default theme is used for new users who have not yet defined the display colour scheme theme of their choice</td>
+ <td>Default Date Format:</td>
+ <td>The default date format for entry of dates and display. It is for input and to appear on reports. The default date format for entry of dates and display use Y-m-d for ISO 8601, d/m/Y for England/Australia/NZ, m/d/Y for US and Canada, or else.</td>
</tr>
+ <tr>
+ <td>Default Theme:</td>
+ <td>The default theme to use for the login screen and the setup of new users. It is used for new users who have not yet defined the display colour scheme theme of their choice. The users' theme selection will override it.</td>
+ </tr>
<tr>
<td colspan="2" align="center"><b>Accounts Receivable/Payable Settings</b></td>
@@ -360,6 +363,7 @@
<p></p>
</td>
</tr>
+</tbody>
</table>
<!-- Help End: SystemConfiguration -->
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 2016-10-07 09:21:45 UTC (rev 7643)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-10-11 15:52:19 UTC (rev 7644)
@@ -8,8 +8,8 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-16 21:31+1200\n"
-"PO-Revision-Date: 2016-06-11 14:24-0600\n"
-"Last-Translator: Rafael Chacon <raf...@gm...>\n"
+"PO-Revision-Date: 2016-10-07 12:41-0600\n"
+"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
"MIME-Version: 1.0\n"
@@ -3877,7 +3877,7 @@
#: BOMs_SingleLevel.php:7
msgid "Bill Of Materials Maintenance"
-msgstr ""
+msgstr "Mantenimiento de lista de materiales"
#: BOMs_SingleLevel.php:260 StockAdjustments.php:171
msgid "The quantity entered cannot be zero"
@@ -11212,7 +11212,7 @@
#: DailyBankTransactions.php:182
msgid "Previous Balance"
-msgstr ""
+msgstr "Saldo anterior"
#: DailyBankTransactions.php:198
msgid "Failed to retrieve gl narrative"
@@ -11220,7 +11220,7 @@
#: DailyBankTransactions.php:238
msgid "Account Balance"
-msgstr ""
+msgstr "Saldo de la cuenta"
#: DailyBankTransactions.php:252 GLJournalInquiry.php:142
msgid "Select Another Date"
@@ -26160,7 +26160,7 @@
#: ReprintGRN.php:92 SupplierGRNAndInvoiceInquiry.php:41
#: SupplierGRNAndInvoiceInquiry.php:75
msgid "Invoice No"
-msgstr ""
+msgstr "Factura No."
#: ReprintGRN.php:112
msgid "Reprint GRN "
@@ -28433,11 +28433,11 @@
#: SelectCustomer.php:558
msgid "Latitude"
-msgstr ""
+msgstr "Latitud"
#: SelectCustomer.php:558
msgid "Longitude"
-msgstr ""
+msgstr "Longitud"
#: SelectCustomer.php:562
msgid "Unable to update GeoCode for CustomerID"
@@ -28467,7 +28467,7 @@
#: SelectCustomer.php:681
msgid "Last Paid Date"
-msgstr ""
+msgstr "Última fecha de pago"
#: SelectCustomer.php:687
msgid "Last Paid Amount (inc tax)"
@@ -39724,7 +39724,7 @@
#: WorkOrderIssue.php:939
msgid "Lot No"
-msgstr ""
+msgstr "Lote No."
#: WorkOrderIssue.php:952
msgid "Quantity Issued"
Modified: trunk/sql/mysql/upgrade4.13-4.13.1.sql
===================================================================
--- trunk/sql/mysql/upgrade4.13-4.13.1.sql 2016-10-07 09:21:45 UTC (rev 7643)
+++ trunk/sql/mysql/upgrade4.13-4.13.1.sql 2016-10-11 15:52:19 UTC (rev 7644)
@@ -1,15 +1,14 @@
-INSERT INTO scripts VALUES ('InternalStockRequestInquiry.php',1,'Internal Stock Request inquiry');
-ALTER table stockrequest ADD initiator varchar(20) NOT NULL DEFAULT '';
-INSERT INTO securitytokens VALUES (19,'Internal stock request fully access authority');
-INSERT INTO scripts VALUES ('PDFGLJournalCN.php',1,'Print GL Journal Chinese version');
-ALTER table custcontacts ADD statement tinyint(4) NOT NULL DEFAULT 0;
-INSERT INTO scripts VALUES ('PcTabExpensesList.php', '15', 'Creates excel with all movements of tab between dates');
-
+ALTER TABLE `custcontacts` ADD `statement` TINYINT(4) NOT NULL DEFAULT 0;
-- standardise transaction date to DATE type:
ALTER TABLE `debtortrans` CHANGE `trandate` `trandate` DATE NOT NULL DEFAULT '0000-00-00';
-ALTER table supplierdiscounts CONVERT TO CHARACTER SET utf8;
-INSERT INTO scripts VALUES ('PcAssignCashTabToTab.php',12,'Assign cash from one tab to another');
-ALTER table workorders ADD remark text DEFAULT NULL;
-ALTER table workorders ADD reference varchar(40) NOT NULL DEFAULT '';
+ALTER TABLE `salesanalysis` CHANGE `salesperson` `salesperson` VARCHAR(4) DEFAULT '' NOT NULL;
+ALTER TABLE `stockrequest` ADD `initiator` VARCHAR(20) NOT NULL DEFAULT '';
+ALTER TABLE `supplierdiscounts` CONVERT TO CHARACTER SET utf8;
+ALTER TABLE `workorders` ADD `reference` VARCHAR(40) NOT NULL DEFAULT '';
+ALTER TABLE `workorders` ADD `remark` TEXT DEFAULT NULL;
+INSERT INTO `scripts` VALUES ('InternalStockRequestInquiry.php', 1, 'Internal Stock Request inquiry');
+INSERT INTO `scripts` VALUES ('PcAssignCashTabToTab.php', 12, 'Assign cash from one tab to another');
+INSERT INTO `scripts` VALUES ('PcTabExpensesList.php', '15', 'Creates excel with all movements of tab between dates');
+INSERT INTO `scripts` VALUES ('PDFGLJournalCN.php', 1, 'Print GL Journal Chinese version');
+INSERT INTO `securitytokens` VALUES (19, 'Internal stock request fully access authority');
-ALTER TABLE `salesanalysis` CHANGE `salesperson` `salesperson` VARCHAR(4) DEFAULT '' NOT NULL;
|
