Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7489] trunk
|
From: <rc...@us...> - 2016-04-10 17:12:54
|
Revision: 7489
http://sourceforge.net/p/web-erp/reponame/7489
Author: rchacon
Date: 2016-04-10 17:12:51 +0000 (Sun, 10 Apr 2016)
Log Message:
-----------
On SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". On SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. On css/*/default.css, regroup horizontal align classes for readability. On doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
Modified Paths:
--------------
trunk/SuppTransGLAnalysis.php
trunk/SupplierInvoice.php
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fluid/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/css/wood/default.css
trunk/css/xenos/default.css
trunk/doc/Change.log
trunk/doc/Manual/ManualAccountsPayable.html
Modified: trunk/SuppTransGLAnalysis.php
===================================================================
--- trunk/SuppTransGLAnalysis.php 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/SuppTransGLAnalysis.php 2016-04-10 17:12:51 UTC (rev 7489)
@@ -10,9 +10,9 @@
/* Session started in header.inc for password checking and authorisation level check */
include('includes/session.inc');
-
$Title = _('Supplier Transaction General Ledger Analysis');
-
+$ViewTopic = 'AccountsPayable';
+$BookMark = 'SuppTransGLAnalysis';
include('includes/header.inc');
if (!isset($_SESSION['SuppTrans'])){
@@ -106,9 +106,10 @@
$TableHeader = '<tr>
<th class="ascending">' . _('Account') . '</th>
<th class="ascending">' . _('Name') . '</th>
- <th class="ascending">' . _('Amount') . '<br />' . _('in') . ' ' . $_SESSION['SuppTrans']->CurrCode . '</th>
+ <th class="ascending">' . _('Amount') . '<br />(' . $_SESSION['SuppTrans']->CurrCode . ')</th>
<th>' . _('Narrative') . '</th>
<th class="ascending">' . _('Tag') . '</th>
+ <th colspan="2"> </th>
</tr>';
echo $TableHeader;
$TotalGLValue=0;
@@ -117,11 +118,11 @@
foreach ( $_SESSION['SuppTrans']->GLCodes AS $EnteredGLCode){
echo '<tr>
- <td>' . $EnteredGLCode->GLCode . '</td>
- <td>' . $EnteredGLCode->GLActName . '</td>
+ <td class="text">' . $EnteredGLCode->GLCode . '</td>
+ <td class="text">' . $EnteredGLCode->GLActName . '</td>
<td class="number">' . locale_number_format($EnteredGLCode->Amount,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
- <td>' . $EnteredGLCode->Narrative . '</td>
- <td>' . $EnteredGLCode->Tag . ' - ' . $EnteredGLCode->TagName . '</td>
+ <td class="text">' . $EnteredGLCode->Narrative . '</td>
+ <td class="text">' . $EnteredGLCode->Tag . ' - ' . $EnteredGLCode->TagName . '</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Edit=' . $EnteredGLCode->Counter . '">' . _('Edit') . '</a></td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=' . $EnteredGLCode->Counter . '">' . _('Delete') . '</a></td>
</tr>';
@@ -138,6 +139,7 @@
echo '<tr>
<td colspan="2" class="number">' . _('Total') . ':</td>
<td class="number">' . locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
+ <td colspan="4"> </td>
</tr>
</table>';
@@ -216,7 +218,7 @@
$_POST['Amount']=0;
}
echo '<tr>
- <td>' . _('Amount') . ':</td>
+ <td>' . _('Amount'), ' (', $_SESSION['SuppTrans']->CurrCode, '):</td>
<td><input type="text" class="number" required="required" pattern="(?!^[-]?0[.,]0*$).{1,11}" title="'._('The amount must be numeric and cannot be zero').'" name="Amount" size="12" placeholder="'._('No zero numeric').'" maxlength="11" value="' . locale_number_format($_POST['Amount'],$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" /></td>
</tr>';
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/SupplierInvoice.php 2016-04-10 17:12:51 UTC (rev 7489)
@@ -1109,7 +1109,7 @@
'" . $SQLInvoiceDate . "',
'" . $PeriodNo . "',
'" . $EnteredGLCode->GLCode . "',
- '" . $_SESSION['SuppTrans']->SupplierID . ' ' . $EnteredGLCode->Narrative . "',
+ '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . $EnteredGLCode->Narrative . "',
'" . $EnteredGLCode->Tag . "',
'" . $EnteredGLCode->Amount/ $_SESSION['SuppTrans']->ExRate ."')";
@@ -1138,7 +1138,7 @@
'" . $SQLInvoiceDate . "',
'" . $PeriodNo . "',
'" . $_SESSION['SuppTrans']->GRNAct . "',
- '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment charge against') . ' ' . $ShiptChg->ShiptRef . "',
+ '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Shipment charge against') . ' ' . $ShiptChg->ShiptRef . "',
'" . $ShiptChg->Amount/ $_SESSION['SuppTrans']->ExRate . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the shipment') .
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/aguapop/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -477,12 +477,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
@@ -491,8 +495,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/default/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -438,12 +438,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
@@ -451,10 +455,6 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
/* END Style for all. ********************************************************/
Modified: trunk/css/fluid/default.css
===================================================================
--- trunk/css/fluid/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/fluid/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -375,20 +375,21 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/fresh/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -484,12 +484,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
background-color:#C9D392;
color:black;
@@ -501,8 +505,4 @@
width:30%;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
/* END Style for all. ********************************************************/
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/gel/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -528,12 +528,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
@@ -542,8 +546,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/professional/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -505,12 +505,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-family:Arial, Verdana, Helvetica;
@@ -521,8 +525,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/professional-rtl/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -523,12 +523,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;/* Should be left ? */
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;/* Should be right ? */
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-family:Arial, Verdana, Helvetica;
@@ -539,8 +543,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;/* Should be right ? */
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/silverwolf/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -496,12 +496,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
background:gainsboro;
margin:10px auto;
@@ -509,8 +513,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/wood/default.css
===================================================================
--- trunk/css/wood/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/wood/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -559,12 +559,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-weight:bold;
@@ -573,8 +577,4 @@
text-align:center;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
-/* END Style for all. ********************************************************/
\ No newline at end of file
+/* END Style for all. ********************************************************/
Modified: trunk/css/xenos/default.css
===================================================================
--- trunk/css/xenos/default.css 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/css/xenos/default.css 2016-04-10 17:12:51 UTC (rev 7489)
@@ -623,12 +623,16 @@
}
.centre {
text-align:center;
- /* Class selector to centre text horizontally in an element. */
+ /* Class selector to horizontal align a text (centre) in an element. */
}
.number {
text-align:right;
/* Class selector to horizontal align a number (right) in an element. */
}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
.page_title_text {
color:black;
font-size:18px;
@@ -639,8 +643,4 @@
width:60%;
/* Class selector for page title. */
}
-.text {
- text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
-}
/* END Style for all. ********************************************************/
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/doc/Change.log 2016-04-10 17:12:51 UTC (rev 7489)
@@ -1,5 +1,6 @@
webERP Change Log
+10/04/16 RChacon: On SupplierInvoice.php, add ' - ' to standardise gltran.narrative to "SupplierID - ". On SuppTransGLAnalysis.php, add ViewTopic and Bookmark, completes html tables, add text class, and add currency_code to input table. On css/*/default.css, regroup horizontal align classes for readability. On doc/Manual/ManualAccountsPayable.html, add anchor id="SuppTransGLAnalysis".
07/04/16 RChacon: On includes/class.pdf.php, add script documentation and completes switch($Align) to translate from Pdf-Creator to TCPDF.
07/04/16 Exson: Add remark column to CopyBOM.php.
01/04/2016 Exson: Make Petty cash assigner and authorizer multiple selectable in PcExpenses.php,PcTabs.php, PcAssignCashToTab.php and PcAuthorizeExpenses.
Modified: trunk/doc/Manual/ManualAccountsPayable.html
===================================================================
--- trunk/doc/Manual/ManualAccountsPayable.html 2016-04-07 14:42:22 UTC (rev 7488)
+++ trunk/doc/Manual/ManualAccountsPayable.html 2016-04-10 17:12:51 UTC (rev 7489)
@@ -172,7 +172,7 @@
<p>
If there are some charges that relate to stock items and some charges that relate to shipments then the total of both is accumulated into the invoice total.</p>
-<h3>Entry of General Ledger Charges</h3>
+<h3><a id="SuppTransGLAnalysis">Entry of General Ledger Charges</a></h3>
<p>
Purchase invoice entry looks a little different depending on whether the GL link to Account Payable is enabled or not (See Setup tab -> Company Preferences). If the GL interface is NOT enabled then there is simply a field to enter the total amount of the invoice into. If the GL interface is enabled then a third button shows "Enter General Ledger Analysis" - the total of all the general ledger analysis, the shipment costs and the entries against GRNs is accumulated into the total invoice charge and there is no opportunity to enter an invoice total amount anywhere - it is derived as the total of all the defined charges on the invoice.</p>
<p>
|
