Menu
▾
▴
web-erp-svn
|
From: <rc...@us...> - 2016-11-21 14:55:39
|
Revision: 7675
http://sourceforge.net/p/web-erp/reponame/7675
Author: rchacon
Date: 2016-11-21 14:55:36 +0000 (Mon, 21 Nov 2016)
Log Message:
-----------
Fix and standardise texts.
Modified Paths:
--------------
trunk/AgedDebtors.php
trunk/PDFCustomerList.php
trunk/PcAuthorizeExpenses.php
trunk/SalesInquiry.php
trunk/SelectCustomer.php
trunk/WorkOrderEntry.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2016-11-21 00:08:18 UTC (rev 7674)
+++ trunk/AgedDebtors.php 2016-11-21 14:55:36 UTC (rev 7675)
@@ -1,10 +1,10 @@
<?php
-
/* $Id$ */
+ /* Lists customer account balances in detail or summary in selected currency */
include('includes/session.inc');
-if (isset($_POST['PrintPDF'])
+if(isset($_POST['PrintPDF'])
and isset($_POST['FromCriteria'])
and mb_strlen($_POST['FromCriteria'])>=1
and isset($_POST['ToCriteria'])
@@ -18,15 +18,15 @@
$line_height = 12;
/*Now figure out the aged analysis for the customer range under review */
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
$_POST['Salesman'] = $_SESSION['SalesmanLogin'];
}
- if (trim($_POST['Salesman'])!=''){
+ if(trim($_POST['Salesman'])!='') {
$SalesLimit = " AND debtorsmaster.debtorno IN (SELECT DISTINCT debtorno FROM custbranch WHERE salesman = '".$_POST['Salesman']."') ";
} else {
$SalesLimit = "";
}
- if ($_POST['All_Or_Overdues']=='All'){
+ if($_POST['All_Or_Overdues']=='All') {
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
currencies.currency,
@@ -46,7 +46,7 @@
ELSE 0 END
ELSE
CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= 0
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
+ THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
END
) AS due,
@@ -97,7 +97,7 @@
HAVING
ROUND(ABS(SUM(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc)),currencies.decimalplaces) > 0";
- } elseif ($_POST['All_Or_Overdues']=='OverduesOnly') {
+ } elseif($_POST['All_Or_Overdues']=='OverduesOnly') {
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
@@ -117,7 +117,7 @@
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
ELSE 0 END
ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= 0
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(ADDDATE(last_day(debtortrans.trandate),paymentterms.dayinfollowingmonth)) >= 0
THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
END
) AS due,
@@ -180,7 +180,7 @@
END
) > 0.01";
- } elseif ($_POST['All_Or_Overdues']=='HeldOnly'){
+ } elseif($_POST['All_Or_Overdues']=='HeldOnly') {
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
@@ -264,12 +264,12 @@
}
$CustomerResult = DB_query($SQL,'','',False,False); /*dont trap errors handled below*/
- if (DB_error_no() !=0) {
+ if(DB_error_no() !=0) {
$Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '.... ';
include('includes/header.inc');
prnMsg(_('The customer details could not be retrieved by the SQL because') . ' ' . DB_error_msg(),'error');
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
- if ($debug==1){
+ if($debug==1) {
echo '<br />' . $SQL;
}
include('includes/footer.inc');
@@ -287,7 +287,7 @@
$ListCount = DB_num_rows($CustomerResult);
$CurrDecimalPlaces =2; //by default
- while ($AgedAnalysis = DB_fetch_array($CustomerResult,$db)){
+ while ($AgedAnalysis = DB_fetch_array($CustomerResult,$db)) {
$CurrDecimalPlaces = $AgedAnalysis['decimalplaces'];
$DisplayDue = locale_number_format($AgedAnalysis['due']-$AgedAnalysis['overdue1'],$CurrDecimalPlaces);
$DisplayCurrent = locale_number_format($AgedAnalysis['balance']-$AgedAnalysis['due'],$CurrDecimalPlaces);
@@ -309,12 +309,12 @@
$LeftOvers = $pdf->addTextWrap(460,$YPos,60,$FontSize,$DisplayOverdue2,'right');
$YPos -=$line_height;
- if ($YPos < $Bottom_Margin + $line_height){
+ if($YPos < $Bottom_Margin + $line_height) {
include('includes/PDFAgedDebtorsPageHeader.inc');
}
- if ($_POST['DetailedReport']=='Yes'){
+ if($_POST['DetailedReport']=='Yes') {
/*draw a line under the customer aged analysis*/
$pdf->line($Page_Width-$Right_Margin, $YPos+10,$Left_Margin, $YPos+10);
@@ -361,24 +361,24 @@
AND debtortrans.debtorno = '" . $AgedAnalysis['debtorno'] . "'
AND ABS(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc)>0.004";
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
$sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
}
$DetailResult = DB_query($sql,'','',False,False); /*Dont trap errors */
- if (DB_error_no() !=0) {
+ if(DB_error_no() !=0) {
$Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
prnMsg(_('The details of outstanding transactions for customer') . ' - ' . $AgedAnalysis['debtorno'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg(),'error');
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
- if ($debug==1){
+ if($debug==1) {
echo '<br />' . _('The SQL that failed was') . '<br />' . $sql;
}
include('includes/footer.inc');
exit;
}
- while ($DetailTrans = DB_fetch_array($DetailResult)){
+ while ($DetailTrans = DB_fetch_array($DetailResult)) {
$LeftOvers = $pdf->addTextWrap($Left_Margin+5,$YPos,60,$FontSize,$DetailTrans['typename'],'left');
$LeftOvers = $pdf->addTextWrap($Left_Margin+65,$YPos,60,$FontSize,$DetailTrans['transno'],'left');
@@ -398,7 +398,7 @@
$LeftOvers = $pdf->addTextWrap(460,$YPos,60,$FontSize,$DisplayOverdue2,'right');
$YPos -=$line_height;
- if ($YPos < $Bottom_Margin + $line_height){
+ if($YPos < $Bottom_Margin + $line_height) {
include('includes/PDFAgedDebtorsPageHeader.inc');
}
@@ -410,10 +410,10 @@
} /*end customer aged analysis while loop */
$YPos -=$line_height;
- if ($YPos < $Bottom_Margin + (2*$line_height)){
+ if($YPos < $Bottom_Margin + (2*$line_height)) {
$PageNumber++;
include('includes/PDFAgedDebtorsPageHeader.inc');
- } elseif ($_POST['DetailedReport']=='Yes') {
+ } elseif($_POST['DetailedReport']=='Yes') {
//dont do a line if the totals have to go on a new page
$pdf->line($Page_Width-$Right_Margin, $YPos+10 ,220, $YPos+10);
}
@@ -430,7 +430,7 @@
$LeftOvers = $pdf->addTextWrap(400,$YPos,60,$FontSize,$DisplayTotOverdue1,'right');
$LeftOvers = $pdf->addTextWrap(460,$YPos,60,$FontSize,$DisplayTotOverdue2,'right');
- if ($ListCount == 0) {
+ if($ListCount == 0) {
$Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
prnMsg(_('There are no customers with balances meeting the criteria specified to list'),'info');
@@ -453,7 +453,7 @@
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
- if ((!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria']))) {
+ if((!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria']))) {
/*if $FromCriteria is not set then show a form to allow input */
@@ -480,7 +480,7 @@
</tr>
<tr>
<td>' . _('Only Show Customers Of') . ':' . '</td>';
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
echo '<td>';
echo $_SESSION['UsersRealName'];
echo '</td>';
@@ -490,8 +490,8 @@
$sql = "SELECT salesmancode, salesmanname FROM salesman";
$result=DB_query($sql);
- echo '<option value="">' . _('All Sales people') . '</option>';
- while ($myrow=DB_fetch_array($result)){
+ echo '<option value="">' . _('All Salespeople') . '</option>';
+ while ($myrow=DB_fetch_array($result)) {
echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
}
echo '</select></td>';
@@ -504,8 +504,8 @@
$sql = "SELECT currency, currabrev FROM currencies";
$result=DB_query($sql);
- while ($myrow=DB_fetch_array($result)){
- if ($myrow['currabrev'] == $_SESSION['CompanyRecord']['currencydefault']){
+ while ($myrow=DB_fetch_array($result)) {
+ if($myrow['currabrev'] == $_SESSION['CompanyRecord']['currencydefault']) {
echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
} else {
echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
Modified: trunk/PDFCustomerList.php
===================================================================
--- trunk/PDFCustomerList.php 2016-11-21 00:08:18 UTC (rev 7674)
+++ trunk/PDFCustomerList.php 2016-11-21 14:55:36 UTC (rev 7675)
@@ -1,13 +1,13 @@
<?php
-
/* $Id$*/
+/* Creates a report of the customer and branch information held. This report has options to print only customer branches in a specified sales area and sales person. Additional option allows to list only those customers with activity either under or over a specified amount, since a specified date. */
include('includes/session.inc');
$ViewTopic = 'ARReports';
$BookMark = 'CustomerListing';
-
-if (isset($_POST['PrintPDF'])){
+if(isset($_POST['PrintPDF'])) {
+
include('includes/PDFStarter.php');
$pdf->addInfo('Title', _('Customer Listing') );
$pdf->addInfo('Subject', _('Customer Listing') );
@@ -15,8 +15,8 @@
$PageNumber = 0;
$FontSize=10;
- if ($_POST['Activity']!='All'){
- if (!is_numeric($_POST['ActivityAmount'])){
+ if($_POST['Activity']!='All') {
+ if(!is_numeric($_POST['ActivityAmount'])) {
$Title = _('Customer List') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
echo '<p />';
@@ -28,8 +28,8 @@
/* Now figure out the customer data to report for the selections made */
- if (in_array('All', $_POST['Areas'])){
- if (in_array('All', $_POST['SalesPeople'])){
+ if(in_array('All', $_POST['Areas'])) {
+ if(in_array('All', $_POST['SalesPeople'])) {
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
debtorsmaster.address1,
@@ -101,8 +101,8 @@
WHERE (";
$i=0;
- foreach ($_POST['SalesPeople'] as $Salesperson){
- if ($i>0){
+ foreach ($_POST['SalesPeople'] as $Salesperson) {
+ if($i>0) {
$SQL .= " OR ";
}
$i++;
@@ -115,7 +115,7 @@
custbranch.branchcode";
} /*end if SalesPeople =='All' */
} else { /* not all sales areas has been selected so need to build the where clause */
- if (in_array('All', $_POST['SalesPeople'])){
+ if(in_array('All', $_POST['SalesPeople'])) {
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
debtorsmaster.address1,
@@ -150,8 +150,8 @@
WHERE (";
$i=0;
- foreach ($_POST['Areas'] as $Area){
- if ($i>0){
+ foreach ($_POST['Areas'] as $Area) {
+ if($i>0) {
$SQL .= " OR ";
}
$i++;
@@ -198,8 +198,8 @@
WHERE (";
$i=0;
- foreach ($_POST['Areas'] as $Area){
- if ($i>0){
+ foreach ($_POST['Areas'] as $Area) {
+ if($i>0) {
$SQL .= " OR ";
}
$i++;
@@ -209,8 +209,8 @@
$SQL .= ") AND (";
$i=0;
- foreach ($_POST['SalesPeople'] as $Salesperson){
- if ($i>0){
+ foreach ($_POST['SalesPeople'] as $Salesperson) {
+ if($i>0) {
$SQL .= " OR ";
}
$i++;
@@ -228,19 +228,19 @@
$CustomersResult = DB_query($SQL);
- if (DB_error_no() !=0) {
+ if(DB_error_no() !=0) {
$Title = _('Customer List') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
prnMsg( _('The customer List could not be retrieved by the SQL because') . ' - ' . DB_error_msg() );
echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu'). '</a>';
- if ($debug==1){
+ if($debug==1) {
echo '<br />' . $SQL;
}
include('includes/footer.inc');
exit;
}
- if (DB_num_rows($CustomersResult) == 0) {
+ if(DB_num_rows($CustomersResult) == 0) {
$Title = _('Customer List') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
prnMsg( _('This report has no output because there were no customers retrieved'), 'error' );
@@ -255,9 +255,9 @@
$Area ='';
$SalesPerson='';
- While ($Customers = DB_fetch_array($CustomersResult,$db)){
+ while($Customers = DB_fetch_array($CustomersResult,$db)) {
- if ($_POST['Activity']!='All'){
+ if($_POST['Activity']!='All') {
/*Get the total turnover in local currency for the customer/branch
since the date entered */
@@ -273,14 +273,14 @@
$ActivityRow = DB_fetch_row($ActivityResult);
$LocalCurrencyTurnover = $ActivityRow[0];
- if ($_POST['Activity'] =='GreaterThan'){
- if ($LocalCurrencyTurnover > $_POST['ActivityAmount']){
+ if($_POST['Activity'] =='GreaterThan') {
+ if($LocalCurrencyTurnover > $_POST['ActivityAmount']) {
$PrintThisCustomer = true;
} else {
$PrintThisCustomer = false;
}
- } elseif ($_POST['Activity'] =='LessThan'){
- if ($LocalCurrencyTurnover < $_POST['ActivityAmount']){
+ } elseif($_POST['Activity'] =='LessThan') {
+ if($LocalCurrencyTurnover < $_POST['ActivityAmount']) {
$PrintThisCustomer = true;
} else {
$PrintThisCustomer = false;
@@ -290,11 +290,11 @@
$PrintThisCustomer = true;
}
- if ($PrintThisCustomer){
- if ($Area!=$Customers['area']){
+ if($PrintThisCustomer) {
+ if($Area!=$Customers['area']) {
$FontSize=10;
$YPos -=$line_height;
- if ($YPos < ($Bottom_Margin + 80)){
+ if($YPos < ($Bottom_Margin + 80)) {
include('includes/PDFCustomerListPageHeader.inc');
}
$pdf->setFont('','B');
@@ -305,10 +305,10 @@
$YPos -=$line_height;
}
- if ($SalesPerson!=$Customers['salesman']){
+ if($SalesPerson!=$Customers['salesman']) {
$FontSize=10;
$YPos -=($line_height);
- if ($YPos < ($Bottom_Margin + 80)){
+ if($YPos < ($Bottom_Margin + 80)) {
include('includes/PDFCustomerListPageHeader.inc');
}
$pdf->setFont('','B');
@@ -333,7 +333,7 @@
$LeftOvers = $pdf->addTextWrap(230,$YPos,60,$FontSize,$Customers['branchcode']);
$LeftOvers = $pdf->addTextWrap(230,$YPos-10,60,$FontSize, _('Price List') . ': ' . $Customers['salestype']);
- if ($_POST['Activity']!='All'){
+ if($_POST['Activity']!='All') {
$LeftOvers = $pdf->addTextWrap(230,$YPos-20,60,$FontSize,_('Turnover'),'right');
$LeftOvers = $pdf->addTextWrap(230,$YPos-30,60,$FontSize,locale_number_format($LocalCurrencyTurnover,0), 'right');
}
@@ -353,7 +353,7 @@
$pdf->line($Page_Width-$Right_Margin, $YPos-32,$Left_Margin, $YPos-32);
$YPos -=40;
- if ($YPos < ($Bottom_Margin +30)){
+ if($YPos < ($Bottom_Margin +30)) {
include('includes/PDFCustomerListPageHeader.inc');
}
} /*end if $PrintThisCustomer == true */
@@ -381,19 +381,19 @@
echo '<option selected="selected" value="All">' . _('All Areas') . '</option>';
- While ($myrow = DB_fetch_array($AreasResult)){
+ while($myrow = DB_fetch_array($AreasResult)) {
echo '<option value="' . $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
}
echo '</select></td></tr>';
echo '<tr><td>' . _('For Sales folk'). ':</td>
<td><select name="SalesPeople[]" multiple="multiple">
- <option selected="selected" value="All">' . _('All sales folk') . '</option>';
+ <option selected="selected" value="All">' . _('All Salespeople') . '</option>';
$sql = "SELECT salesmancode, salesmanname FROM salesman";
$SalesFolkResult = DB_query($sql);
- While ($myrow = DB_fetch_array($SalesFolkResult)){
+ while($myrow = DB_fetch_array($SalesFolkResult)) {
echo '<option value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
}
echo '</select></td></tr>';
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2016-11-21 00:08:18 UTC (rev 7674)
+++ trunk/PcAuthorizeExpenses.php 2016-11-21 14:55:36 UTC (rev 7675)
@@ -1,67 +1,68 @@
<?php
/* $Id$*/
+/* */
include('includes/session.inc');
$Title = _('Authorisation of Petty Cash Expenses');
-/* webERP manual links before header.inc */
$ViewTopic= 'PettyCash';
$BookMark = 'AuthorizeExpense';
include('includes/header.inc');
+
include('includes/SQL_CommonFunctions.inc');
-if (isset($_POST['SelectedTabs'])){
+if(isset($_POST['SelectedTabs'])) {
$SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
-} elseif (isset($_GET['SelectedTabs'])){
+} elseif(isset($_GET['SelectedTabs'])) {
$SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
}
-if (isset($_POST['SelectedIndex'])){
+if(isset($_POST['SelectedIndex'])) {
$SelectedIndex = $_POST['SelectedIndex'];
-} elseif (isset($_GET['SelectedIndex'])){
+} elseif(isset($_GET['SelectedIndex'])) {
$SelectedIndex = $_GET['SelectedIndex'];
}
-if (isset($_POST['Days'])){
+if(isset($_POST['Days'])) {
$Days = filter_number_format($_POST['Days']);
-} elseif (isset($_GET['Days'])){
+} elseif(isset($_GET['Days'])) {
$Days = filter_number_format($_GET['Days']);
}
-if (isset($_POST['Process'])) {
- if ($SelectedTabs=='') {
+if(isset($_POST['Process'])) {
+ if($SelectedTabs=='') {
prnMsg(_('You Must First Select a Petty Cash Tab To Authorise'),'error');
unset($SelectedTabs);
}
}
-if (isset($_POST['Go'])) {
- if ($Days<=0) {
+if(isset($_POST['Go'])) {
+ if($Days<=0) {
prnMsg(_('The number of days must be a positive number'),'error');
$Days=30;
}
}
-if (isset($SelectedTabs)) {
+if(isset($SelectedTabs)) {
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Petty Cash') .
- '" alt="" />' . _('Authorisation Of Petty Cash Expenses') . ' '.$SelectedTabs . '</p>';
+ '" alt="" />', _('Authorisation of Petty Cash Expenses'), ' ', $SelectedTabs, '</p>';
} else {
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Petty Cash') .
- '" alt="" />' . _('Authorisation Of Petty Cash Expenses') . '</p>';
+ '" alt="" />', _('Authorisation of Petty Cash Expenses'), '</p>';
}
-if (isset($_POST['Submit']) or isset($_POST['update']) OR isset($SelectedTabs) OR isset ($_POST['GO'])) {
+if(isset($_POST['Submit']) or isset($_POST['update']) OR isset($SelectedTabs) OR isset ($_POST['GO'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if(!isset ($Days)){
+ if(!isset ($Days)) {
$Days=30;
}
echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />
<br />
<table class="selection">
<tr>
- <th colspan="7">' . _('Detail Of Movement For Last ') .':<input type="text" class="intger" name="Days" value="' . $Days . '" maxlength="3" size="4" />' . _('Days');
+ <th colspan="7">', _('Detail Of Movement For Last '), ':<input class="integer" maxlength="3" name="Days" size="4" type="text" value="', $Days, '" />', _('Days');
echo '<input type="submit" name="Go" value="' . _('Go') . '" /></th>
</tr>';
@@ -101,22 +102,22 @@
$k=0; //row colour counter
- while ($myrow=DB_fetch_array($result)) {
+ while($myrow=DB_fetch_array($result)) {
$CurrDecimalPlaces = $myrow['decimalplaces'];
//update database if update pressed
- if (isset($_POST['Submit'])
+ if(isset($_POST['Submit'])
AND $_POST['Submit']==_('Update')
- AND isset($_POST[$myrow['counterindex']])){
+ AND isset($_POST[$myrow['counterindex']])) {
$PeriodNo = GetPeriod(ConvertSQLDate($myrow['date']), $db);
- if ($myrow['rate'] == 1){ // functional currency
+ if($myrow['rate'] == 1) { // functional currency
$Amount = $myrow['amount'];
}else{ // other currencies
$Amount = $myrow['amount']/$myrow['rate'];
}
- if ($myrow['codeexpense'] == 'ASSIGNCASH'){
+ if($myrow['codeexpense'] == 'ASSIGNCASH') {
$type = 2;
$AccountFrom = $myrow['glaccountassignment'];
$AccountTo = $myrow['glaccountpcash'];
@@ -139,7 +140,7 @@
$typeno = GetNextTransNo($type,$db);
//build narrative
- $Narrative= _('PettyCash') . ' - '. $myrow['tabcode'] . ' - ' . $myrow['codeexpense'] . ' - ' . DB_escape_string($myrow['notes']) . ' - ' . $myrow['receipt'];
+ $Narrative = _('Petty Cash') . ' - '. $myrow['tabcode'] . ' - ' . $myrow['codeexpense'] . ' - ' . DB_escape_string($myrow['notes']) . ' - ' . $myrow['receipt'];
//insert to gltrans
DB_Txn_Begin();
@@ -197,7 +198,7 @@
$ResultTo = DB_query($sqlTo,'', '', true);
- if ($myrow['codeexpense'] == 'ASSIGNCASH'){
+ if($myrow['codeexpense'] == 'ASSIGNCASH') {
// if it's a cash assignation we need to updated banktrans table as well.
$ReceiptTransNo = GetNextTransNo( 2, $db);
$SQLBank= "INSERT INTO banktrans (transno,
@@ -235,14 +236,14 @@
DB_Txn_Commit();
}
- if ($k==1){
+ if($k==1) {
echo '<tr class="EvenTableRows">';
$k=0;
} else {
echo '<tr class="OddTableRows">';
$k=1;
}
- if ($myrow['posted']==0) {
+ if($myrow['posted']==0) {
$Posted=_('No');
} else {
$Posted=_('Yes');
@@ -254,11 +255,11 @@
<td>' .$myrow['notes'] . '</td>
<td>' . $myrow['receipt'] . '</td>';
- if (isset($_POST[$myrow['counterindex']])){
+ if(isset($_POST[$myrow['counterindex']])) {
echo'<td>' . ConvertSQLDate(Date('Y-m-d'));
}else{
//compare against raw SQL format date, then convert for display.
- if(($myrow['authorized']!='0000-00-00')){
+ if(($myrow['authorized']!='0000-00-00')) {
echo'<td>' . ConvertSQLDate($myrow['authorized']);
}else{
echo '<td align="right"><input type="checkbox" name="'.$myrow['counterindex'].'" />';
@@ -278,7 +279,7 @@
$ResultAmount = DB_query($sqlamount);
$Amount=DB_fetch_array($ResultAmount);
- if (!isset($Amount['0'])) {
+ if(!isset($Amount['0'])) {
$Amount['0']=0;
}
@@ -315,10 +316,10 @@
<td>' . _('Authorise expenses to Petty Cash Tab') . ':</td>
<td><select name="SelectedTabs" required="required" autofocus="autofocus" >';
- while ($myrow = DB_fetch_array($result)) {
+ while($myrow = DB_fetch_array($result)) {
$Authorisers = explode(',',$myrow['authorizer']);
- if (in_array($_SESSION['UserID'],$Authorisers)) {
- if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
+ if(in_array($_SESSION['UserID'],$Authorisers)) {
+ if(isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
@@ -340,5 +341,6 @@
</div>
</form>';
} /*end of else not submit */
+
include('includes/footer.inc');
?>
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2016-11-21 00:08:18 UTC (rev 7674)
+++ trunk/SalesInquiry.php 2016-11-21 14:55:36 UTC (rev 7675)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$*/
+/* */
// SalesInquiry.php
// Inquiry on Sales Orders - If Date Type is Order Date, salesorderdetails is the main table
// If Date Type is Invoice, stockmoves is the main table
@@ -10,43 +10,43 @@
include('includes/header.inc');
# Sets default date range for current month
-if (!isset($_POST['FromDate'])){
+if(!isset($_POST['FromDate'])) {
$_POST['FromDate']=Date($_SESSION['DefaultDateFormat'], mktime(0,0,0,Date('m'),1,Date('Y')));
}
-if (!isset($_POST['ToDate'])){
+if(!isset($_POST['ToDate'])) {
$_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']);
}
-if (isset($_POST['PartNumber'])){
+if(isset($_POST['PartNumber'])) {
$PartNumber = trim(mb_strtoupper($_POST['PartNumber']));
-} elseif (isset($_GET['PartNumber'])){
+} elseif(isset($_GET['PartNumber'])) {
$PartNumber = trim(mb_strtoupper($_GET['PartNumber']));
}
# Part Number operator - either LIKE or =
-if (isset($_POST['PartNumberOp'])){
+if(isset($_POST['PartNumberOp'])) {
$PartNumberOp = $_POST['PartNumberOp'];
} else {
$PartNumberOp = '=';
}
-if (isset($_POST['DebtorNo'])){
+if(isset($_POST['DebtorNo'])) {
$DebtorNo = trim(mb_strtoupper($_POST['DebtorNo']));
-} elseif (isset($_GET['DebtorNo'])){
+} elseif(isset($_GET['DebtorNo'])) {
$DebtorNo = trim(mb_strtoupper($_GET['DebtorNo']));
}
-if (isset($_POST['DebtorNoOp'])){
+if(isset($_POST['DebtorNoOp'])) {
$DebtorNoOp = $_POST['DebtorNoOp'];
} else {
$DebtorNoOp = '=';
}
-if (isset($_POST['DebtorName'])){
+if(isset($_POST['DebtorName'])) {
$DebtorName = trim(mb_strtoupper($_POST['DebtorName']));
-} elseif (isset($_GET['DebtorName'])){
+} elseif(isset($_GET['DebtorName'])) {
$DebtorName = trim(mb_strtoupper($_GET['DebtorName']));
}
-if (isset($_POST['DebtorNameOp'])){
+if(isset($_POST['DebtorNameOp'])) {
$DebtorNameOp = $_POST['DebtorNameOp'];
} else {
$DebtorNameOp = '=';
@@ -54,13 +54,13 @@
// Save $_POST['SummaryType'] in $SaveSummaryType because change $_POST['SummaryType'] when
// create $sql
-if (isset($_POST['SummaryType'])){
+if(isset($_POST['SummaryType'])) {
$SaveSummaryType = $_POST['SummaryType'];
} else {
$SaveSummaryType = 'name';
}
-if (isset($_POST['submit'])) {
+if(isset($_POST['submit'])) {
submit($db,$PartNumber,$PartNumberOp,$DebtorNo,$DebtorNoOp,$DebtorName,$DebtorNameOp,$SaveSummaryType);
} else {
display($db);
@@ -77,22 +77,22 @@
//first off validate inputs sensible
- if (!Is_Date($_POST['FromDate'])) {
+ if(!Is_Date($_POST['FromDate'])) {
$InputError = 1;
prnMsg(_('Invalid From Date'),'error');
}
- if (!Is_Date($_POST['ToDate'])) {
+ if(!Is_Date($_POST['ToDate'])) {
$InputError = 1;
prnMsg(_('Invalid To Date'),'error');
}
- if ($_POST['ReportType'] == 'Summary' AND $_POST['DateType'] == 'Order' AND $_POST['SummaryType'] == 'transno') {
+ if($_POST['ReportType'] == 'Summary' AND $_POST['DateType'] == 'Order' AND $_POST['SummaryType'] == 'transno') {
$InputError = 1;
prnMsg(_('Cannot summarize by transaction number with a date type of Order Date'),'error');
return;
}
- if ($_POST['ReportType'] == 'Detail' AND $_POST['DateType'] == 'Order' AND $_POST['SortBy'] == 'tempstockmoves.transno,salesorderdetails.stkcode') {
+ if($_POST['ReportType'] == 'Detail' AND $_POST['DateType'] == 'Order' AND $_POST['SortBy'] == 'tempstockmoves.transno,salesorderdetails.stkcode') {
$InputError = 1;
prnMsg(_('Cannot sort by transaction number with a date type of Order Date'),'error');
return;
@@ -100,44 +100,44 @@
// TempStockmoves function creates a temporary table of stockmoves that is used when the DateType
// is Invoice Date
- if ($_POST['DateType'] == 'Invoice') {
+ if($_POST['DateType'] == 'Invoice') {
TempStockmoves($db);
}
# Add more to WHERE statement, if user entered something for the part number,debtorno, name
// Variables that end with Op - meaning operator - are either = or LIKE
$WherePart = ' ';
- if (mb_strlen($PartNumber) > 0 AND $PartNumberOp == 'LIKE') {
+ if(mb_strlen($PartNumber) > 0 AND $PartNumberOp == 'LIKE') {
$PartNumber = $PartNumber . '%';
} else {
$PartNumberOp = '=';
}
- if (mb_strlen($PartNumber) > 0) {
+ if(mb_strlen($PartNumber) > 0) {
$WherePart = " AND salesorderdetails.stkcode " . $PartNumberOp . " '" . $PartNumber . "' ";
}
$WhereDebtorNo = ' ';
- if ($DebtorNoOp == 'LIKE') {
+ if($DebtorNoOp == 'LIKE') {
$DebtorNo = $DebtorNo . '%';
} else {
$DebtorNoOp = '=';
}
- if (mb_strlen($DebtorNo) > 0) {
+ if(mb_strlen($DebtorNo) > 0) {
$WhereDebtorNo = " AND salesorders.debtorno " . $DebtorNoOp . " '" . $DebtorNo . "' ";
} else {
$WhereDebtorNo = ' ';
}
$WhereDebtorName = ' ';
- if (mb_strlen($DebtorName) > 0 AND $DebtorNameOp == 'LIKE') {
+ if(mb_strlen($DebtorName) > 0 AND $DebtorNameOp == 'LIKE') {
$DebtorName = $DebtorName . '%';
} else {
$DebtorNameOp = '=';
}
- if (mb_strlen($DebtorName) > 0) {
+ if(mb_strlen($DebtorName) > 0) {
$WhereDebtorName = " AND debtorsmaster.name " . $DebtorNameOp . " '" . $DebtorName . "' ";
}
- if (mb_strlen($_POST['OrderNo']) > 0) {
+ if(mb_strlen($_POST['OrderNo']) > 0) {
$WhereOrderNo = " AND salesorderdetails.orderno = " . " '" . $_POST['OrderNo'] . "' ";
} else {
$WhereOrderNo = " ";
@@ -147,7 +147,7 @@
# Had to use IF statement instead of comparing 'linestatus' to $_POST['LineStatus']
#in WHERE clause because the WHERE clause did not recognize
# that had used the IF statement to create a field caused linestatus
- if ($_POST['LineStatus'] != 'All') {
+ if($_POST['LineStatus'] != 'All') {
$WhereLineStatus = " AND IF(salesorderdetails.quantity = salesorderdetails.qtyinvoiced ||
salesorderdetails.completed = 1,'Completed','Open') = '" . $_POST['LineStatus'] . "'";
}
@@ -156,35 +156,35 @@
// for multiple selections from Areas - decided to just allow selection of one Area at
// a time, so used simpler code
$WhereArea = ' ';
- if ($_POST['Area'] != 'All') {
+ if($_POST['Area'] != 'All') {
$WhereArea = " AND custbranch.area = '" . $_POST['Area'] . "'";
}
$WhereSalesman = ' ';
- if ($_SESSION['SalesmanLogin'] != '') {
+ if($_SESSION['SalesmanLogin'] != '') {
$WhereSalesman .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
- }elseif ($_POST['Salesman'] != 'All') {
+ }elseif($_POST['Sal...
[truncated message content] |
|
From: <rc...@us...> - 2016-11-22 17:15:05
|
Revision: 7676
http://sourceforge.net/p/web-erp/reponame/7676
Author: rchacon
Date: 2016-11-22 17:15:03 +0000 (Tue, 22 Nov 2016)
Log Message:
-----------
Standardise text.
Modified Paths:
--------------
trunk/Z_ImportDebtors.php
trunk/Z_ImportSuppliers.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/country_sql/default.sql
Modified: trunk/Z_ImportDebtors.php
===================================================================
--- trunk/Z_ImportDebtors.php 2016-11-21 14:55:36 UTC (rev 7675)
+++ trunk/Z_ImportDebtors.php 2016-11-22 17:15:03 UTC (rev 7676)
@@ -1,27 +1,28 @@
<?php
/* $Id: Z_ImportDebtors.php 6067 2013-07-10 02:04:22Z tehonu $*/
+/* Import debtors by csv file */
include('includes/session.inc');
$Title = _('Import Debtors And branches');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
-if(isset($_POST['FormID'])){
- if(!isset($_POST['AutoDebtorNo'])){
+if(isset($_POST['FormID'])) {
+ if(!isset($_POST['AutoDebtorNo'])) {
$_POST['AutoDebtorNo']=0;
- }else{
+ } else {
$_POST['AutoDebtorNo']=1;
}
- if($_POST['AutoDebtorNo']==1){
+ if($_POST['AutoDebtorNo']==1) {
$_POST['UpdateIfExists']=0;
- }else{
- if(!isset($_POST['UpdateIfExists'])){
+ } else {
+ if(!isset($_POST['UpdateIfExists'])) {
$_POST['UpdateIfExists']=0;
- }else{
+ } else {
$_POST['UpdateIfExists']=1;
}
}
-}else{
+} else {
$_POST['AutoDebtorNo']=$_SESSION['AutoDebtorNo'];
$_POST['UpdateIfExists']=0;
}
@@ -86,7 +87,7 @@
'custbranchcode', //53
);
-if (isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
+if(isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
//initialize
$FieldTarget = count($FieldHeadings);
@@ -101,7 +102,7 @@
//get the header row
$headRow = fgetcsv($FileHandle, 10000, ",");
//check for correct number of fields
- if ( count($headRow) != count($FieldHeadings) ) {
+ if( count($headRow) != count($FieldHeadings) ) {
prnMsg (_('File contains '. count($headRow). ' columns, expected '. count($FieldHeadings). '. Try downloading a new template.'),'error');
fclose($FileHandle);
include('includes/footer.inc');
@@ -110,8 +111,8 @@
//test header row field name and sequence
$head = 0;
- foreach ($headRow as $headField) {
- if ( mb_strtoupper($headField) != mb_strtoupper($FieldHeadings[$head]) ) {
+ foreach($headRow as $headField) {
+ if( mb_strtoupper($headField) != mb_strtoupper($FieldHeadings[$head]) ) {
prnMsg (_('File contains incorrect headers ('. mb_strtoupper($headField). ' != '. mb_strtoupper($header[$head]). '. Try downloading a new template.'),'error');
fclose($FileHandle);
include('includes/footer.inc');
@@ -127,11 +128,11 @@
$row = 1;
$UpdatedNum=0;
$InsertNum=0;
- while ( ($filerow = fgetcsv($FileHandle, 10000, ",")) !== FALSE ) {
+ while( ($filerow = fgetcsv($FileHandle, 10000, ",")) !== FALSE ) {
//check for correct number of fields
$fieldCount = count($filerow);
- if ($fieldCount != $FieldTarget){
+ if($fieldCount != $FieldTarget) {
prnMsg (_($FieldTarget. ' fields required, '. $fieldCount. ' fields received'),'error');
fclose($FileHandle);
include('includes/footer.inc');
@@ -139,7 +140,7 @@
}
// cleanup the data (csv files often import with empty strings and such)
- foreach ($filerow as &$value) {
+ foreach($filerow as &$value) {
$value = trim($value);
}
@@ -175,9 +176,9 @@
$_POST['CustomerPOLine']=$filerow[29];
$_POST['typeid']=$filerow[30];
- if ($_POST['AutoDebtorNo']== 1) {
+ if($_POST['AutoDebtorNo']== 1) {
$_POST['DebtorNo'] = GetNextTransNo(500, $db);
- }else{
+ } else {
$_POST['DebtorNo'] = mb_strtoupper($_POST['DebtorNo']);
}
@@ -214,96 +215,96 @@
$_POST['SpecialInstructions']=$filerow[52];
$i=0;
- if ($_POST['AutoDebtorNo']==0 AND mb_strlen($_POST['DebtorNo']) ==0) {
+ if($_POST['AutoDebtorNo']==0 AND mb_strlen($_POST['DebtorNo']) ==0) {
$InputError = 1;
prnMsg( _('The debtor code cannot be empty'),'error');
$Errors[$i] = 'DebtorNo';
$i++;
- } elseif ($_POST['AutoDebtorNo']==0 AND (ContainsIllegalCharacters($_POST['DebtorNo']) OR mb_strpos($_POST['DebtorNo'], ' '))) {
+ } elseif($_POST['AutoDebtorNo']==0 AND (ContainsIllegalCharacters($_POST['DebtorNo']) OR mb_strpos($_POST['DebtorNo'], ' '))) {
$InputError = 1;
prnMsg( _('The customer code cannot contain any of the following characters') . " . - ' & + \" " . _('or a space'),'error');
$Errors[$i] = 'DebtorNo';
$i++;
}
- if (mb_strlen($_POST['CustName']) > 40 OR mb_strlen($_POST['CustName'])==0) {
+ if(mb_strlen($_POST['CustName']) > 40 OR mb_strlen($_POST['CustName'])==0) {
$InputError = 1;
prnMsg( _('The customer name must be entered and be forty characters or less long'),'error');
$Errors[$i] = 'CustName';
$i++;
- } elseif (mb_strlen($_POST['Address1']) >40) {
+ } elseif(mb_strlen($_POST['Address1']) >40) {
$InputError = 1;
prnMsg( _('The Line 1 of the address must be forty characters or less long'),'error');
$Errors[$i] = 'Address1';
$i++;
- } elseif (mb_strlen($_POST['Address2']) >40) {
+ } elseif(mb_strlen($_POST['Address2']) >40) {
$InputError = 1;
prnMsg( _('The Line 2 of the address must be forty characters or less long'),'error');
$Errors[$i] = 'Address2';
$i++;
- } elseif (mb_strlen($_POST['Address3']) >40) {
+ } elseif(mb_strlen($_POST['Address3']) >40) {
$InputError = 1;
prnMsg( _('The Line 3 of the address must be forty characters or less long'),'error');
$Errors[$i] = 'Address3';
$i++;
- } elseif (mb_strlen($_POST['Address4']) >50) {
+ } elseif(mb_strlen($_POST['Address4']) >50) {
$InputError = 1;
prnMsg( _('The Line 4 of the address must be fifty characters or less long'),'error');
$Errors[$i] = 'Address4';
$i++;
- } elseif (mb_strlen($_POST['Address5']) >20) {
+ } elseif(mb_strlen($_POST['Address5']) >20) {
$InputError = 1;
prnMsg( _('The Line 5 of the address must be twenty characters or less long'),'error');
$Errors[$i] = 'Address5';
$i++;
- } elseif (!is_numeric(filter_number_format($_POST['CreditLimit']))) {
+ } elseif(!is_numeric(filter_number_format($_POST['CreditLimit']))) {
$InputError = 1;
prnMsg( _('The credit limit must be numeric'),'error');
$Errors[$i] = 'CreditLimit';
$i++;
- } elseif (!is_numeric(filter_number_format($_POST['PymtDiscount']))) {
+ } elseif(!is_numeric(filter_number_format($_POST['PymtDiscount']))) {
$InputError = 1;
prnMsg( _('The payment discount must be numeric'),'error');
$Errors[$i] = 'PymtDiscount';
$i++;
- } elseif (!Is_Date($_POST['ClientSince'])) {
+ } elseif(!Is_Date($_POST['ClientSince'])) {
$InputError = 1;
prnMsg( _('The customer since field must be a date in the format') . ' ' . $_SESSION['DefaultDateFormat'],'error');
$Errors[$i] = 'ClientSince';
$i++;
- } elseif (!is_numeric(filter_number_format($_POST['Discount']))) {
+ } elseif(!is_numeric(filter_number_format($_POST['Discount']))) {
$InputError = 1;
prnMsg( _('The discount percentage must be numeric'),'error');
$Errors[$i] = 'Discount';
$i++;
- } elseif (filter_number_format($_POST['CreditLimit']) <0) {
+ } elseif(filter_number_format($_POST['CreditLimit']) <0) {
$InputError = 1;
prnMsg( _('The credit limit must be a positive number'),'error');
$Errors[$i] = 'CreditLimit';
$i++;
- } elseif ((filter_number_format($_POST['PymtDiscount'])> 10) OR (filter_number_format($_POST['PymtDiscount']) <0)) {
+ } elseif((filter_number_format($_POST['PymtDiscount'])> 10) OR (filter_number_format($_POST['PymtDiscount']) <0)) {
$InputError = 1;
prnMsg( _('The payment discount is expected to be less than 10% and greater than or equal to 0'),'error');
$Errors[$i] = 'PymtDiscount';
$i++;
- } elseif ((filter_number_format($_POST['Discount'])> 100) OR (filter_number_format($_POST['Discount']) <0)) {
+ } elseif((filter_number_format($_POST['Discount'])> 100) OR (filter_number_format($_POST['Discount']) <0)) {
$InputError = 1;
prnMsg( _('The discount is expected to be less than 100% and greater than or equal to 0'),'error');
$Errors[$i] = 'Discount';
$i++;
}
- if (ContainsIllegalCharacters($_POST['EDIReference'])
+ if(ContainsIllegalCharacters($_POST['EDIReference'])
OR mb_strstr($_POST['EDIReference'],' ')) {
$InputError = 1;
prnMsg(_('The customers EDI reference code cannot contain any of the following characters') .' - \' & + \" ' . _('or a space'),'warn');
}
- if (mb_strlen($_POST['EDIReference'])<4 AND ($_POST['EDIInvoices']==1 OR $_POST['EDIOrders']==1)){
+ if(mb_strlen($_POST['EDIReference'])<4 AND ($_POST['EDIInvoices']==1 OR $_POST['EDIOrders']==1)) {
$InputError = 1;
prnMsg(_('The customers EDI reference code must be set when EDI Invoices or EDI orders are activated'),'warn');
$Errors[$i] = 'EDIReference';
$i++;
}
- if (mb_strlen($_POST['EDIAddress'])<4 AND $_POST['EDIInvoices']==1){
+ if(mb_strlen($_POST['EDIAddress'])<4 AND $_POST['EDIInvoices']==1) {
$InputError = 1;
prnMsg(_('The customers EDI email address or FTP server address must be entered if EDI Invoices are to be sent'),'warn');
$Errors[$i] = 'EDIAddress';
@@ -311,17 +312,17 @@
}
- if ($InputError !=1){
+ if($InputError !=1) {
$sql="SELECT 1 FROM debtorsmaster WHERE debtorno='".$_POST['DebtorNo']."' LIMIT 1";
$result=DB_query($sql);
$DebtorExists=(DB_num_rows($result)>0);
- if ($DebtorExists AND $_POST['UpdateIfExists']!=1) {
+ if($DebtorExists AND $_POST['UpdateIfExists']!=1) {
$UpdatedNum++;
- }else{
+ } else {
$SQL_ClientSince = FormatDateForSQL($_POST['ClientSince']);
- if ($DebtorExists) {//update
+ if($DebtorExists) {//update
$UpdatedNum++;
$sql = "SELECT 1
FROM debtortrans
@@ -329,16 +330,16 @@
$result = DB_query($sql);
$curr=false;
- if (DB_num_rows($result) == 0) {
+ if(DB_num_rows($result) == 0) {
$curr=true;
- }else{
+ } else {
$CurrSQL = "SELECT currcode
FROM debtorsmaster
where debtorno = '" . $_POST['DebtorNo'] . "'";
$CurrResult = DB_query($CurrSQL);
$CurrRow = DB_fetch_array($CurrResult);
$OldCurrency = $CurrRow[0];
- if ($OldCurrency != $_POST['CurrCode']) {
+ if($OldCurrency != $_POST['CurrCode']) {
prnMsg( _('The currency code cannot be updated as there are already transactions for this customer'),'info');
}
}
@@ -426,52 +427,52 @@
}
}
- }else{
+ } else {
break;
}
$i=0;
- if (ContainsIllegalCharacters($_POST['BranchCode']) OR mb_strstr($_POST['BranchCode'],' ')) {
+ if(ContainsIllegalCharacters($_POST['BranchCode']) OR mb_strstr($_POST['BranchCode'],' ')) {
$InputError = 1;
prnMsg(_('The Branch code cannot contain any of the following characters')." - & \' < >",'error');
$Errors[$i] = 'BranchCode';
$i++;
}
- if (mb_strlen($_POST['BranchCode'])==0) {
+ if(mb_strlen($_POST['BranchCode'])==0) {
$InputError = 1;
prnMsg(_('The Branch code must be at least one character long'),'error');
$Errors[$i] = 'BranchCode';
$i++;
}
- if (!is_numeric($_POST['FwdDate'])) {
+ if(!is_numeric($_POST['FwdDate'])) {
$InputError = 1;
prnMsg(_('The date after which invoices are charged to the following month is expected to be a number and a recognised number has not been entered'),'error');
$Errors[$i] = 'FwdDate';
$i++;
}
- if ($_POST['FwdDate'] >30) {
+ if($_POST['FwdDate'] >30) {
$InputError = 1;
prnMsg(_('The date (in the month) after which invoices are charged to the following month should be a number less than 31'),'error');
$Errors[$i] = 'FwdDate';
$i++;
}
- if (!is_numeric(filter_number_format($_POST['EstDeliveryDays']))) {
+ if(!is_numeric(filter_number_format($_POST['EstDeliveryDays']))) {
$InputError = 1;
prnMsg(_('The estimated delivery days is expected to be a number and a recognised number has not been entered'),'error');
$Errors[$i] = 'EstDeliveryDays';
$i++;
}
- if (filter_number_format($_POST['EstDeliveryDays']) >60) {
+ if(filter_number_format($_POST['EstDeliveryDays']) >60) {
$InputError = 1;
prnMsg(_('The estimated delivery days should be a number of days less than 60') . '. ' . _('A package can be delivered by seafreight anywhere in the world normally in less than 60 days'),'error');
$Errors[$i] = 'EstDeliveryDays';
$i++;
}
- if ($InputError !=1){
- if (DB_error_no() ==0) {
+ if($InputError !=1) {
+ if(DB_error_no() ==0) {
$sql = "SELECT 1
FROM custbranch
@@ -479,18 +480,18 @@
branchcode='".$_POST['BranchCode']."' LIMIT 1";
$result=DB_query($sql);
$BranchExists=(DB_num_rows($result)>0);
- if ($BranchExists AND $_POST['UpdateIfExists']!=1) {
+ if($BranchExists AND $_POST['UpdateIfExists']!=1) {
//do nothing
- }else{
+ } else {
- if (!isset($_POST['EstDeliveryDays'])) {
+ if(!isset($_POST['EstDeliveryDays'])) {
$_POST['EstDeliveryDays']=1;
}
- if (!isset($Latitude)) {
+ if(!isset($Latitude)) {
$Latitude=0.0;
$Longitude=0.0;
}
- if ($BranchExists) {
+ if($BranchExists) {
$sql = "UPDATE custbranch SET brname = '" . $_POST['BrName'] . "',
braddress1 = '" . $_POST['BrAddress1'] . "',
braddress2 = '" . $_POST['BrAddress2'] . "',
@@ -594,7 +595,7 @@
$result = DB_query($sql, $ErrMsg);
- if (DB_error_no() ==0) {
+ if(DB_error_no() ==0) {
prnMsg( _('New Item') .' ' . $StockID . ' '. _('has been added to the transaction'),'info');
} else { //location insert failed so set some useful error info
$InputError = 1;
@@ -608,29 +609,29 @@
}
- if ($InputError == 1) { //this row failed so exit loop
+ if($InputError == 1) { //this row failed so exit loop
break;
}
$row++;
}
- if ($InputError == 1) { //exited loop with errors so rollback
+ if($InputError == 1) { //exited loop with errors so rollback
prnMsg(_('Failed on row '. $row. '. Batch import has been rolled back.'),'error');
DB_Txn_Rollback();
} else { //all good so commit data transaction
DB_Txn_Commit();
prnMsg( _('Batch Import of') .' ' . $FileName . ' '. _('has been completed. All transactions committed to the database.'),'success');
- if($_POST['UpdateIfExists']==1){
- prnMsg( _('Updated:') .' ' . $UpdatedNum .' '._('Insert:'). $InsertNum );
- }else{
- prnMsg( _('Exist:') .' ' . $UpdatedNum .' '._('Insert:'). $InsertNum );
+ if($_POST['UpdateIfExists']==1) {
+ prnMsg( _('Updated:') .' ' . $UpdatedNum .' '._('Insert') . ':' . $InsertNum );
+ } else {
+ prnMsg( _('Exist:') .' ' . $UpdatedNum .' '. _('Insert') . ':' . $InsertNum );
}
}
fclose($FileHandle);
-} elseif ( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
+} elseif( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
echo '<br /><br /><br />"'. implode('","',$FieldHeadings). '"<br /><br /><br />';
Modified: trunk/Z_ImportSuppliers.php
===================================================================
--- trunk/Z_ImportSuppliers.php 2016-11-21 14:55:36 UTC (rev 7675)
+++ trunk/Z_ImportSuppliers.php 2016-11-22 17:15:03 UTC (rev 7676)
@@ -1,17 +1,18 @@
<?php
/* $Id: Z_ImportSuppliers.php 6067 2013-07-10 02:04:22Z tehonu $*/
+/* Import suppliers by csv file */
include('includes/session.inc');
$Title = _('Import Items');
include('includes/header.inc');
-if(isset($_POST['FormID'])){
- if(!isset($_POST['UpdateIfExists'])){
+if(isset($_POST['FormID'])) {
+ if(!isset($_POST['UpdateIfExists'])) {
$_POST['UpdateIfExists']=0;
- }else{
- $_POST['UpdateIfExists']=1;
+ } else {
+ $_POST['UpdateIfExists']=1;
}
-}else{
+} else {
$_POST['UpdateIfExists']=0;
}
// If this script is called with a file object, then the file contents are imported
@@ -45,7 +46,7 @@
'lng', //23
);
-if (isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
+if(isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
//initialize
$FieldTarget = count($FieldHeadings);
@@ -55,7 +56,7 @@
$FileName = $_FILES['userfile']['name'];
$TempName = $_FILES['userfile']['tmp_name'];
$FileSize = $_FILES['userfile']['size'];
-
+
//get file handle
$FileHandle = fopen($TempName, 'r');
@@ -63,7 +64,7 @@
$headRow = fgetcsv($FileHandle, 10000, ",");
//check for correct number of fields
- if ( count($headRow) != count($FieldHeadings) ) {
+ if( count($headRow) != count($FieldHeadings) ) {
prnMsg (_('File contains '. count($headRow). ' columns, expected '. count($FieldHeadings). '. Try downloading a new template.'),'error');
fclose($FileHandle);
include('includes/footer.inc');
@@ -72,8 +73,8 @@
//test header row field name and sequence
$head = 0;
- foreach ($headRow as $headField) {
- if ( mb_strtoupper($headField) != mb_strtoupper($FieldHeadings[$head]) ) {
+ foreach($headRow as $headField) {
+ if( mb_strtoupper($headField) != mb_strtoupper($FieldHeadings[$head]) ) {
prnMsg (_('File contains incorrect headers ('. mb_strtoupper($headField). ' != '. mb_strtoupper($header[$head]). '. Try downloading a new template.'),'error');
fclose($FileHandle);
include('includes/footer.inc');
@@ -89,10 +90,10 @@
$row = 1;
$UpdatedNum=0;
$InsertNum=0;
- while ( ($filerow = fgetcsv($FileHandle, 10000, ",")) !== FALSE ) {
+ while( ($filerow = fgetcsv($FileHandle, 10000, ",")) !== FALSE ) {
//check for correct number of fields
$fieldCount = count($filerow);
- if ($fieldCount != $FieldTarget){
+ if($fieldCount != $FieldTarget) {
prnMsg (_($FieldTarget. ' fields required, '. $fieldCount. ' fields received'),'error');
fclose($FileHandle);
include('includes/footer.inc');
@@ -100,7 +101,7 @@
}
// cleanup the data (csv files often import with empty strings and such)
- foreach ($filerow as &$value) {
+ foreach($filerow as &$value) {
$value = trim($value);
}
@@ -133,7 +134,7 @@
/* actions to take once the user has clicked the submit button
ie the page has called itself with some user input */
- if (mb_strlen(trim($_POST['SuppName'])) > 40
+ if(mb_strlen(trim($_POST['SuppName'])) > 40
OR mb_strlen(trim($_POST['SuppName'])) == 0
OR trim($_POST['SuppName']) == '') {
@@ -142,56 +143,56 @@
$Errors[$i]='Name';
$i++;
}
- if (mb_strlen($SupplierID) == 0) {
+ if(mb_strlen($SupplierID) == 0) {
$InputError = 1;
prnMsg(_('The Supplier Code cannot be empty'),'error');
$Errors[$i]='ID';
$i++;
}
- if (ContainsIllegalCharacters($SupplierID)) {
+ if(ContainsIllegalCharacters($SupplierID)) {
$InputError = 1;
prnMsg(_('The supplier code cannot contain any of the illegal characters') ,'error');
$Errors[$i]='ID';
$i++;
}
- if (mb_strlen($_POST['Phone']) >25) {
+ if(mb_strlen($_POST['Phone']) >25) {
$InputError = 1;
prnMsg(_('The telephone number must be 25 characters or less long'),'error');
$Errors[$i] = 'Telephone';
$i++;
}
- if (mb_strlen($_POST['Fax']) >25) {
+ if(mb_strlen($_POST['Fax']) >25) {
$InputError = 1;
prnMsg(_('The fax number must be 25 characters or less long'),'error');
$Errors[$i] = 'Fax';
$i++;
}
- if (mb_strlen($_POST['Email']) >55) {
+ if(mb_strlen($_POST['Email']) >55) {
$InputError = 1;
prnMsg(_('The email address must be 55 characters or less long'),'error');
$Errors[$i] = 'Email';
$i++;
}
- if (mb_strlen($_POST['Email'])>0 AND !IsEmailAddress($_POST['Email'])) {
+ if(mb_strlen($_POST['Email'])>0 AND !IsEmailAddress($_POST['Email'])) {
$InputError = 1;
prnMsg(_('The email address is not correctly formed'),'error');
$Errors[$i] = 'Email';
$i++;
}
- if (mb_strlen($_POST['BankRef']) > 12) {
+ if(mb_strlen($_POST['BankRef']) > 12) {
$InputError = 1;
prnMsg(_('The bank reference text must be less than 12 characters long'),'error');
$Errors[$i]='BankRef';
$i++;
}
- if (!Is_Date($_POST['SupplierSince'])) {
+ if(!Is_Date($_POST['SupplierSince'])) {
$InputError = 1;
prnMsg(_('The supplier since field must be a date in the format') . ' ' . $_SESSION['DefaultDateFormat'],'error');
$Errors[$i]='SupplierSince';
$i++;
}
- if ($InputError != 1){
+ if($InputError != 1) {
$SQL_SupplierSince = FormatDateForSQL($_POST['SupplierSince']);
@@ -202,9 +203,9 @@
$SuppExists = ($myrow[0]>0);
- if ($SuppExists AND $_POST['UpdateIfExists']!=1) {
+ if($SuppExists AND $_POST['UpdateIfExists']!=1) {
$UpdatedNum++;
- }elseif($SuppExists){
+ }elseif($SuppExists) {
$UpdatedNum++;
$supptranssql = "SELECT supplierno
FROM supptrans
@@ -229,7 +230,7 @@
fax = '". $_POST['Fax']."',
email = '" . $_POST['Email'] . "',
supptype = '".$_POST['SupplierType']."',";
- if ($supptrans == 0)$sql.="currcode='" . $_POST['CurrCode'] . "',";
+ if($supptrans == 0)$sql.="currcode='" . $_POST['CurrCode'] . "',";
$sql.="suppliersince='".$SQL_SupplierSince . "',
paymentterms='" . $_POST['PaymentTerms'] . "',
bankpartics='" . $_POST['BankPartics'] . "',
@@ -242,11 +243,11 @@
lng='" . $longitude ."',
taxref='". $_POST['TaxRef'] ."'
WHERE supplierid = '".$SupplierID."'";
-
- if ($suppcurr[0] != $_POST['CurrCode']) {
+
+ if($suppcurr[0] != $_POST['CurrCode']) {
prnMsg( _('Cannot change currency code as transactions already exist'), 'info');
}
-
+
$ErrMsg = _('The supplier could not be updated because');
$DbgMsg = _('The SQL that was used to update the supplier but failed was');
// echo $sql;
@@ -309,7 +310,7 @@
$result = DB_query($sql, $ErrMsg, $DbgMsg);
}
- if (DB_error_no() ==0) {
+ if(DB_error_no() ==0) {
} else { //location insert failed so set some useful error info
$InputError = 1;
@@ -317,7 +318,7 @@
} else { //item insert failed so set some useful error info
$InputError = 1;
}
- if ($InputError == 1) { //this row failed so exit loop
+ if($InputError == 1) { //this row failed so exit loop
break;
}
@@ -325,30 +326,30 @@
}
- if ($InputError == 1) { //exited loop with errors so rollback
+ if($InputError == 1) { //exited loop with errors so rollback
prnMsg(_('Failed on row '. $row. '. Batch import has been rolled back.'),'error');
DB_Txn_Rollback();
} else { //all good so commit data transaction
DB_Txn_Commit();
prnMsg( _('Batch Import of') .' ' . $FileName . ' '. _('has been completed. All transactions committed to the database.'),'success');
- if($_POST['UpdateIfExists']==1){
- prnMsg( _('Updated:') .' ' . $UpdatedNum .' '._('Insert:'). $InsertNum );
- }else{
- prnMsg( _('Exist:') .' ' . $UpdatedNum .' '._('Insert:'). $InsertNum );
+ if($_POST['UpdateIfExists']==1) {
+ prnMsg( _('Updated:') .' ' . $UpdatedNum .' '. _('Insert') . ':' . $InsertNum );
+ } else {
+ prnMsg( _('Exist:') .' ' . $UpdatedNum .' '. _('Insert') . ':' . $InsertNum );
}
}
fclose($FileHandle);
-} elseif ( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
+} elseif( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
echo '<br /><br /><br />"'. implode('","',$FieldHeadings). '"<br /><br /><br />';
} else { //show file upload form
prnMsg(_('Please ensure that your csv file charset is UTF-8, otherwise the data will not store correctly in database'),'warn');
-
+
echo '
<br />
<a href="Z_ImportSuppliers.php?gettemplate=1">Get Import Template</a>
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-11-21 14:55:36 UTC (rev 7675)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-22 17:15:03 UTC (rev 7676)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
-"PO-Revision-Date: 2016-11-21 07:31-0600\n"
+"PO-Revision-Date: 2016-11-22 11:01-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -3777,7 +3777,7 @@
#: BankReconciliation.php:208
msgid "Add back unpresented cheques"
-msgstr "Sumar cheques no cobrados"
+msgstr "Añadir cheques no cobrados"
#: BankReconciliation.php:214 BankReconciliation.php:291 CustWhereAlloc.php:135
#: CustomerAccount.php:251 CustomerAllocations.php:347
@@ -9476,11 +9476,11 @@
#: CustomerAllocations.php:340
msgid "Allocate Receipt"
-msgstr "Asignar Cobro"
+msgstr "Asignar cobro"
#: CustomerAllocations.php:340 CustomerReceipt.php:594
msgid "Allocate Receipts"
-msgstr "Asignar Cobros"
+msgstr "Asignar cobros"
#: CustomerAllocations.php:344 PDFRemittanceAdvice.php:307
#: SupplierAllocations.php:566 SupplierAllocations.php:641
@@ -13080,7 +13080,7 @@
#: Factors.php:256
msgid "Insert New Factor"
-msgstr "Agregar la Nueva Compañía Financiera"
+msgstr "Insertar compañía de factoreo nueva"
#: Factors.php:263
msgid "Update Factor"
@@ -13770,7 +13770,7 @@
#: FixedAssetItems.php:679
msgid "Insert New Fixed Asset"
-msgstr "Insertar Nuevo activo fijo"
+msgstr "Insertar activo fijo nuevo"
#: FixedAssetItems.php:685
msgid ""
@@ -14342,7 +14342,7 @@
#: GLAccountCSV.php:79 GLAccountInquiry.php:90 GLAccountReport.php:282
msgid "All tags"
-msgstr "Todos los Centros de Costo"
+msgstr "Todos los centros de costo"
#: GLAccountCSV.php:91 SalesAnalRepts.php:306
#, php-format
@@ -15598,7 +15598,7 @@
#: GLTags.php:70 SecurityTokens.php:154
msgid "Insert"
-msgstr "Crear"
+msgstr "Insertar"
#: GLTags.php:81
msgid "Tag ID"
@@ -22334,7 +22334,7 @@
#: PO_Items.php:1164 SelectProduct.php:477 SelectProduct.php:515
#: StockClone.php:1116 Stocks.php:1445
msgid "Insert New Item"
-msgstr "Agregar nuevo artículo"
+msgstr "Insertar artículo nuevo"
#: PO_Items.php:1169
msgid "Order a non stock item"
@@ -27050,7 +27050,7 @@
#: SalesAnalReptCols.php:515 SalesAnalReptCols.php:517
msgid "Add to"
-msgstr "Sumar a"
+msgstr "Añadir a"
#: SalesAnalReptCols.php:520 SalesAnalReptCols.php:522
msgid "Numerator Minus Denominator"
@@ -31394,7 +31394,7 @@
#: StockAdjustmentsControlled.php:56
msgid "Adding Items"
-msgstr "Agregando Artículos"
+msgstr "Añadiendo artículos"
#: StockAdjustmentsControlled.php:61
msgid "Removing Items"
@@ -36568,7 +36568,7 @@
#: Suppliers.php:859
msgid "Insert New Supplier"
-msgstr "Inserte nuevo proveedor"
+msgstr "Insertar proveedor nuevo"
#: Suppliers.php:953 Suppliers.php:957 Suppliers.php:961
msgid "Within 40 characters"
@@ -41406,7 +41406,7 @@
#: Z_ChangeLocationCode.php:61
msgid "Adding the new location record"
-msgstr "Agregando registro de nueva localidad"
+msgstr "Añadiendo registro de nueva localidad"
#: Z_ChangeLocationCode.php:107
msgid "The SQL to insert the new location record failed"
@@ -41648,7 +41648,7 @@
#: Z_ChangeStockCategory.php:51
msgid "Adding the new stock Category record"
-msgstr "Agregar la nueva categoría del registro de la ubicación de productos"
+msgstr "Añadiendo la nueva categoría del registro de la ubicación de productos"
#: Z_ChangeStockCategory.php:75
msgid "The SQL to insert the new stock category record failed"
@@ -41744,7 +41744,7 @@
#: Z_ChangeStockCode.php:56
msgid "Adding the new stock master record"
-msgstr "Agregando nuevo registro maestro de existencias"
+msgstr "Añadiendo nuevo registro maestro de existencias"
#: Z_ChangeStockCode.php:113
msgid "The SQL to insert the new stock master record failed"
@@ -42748,7 +42748,7 @@
#: Z_ImportChartOfAccounts.php:111
msgid "All general ledger accounts have been added to the chart of accounts"
-msgstr ""
+msgstr "Todas las cuentas contables se han añadido al catálogo contable"
#: Z_ImportChartOfAccounts.php:124
msgid ""
@@ -42930,7 +42930,7 @@
#: Z_ImportCustbranch.php:513
msgid "Insert branches total:"
-msgstr ""
+msgstr "Insertar total de sucursales:"
#: Z_ImportCustbranch.php:515
msgid "Exist branches total:"
@@ -42970,7 +42970,7 @@
#: Z_ImportDebtors.php:625 Z_ImportDebtors.php:627 Z_ImportSuppliers.php:335
#: Z_ImportSuppliers.php:337
msgid "Insert:"
-msgstr ""
+msgstr "Insertar:"
#: Z_ImportDebtors.php:627 Z_ImportSuppliers.php:337
msgid "Exist:"
@@ -46281,7 +46281,7 @@
#: api/api_xml-rpc.php:1218
msgid "Insert Sales Order Header"
-msgstr "Insertar el Encabezado de Pedidos de Venta"
+msgstr "Insertar encabezado de orden de venta"
#: api/api_xml-rpc.php:1222
msgid ""
@@ -46333,7 +46333,7 @@
#: api/api_xml-rpc.php:1316
msgid "Insert Sales Order Line"
-msgstr "Inserte la Línea de Pedidos de Venta"
+msgstr "Insertar línea de orden de ventas"
#: api/api_xml-rpc.php:1320
msgid "The orderno key must be one of these values. "
@@ -50974,7 +50974,7 @@
#: includes/MainMenuLinksArray.php:441
msgid "Add or Maintain Asset Locations"
-msgstr "Agregar o Administrar Ubicaciones de activos"
+msgstr "Añadir o Administrar Ubicaciones de activos"
#: includes/MainMenuLinksArray.php:448
msgid "Assign Cash to PC Tab"
@@ -51615,7 +51615,7 @@
#: install/index.php:1070
msgid "Administrator account settings"
-msgstr ""
+msgstr "Configuración de la cuenta del administrador"
#: install/index.php:1074
msgid "The default user name is 'admin' and it cannot be changed."
@@ -52077,7 +52077,7 @@
#: reportwriter/languages/en_US/reports.php:164
msgid "Administrator Page"
-msgstr ""
+msgstr "Página del administrador"
#: reportwriter/languages/en_US/reports.php:165
msgid "Border Line"
Modified: trunk/sql/mysql/country_sql/de...
[truncated message content] |
|
From: <rc...@us...> - 2016-11-23 16:05:04
|
Revision: 7677
http://sourceforge.net/p/web-erp/reponame/7677
Author: rchacon
Date: 2016-11-23 16:05:02 +0000 (Wed, 23 Nov 2016)
Log Message:
-----------
Standardise text.
Modified Paths:
--------------
trunk/ExchangeRateTrend.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php 2016-11-22 17:15:03 UTC (rev 7676)
+++ trunk/ExchangeRateTrend.php 2016-11-23 16:05:02 UTC (rev 7677)
@@ -3,9 +3,9 @@
/* This script shows the trend in exchange rates as retrieved from ECB. */
include('includes/session.inc');
-$Title = _('View Currency Trends');// Screen identification.
-$ViewTopic= 'Currencies';// Filename's id in ManualContents.php's TOC.
-$BookMark = 'ExchangeRateTrend';// Anchor's id in the manual's html document.
+$Title = _('View Currency Trend');
+$ViewTopic= 'Currencies';
+$BookMark = 'ExchangeRateTrend';
include('includes/header.inc');
$FunctionalCurrency = $_SESSION['CompanyRecord']['currencydefault'];
@@ -23,12 +23,11 @@
echo '<form method="post" id="update" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<div class="centre">';
- echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/currency.png" title="' .// Icon image.
- _('View Currency Trend') . '" /> ' .// Icon title.
- _('View Currency Trend') . '</p>';// Page title.
- echo '</div><table>'; // First column
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/currency.png" title="', // Icon image.
+ _('View Currency Trend'), '" /> ', // Icon title.
+ _('View Currency Trend'), '</p>';// Page title.
+ echo '<table>'; // First column
$SQL = "SELECT currabrev FROM currencies";
$result=DB_query($SQL);
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-11-22 17:15:03 UTC (rev 7676)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-23 16:05:02 UTC (rev 7677)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
-"PO-Revision-Date: 2016-11-22 11:01-0600\n"
+"PO-Revision-Date: 2016-11-23 08:21-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -11948,7 +11948,7 @@
#: Departments.php:197
msgid "View all Departments"
-msgstr "Ver todos los Departamentos"
+msgstr "Ver todos los departamentos"
#: Departments.php:220
msgid "The selected departemnt could not be found."
@@ -12870,11 +12870,11 @@
#: ExchangeRateTrend.php:6
msgid "View Currency Trends"
-msgstr "Ver Tendencias de la Divisa"
+msgstr "Ver tendencia de la moneda"
#: ExchangeRateTrend.php:29 ExchangeRateTrend.php:30
msgid "View Currency Trend"
-msgstr "Ver Tendencia de la Divisa"
+msgstr "Ver tendencia de la moneda"
#: ExchangeRateTrend.php:76
msgid "Trend Currently Unavailable"
@@ -29849,7 +29849,7 @@
#: SelectSupplier.php:178
msgid "View All Purchase Orders"
-msgstr "Ver todas las Órdenes de Compra"
+msgstr "Ver todas las órdenes de compra"
#: SelectSupplier.php:180
msgid "List all open shipments for"
|
|
From: <rc...@us...> - 2016-11-23 17:15:39
|
Revision: 7678
http://sourceforge.net/p/web-erp/reponame/7678
Author: rchacon
Date: 2016-11-23 17:15:37 +0000 (Wed, 23 Nov 2016)
Log Message:
-----------
Add navigation aids (return button).
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/doc/Change.log
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2016-11-23 16:05:02 UTC (rev 7677)
+++ trunk/AccountGroups.php 2016-11-23 17:15:37 UTC (rev 7678)
@@ -11,14 +11,13 @@
include('includes/SQL_CommonFunctions.inc');
-function CheckForRecursiveGroup ($ParentGroupName, $GroupName, $db) {
+function CheckForRecursiveGroup($ParentGroupName, $GroupName, $db) {
/* returns true ie 1 if the group contains the parent group as a child group
ie the parent group results in a recursive group structure otherwise false ie 0 */
$ErrMsg = _('An error occurred in retrieving the account groups of the parent account group during the check for recursion');
$DbgMsg = _('The SQL that was used to retrieve the account groups of the parent account group and that failed in the process was');
-
do {
$sql = "SELECT parentgroupname
FROM accountgroups
@@ -26,22 +25,22 @@
$result = DB_query($sql,$ErrMsg,$DbgMsg);
$myrow = DB_fetch_row($result);
- if ($ParentGroupName == $myrow[0]){
+ if($ParentGroupName == $myrow[0]) {
return true;
}
$GroupName = $myrow[0];
- } while ($myrow[0]!='');
+ } while($myrow[0] != '');
return false;
-} //end of function CheckForRecursiveGroupName
+}// END of function CheckForRecursiveGroupName
// If $Errors is set, then unset it.
-if (isset($Errors)) {
+if(isset($Errors)) {
unset($Errors);
}
$Errors = array();
-if (isset($_POST['MoveGroup'])) {
+if(isset($_POST['MoveGroup'])) {
$sql="UPDATE chartmaster SET group_='" . $_POST['DestinyAccountGroup'] . "' WHERE group_='" . $_POST['OriginalAccountGroup'] . "'";
$ErrMsg = _('An error occurred in moving the account group');
$DbgMsg = _('The SQL that was used to move the account group was');
@@ -50,7 +49,7 @@
prnMsg( _('All accounts in the account group:') . ' ' . $_POST['OriginalAccountGroup'] . ' ' . _('have been changed to the account group:') . ' ' . $_POST['DestinyAccountGroup'],'success');
}
-if (isset($_POST['submit'])) {
+if(isset($_POST['submit'])) {
//initialise no input errors assumed initially before we test
@@ -72,26 +71,26 @@
$result=DB_query($sql,$ErrMsg,$DbgMsg);
$myrow=DB_fetch_row($result);
- if ($myrow[0] != 0 AND $_POST['SelectedAccountGroup'] == '') {
+ if($myrow[0] != 0 AND $_POST['SelectedAccountGroup'] == '') {
$InputError = 1;
prnMsg( _('The account group name already exists in the database'),'error');
$Errors[$i] = 'GroupName';
$i++;
}
- if (ContainsIllegalCharacters($_POST['GroupName'])) {
+ if(ContainsIllegalCharacters($_POST['GroupName'])) {
$InputError = 1;
prnMsg( _('The account group name cannot contain the character') . " '&' " . _('or the character') ."' '",'error');
$Errors[$i] = 'GroupName';
$i++;
}
- if (mb_strlen($_POST['GroupName'])==0){
+ if(mb_strlen($_POST['GroupName'])==0) {
$InputError = 1;
prnMsg( _('The account group name must be at least one character long'),'error');
$Errors[$i] = 'GroupName';
$i++;
}
- if ($_POST['ParentGroupName'] !=''){
- if (CheckForRecursiveGroup($_POST['GroupName'],$_POST['ParentGroupName'],$db)) {
+ if($_POST['ParentGroupName'] !='') {
+ if(CheckForRecursiveGroup($_POST['GroupName'],$_POST['ParentGroupName'],$db)) {
$InputError =1;
prnMsg(_('The parent account group selected appears to result in a recursive account structure - select an alternative parent account group or make this group a top level account group'),'error');
$Errors[$i] = 'ParentGroupName';
@@ -115,19 +114,19 @@
prnMsg(_('Since this account group is a child group, the sequence in the trial balance, the section in the accounts and whether or not the account group appears in the balance sheet or profit and loss account are all properties inherited from the parent account group. Any changes made to these fields will have no effect.'),'warn');
}
}
- if (!ctype_digit($_POST['SectionInAccounts'])) {
+ if(!ctype_digit($_POST['SectionInAccounts'])) {
$InputError = 1;
prnMsg( _('The section in accounts must be an integer'),'error');
$Errors[$i] = 'SectionInAccounts';
$i++;
}
- if (!ctype_digit($_POST['SequenceInTB'])) {
+ if(!ctype_digit($_POST['SequenceInTB'])) {
$InputError = 1;
prnMsg( _('The sequence in the trial balance must be an integer'),'error');
$Errors[$i] = 'SequenceInTB';
$i++;
}
- if (!ctype_digit($_POST['SequenceInTB']) OR $_POST['SequenceInTB'] > 10000) {
+ if(!ctype_digit($_POST['SequenceInTB']) OR $_POST['SequenceInTB'] > 10000) {
$InputError = 1;
prnMsg( _('The sequence in the TB must be numeric and less than') . ' 10,000','error');
$Errors[$i] = 'SequenceInTB';
@@ -135,10 +134,10 @@
}
- if ($_POST['SelectedAccountGroup']!='' AND $InputError !=1) {
+ if($_POST['SelectedAccountGroup']!='' AND $InputError !=1) {
/*SelectedAccountGroup could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
- if ($_POST['SelectedAccountGroup']!==$_POST['GroupName']) {
+ if($_POST['SelectedAccountGroup']!==$_POST['GroupName']) {
DB_IgnoreForeignKeys();
@@ -169,7 +168,7 @@
$DbgMsg = _('The SQL that was used to update the account group was');
$msg = _('Record Updated');
- } elseif ($InputError !=1) {
+ } elseif($InputError !=1) {
/*Selected group is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new account group form */
@@ -189,7 +188,7 @@
$msg = _('Record inserted');
}
- if ($InputError!=1){
+ if($InputError!=1) {
//run the SQL from either of the above possibilites
$result = DB_query($sql,$ErrMsg,$DbgMsg);
prnMsg($msg,'success');
@@ -198,7 +197,7 @@
unset ($_POST['SequenceInTB']);
}
-} elseif (isset($_GET['delete'])) {
+} elseif(isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
// PREVENT DELETES IF DEPENDENT RECORDS IN 'ChartMaster'
@@ -208,7 +207,7 @@
$DbgMsg = _('The SQL that was used to retrieve the information was');
$result = DB_query($sql,$ErrMsg,$DbgMsg);
$myrow = DB_fetch_array($result);
- if ($myrow['groups']>0) {
+ if($myrow['groups']>0) {
prnMsg( _('Cannot delete this account group because general ledger accounts have been created using this group'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group');
echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
@@ -222,9 +221,9 @@
$sql = "SELECT groupname FROM accountgroups";
$GroupResult = DB_query($sql,$ErrMsg,$DbgMsg);
- while ($GroupRow = DB_fetch_array($GroupResult) ) {
+ while($GroupRow = DB_fetch_array($GroupResult) ) {
- if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$GroupRow['groupname']) {
+ if(isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$GroupRow['groupname']) {
echo '<option selected="selected" value="'.htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8'). '</option>';
} else {
echo '<option value="'.htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($GroupRow['groupname'], ENT_QUOTES,'UTF-8') . '</option>';
@@ -243,7 +242,7 @@
$DbgMsg = _('The SQL that was used to retrieve the information was');
$result = DB_query($sql,$ErrMsg,$DbgMsg);
$myrow = DB_fetch_array($result);
- if ($myrow['groupnames']>0) {
+ if($myrow['groupnames']>0) {
prnMsg( _('Cannot delete this account group because it is a parent account group of other account group(s)'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow['groupnames'] . ' ' . _('account groups that have this group as its/there parent account group');
@@ -258,7 +257,7 @@
} //end if account group used in GL accounts
}
-if (!isset($_GET['SelectedAccountGroup']) AND !isset($_POST['SelectedAccountGroup'])) {
+if(!isset($_GET['SelectedAccountGroup']) AND !isset($_POST['SelectedAccountGroup'])) {
/* An account group could be posted when one has been edited and is being updated or GOT when selected for modification
SelectedAccountGroup will exist because it was sent with the page in a GET .
@@ -292,9 +291,9 @@
</tr>';
$k=0; //row colour counter
- while ($myrow = DB_fetch_array($result)) {
+ while($myrow = DB_fetch_array($result)) {
- if ($k==1){
+ if($k==1) {
echo '<tr class="EvenTableRows">';
$k=0;
} else {
@@ -327,17 +326,17 @@
} //end of ifs and buts!
-if (isset($_POST['SelectedAccountGroup']) or isset($_GET['SelectedAccountGroup'])) {
+if(isset($_POST['SelectedAccountGroup']) or isset($_GET['SelectedAccountGroup'])) {
echo '<div class="centre"><br /><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
}
-if (!isset($_GET['delete'])) {
+if(!isset($_GET['delete'])) {
echo '<form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if (isset($_GET['SelectedAccountGroup'])) {
+ if(isset($_GET['SelectedAccountGroup'])) {
//editing an existing account group
$sql = "SELECT groupname,
@@ -351,7 +350,7 @@
$ErrMsg = _('An error occurred in retrieving the account group information');
$DbgMsg = _('The SQL that was used to retrieve the account group and that failed in the process was');
$result = DB_query($sql,$ErrMsg,$DbgMsg);
- if (DB_num_rows($result) == 0) {
+ if(DB_num_rows($result) == 0) {
prnMsg( _('The account group name does not exist in the database'),'error');
include('includes/footer.inc');
exit;
@@ -370,45 +369,60 @@
<th colspan="2">', _('Edit Account Group Details'), '</th>
</tr>
</thead>
+ <tfoot>
+ <tr>
+ <td class="centre" colspan="2">',
+ '<button name="submit" tabindex="6" type="submit" value="Update"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/tick.svg" /> ', _('Update'), '</button>', // "Update" button.
+ '<button onclick="window.location=\'AccountGroups.php\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
+ '</td>
+ </tr>
+ </tfoot>
<tbody>
<tr>
<td><input name="SelectedAccountGroup" type="hidden" value="', $_GET['SelectedAccountGroup'], '" /></td>
</tr>';
- } elseif (!isset($_POST['MoveGroup'])) { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
+ } elseif(!isset($_POST['MoveGroup'])) { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
- if (!isset($_POST['SelectedAccountGroup'])){
+ if(!isset($_POST['SelectedAccountGroup'])) {
$_POST['SelectedAccountGroup']='';
}
- if (!isset($_POST['GroupName'])){
+ if(!isset($_POST['GroupName'])) {
$_POST['GroupName']='';
}
- if (!isset($_POST['SectionInAccounts'])){
+ if(!isset($_POST['SectionInAccounts'])) {
$_POST['SectionInAccounts']='';
}
- if (!isset($_POST['SequenceInTB'])){
+ if(!isset($_POST['SequenceInTB'])) {
$_POST['SequenceInTB']='';
}
- if (!isset($_POST['PandL'])){
+ if(!isset($_POST['PandL'])) {
$_POST['PandL']='';
}
echo '<br />
- <table class="noprint selection">
- <thead>
+ <table class="noprint selection">
+ <thead>
+ <tr>
+ <th colspan="2">', _('New Account Group Details'), '</th>
+ </tr>
+ </thead>
+ <tfoot>
<tr>
- <th colspan="2">', _('New Account Group Details'), '</th>
+ <td class="centre" colspan="2">',
+ '<button name="submit" tabindex="6" type="submit" value="Insert"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/tick.svg" /> ', _('Insert'), '</button>', // "Insert" button.
+ '<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
+ '</td>
</tr>
- </thead>
- <tfoot>
- <tr>
- <td class="centre" colspan="2"><input name="submit" tabindex="6" type="submit" value="', _('Enter Information'), '" /></td>
- </tr>
- </tfoot>
- <tbody>
- <tr>
- <td><input name="SelectedAccountGroup" type="hidden" value="', $_POST['SelectedAccountGroup'], '" /></td>
- </tr>';
+ </tfoot>
+ <tbody>
+ <tr>
+ <td><input name="SelectedAccountGroup" type="hidden" value="', $_POST['SelectedAccountGroup'], '" /></td>
+ </tr>';
}
echo '<tr>
<td>', _('Account Group Name'), ':</td>
@@ -419,16 +433,14 @@
<td><select ',
( in_array('ParentGroupName',$Errors) ? 'class="selecterror" ' : '' ),
'name="ParentGroupName" tabindex="2">';
-
- $sql = "SELECT groupname FROM accountgroups";
- $groupresult = DB_query($sql,$ErrMsg,$DbgMsg);
echo '<option ',
( !isset($_POST['ParentGroupName']) ? 'selected="selected" ' : '' ),
'value="">', _('Top Level Group'), '</option>';
- while ( $grouprow = DB_fetch_array($groupresult) ) {
-
- if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$grouprow['groupname']) {
+ $sql = "SELECT groupname FROM accountgroups";
+ $groupresult = DB_query($sql,$ErrMsg,$DbgMsg);
+ while( $grouprow = DB_fetch_array($groupresult) ) {
+ if(isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$grouprow['groupname']) {
echo '<option selected="selected" value="'.htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8') . '</option>';
} else {
echo '<option value="'.htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8') . '</option>';
@@ -445,7 +457,7 @@
$sql = "SELECT sectionid, sectionname FROM accountsection ORDER BY sectionid";
$secresult = DB_query($sql,$ErrMsg,$DbgMsg);
while( $secrow = DB_fetch_array($secresult) ) {
- if ($_POST['SectionInAccounts']==$secrow['sectionid']) {
+ if($_POST['SectionInAccounts']==$secrow['sectionid']) {
echo '<option selected="selected" value="'.$secrow['sectionid'].'">' . $secrow['sectionname'].' ('.$secrow['sectionid'].')</option>';
} else {
echo '<option value="'.$secrow['sectionid'].'">' . $secrow['sectionname'].' ('.$secrow['sectionid'].')</option>';
@@ -456,18 +468,13 @@
<tr>
<td>', _('Profit and Loss'), ':</td>
<td><select name="PandL" tabindex="4" title="', _('Select YES if this account group will contain accounts that will consist of only profit and loss accounts or NO if the group will contain balance sheet account'), '">';
-
- if ($_POST['PandL']!=0 ) {
- echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
+ if($_POST['PandL']!=0 ) {
+ echo '<option value="0">', _('No'), '</option>',
+ '<option selected="selected" value="1">', _('Yes'), '</option>';
} else {
- echo '<option value="1">' . _('Yes') . '</option>';
+ echo '<option selected="selected" value="0">', _('No'), '</option>',
+ '<option value="1">', _('Yes'), '</option>';
}
- if ($_POST['PandL']==0) {
- echo '<option selected="selected" value="0">' . _('No') . '</option>';
- } else {
- echo '<option value="0">' . _('No') . '</option>';
- }
-
echo '</select></td>
</tr>
<tr>
@@ -481,5 +488,6 @@
</form>';
} //end if record deleted no point displaying form to add record
+
include('includes/footer.inc');
?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-11-23 16:05:02 UTC (rev 7677)
+++ trunk/doc/Change.log 2016-11-23 17:15:37 UTC (rev 7678)
@@ -1,5 +1,6 @@
webERP Change Log
+23/11/16 RChacon: On AccountGroups.php, add navigation aids (return button).
08/11/16 RChacon: On WWW_Users.php, fix hardcoded label (difficult to translate for languages with a different structure to English), do sortable the users list, replace printf() with plain list echo, and add format class.
08/11/16 RChacon: Add scripts to show a statement of cash flows for the period using the indirect method.
08/11/16 RChacon: On SelectSupplier.php, fix table html code.
|
|
From: <rc...@us...> - 2016-11-23 19:08:11
|
Revision: 7679
http://sourceforge.net/p/web-erp/reponame/7679
Author: rchacon
Date: 2016-11-23 19:08:09 +0000 (Wed, 23 Nov 2016)
Log Message:
-----------
Removes ':' from text.
Modified Paths:
--------------
trunk/BOMIndented.php
trunk/MaintenanceReminders.php
trunk/PDFStockCheckComparison.php
trunk/PcReportTab.php
trunk/SuppPriceList.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2016-11-23 17:15:37 UTC (rev 7678)
+++ trunk/BOMIndented.php 2016-11-23 19:08:09 UTC (rev 7679)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$*/
+/* Shows the bill of material indented for each level */
// BOMIndented.php - Indented Bill of Materials
@@ -323,7 +323,7 @@
$FontSize=8;
$YPos =$YPos - (2*$line_height);
- $pdf->addTextWrap($Left_Margin+1,$YPos,40,$FontSize,_('Assembly:'),'',0);
+ $pdf->addTextWrap($Left_Margin+1,$YPos,40,$FontSize,_('Assembly').':','',0);
$pdf->addTextWrap(85,$YPos,100,$FontSize,mb_strtoupper($_POST['Part']),'',0);
$pdf->addTextWrap(185,$YPos,150,$FontSize,$assemblydesc,'',0);
$YPos -=(2*$line_height);
Modified: trunk/MaintenanceReminders.php
===================================================================
--- trunk/MaintenanceReminders.php 2016-11-23 17:15:37 UTC (rev 7678)
+++ trunk/MaintenanceReminders.php 2016-11-23 19:08:09 UTC (rev 7679)
@@ -34,7 +34,7 @@
${'Mail' . $myrow['userresponsible']}->setSubject('Maintenance Tasks Reminder');
${'Mail' . $myrow['userresponsible']}->setFrom('Do_not_reply <>');
}
- $MailText .= "Asset: " . $myrow['description'] . "\nTask: " . $myrow['taskdescription'] . "\nDue: " . ConvertSQLDate($myrow['duedate']);
+ $MailText .= 'Asset' . ': ' . $myrow['description'] . "\nTask: " . $myrow['taskdescription'] . "\nDue: " . ConvertSQLDate($myrow['duedate']);
if (Date1GreaterThanDate2(ConvertSQLDate($myrow['duedate']),Date($_SESSION['DefaultDateFormat']))) {
$MailText .= _('NB: THIS JOB IS OVERDUE');
}
@@ -74,7 +74,7 @@
${'Mail' . $myrow['manager']}->setSubject('Overdue Maintenance Tasks Reminder');
${'Mail' . $myrow['manager']}->setFrom('Do_not_reply <>');
}
- $MailText .= _('Asset:') .' ' . $myrow['description'] . "\n" . _('Task:') . ' ' . $myrow['taskdescription'] . "\n" . _('Due:') . ' ' . ConvertSQLDate($myrow['duedate']);
+ $MailText .= _('Asset') . ': ' . $myrow['description'] . "\n" . _('Task:') . ' ' . $myrow['taskdescription'] . "\n" . _('Due:') . ' ' . ConvertSQLDate($myrow['duedate']);
$MailText . "\n\n";
}
if (DB_num_rows($result)>0){
Modified: trunk/PDFStockCheckComparison.php
===================================================================
--- trunk/PDFStockCheckComparison.php 2016-11-23 17:15:37 UTC (rev 7678)
+++ trunk/PDFStockCheckComparison.php 2016-11-23 19:08:09 UTC (rev 7679)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$*/
+/* Creates a pdf comparing the quantites entered as counted at a given range of locations against the quantity stored as on hand as at the time a stock check was initiated. */
include('includes/session.inc');
@@ -219,7 +219,7 @@
$FirstRow = DB_fetch_array($CheckedItems);
$LocationName = $FirstRow['locationname'];
DB_data_seek($CheckedItems,0);
-
+
include ('includes/PDFStockComparisonPageHeader.inc');
$Location = '';
@@ -254,7 +254,7 @@
$YPos -=$line_height;
}
-
+
$SQL = "SELECT qtycounted,
reference
FROM stockcounts
@@ -279,7 +279,7 @@
$YPos -=$line_height;
$FontSize=8;
if (mb_strlen($CheckItemRow['bin'])>0){
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'] . ' - ' . _('Bin:') . $CheckItemRow['bin'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'] . ' - ' . _('Bin') . ':' . $CheckItemRow['bin'], 'left');
} else {
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'], 'left');
}
Modified: trunk/PcReportTab.php
===================================================================
--- trunk/PcReportTab.php 2016-11-23 17:15:37 UTC (rev 7678)
+++ trunk/PcReportTab.php 2016-11-23 19:08:09 UTC (rev 7679)
@@ -1,11 +1,14 @@
<?php
-
/* $Id$ */
+/* */
include ('includes/session.inc');
+$Title = _('Petty Cash Management Report');
+$ViewTopic = 'PettyCash';
+$BookMark = 'PcReportTab';
+
include ('includes/SQL_CommonFunctions.inc');
-$Title = _('Petty Cash Management Report');
if (isset($_POST['SelectedTabs'])){
$SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
@@ -13,7 +16,7 @@
$SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
}
-if ((! isset($_POST['FromDate']) AND ! isset($_POST['ToDate'])) OR isset($_POST['SelectDifferentDate'])){
+if ((! isset($_POST['FromDate']) AND ! isset($_POST['ToDate'])) OR isset($_POST['SelectDifferentDate'])) {
include ('includes/header.inc');
@@ -78,7 +81,7 @@
</div>
</form>';
-} else if (isset($_POST['PrintPDF'])) {
+} elseif (isset($_POST['PrintPDF'])) {
include('includes/PDFStarter.php');
$PageNumber = 0;
@@ -138,34 +141,34 @@
$YPos -= (2 * $line_height);
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Tab Code :'));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$SelectedTabs);
$LeftOvers = $pdf->addTextWrap($Left_Margin+290,$YPos,70,$FontSize,_('From'). ' ');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+340,$YPos,70,$FontSize,$_POST['FromDate']);
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('User '));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$Tabs['usercode']);
$LeftOvers = $pdf->addTextWrap($Left_Margin+290,$YPos,70,$FontSize,_('To '));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+340,$YPos,70,$FontSize,$_POST['ToDate']);
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Authoriser '));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$Tabs['authorizer']);
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Currency '));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$Tabs['currency']);
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,40,$FontSize,_('Balance before '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+55,$YPos,70,$FontSize,$_POST['FromDate']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,locale_number_format($Balance['0'],$_SESSION['CompanyRecord']['decimalplaces']));
$LeftOvers = $pdf->addTextWrap($Left_Margin+150,$YPos,70,$FontSize,$Tabs['currency']);
@@ -222,7 +225,7 @@
$pdf->line($Left_Margin+250, $YPos+$line_height,$Left_Margin+500, $YPos+$line_height);
$LeftOvers = $pdf->addTextWrap($Left_Margin+70,$YPos,100,$FontSize,_('Balance at'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$_POST['ToDate']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,20,$FontSize,_(': '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,20,$FontSize,': ');
$LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,70,$FontSize,locale_number_format($Amount[0],$_SESSION['CompanyRecord']['decimalplaces']),'right');
$LeftOvers = $pdf->addTextWrap($Left_Margin+240,$YPos,70,$FontSize,$Tabs['currency']);
$pdf->line($Page_Width-$Right_Margin, $YPos+$line_height,$Left_Margin, $YPos+$line_height);
Modified: trunk/SuppPriceList.php
===================================================================
--- trunk/SuppPriceList.php 2016-11-23 17:15:37 UTC (rev 7678)
+++ trunk/SuppPriceList.php 2016-11-23 19:08:09 UTC (rev 7679)
@@ -1,6 +1,6 @@
<?php
-
/* $Id$*/
+/* */
include('includes/session.inc');
@@ -246,7 +246,6 @@
}
echo '</select></td>
</tr>';
-
echo '<tr>
<td>' . _('Price List') . ':</td>
<td><select name="price">
@@ -255,8 +254,6 @@
</select>
</td>
</tr>';
-
-
echo '</table>
<br/>
<div class="centre">
@@ -293,15 +290,15 @@
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
$YPos -= $line_height;
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Supplier').' ');
- $pdf->addTextWrap(95,$YPos,150,$FontSize,_(': ').$SupplierName);
+ $pdf->addTextWrap(95,$YPos,150,$FontSize,': '.$SupplierName);
$YPos -= $line_height;
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Category').' ');
- $pdf->addTextWrap(95,$YPos,150,$FontSize,_(': ').$Categoryname);
+ $pdf->addTextWrap(95,$YPos,150,$FontSize,': '.$Categoryname);
$YPos -= $line_height;
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Currency').' ');
- $pdf->addTextWrap(95,$YPos,50,$FontSize,_(': ').$CurrCode);
+ $pdf->addTextWrap(95,$YPos,50,$FontSize,': '.$CurrCode);
$YPos -=(2*$line_height);
/*set up the headings */
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-11-23 17:15:37 UTC (rev 7678)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-23 19:08:09 UTC (rev 7679)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
-"PO-Revision-Date: 2016-11-23 08:21-0600\n"
+"PO-Revision-Date: 2016-11-23 13:05-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -23793,7 +23793,7 @@
#: PcReportTab.php:168 PcReportTab.php:225 SuppPriceList.php:296
#: SuppPriceList.php:301 SuppPriceList.php:304
msgid ": "
-msgstr ":"
+msgstr ": "
#: PcReportTab.php:148
msgid "User "
|
|
From: <rc...@us...> - 2016-11-24 14:10:28
|
Revision: 7682
http://sourceforge.net/p/web-erp/reponame/7682
Author: rchacon
Date: 2016-11-24 14:10:25 +0000 (Thu, 24 Nov 2016)
Log Message:
-----------
Merges duplicated text.
Modified Paths:
--------------
trunk/ContractBOM.php
trunk/ContractOtherReqts.php
trunk/ImportBankTransAnalysis.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReport.php
trunk/PDFCustomerList.php
trunk/PcExpensesTypeTab.php
trunk/SalesGraph.php
trunk/Z_MakeNewCompany.php
trunk/geocode.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/ContractBOM.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id: ContractBOM.php 4553 2011-04-18 00:09:23Z daintree $*/
include('includes/DefineContractClass.php');
@@ -233,7 +232,7 @@
if (isset($_SESSION['Contract'.$identifier]->ContractRef)) {
echo '<tr>
- <th colspan="7">' . _('Contract Reference:') .' '. $_SESSION['Contract'.$identifier]->ContractRef . '</th>
+ <th colspan="7">' . _('Contract Reference') . ': '. $_SESSION['Contract'.$identifier]->ContractRef . '</th>
</tr>';
}
Modified: trunk/ContractOtherReqts.php
===================================================================
--- trunk/ContractOtherReqts.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/ContractOtherReqts.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id: ContractOtherReqts.php 3692 2010-08-15 09:22:08Z daintree $*/
include('includes/DefineContractClass.php');
@@ -90,7 +89,7 @@
if (isset($_SESSION['Contract'.$identifier]->ContractRef)) {
echo '<tr>
- <th colspan="5">' . _('Contract Reference:') .' '. $_SESSION['Contract'.$identifier]->ContractRef . '</th>
+ <th colspan="5">' . _('Contract Reference') . ': '. $_SESSION['Contract'.$identifier]->ContractRef . '</th>
</tr>';
}
Modified: trunk/ImportBankTransAnalysis.php
===================================================================
--- trunk/ImportBankTransAnalysis.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/ImportBankTransAnalysis.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -110,10 +110,10 @@
/*Show all the selected GLEntries so far from the $_SESSION['Trans'][$TransID]->GLEntries array */
if ($_SESSION['Trans'][$TransID]->Amount >= 0){ //its a receipt
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Bank Account Transaction Analysis') . '" alt="" />' . ' '
- . _('Imported Bank Receipt of') . ' ' . $_SESSION['Trans'][$TransID]->Amount . ' ' . $_SESSION['Statement']->CurrCode . ' ' . _('dated:') . ' ' . $_SESSION['Trans'][$TransID]->ValueDate . '<br /> ' . $_SESSION['Trans'][$TransID]->Description;
+ . _('Imported Bank Receipt of') . ' ' . $_SESSION['Trans'][$TransID]->Amount . ' ' . $_SESSION['Statement']->CurrCode . ' ' . _('dated') . ': ' . $_SESSION['Trans'][$TransID]->ValueDate . '<br /> ' . $_SESSION['Trans'][$TransID]->Description;
} else {
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Bank Account Transaction Analysis') . '" alt="" />' . ' '
- . _('Imported Bank Payment of') . ' ' . $_SESSION['Trans'][$TransID]->Amount . ' ' . $_SESSION['Statement']->CurrCode . ' ' ._('dated:') . ' ' . $_SESSION['Trans'][$TransID]->ValueDate . '<br /> ' . $_SESSION['Trans'][$TransID]->Description;
+ . _('Imported Bank Payment of') . ' ' . $_SESSION['Trans'][$TransID]->Amount . ' ' . $_SESSION['Statement']->CurrCode . ' ' ._('dated') . ': ' . $_SESSION['Trans'][$TransID]->ValueDate . '<br /> ' . $_SESSION['Trans'][$TransID]->Description;
}
/*Set up a form to allow input of new GL entries */
Modified: trunk/MRPPlannedPurchaseOrders.php
===================================================================
--- trunk/MRPPlannedPurchaseOrders.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/MRPPlannedPurchaseOrders.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id$*/
// MRPPlannedPurchaseOrders.php - Report of purchase parts that MRP has determined should have
// purchase orders created for them
@@ -14,7 +13,7 @@
$Title=_('MRP error');
include('includes/header.inc');
echo '<br />';
- prnMsg( _('The MRP calculation must be run before you can run this report') . '<br />' .
+ prnMsg( _('The MRP calculation must be run before you can run this report') . '<br />' .
_('To run the MRP calculation click').' ' . '<a href='.$RootPath .'/MRP.php>' . _('here') . '</a>', 'error');
include('includes/footer.inc');
exit;
@@ -327,7 +326,7 @@
} else {
$displayconsolidation = _('Monthly');
};
- $pdf->addTextWrap($Left_Margin,$YPos,65,$FontSize,_('Consolidation:'));
+ $pdf->addTextWrap($Left_Margin,$YPos,65,$FontSize,_('Consolidation').':');
$pdf->addTextWrap(110,$YPos,40,$FontSize,$displayconsolidation);
$YPos -=(2*$line_height);
Modified: trunk/MRPPlannedWorkOrders.php
===================================================================
--- trunk/MRPPlannedWorkOrders.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/MRPPlannedWorkOrders.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id$*/
// MRPPlannedWorkOrders.php - Report of manufactured parts that MRP has determined should have
@@ -13,7 +12,7 @@
$Title=_('MRP error');
include('includes/header.inc');
echo '<br />';
- prnMsg( _('The MRP calculation must be run before you can run this report') . '<br />' .
+ prnMsg( _('The MRP calculation must be run before you can run this report') . '<br />' .
_('To run the MRP calculation click').' ' . '<a href="' . $RootPath . '/MRP.php">' . _('here') . '</a>', 'error');
include('includes/footer.inc');
exit;
@@ -381,7 +380,7 @@
} else {
$displayconsolidation = _('Monthly');
};
- $pdf->addTextWrap($Left_Margin,$YPos,65,$FontSize,_('Consolidation:'));
+ $pdf->addTextWrap($Left_Margin,$YPos,65,$FontSize,_('Consolidation').':');
$pdf->addTextWrap(110,$YPos,40,$FontSize,$displayconsolidation);
$YPos -=(2*$line_height);
Modified: trunk/MRPReport.php
===================================================================
--- trunk/MRPReport.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/MRPReport.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id$*/
// MRPReport.php - Shows supply and demand for a part as determined by MRP
@@ -178,7 +177,7 @@
$myrow=DB_fetch_array($result);
$pdf->addTextWrap($Left_Margin,$YPos,35,$FontSize,_('Part:'),'');
$pdf->addTextWrap(70,$YPos,100,$FontSize,$myrow['part'],'');
- $pdf->addTextWrap(245,$YPos,40,$FontSize,_('EOQ:'),'right');
+ $pdf->addTextWrap(245,$YPos,40,$FontSize,_('EOQ').':','right');
$pdf->addTextWrap(285,$YPos,45,$FontSize,locale_number_format($myrow['eoq'],$myrow['decimalplaces']),'right');
$pdf->addTextWrap(360,$YPos,50,$FontSize,_('On Hand:'),'right');
$pdf->addTextWrap(410,$YPos,50,$FontSize,locale_number_format($qoh,$myrow['decimalplaces']),'right');
Modified: trunk/PDFCustomerList.php
===================================================================
--- trunk/PDFCustomerList.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/PDFCustomerList.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -386,7 +386,7 @@
}
echo '</select></td></tr>';
- echo '<tr><td>' . _('For Sales folk'). ':</td>
+ echo '<tr><td>' . _('For Salesperson:') . '</td>
<td><select name="SalesPeople[]" multiple="multiple">
<option selected="selected" value="All">' . _('All Salespeople') . '</option>';
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/PcExpensesTypeTab.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id$ */
include('includes/session.inc');
@@ -76,7 +75,7 @@
VALUES ('" . $_POST['SelectedTab'] . "',
'" . $_POST['SelectedExpense'] . "')";
- $msg = _('Expense code:') . ' ' . $_POST['SelectedExpense'].' '._('for Type of Tab:') .' '. $_POST['SelectedTab'] . ' ' . _('has been created');
+ $msg = _('Expense code') . ': ' . $_POST['SelectedExpense'].' '._('for Type of Tab:') .' '. $_POST['SelectedTab'] . ' ' . _('has been created');
$checkSql = "SELECT count(typetabcode)
FROM pctypetabs";
$result = DB_query($checkSql);
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/SalesGraph.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -1,5 +1,4 @@
<?php
-
/* $Id$*/
include('includes/session.inc');
@@ -119,7 +118,7 @@
$_POST['CategoryID']='';
}
echo '<tr>
- <td>' . _('For Stock Category:') . '</td>
+ <td>' . _('For Stock Category') . ':</td>
<td><select name="CategoryID">';
if($_POST['CategoryID']=='All'){
echo '<option selected="selected" value="All">' . _('All') . '</option>';
@@ -142,7 +141,7 @@
}
echo '<tr>
- <td>' . _('For Sales Person:') . '</td>
+ <td>' . _('For Salesperson:') . '</td>
<td><select name="SalesmanCode">';
if($_POST['SalesmanCode']=='All'){
Modified: trunk/Z_MakeNewCompany.php
===================================================================
--- trunk/Z_MakeNewCompany.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/Z_MakeNewCompany.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -176,7 +176,7 @@
$_POST['NewCompany'] = html_entity_decode($_POST['NewCompany'],ENT_QUOTES,'UTF-8');
$config_php = preg_replace('/\/\/End Installed companies-do not change this line/', "\$CompanyList[] = array('database'=>'".$_POST['NewDatabase']."' ,'company'=>'".$_POST['NewCompany']."');\n//End Installed companies-do not change this line", $config_php);
if (!$fp = fopen($ConfigFile, 'wb')) {
- prnMsg(_("Cannot open the configuration file: ").$ConfigFile.". Please add the following line to the end of the file:\n\$CompanyList[] = array('database'=>'".$_POST['NewDatabase']."' ,'company'=>'".htmlspecialchars($_POST['NewCompany'],ENT_QUOTES,'UTF-8').");",'error');
+ prnMsg(_('Cannot open the configuration file' . ': ').$ConfigFile.". Please add the following line to the end of the file:\n\$CompanyList[] = array('database'=>'".$_POST['NewDatabase']."' ,'company'=>'".htmlspecialchars($_POST['NewCompany'],ENT_QUOTES,'UTF-8').");",'error');
} else {
fwrite ($fp, $config_php);
fclose ($fp);
Modified: trunk/geocode.php
===================================================================
--- trunk/geocode.php 2016-11-24 13:30:26 UTC (rev 7681)
+++ trunk/geocode.php 2016-11-24 14:10:25 UTC (rev 7682)
@@ -51,13 +51,13 @@
$debtorno =$row["debtorno"];
$request_url = $base_url . $address . ',&sensor=true';
- echo '<br \>' . _('Customer Code: ') . $id;
+ echo '<br \>', _('Customer Code'), ': ', $id;
$xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or die("url not loading");
// $xml = simplexml_load_file($request_url) or die("url not loading");
- $status = $xml->status;
+ $status = $xml->status;
if (strcmp($status, "OK") == 0) {
// Successful geocode
@@ -82,7 +82,7 @@
if ($update_result==1) {
echo '<br />'. 'Address: ' . $address . ' updated to geocode.';
echo '<br />'. 'Received status ' . $status . '<br />';
- }
+ }
} else {
// failure to geocode
$geocode_pending = false;
@@ -108,7 +108,7 @@
$xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or die("url not loading");
// $xml = simplexml_load_file($request_url) or die("url not loading");
- $status = $xml->status;
+ $status = $xml->status;
if (strcmp($status, "OK") == 0) {
// Successful geocode
@@ -128,7 +128,7 @@
($id));
$update_result = DB_query($query);
-
+
if ($update_result==1) {
echo '<br />' . 'Address: ' . $address . ' updated to geocode.';
echo '<br />' . 'Received status ' . $status . '<br />';
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-11-24 13:30:26 UTC (rev 7681)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-11-24 14:10:25 UTC (rev 7682)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-20 17:14-0600\n"
-"PO-Revision-Date: 2016-11-23 13:05-0600\n"
+"PO-Revision-Date: 2016-11-24 08:08-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -1896,7 +1896,7 @@
#: AuditTrail.php:43 BOMIndented.php:319 BOMIndentedReverse.php:297
#: MRPCalendar.php:264
msgid "From Date"
-msgstr "Desde la fecha"
+msgstr "Fecha inicial"
#: AuditTrail.php:47 BOMIndented.php:320 BOMIndentedReverse.php:298
#: MRPCalendar.php:266
@@ -3512,7 +3512,7 @@
#: InternalStockRequestFulfill.php:39 StockLocTransferReceive.php:537
#: SuppShiptChgs.php:137 SupplierAllocations.php:434
msgid "from"
-msgstr "Desde"
+msgstr "desde"
#: BankMatching.php:137 ConfirmDispatchControlled_Invoice.php:68
#: CounterReturns.php:197 EmailCustTrans.php:65 FTP_RadioBeacon.php:280
@@ -10654,7 +10654,7 @@
#: includes/PDFStockLocTransferHeader.inc:43
#: reportwriter/languages/en_US/reports.php:73
msgid "From"
-msgstr "De"
+msgstr "Desde"
#: CustomerTransInquiry.php:58 DailyBankTransactions.php:70
#: SupplierTransInquiry.php:65
@@ -19970,7 +19970,7 @@
#: PDFCustomerList.php:389
msgid "For Sales folk"
-msgstr "Para el equipo de Ventas"
+msgstr "Para el vendedor"
#: PDFCustomerList.php:391
msgid "All sales folk"
@@ -27691,7 +27691,7 @@
#: SalesGraph.php:145
msgid "For Sales Person:"
-msgstr "Para el Vendedor:"
+msgstr "Para el vendedor:"
#: SalesGraph.php:165
msgid "Graph Type"
@@ -27784,7 +27784,7 @@
#: SalesGraph.php:246
msgid "For Salesperson:"
-msgstr "Para el Vendedor:"
+msgstr "Para el vendedor:"
#: SalesGraph.php:251
msgid "For Customers from"
@@ -27874,7 +27874,7 @@
#: SalesInquiry.php:1179
msgid "For Sales Person"
-msgstr "Para el Vendedor"
+msgstr "Para el vendedor"
#: SalesInquiry.php:1188
msgid "All Salesmen"
|
|
From: <ex...@us...> - 2016-11-26 10:30:12
|
Revision: 7684
http://sourceforge.net/p/web-erp/reponame/7684
Author: exsonqu
Date: 2016-11-26 10:30:10 +0000 (Sat, 26 Nov 2016)
Log Message:
-----------
26/11/16 Exson: Fixed the bugs in InternalStockRequestInquiry.php. Thanks for Tim's report.
Modified Paths:
--------------
trunk/InternalStockRequestInquiry.php
trunk/doc/Change.log
Modified: trunk/InternalStockRequestInquiry.php
===================================================================
--- trunk/InternalStockRequestInquiry.php 2016-11-24 15:45:40 UTC (rev 7683)
+++ trunk/InternalStockRequestInquiry.php 2016-11-26 10:30:10 UTC (rev 7684)
@@ -31,7 +31,7 @@
echo '<table class="selection">
<tr>
<td>' . _('Request Number') . ':</td>
- <td><input type="text" name="OrderNumber" maxlength="8" size="9" /></td>
+ <td><input type="text" name="RequestNo" maxlength="8" size="9" /></td>
<td>' . _('From Stock Location') . ':</td>
<td><select name="StockLocation">';
$sql = "SELECT locations.loccode, locationname, canview FROM locations
@@ -40,13 +40,12 @@
AND locationusers.userid='" . $_SESSION['UserID'] . "'
AND locationusers.canview=1
AND locations.internalrequest=1";
- $locresult = DB_query($sql);
- $LocationCounter = DB_num_rows($locresult);
+ $LocResult = DB_query($sql);
+ $LocationCounter = DB_num_rows($LocResult);
$locallctr = 0;//location all counter
- $locctr = 0;//location counter
$Locations = array();
if ($LocationCounter>0) {
- while ($myrow = DB_fetch_array($locresult)) {
+ while ($myrow = DB_fetch_array($LocResult)) {
$Locations[] = $myrow['loccode'];
if (isset($_POST['StockLocation'])){
if ($_POST['StockLocation'] == 'All' AND $locallctr == 0) {
@@ -56,9 +55,9 @@
echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
} else {
- if ($LocationCounter>1 AND $locctr == 0) {//we show All only when it is necessary
+ if ($LocationCounter>1 AND $locallctr == 0) {//we show All only when it is necessary
echo '<option value="All">' . _('All') . '</option>';
- $loctr = 1;
+ $locallctr = 1;
}
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
@@ -83,8 +82,8 @@
echo '<option value="' . $myrow['loccode'] . '" selected="selected">' . $myrow['locationname'] . '</option>';
}
} else {
- if ($LocationCounter>1 AND $locctr == 0) {
- $locctr = 1;
+ if ($LocationCounter>1 AND $locallctr == 0) {
+ $locallctr = 1;
echo '<option value="All">' . _('All') . '</option>';
}
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] .'</option>';
@@ -342,8 +341,8 @@
INNER JOIN locations ON locations.loccode=stockrequest.loccode ";
}
//lets add the condition selected by users
- if (isset($_POST['RequestNo'])) {
- $SQL .= "WHERE stockrequest.dispatchid = '" . $_POST['RequsetNo'] . "'";
+ if (isset($_POST['RequestNo']) AND $_POST['RequestNo'] !== '') {
+ $SQL .= "WHERE stockrequest.dispatchid = '" . $_POST['RequestNo'] . "'";
} else {
//first the constraint of locations;
if ($_POST['StockLocation'] != 'All') {//retrieve the location data from current code
@@ -353,6 +352,8 @@
$Locations = unserialize($_POST['Locations']);
$Locations = implode("','",$Locations);
$SQL .= "WHERE stockrequest.loccode in ('" . $Locations . "')";
+ } else {
+ $SQL .= "WHERE 1 ";
}
}
//the authorization status
@@ -375,11 +376,11 @@
$SQL .= " AND stockrequest.departmentid='" . $_POST['Department'] . "'";
}
//Date from
- if (isset($_POST['DateFrom']) AND is_date($_POST['DateFrom'])) {
- $SQL .= " AND despatchdate>='" . $_POST['DateFrom'] . "'";
+ if (isset($_POST['FromDate']) AND is_date($_POST['FromDate'])) {
+ $SQL .= " AND despatchdate>='" . $_POST['FromDate'] . "'";
}
- if (isset($_POST['DateTo']) AND is_date($_POST['DateTo'])) {
- $SQL .= " AND despatchdate<='" . $_POST['DateTo'] . "'";
+ if (isset($_POST['ToDate']) AND is_date($_POST['ToDate'])) {
+ $SQL .= " AND despatchdate<='" . $_POST['ToDate'] . "'";
}
//item selected
if (isset($StockID)) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-11-24 15:45:40 UTC (rev 7683)
+++ trunk/doc/Change.log 2016-11-26 10:30:10 UTC (rev 7684)
@@ -1,5 +1,6 @@
webERP Change Log
+26/11/16 Exson: Fixed the bugs in InternalStockRequestInquiry.php. Thanks for Tim's report.
23/11/16 RChacon: On AccountGroups.php, add navigation aids (return button).
08/11/16 RChacon: On WWW_Users.php, fix hardcoded label (difficult to translate for languages with a different structure to English), do sortable the users list, replace printf() with plain list echo, and add format class.
08/11/16 RChacon: Add scripts to show a statement of cash flows for the period using the indirect method.
|
|
From: <ex...@us...> - 2016-11-26 11:36:16
|
Revision: 7685
http://sourceforge.net/p/web-erp/reponame/7685
Author: exsonqu
Date: 2016-11-26 11:36:14 +0000 (Sat, 26 Nov 2016)
Log Message:
-----------
26/11/2016 Exson: Add a constraint to Pc assignment transfer in PcAssignCashTabToTab.php
Modified Paths:
--------------
trunk/PcAssignCashTabToTab.php
trunk/doc/Change.log
Modified: trunk/PcAssignCashTabToTab.php
===================================================================
--- trunk/PcAssignCashTabToTab.php 2016-11-26 10:30:10 UTC (rev 7684)
+++ trunk/PcAssignCashTabToTab.php 2016-11-26 11:36:14 UTC (rev 7685)
@@ -38,6 +38,25 @@
unset($_POST['SelectedTabsTo']);
unset($_POST['Process']);
}
+ //to ensure currency is the same
+ $CurrSQL = "SELECT currency
+ FROM pctabs
+ WHERE tabcode IN ('" . $SelectedTabs . "','" . $_POST['SelectedTabsTo'] . "')";
+ $CurrResult = DB_query($CurrSQL);
+ if (DB_num_rows($CurrResult)>0) {
+ $Currency = '';
+ while ($CurrRow = DB_fetch_array($CurrResult)) {
+ if ($Currency === '') {
+ $Currency = $CurrRow['currency'];
+ } elseif ($Currency != $CurrRow['currency']) {
+ prnMsg (_('The currency transferred from shoud be the same with the transferred to'),'error');
+ unset($SelectedTabs);
+ unset($_POST['SelectedTabsTo']);
+ unset($_POST['Process']);
+ }
+ }
+ }
+
}
if (isset($_POST['Go'])) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-11-26 10:30:10 UTC (rev 7684)
+++ trunk/doc/Change.log 2016-11-26 11:36:14 UTC (rev 7685)
@@ -1,5 +1,6 @@
webERP Change Log
+26/11/2016 Exson: Add a constraint to Pc assignment transfer in PcAssignCashTabToTab.php
26/11/16 Exson: Fixed the bugs in InternalStockRequestInquiry.php. Thanks for Tim's report.
23/11/16 RChacon: On AccountGroups.php, add navigation aids (return button).
08/11/16 RChacon: On WWW_Users.php, fix hardcoded label (difficult to translate for languages with a different structure to English), do sortable the users list, replace printf() with plain list echo, and add format class.
|
|
From: <ex...@us...> - 2016-11-27 07:14:23
|
Revision: 7686
http://sourceforge.net/p/web-erp/reponame/7686
Author: exsonqu
Date: 2016-11-27 07:14:21 +0000 (Sun, 27 Nov 2016)
Log Message:
-----------
27/11/16 Exson: 4.13.1 release rollup for includes/ConnectDB.inc, UpgradeDatabase.php, upgrade4.13-4.13.1.sql.
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/includes/ConnectDB.inc
trunk/sql/mysql/upgrade4.13-4.13.1.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2016-11-26 11:36:14 UTC (rev 7685)
+++ trunk/UpgradeDatabase.php 2016-11-27 07:14:21 UTC (rev 7686)
@@ -194,6 +194,8 @@
$SQLScripts[] = './sql/mysql/upgrade4.12.2-4.12.3.sql';
case '4.12.3':
$SQLScripts[] = './sql/mysql/upgrade4.12.3-4.13.sql';
+ case '4.13.1':
+ $SQLScripts[] = './sql/mysql/upgrade4.13-4.13.1.sql';
break;
} //end switch
}
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2016-11-26 11:36:14 UTC (rev 7685)
+++ trunk/includes/ConnectDB.inc 2016-11-27 07:14:21 UTC (rev 7686)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.13'; //must update manually every time there is a DB change
+$Version='4.13.1'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
if (!isset($_SESSION['DatabaseName'])){
Modified: trunk/sql/mysql/upgrade4.13-4.13.1.sql
===================================================================
--- trunk/sql/mysql/upgrade4.13-4.13.1.sql 2016-11-26 11:36:14 UTC (rev 7685)
+++ trunk/sql/mysql/upgrade4.13-4.13.1.sql 2016-11-27 07:14:21 UTC (rev 7686)
@@ -18,3 +18,6 @@
-- Add new scripts:
INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('GLCashFlowsIndirect.php', '8', 'Shows a statement of cash flows for the period using the indirect method');
INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('GLCashFlowsSetup.php', '8', 'Setups the statement of cash flows sections');
+
+-- Update version number:
+UPDATE config SET confvalue='4.13.1' WHERE confname='VersionNumber';
|
|
From: <ex...@us...> - 2016-12-02 07:56:20
|
Revision: 7691
http://sourceforge.net/p/web-erp/reponame/7691
Author: exsonqu
Date: 2016-12-02 07:56:18 +0000 (Fri, 02 Dec 2016)
Log Message:
-----------
2/12/16 Exson: Fixed the no users data displayed bug and copy BOM fields error bug in WWW_Users.php and CopyBOM.php. Thanks for shane's report.
Modified Paths:
--------------
trunk/CopyBOM.php
trunk/WWW_Users.php
Modified: trunk/CopyBOM.php
===================================================================
--- trunk/CopyBOM.php 2016-11-30 05:13:03 UTC (rev 7690)
+++ trunk/CopyBOM.php 2016-12-02 07:56:18 UTC (rev 7691)
@@ -57,7 +57,7 @@
serialised,
appendfile,
perishable,
- decimalplaces,
+ digitals,
nextserialno,
pansize,
shrinkfactor,
@@ -85,7 +85,7 @@
serialised,
appendfile,
perishable,
- decimalplaces,
+ digitals,
nextserialno,
pansize,
shrinkfactor,
@@ -131,7 +131,7 @@
autoissue,
remark,
digitals,
- decimalplaces
+ digitals
FROM bom
WHERE parent='".$StockID."';";
$result = DB_query($sql);
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2016-11-30 05:13:03 UTC (rev 7690)
+++ trunk/WWW_Users.php 2016-12-02 07:56:18 UTC (rev 7691)
@@ -349,7 +349,7 @@
$Result = DB_query($Sql);
$k = 1;// Row colour counter.
- foreach($Result as $MyRow) {
+ while ($MyRow = DB_fetch_array($Result)) {
if($k == 1) {
echo '<tr class="OddTableRows">';
$k = 0;
|
|
From: <tu...@us...> - 2016-12-02 23:02:35
|
Revision: 7698
http://sourceforge.net/p/web-erp/reponame/7698
Author: turbopt
Date: 2016-12-02 23:02:33 +0000 (Fri, 02 Dec 2016)
Log Message:
-----------
WriteReport.inc: Fix condition needed to support PHP7, reported by Tim.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/reportwriter/WriteReport.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-12-02 18:05:25 UTC (rev 7697)
+++ trunk/doc/Change.log 2016-12-02 23:02:33 UTC (rev 7698)
@@ -1,5 +1,6 @@
webERP Change Log
+02/12/16 PaulT: WriteReport.inc: Fix condition needed to support PHP7, reported by Tim.
02/12/16 RChacon: fix and improve code for existent parameters in GLCashFlowsSetup.php.
02/12/16 Exson: Add location code and reference to Work Orders search result in SelectWorkOrder.php.
02/12/16 Exson: Fixed the no users data displayed bug and copy BOM fields error bug in WWW_Users.php and CopyBOM.php. Thanks for shane's report.
Modified: trunk/reportwriter/WriteReport.inc
===================================================================
--- trunk/reportwriter/WriteReport.inc 2016-12-02 18:05:25 UTC (rev 7697)
+++ trunk/reportwriter/WriteReport.inc 2016-12-02 23:02:33 UTC (rev 7698)
@@ -361,7 +361,7 @@
case "h": // RPT_GROUP_QUARTER
$QtrStrt = intval(($ThisMonth-1)/3)*3+1;
$QtrEnd = intval(($ThisMonth-1)/3)*3+3;
- if ($QtrEnd==04 OR $QtrEnd==06 OR $QtrEnd==09 OR $QtrEnd==11) { $TotalDays=30; }
+ if ( $QtrEnd == 4 OR $QtrEnd == 6 OR $QtrEnd == 9 OR $QtrEnd == 11 ) { $TotalDays=30; }
$qs = date('Y-m-d', mktime(0,0,0, $QtrStrt, 1, $ThisYear));
$qe = date('Y-m-d', mktime(0,0,0, $QtrEnd, $TotalDays, $ThisYear));
$d = $df.">='".$qs."'";
|
|
From: <tu...@us...> - 2016-12-06 19:42:18
|
Revision: 7699
http://sourceforge.net/p/web-erp/reponame/7699
Author: turbopt
Date: 2016-12-06 19:42:15 +0000 (Tue, 06 Dec 2016)
Log Message:
-----------
SelectProduct.php: Add footer before the script exits when stock categories are not defined.
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/doc/Change.log
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2016-12-02 23:02:33 UTC (rev 7698)
+++ trunk/SelectProduct.php 2016-12-06 19:42:15 UTC (rev 7699)
@@ -45,6 +45,7 @@
if (DB_num_rows($result1) == 0) {
echo '<p class="bad">' . _('Problem Report') . ':<br />' . _('There are no stock categories currently defined please use the link below to set them up') . '</p>';
echo '<br /><a href="' . $RootPath . '/StockCategories.php">' . _('Define Stock Categories') . '</a>';
+ include('includes/footer.inc');
exit;
}
// end of showing search facilities
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-12-02 23:02:33 UTC (rev 7698)
+++ trunk/doc/Change.log 2016-12-06 19:42:15 UTC (rev 7699)
@@ -1,5 +1,6 @@
webERP Change Log
+06/12/16 PaulT: SelectProduct.php: Add footer before the script exits when stock categories are not defined.
02/12/16 PaulT: WriteReport.inc: Fix condition needed to support PHP7, reported by Tim.
02/12/16 RChacon: fix and improve code for existent parameters in GLCashFlowsSetup.php.
02/12/16 Exson: Add location code and reference to Work Orders search result in SelectWorkOrder.php.
|
|
From: <ex...@us...> - 2016-12-08 14:24:22
|
Revision: 7702
http://sourceforge.net/p/web-erp/reponame/7702
Author: exsonqu
Date: 2016-12-08 14:24:19 +0000 (Thu, 08 Dec 2016)
Log Message:
-----------
08/12/16 Exson: Fixed the variable error in stock take pdf header in includes/PDFStockCheckPageHeader.inc. And fixed undefined noise in Payments.php. Reported by shane.
Modified Paths:
--------------
trunk/Payments.php
trunk/includes/PDFStockCheckPageHeader.inc
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2016-12-08 13:40:57 UTC (rev 7701)
+++ trunk/Payments.php 2016-12-08 14:24:19 UTC (rev 7702)
@@ -838,7 +838,7 @@
while($myrow=DB_fetch_array($AccountsResults)) {
/*list the bank account names */
echo '<option ';
- if(/*isset($_POST['BankAccount']) AND */$_POST['BankAccount']==$myrow['accountcode']) {
+ if(isset($_POST['BankAccount']) AND $_POST['BankAccount']==$myrow['accountcode']) {
echo 'selected="selected" ';
}
echo 'value="', $myrow['accountcode'], '">', $myrow['bankaccountname'], ' - ', $myrow['currcode'], '</option>';
Modified: trunk/includes/PDFStockCheckPageHeader.inc
===================================================================
--- trunk/includes/PDFStockCheckPageHeader.inc 2016-12-08 13:40:57 UTC (rev 7701)
+++ trunk/includes/PDFStockCheckPageHeader.inc 2016-12-08 14:24:19 UTC (rev 7702)
@@ -12,9 +12,10 @@
$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-180,$YPos,180,$FontSize,_('Printed') . ': ' . Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber);
$YPos -=15;
+sort($_POST['Categories']);
+$q = count($_POST['Categories'])-1;
+$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,550,$FontSize,_('Check Sheets for Categories between') . ' ' . $_POST['Categories'][0] . ' ' . _('and') . ' ' . $_POST['Categories'][$q] . ' ' . _('for stock at') . ' ' . $_POST['Location']);
-$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,550,$FontSize,_('Check Sheets for Categories between') . ' ' . $_POST['FromCriteria'] . ' ' . _('and') . ' ' . $_POST['ToCriteria'] . ' ' . _('for stock at') . ' ' . $_POST['Location']);
-
$YPos -=20;
/*Draw a rectangle to put the headings in */
$BoxHeight =15;
|
|
From: <rc...@us...> - 2016-12-12 15:50:46
|
Revision: 7704
http://sourceforge.net/p/web-erp/reponame/7704
Author: rchacon
Date: 2016-12-12 15:50:44 +0000 (Mon, 12 Dec 2016)
Log Message:
-----------
Update translations
Modified Paths:
--------------
trunk/css/default/default.css
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2016-12-08 14:25:23 UTC (rev 7703)
+++ trunk/css/default/default.css 2016-12-12 15:50:44 UTC (rev 7704)
@@ -1,5 +1,9 @@
/* $Id$*/
/* Default theme for WebERP by . */
+/* Design guidelines:
+ Fonts are 10px hight.
+ Icons are 16px x 16px size.
+*/
body {
background-color:#ccd;
@@ -7,6 +11,7 @@
font-size:10pt;
margin:0;
padding:0;
+ /* Tag selector for body. */
}
button img {
@@ -19,25 +24,26 @@
color:blue;
text-decoration:none;
}
-
a:hover {
color:blue;
+ background-color:transparent;
text-decoration:underline;
+ /* Tag selector for mouse over link. */
}
img {
border:none;
vertical-align:middle;
}
-
p.bad {
color:red;
font-weight:bold;
+ /* Tag selector for paragraph class "bad". */
}
-
p.good {
color:green;
font-weight:bold;
+ /* Tag selector for paragraph class "good". */
}
table {
@@ -515,19 +521,16 @@
.centre {
text-align:center;
- /* Class selector to horizontal align a text (centre) in an element. */
+ /* Class selector to horizontally align a text (centre) in an element. */
}
-
.number {
text-align:right;
- /* Class selector to horizontal align a number (right) in an element. */
+ /* Class selector to horizontally align a number (right) in an element. */
}
-
.text {
text-align:left;
- /* Class selector to horizontal align a text (left) in an element. */
+ /* Class selector to horizontally align a text (left) in an element. */
}
-
.page_title_text {
color:black;
font-weight:bold;
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-12-08 14:25:23 UTC (rev 7703)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-12-12 15:50:44 UTC (rev 7704)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-24 08:54-0600\n"
-"PO-Revision-Date: 2016-11-24 08:08-0600\n"
+"PO-Revision-Date: 2016-12-02 12:32-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -15077,7 +15077,7 @@
#: GLCashFlowsIndirect.php:765
msgid "Report parameters"
-msgstr ""
+msgstr "Parámetros del informe"
#: GLCashFlowsIndirect.php:798
msgid "Select the beginning of the reporting period"
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2016-12-08 14:25:23 UTC (rev 7703)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2016-12-12 15:50:44 UTC (rev 7704)
@@ -9,7 +9,7 @@
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-24 08:54-0600\n"
-"PO-Revision-Date: 2016-11-20 17:50-0600\n"
+"PO-Revision-Date: 2016-12-02 12:36-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: French <none>\n"
"Language: fr_FR\n"
@@ -15156,7 +15156,7 @@
#: GLCashFlowsIndirect.php:765
msgid "Report parameters"
-msgstr ""
+msgstr "Paramètres du rapport"
#: GLCashFlowsIndirect.php:798
msgid "Select the beginning of the reporting period"
@@ -51270,10 +51270,9 @@
msgid "Set Purchase Order Authorisation levels"
msgstr "Autorisations pour les achats"
-# JDN
#: includes/MainMenuLinksArray.php:523
msgid "Sales People"
-msgstr "Gestion des vendeurs"
+msgstr "Vendeurs"
#: includes/MainMenuLinksArray.php:524
msgid "Sales Areas"
|
|
From: <tu...@us...> - 2016-12-13 00:30:24
|
Revision: 7705
http://sourceforge.net/p/web-erp/reponame/7705
Author: turbopt
Date: 2016-12-13 00:30:22 +0000 (Tue, 13 Dec 2016)
Log Message:
-----------
Dashboard.php: Correct table closure. When there are no outstanding orders, causes footer artifact.
Modified Paths:
--------------
trunk/Dashboard.php
trunk/doc/Change.log
Modified: trunk/Dashboard.php
===================================================================
--- trunk/Dashboard.php 2016-12-12 15:50:44 UTC (rev 7704)
+++ trunk/Dashboard.php 2016-12-13 00:30:22 UTC (rev 7705)
@@ -684,10 +684,10 @@
echo '<tr>
<td class="number" colspan="7"><b>', _('Total Order(s) Value in'), ' ', $_SESSION['CompanyRecord']['currencydefault'], ' :</b></td>
<td class="number"><b>', locale_number_format($OrdersTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- </tr>
- </tbody></table>';
+ </tr>';
+ } //rows > 0
- } //rows > 0
+ echo '</tbody></table>';
} //OrderSecurity
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-12-12 15:50:44 UTC (rev 7704)
+++ trunk/doc/Change.log 2016-12-13 00:30:22 UTC (rev 7705)
@@ -1,5 +1,6 @@
webERP Change Log
+11/12/16 PaulT: Dashboard.php: Correct table closure. When there are no outstanding orders, causes footer artifact.
08/12/16 Exson: Fixed the variable error in stock take pdf header in includes/PDFStockCheckPageHeader.inc. And fixed undefined noise in Payments.php. Reported by shane.
08/12/16 Exson: Fixed noise of undefined variable and string required for function_exists in Dashboard.php. Reported by Shane.
06/12/16 PaulT: SelectProduct.php: Add footer before the script exits when stock categories are not defined.
|
|
From: <rc...@us...> - 2016-12-16 21:22:11
|
Revision: 7706
http://sourceforge.net/p/web-erp/reponame/7706
Author: rchacon
Date: 2016-12-16 21:22:07 +0000 (Fri, 16 Dec 2016)
Log Message:
-----------
Groups numeric columns to easy reading.
Modified Paths:
--------------
trunk/GLAccountInquiry.php
trunk/doc/Manual/ManualGeneralLedger.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2016-12-13 00:30:22 UTC (rev 7705)
+++ trunk/GLAccountInquiry.php 2016-12-16 21:22:07 UTC (rev 7706)
@@ -15,23 +15,23 @@
include('includes/GLPostings.inc');
-if (isset($_POST['Account'])){
+if(isset($_POST['Account'])) {
$SelectedAccount = $_POST['Account'];
-} elseif (isset($_GET['Account'])){
+} elseif(isset($_GET['Account'])) {
$SelectedAccount = $_GET['Account'];
}
-if (isset($_POST['Period'])){
+if(isset($_POST['Period'])) {
$SelectedPeriod = $_POST['Period'];
-} elseif (isset($_GET['Period'])){
+} elseif(isset($_GET['Period'])) {
$SelectedPeriod = array($_GET['Period']);
}
/* Get the start and periods, depending on how this script was called*/
-if (isset($SelectedPeriod)) { //If it was called from itself (in other words an inquiry was run and we wish to leave the periods selected unchanged
+if(isset($SelectedPeriod)) { //If it was called from itself (in other words an inquiry was run and we wish to leave the periods selected unchanged
$FirstPeriodSelected = min($SelectedPeriod);
$LastPeriodSelected = max($SelectedPeriod);
-} elseif (isset($_GET['FromPeriod'])) { //If it was called from the Trial Balance/P&L or Balance sheet
+} elseif(isset($_GET['FromPeriod'])) { //If it was called from the Trial Balance/P&L or Balance sheet
$FirstPeriodSelected = $_GET['FromPeriod'];
$LastPeriodSelected = $_GET['ToPeriod'];
} else { // Otherwise just highlight the current period
@@ -40,7 +40,6 @@
}
echo '<div class="page_help_text noprint">' . _('Use the keyboard Shift key to select multiple periods') . '</div><br />';
-
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div class="noprint">';// Begin input of criteria div.
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -63,9 +62,9 @@
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
ORDER BY chartmaster.accountcode";
$Account = DB_query($sql);
-while ($myrow=DB_fetch_array($Account,$db)){
- if($myrow['accountcode'] == $SelectedAccount){
- if (!is_null($myrow['bankact'])) {
+while($myrow=DB_fetch_array($Account,$db)) {
+ if($myrow['accountcode'] == $SelectedAccount) {
+ if(!is_null($myrow['bankact'])) {
$BankAccount = true;
}
echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
@@ -89,8 +88,8 @@
$result=DB_query($SQL);
echo '<option value="0">0 - '._('All tags') . '</option>';
-while ($myrow=DB_fetch_array($result)){
- if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
+while($myrow=DB_fetch_array($result)) {
+ if(isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']) {
echo '<option selected="selected" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
} else {
echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
@@ -105,8 +104,8 @@
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql);
-while ($myrow=DB_fetch_array($Periods,$db)){
- if (isset($FirstPeriodSelected) AND $myrow['periodno'] >= $FirstPeriodSelected AND $myrow['periodno'] <= $LastPeriodSelected) {
+while($myrow=DB_fetch_array($Periods,$db)) {
+ if(isset($FirstPeriodSelected) AND $myrow['periodno'] >= $FirstPeriodSelected AND $myrow['periodno'] <= $LastPeriodSelected) {
echo '<option selected="selected" value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
} else {
echo '<option value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
@@ -124,9 +123,9 @@
/* End of the Form rest of script is what happens if the show button is hit*/
-if (isset($_POST['Show'])){
+if(isset($_POST['Show'])) {
- if (!isset($SelectedPeriod)){
+ if(!isset($SelectedPeriod)) {
prnMsg(_('A period or range of periods must be selected from the list box'),'info');
include('includes/footer.inc');
exit;
@@ -137,9 +136,9 @@
INNER JOIN chartmaster ON accountgroups.groupname=chartmaster.group_
WHERE chartmaster.accountcode='" . $SelectedAccount ."'");
$PandLRow = DB_fetch_row($result);
- if ($PandLRow[0]==1){
+ if($PandLRow[0]==1) {
$PandLAccount = True;
- }else{
+ } else {
$PandLAccount = False; /*its a balance sheet account */
}
@@ -165,7 +164,7 @@
AND periodno>='" . $FirstPeriodSelected . "'
AND periodno<='" . $LastPeriodSelected . "'";
- if ($_POST['tag']!=0) {
+ if($_POST['tag']!=0) {
$sql = $sql . " AND tag='" . $_POST['tag'] . "'";
}
@@ -176,10 +175,11 @@
$SelectedAccountName=$namerow['accountname'];
$ErrMsg = _('The transactions for account') . ' ' . $SelectedAccount . ' ' . _('could not be retrieved because') ;
$TransResult = DB_query($sql,$ErrMsg);
- $BankAccountInfo = isset($BankAccount)?'<th>' . _('Org Currency') . '</th>
- <th>' . _('Amount in Org Currency') . '</th>
- <th>' . _('Bank Ref') .'</th>':'';
-
+ $BankAccountInfo = isset($BankAccount)
+ ? '<th>' . _('Org Currency') . '</th>
+ <th>' . _('Amount in Org Currency') . '</th>
+ <th>' . _('Bank Ref') . '</th>'
+ : '' ;
echo '<br />
<table class="selection">
<thead>
@@ -187,57 +187,53 @@
<th colspan="11"><b>', _('Transactions for account'), ' ', $SelectedAccount, ' - ', $SelectedAccountName, '</b></th>
</tr>
<tr>
- <th class="text">', _('Type'), '</th>
- <th class="number">', _('Number'), '</th>
- <th class="centre">', ('Date'), '</th>
- <th class="number">', _('Debit'), '</th>
- <th class="number">', _('Credit'), '</th>' .
- $BankAccountInfo .'
- <th class="text">', _('Narrative'), '</th>
- <th class="number">', _('Balance'), '</th>
- <th class="text">', _('Tag'), '</th>
+ <th>', _('Type'), '</th>
+ <th>', _('Number'), '</th>
+ <th>', ('Date'), '</th>
+ <th>', _('Narrative'), '</th>
+ <th>', _('Debit'), '</th>
+ <th>', _('Credit'), '</th>
+ <th>', _('Balance'), '</th>
+ <th>', _('Tag'), '</th>',
+ $BankAccountInfo, '
</tr>
</thead><tbody>';
- if ($PandLAccount==True) {
+ if($PandLAccount==True) {
$RunningTotal = 0;
} else {
- // added to fix bug with Brought Forward Balance always being zero
- $sql = "SELECT bfwd,
+ // added to fix bug with Brought Forward Balance always being zero
+ $Sql = "SELECT bfwd,
actual,
period
FROM chartdetails
WHERE chartdetails.accountcode='" . $SelectedAccount . "'
AND chartdetails.period='" . $FirstPeriodSelected . "'";
-
$ErrMsg = _('The chart details for account') . ' ' . $SelectedAccount . ' ' . _('could not be retrieved');
- $ChartDetailsResult = DB_query($sql,$ErrMsg);
+ $ChartDetailsResult = DB_query($Sql, $ErrMsg);
$ChartDetailRow = DB_fetch_array($ChartDetailsResult);
-
$RunningTotal = $ChartDetailRow['bfwd'];
- echo '<tr>
- <td colspan="3"><b>', _('Brought Forward Balance'), '</b></td>
- ';
+ echo '<tr>
+ <td colspan="4"><b>', _('Brought Forward Balance'), '</b></td>';
if($RunningTotal < 0 ) {// It is a credit balance b/fwd
- echo ' <td> </td>
- <td class="number"><b>', locale_number_format(-$RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- <td colspan="6"> </td>
- </tr>';
+ echo '<td> </td>
+ <td class="number"><b>', locale_number_format(-$RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>';
} else {// It is a debit balance b/fwd
- echo ' <td class="number"><b>', locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- <td colspan="7"> </td>
+ echo '<td class="number"><b>', locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+ <td> </td>';
+ }
+ echo '<td colspan="5"> </td>
</tr>';
- }
}
$PeriodTotal = 0;
$PeriodNo = -9999;
$ShowIntegrityReport = False;
$j = 1;
- $k=0; //row colour counter
+ $k = 0; //row colour counter
$IntegrityReport='';
- while ($myrow=DB_fetch_array($TransResult)) {
- if ($myrow['periodno']!=$PeriodNo){
- if ($PeriodNo!=-9999){ //ie its not the first time around
+ while($myrow=DB_fetch_array($TransResult)) {
+ if($myrow['periodno']!=$PeriodNo) {
+ if($PeriodNo!=-9999) { //ie its not the first time around
/*Get the ChartDetails balance b/fwd and the actual movement in the account for the period as recorded in the chart details - need to ensure integrity of transactions to the chart detail movements. Also, for a balance sheet account it is the balance carried forward that is important, not just the transactions*/
$sql = "SELECT bfwd,
@@ -252,26 +248,22 @@
$ChartDetailRow = DB_fetch_array($ChartDetailsResult);
echo '<tr>
- <td colspan="3"><b>' . _('Total for period') . ' ' . $PeriodNo . '</b></td>';
+ <td colspan="4"><b>' . _('Total for period') . ' ' . $PeriodNo . '</b></td>';
+ if($PandLAccount==True) {
+ $RunningTotal = 0;
+ }
if($PeriodTotal < 0 ) {// It is a credit balance b/fwd
- if ($PandLAccount==True) {
- $RunningTotal = 0;
- }
- echo ' <td> </td>
- <td class="number"><b>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- <td colspan="6"> </td>
- </tr>';
+ echo '<td> </td>
+ <td class="number"><b>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>';
} else {// It is a debit balance b/fwd
- if($PandLAccount==True) {
- $RunningTotal = 0;
- }
- echo ' <td class="number"><b>', locale_number_format($PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- <td colspan="7"> </td>
+ echo '<td class="number"><b>', locale_number_format($PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+ <td> </td>';
+ }
+ echo '<td colspan="5"> </td>
</tr>';
- }
$IntegrityReport .= '<br />' . _('Period') . ': ' . $PeriodNo . _('Account movement per transaction') . ': ' . locale_number_format($PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']) . ' ' . _('Movement per ChartDetails record') . ': ' . locale_number_format($ChartDetailRow['actual'],$_SESSION['CompanyRecord']['decimalplaces']) . ' ' . _('Period difference') . ': ' . locale_number_format($PeriodTotal -$ChartDetailRow['actual'],3);
- if (ABS($PeriodTotal -$ChartDetailRow['actual'])>0.01){
+ if(ABS($PeriodTotal -$ChartDetailRow['actual'])>0.01) {
$ShowIntegrityReport = True;
}
}
@@ -279,7 +271,7 @@
$PeriodTotal = 0;
}
- if ($k==1){
+ if($k==1) {
echo '<tr class="EvenTableRows">';
$k=0;
} else {
@@ -289,25 +281,25 @@
$BankRef = '';
$OrgAmt = '';
$Currency = '';
- if ($myrow['type'] == 12 OR $myrow['type'] == 22 OR $myrow['type'] == 2 OR $myrow['type'] == 1) {
+ if($myrow['type'] == 12 OR $myrow['type'] == 22 OR $myrow['type'] == 2 OR $myrow['type'] == 1) {
$banksql = "SELECT ref,currcode,amount FROM banktrans
WHERE type='" .$myrow['type']."' AND transno='" . $myrow['typeno'] . "' AND bankact='" . $SelectedAccount . "'";
$ErrMsg = _('Failed to retrieve bank data');
$bankresult = DB_query($banksql,$ErrMsg);
- if (DB_num_rows($bankresult)>0) {
+ if(DB_num_rows($bankresult)>0) {
$bankrow = DB_fetch_array($bankresult);
$BankRef = $bankrow['ref'];
$OrgAmt = $bankrow['amount'];
$Currency = $bankrow['currcode'];
- } elseif ($myrow['type'] == 1) {
+ } elseif($myrow['type'] == 1) {
//We should find out when transaction happens between bank accounts;
$bankreceivesql = "SELECT ref,type,transno,currcode,amount FROM banktrans
WHERE ref LIKE '@%' AND transdate='" . $myrow['trandate'] . "' AND bankact='" . $SelectedAccount . "'";
$ErrMsg = _('Failed to retrieve bank receive data');
$bankresult = DB_query($bankreceivesql,$ErrMsg);
- if (DB_num_rows($bankresult)>0) {
- while ($bankrow = DB_fetch_array($bankresult)) {
- if (substr($bankrow['ref'],1,strpos($bankrow['ref'],' ')-1) == $myrow['typeno']) {
+ if(DB_num_rows($bankresult)>0) {
+ while($bankrow = DB_fetch_array($bankresult)) {
+ if(substr($bankrow['ref'],1,strpos($bankrow['ref'],' ')-1) == $myrow['typeno']) {
$BankRef = $bankrow['ref'];
$OrgAmt = $bankrow['amount'];
$Currency = $bankrow['currcode'];
@@ -316,108 +308,69 @@
}
}
}
- if (!isset($BankReceipt)) {
+ if(!isset($BankReceipt)) {
$BankRef = '';
$OrgAmt = $myrow['amount'];
$Currency = $_SESSION['CompanyRecord']['currencydefault'];
}
- } elseif(isset($BankAccount)){
+ } elseif(isset($BankAccount)) {
$BankRef = '';
$OrgAmt = $myrow['amount'];
$Currency = $_SESSION['CompanyRecord']['currencydefault'];
}
}
- $RunningTotal += $myrow['amount'];
- $PeriodTotal += $myrow['amount'];
- if($myrow['amount']>=0){
- $DebitAmount = locale_number_format($myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
+ $URL_to_TransDetail = $RootPath . '/GLTransInquiry.php?TypeID=' . $myrow['type'] . '&TransNo=' . $myrow['typeno'];
+ $FormatedTranDate = ConvertSQLDate($myrow['trandate']);
+ if($myrow['amount']>=0) {
+ $DebitAmount = locale_number_format($myrow['amount'], $_SESSION['CompanyRecord']['decimalplaces']);
$CreditAmount = '';
} else {
- $CreditAmount = locale_number_format(-$myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
+ $CreditAmount = locale_number_format(-$myrow['amount'], $_SESSION['CompanyRecord']['decimalplaces']);
$DebitAmount = '';
}
-
- $FormatedTranDate = ConvertSQLDate($myrow['trandate']);
- $URL_to_TransDetail = $RootPath . '/GLTransInquiry.php?TypeID=' . $myrow['type'] . '&TransNo=' . $myrow['typeno'];
- if (isset($BankAccount)) {
- printf('<td class="text">%s</td>
- <td class="number"><a href="%s">%s</a></td>
- <td class="centre">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="text">%s</td>
- <td class="number"><b>%s</b></td>
- <td class="text">%s</td>
- <td class="text">%s</td>
- <td class="number">%s</td>
- <td class="text">%s</td>
- </tr>',
- _($myrow['typename']),
- $URL_to_TransDetail,
- $myrow['typeno'],
- $FormatedTranDate,
- $DebitAmount,
- $CreditAmount,
- $Currency,
- locale_number_format($OrgAmt,$_SESSION['CompanyRecord']['decimalplaces']),
- $BankRef,
- $myrow['narrative'],
- locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']),
- $myrow['tagdescription']
- );
- } else {
- printf('<td class="text">%s</td>
- <td class="number"><a href="%s">%s</a></td>
- <td class="centre">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="text">%s</td>
- <td class="number">%s</td>
- <td class="text">%s</td>
- </tr>',
- _($myrow['typename']),
- $URL_to_TransDetail,
- $myrow['typeno'],
- $FormatedTranDate,
- $DebitAmount,
- $CreditAmount,
- $myrow['narrative'],
- locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']),
- $myrow['tagdescription']
- );
+ $RunningTotal += $myrow['amount'];
+ $PeriodTotal += $myrow['amount'];
+ echo '<td class="text">', _($myrow['typename']), '</td>
+ <td class="number"><a href="', $URL_to_TransDetail, '">', $myrow['typeno'], '</a></td>
+ <td class="centre">', $FormatedTranDate, '</td>
+ <td class="text">', $myrow['narrative'], '</td>
+ <td class="number">', $DebitAmount, '</td>
+ <td class="number">', $CreditAmount, '</td>
+ <td class="number">', locale_number_format($RunningTotal, $_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="text">', $myrow['tagdescription'], '</td>';
+ if(isset($BankAccount)) {
+ echo '<td class="text">', $Currency, '</td>
+ <td class="number"><b>', locale_number_format($OrgAmt, $_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+ <td class="text">', $BankRef, '</td>';
}
-
+ echo '</tr>';
}
echo '<tr>
- <td colspan="3"><b>';
- if ($PandLAccount==True){
- echo _('Total Period Movement');
+ <td colspan="4"><b>';
+ if($PandLAccount==True) {
+ echo _('Total Period Movement');/* RChacon: "Total for period XX"? */
} else { /*its a balance sheet account*/
echo _('Balance C/Fwd');
}
echo '</b></td>';
-
if($RunningTotal < 0) {// It is a debit Total Period Movement or Balance C/Fwd
- echo ' <td> </td>
- <td class="number"><b>', locale_number_format((-$RunningTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- <td colspan="6"></td>
- </tr>';
+ echo '<td> </td>
+ <td class="number"><b>', locale_number_format((-$RunningTotal), $_SESSION['CompanyRecord']['decimalplaces']), '</b></td>';
} else {// It is a credit Total Period Movement or Balance C/Fwd
- echo ' <td class="number"><b>', locale_number_format(($RunningTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
- <td colspan="7"></td>
- </tr>';
+ echo '<td class="number"><b>', locale_number_format(($RunningTotal), $_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+ <td> </td>';
}
- echo '</tbody></table>';
+ echo '<td colspan="5"> </td>
+ </tr>
+ </tbody></table>';
} /* end of if Show button hit */
-
-
-if (isset($ShowIntegrityReport) AND $ShowIntegrityReport==True AND $_POST['tag']=='0'){
- if (!isset($IntegrityReport)) {
+if(isset($ShowIntegrityReport) AND $ShowIntegrityReport==True AND $_POST['tag']=='0') {
+ if(!isset($IntegrityReport)) {
$IntegrityReport='';
}
prnMsg( _('There are differences between the sum of the transactions and the recorded movements in the ChartDetails table') . '. ' . _('A log of the account differences for the periods report shows below'),'warn');
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2016-12-13 00:30:22 UTC (rev 7705)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2016-12-16 21:22:07 UTC (rev 7706)
@@ -72,7 +72,7 @@
<!-- Help End: GLAccounts -->
<h2><a id="GLTags">General Ledger Tags (Or Cost Centres)</a></h2>
-<p>General Ledger tags provide an alternative way of viewing General Ledger transactions. Each income or expenditure transaction can be given its own tag, and then reports acan be run based on tags.</p>
+<p>General Ledger tags provide an alternative way of viewing General Ledger transactions. Each income or expenditure transaction can be given its own tag, and then reports can be run based on tags.</p>
<p>As an example consider an organisation with several vehicles and the organisation wishes to report on how much each vehicle costs to run. A tag can be setup for each vehicle, and then when there is any expense, such as fuel, maintenance, licensing, insurance etc then each transaction can be tagged to individual vehicles, and then a report be produced for the cost of each tag corresponding to each vehicle.</p>
<p>Tags effectively add another dimension to the general ledger - or "cost centre" functionality. There is a "tag" profit and loss account so you can produce a p & l for each "tag".
<p>The tag is offered up each time you create a general ledger transaction or purchase invoice or stock adjustment so all general ledger transactions can be captured with the "tag" or "cost centre" they relate to and the P & L can be reported by "tag" (or "cost centre").</p>
@@ -350,8 +350,8 @@
</li>
<!-- ----------------------------------------------------------------------- -->
<li>
- <h3><a id="GLCashFlows">Statement of Cash Flows</a></h3>
- <p>The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.</p>
+ <h3><a id="GLCashFlows">Statement of Cash Flows</a></h3>
+ <p>The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.</p>
<p>The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities (see <a href="ManualContents.php?
ViewTopic=GeneralLedger#GLCashFlowsSetup">GLCashFlowsSetup</a>).</p>
<p>It can be generated using either direct method or indirect method. The main difference between them is the cash flows from operating activities, the first section of the statement of cash flows; there is no difference in the investing and financing activities sections.</p>
@@ -370,7 +370,7 @@
</ul>
<p><b>Note 1</b>. The "<i>net profit for the period</i>" is calculated from the accounts of the <i>statement of comprehensive income</i>.</p>
<p><b>Note 2</b>. The "<i>dividends</i>" are calculated as "<i>net profit for the period</i>" minus "<i>retained earnings</i>". The "<i>retained earnings</i>" are calculated using the complement method; that is: the changes of retained earnings are equal to the opposite of changes in other <i>statement of financial position</i> accounts. This is done to correct the impact of the "<i>net profit for the period</i>" underreporting before the end of that period; so, if you have differences between dividents in this report and the real dividend payments, check retained earnings related accounts.</p>
- <p><b>Warning!</b> Although the standard states that "<i>Net profit for the period</i>", "<i>Dividends</i>", and "<i>No effect on cash flow</i>" are part of section "<i>Operating activities</i>", in this report they are shown separately to cover those accountants that use that practice.</p>
+ <p><b>Warning!</b> Although the standard states that "<i>Net profit for the period</i>", "<i>Dividends</i>", and "<i>No effect on cash flow</i>" are part of section "<i>Operating activities</i>", in this report they are shown separately to cover the accountants that use to separate those accounts.</p>
</li>
<!-- ----------------------------------------------------------------------- -->
<li>
@@ -418,6 +418,26 @@
<div class="floatright"><a class="minitext" href="#top">⬆ Top</a></div>
<h2>Maintenance</h2>
+<!--h3><a id="BankAccounts">Bank Accounts</a></h3>
+<p>.</p-->
+
+<h3><a id="BankAccountUsers">Bank Account Authorised Users</a></h3>
+<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view and make changes to the contents of the bank accounts.</p>
+<p>With this script, you can add or remove the access permission for each user that grants or denies his ability to view or update that bank account.</p>
+
+<h3><a id="UserBankAccounts">User Authorised Bank Accounts</a></h3>
+<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view and make changes to the contents of the bank accounts.</p>
+<p>With this script, you can add or remove the access permission for each bank account that grants or denies the ability of that user to view or update it.</p>
+
+<!--h3><a id="AccountSections">Account Sections</a></h3>
+<p>.</p-->
+
+<!--h3><a id="AccountGroups">Account Groups</a></h3>
+<p>.</p-->
+
+<!--h3><a id="GLAccounts">GL Accounts</a></h3>
+<p>.</p-->
+
<h3><a id="GLAccountUsers">GL Account Authorised Users</a></h3>
<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view or make changes to the contents of the GL accounts.</p>
<p>With this script, you can change a specific GL account access permissions for users:</p>
@@ -438,13 +458,8 @@
<p>If you need to copy the access rights to general ledger accounts from one user to another, you can use an utility. See: <a href="ManualContents.php?
ViewTopic=SpecialUtilities#Z_GLAccountUsersCopyAuthority">Copy Authority of GL Accounts from one user to another</a>.</p>
-<!--h3><a id="BankAccounts.php">Bank Accounts</a></h3>
+<!--h3><a id="GLBudgets">GL Budgets</a></h3>
<p>.</p-->
-<h3><a id="BankAccountUsers">Bank Account Authorised Users</a></h3>
-<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view and make changes to the contents of the bank accounts.</p>
-<p>With this script, you can add or remove the access permission for each user that grants or denies his ability to view or update that bank account.</p>
-
-<h3><a id="UserBankAccounts">User Authorised Bank Accounts</a></h3>
-<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view and make changes to the contents of the bank accounts.</p>
-<p>With this script, you can add or remove the access permission for each bank account that grants or denies the ability of that user to view or update it.</p>
+<h3><a id="GLTagsMaintenance">GL Tags (maintenance)</a></h3>
+<p>This software allows the use of accounting tags to help you track specific units within your organization. You can set up any quantity of accounting tags. In this way, you can group transactions and assign them to cost centres, profit centres, activities centres, divisions, departments, or any units for which you need to produce a statement of comprehensive income for each "<i>tag</i>". See: <a href="#GLTags">GL Tags</a>.</p>
\ No newline at end of file
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-12-13 00:30:22 UTC (rev 7705)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-12-16 21:22:07 UTC (rev 7706)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-24 08:54-0600\n"
-"PO-Revision-Date: 2016-12-02 12:32-0600\n"
+"PO-Revision-Date: 2016-12-16 11:38-0600\n"
"Last-Translator: Rafael E. Chacón <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -10528,7 +10528,7 @@
#: Payments.php:1135 PcExpenses.php:193 PcExpenses.php:325
#: SuppTransGLAnalysis.php:111 SupplierCredit.php:461 SupplierInvoice.php:835
msgid "Tag"
-msgstr "Centro de Costo (Tag)"
+msgstr "Etiqueta"
#: CustomerReceipt.php:1025
msgid ""
@@ -15595,7 +15595,7 @@
#: GLTags.php:81
msgid "Tag ID"
-msgstr "ID Centro de Costo"
+msgstr "Identificación de la etiqueta"
#: GLTags.php:97
msgid "Are you sure you wish to delete this GL tag?"
@@ -43139,7 +43139,7 @@
#: Z_ImportGLTransactions.php:114
msgid "Tag ref"
-msgstr ""
+msgstr "Referencia de la etiqueta"
#: Z_ImportGLTransactions.php:114 Z_ImportPriceList.php:81
#: Z_ImportPriceList.php:89 Z_ImportPriceList.php:98
@@ -47590,7 +47590,7 @@
#: includes/PDFGLJournalHeader.inc:23
msgid "Tag Details"
-msgstr ""
+msgstr "Detalles de la etiqueta"
#: includes/PDFGrnHeader.inc:20
msgid "GRN number "
|
|
From: <rc...@us...> - 2016-12-20 14:51:41
|
Revision: 7707
http://sourceforge.net/p/web-erp/reponame/7707
Author: rchacon
Date: 2016-12-20 14:51:38 +0000 (Tue, 20 Dec 2016)
Log Message:
-----------
Add a report of purchases to suppliers for the range of selected dates.
Modified Paths:
--------------
trunk/GLCashFlowsIndirect.php
trunk/doc/Manual/ManualPurchaseOrdering.html
trunk/includes/MainMenuLinksArray.php
Added Paths:
-----------
trunk/PurchasesReport.php
trunk/sql/mysql/upgrade4.13.1-4.14.sql
Modified: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php 2016-12-16 21:22:07 UTC (rev 7706)
+++ trunk/GLCashFlowsIndirect.php 2016-12-20 14:51:38 UTC (rev 7707)
@@ -70,7 +70,7 @@
}
// Main code:
-if(isset($_POST['PeriodFrom']) AND isset($_POST['PeriodTo']) AND !isset($_POST['SelectADifferentPeriod'])) {// If all parameters are set and valid, generates the report:
+if(isset($_POST['PeriodFrom']) AND isset($_POST['PeriodTo']) AND $_POST['Action']!='New') {// If all parameters are set and valid, generates the report:
echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/reports.png" title="', // Icon image.
$Title, '" /> ', // Icon title.
@@ -105,7 +105,7 @@
// Gets the retained earnings GL account:
if(!isset($_SESSION['RetainedEarningsAccount'])) {
$_SESSION['RetainedEarningsAccount'] = '';
-/* $MyRow = DB_fetch_array(DB_query("SELECT confvalue FROM `config` WHERE confname ='RetainedEarningsAccount'"));*/
+/* $MyRow = DB_fetch_array(DB_query("SELECT confvalue FROM `config` WHERE confname ='RetainedEarningsAccount'"));// RChacon: Standardise to config table? */
$MyRow = DB_fetch_array(DB_query("SELECT retainedearnings FROM companies WHERE coycode = 1"));
if($MyRow) {
$_SESSION['RetainedEarningsAccount'] = $MyRow['confvalue'];
@@ -727,16 +727,16 @@
'<input name="ShowDetail" type="hidden" value="', $_POST['ShowDetail'], '" />',
'<input name="ShowZeroBalance" type="hidden" value="', $_POST['ShowZeroBalance'], '" />',
'<input name="ShowBudget" type="hidden" value="', $_POST['ShowBudget'], '" />',
- '<input name="ShowCash" type="hidden" value="', $_POST['ShowCash'], '" />', // Form buttons:
- '<div class="centre noprint">';
+ '<input name="ShowCash" type="hidden" value="', $_POST['ShowCash'], '" />',
+ '<div class="centre noprint">'; // Form buttons:
if($NeedSetup) {
echo '<button onclick="javascript:window.location=\'GLCashFlowsSetup.php\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/maintenance.png" /> ', _('Run Setup'), '</button>'; // "Run Setup" button.
}
echo '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/printer.png" /> ', _('Print This'), '</button>', // "Print This" button.
- '<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/gl.png" /> ', _('Select A Different Period'), '</button>', // "Select A Different Period" button.
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
+ '<button name="Action" type="submit" value="New"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/reports.png" /> ', _('New Report'), '</button>', // "New Report" button.
'<button onclick="javascript:window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
'</div>';
@@ -779,7 +779,7 @@
// Content of the body of the input table:
// Select period from:
'<tr>',
- '<td><label for="PeriodFrom">', _('Select period from'), ':</label></td>
+ '<td><label for="PeriodFrom">', _('Select period from'), '</label></td>
<td><select id="PeriodFrom" name="PeriodFrom" required="required">';
$Periods = DB_query('SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno ASC');
if(!isset($_POST['PeriodFrom'])) {
@@ -800,7 +800,7 @@
</tr>',
// Select period to:
'<tr>',
- '<td><label for="PeriodTo">', _('Select period to'), ':</label></td>
+ '<td><label for="PeriodTo">', _('Select period to'), '</label></td>
<td><select id="PeriodTo" name="PeriodTo" required="required">';
if(!isset($_POST['PeriodTo'])) {
$_POST['PeriodTo'] = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
@@ -837,4 +837,4 @@
}
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Added: trunk/PurchasesReport.php
===================================================================
--- trunk/PurchasesReport.php (rev 0)
+++ trunk/PurchasesReport.php 2016-12-20 14:51:38 UTC (rev 7707)
@@ -0,0 +1,290 @@
+<?php
+/* $Id: PurchasesReport.php 7672 2016-11-27 10:42:50Z rchacon $ */
+/* Shows a report of purchases to suppliers for the range of selected dates. */
+/* This program is under the GNU General Public License, last version. Rafael E. Chacón, 2016-12-18. */
+/* This creative work is under the CC BY-NC-SA, later version. Rafael E. Chacón, 2016-12-18. */
+
+// Notes:
+// Coding Conventions/Style: http://www.weberp.org/CodingConventions.html
+
+// BEGIN: Functions division ---------------------------------------------------
+// END: Functions division -----------------------------------------------------
+
+// BEGIN: Procedure division ---------------------------------------------------
+include('includes/session.inc');
+$Title = _('Purchases to Suppliers');
+$ViewTopic = 'PurchaseOrdering';
+$BookMark = 'PurchasesReport';
+include('includes/header.inc');
+
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/reports.png" title="', // Icon image.
+ $Title, '" /> ', // Icon title.
+ $Title, '</p>';// Page title.
+
+// Merges gets into posts:
+if(isset($_GET['PeriodFrom'])) {// Select period from.
+ $_POST['PeriodFrom'] = $_GET['PeriodFrom'];
+}
+if(isset($_GET['PeriodTo'])) {// Select period to.
+ $_POST['PeriodTo'] = $_GET['PeriodTo'];
+}
+if(isset($_GET['ShowDetails'])) {// Show the budget for the period.
+ $_POST['ShowDetails'] = $_GET['ShowDetails'];
+}
+
+// Validates the data submitted in the form:
+if($_POST['PeriodFrom'] > $_POST['PeriodTo']) {// RChacon: Is it the correct way to do this? **********************************************************************************
+ // The beginning is after the end.
+ unset($_POST['PeriodFrom']);
+ unset($_POST['PeriodTo']);
+ prnMsg(_('The beginning of the period should be before or equal to the end of the period. Please reselect the reporting period.'), 'error');
+}
+
+// Main code:
+if(isset($_POST['PeriodFrom']) AND isset($_POST['PeriodTo']) AND $_POST['Action']!='New') {// If all parameters are set and valid, generates the report:
+ echo '<table class="selection">
+ <thead>
+ <tr>';
+ $TableFoot =
+ '</tr>
+ </thead><tfoot>
+ <tr>
+ <td colspan="9"><br /><b>' .
+ _('Notes') . '</b><br />' .
+ _('Original amounts in the supplier\'s currency. GL amounts in the functional currency.') .
+ '</td>
+ </tr>
+ </tfoot><tbody>';// Common table code.
+ $TotalGlAmount = 0;
+ $TotalGlTax = 0;
+ $k = 1;// Row colour counter.
+ $PeriodFrom = ConvertSQLDate($_POST['PeriodFrom']);
+ $PeriodTo = ConvertSQLDate($_POST['PeriodTo']);
+ if($_POST['ShowDetails']) {// Parameters: PeriodFrom, PeriodTo, ShowDetails=on.
+ echo '<th>', _('Date'), '</th>
+ <th>', _('Purchase Invoice'), '</th>
+ <th>', _('Reference'), '</th>
+ <th>', _('Original Overall Amount'), '</th>
+ <th>', _('Original Overall Taxes'), '</th>
+ <th>', _('Original Overall Total'), '</th>
+ <th>', _('GL Overall Amount'), '</th>
+ <th>', _('GL Overall Taxes'), '</th>
+ <th>', _('GL Overall Total'), '</th>', $TableFoot;
+ $SupplierId = '';
+ $SupplierOvAmount = 0;
+ $SupplierOvTax = 0;
+ $SupplierGlAmount = 0;
+ $SupplierGlTax = 0;
+ $Sql = "SELECT
+ supptrans.supplierno,
+ suppliers.suppname,
+ suppliers.currcode,
+ supptrans.trandate,
+ supptrans.suppreference,
+ supptrans.transno,
+ supptrans.ovamount,
+ supptrans.ovgst,
+ supptrans.rate
+ FROM supptrans
+ INNER JOIN suppliers ON supptrans.supplierno=suppliers.supplierid
+ WHERE supptrans.trandate>='" . $PeriodFrom . "'
+ AND supptrans.trandate<='" . $PeriodTo . "'
+ AND supptrans.`type`=20
+ ORDER BY supptrans.supplierno, supptrans.trandate";
+ $Result = DB_query($Sql);
+ include('includes/CurrenciesArray.php'); // To get the currency name from the currency code.
+ foreach($Result as $MyRow) {
+ if($MyRow['supplierno'] != $SupplierId) {// If different, prints supplier totals:
+ if($SupplierId != '') {// If NOT the first line.
+ echo '<tr>',
+ '<td colspan="3"> </td>',
+ '<td class="number">', locale_number_format($SupplierOvAmount, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($SupplierOvTax, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($SupplierOvAmount+$SupplierOvTax, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($SupplierGlAmount, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($SupplierGlTax, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($SupplierGlAmount+$SupplierGlTax, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '</tr>';
+ }
+ echo '<tr><td colspan="9"> </td></tr>';
+ echo '<tr><td class="text" colspan="9">', $MyRow['supplierno'], ' - ', $MyRow['suppname'], ' - ', $MyRow['currcode'], ' ', $CurrencyName[$MyRow['currcode']], '</td></tr>';
+ $TotalGlAmount += $SupplierGlAmount;
+ $TotalGlTax += $SupplierGlTax;
+ $SupplierId = $MyRow['supplierno'];
+ $SupplierOvAmount = 0;
+ $SupplierOvTax = 0;
+ $SupplierGlAmount = 0;
+ $SupplierGlTax = 0;
+ }
+ if($k == 1) {
+ echo '<tr class="OddTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="EvenTableRows">';
+ $k = 1;
+ }
+ $GlAmount = $MyRow['ovamount']/$MyRow['rate'];
+ $GlTax = $MyRow['ovgst']/$MyRow['rate'];
+ echo '<td class="centre">', $MyRow['trandate'], '</td>',
+ '<td class="number">', $MyRow['transno'], '</td>',
+ '<td class="text">', $MyRow['suppreference'], '</td>',
+ '<td class="number">', locale_number_format($MyRow['ovamount'], $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($MyRow['ovgst'], $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number"><a href="', $RootPath, '/SuppWhereAlloc.php?TransType=20&TransNo=', $MyRow['transno'], '&ScriptFrom=PurchasesReport" target="_blank" title="', _('Click to view where allocated'), '">', locale_number_format($MyRow['ovamount']+$MyRow['ovgst'], $_SESSION['CompanyRecord']['decimalplaces']), '</a></td>',
+ '<td class="number">', locale_number_format($GlAmount, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($GlTax, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number"><a href="', $RootPath, '/GLTransInquiry.php?TypeID=20&TransNo=', $MyRow['transno'], '&ScriptFrom=PurchasesReport" target="_blank" title="', _('Click to view the GL entries'), '">', locale_number_format($GlAmount+$GlTax, $_SESSION['CompanyRecord']['decimalplaces']), '</a></td>', // RChacon: Should be "Click to view the General Ledger transaction" instead?
+ '</tr>';
+ $SupplierOvAmount += $MyRow['ovamount'];
+ $SupplierOvTax += $MyRow['ovgst'];
+ $SupplierGlAmount += $GlAmount;
+ $SupplierGlTax += $GlTax;
+ }
+
+ // Prints last supplier total:
+ echo '<tr>',
+ '<td colspan="3"> </td>',
+ '<td class="number">', locale_number_format($SupplierOvAmount, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($SupplierOvTax, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($SupplierOvAmount+$SupplierOvTax, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($SupplierGlAmount, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($SupplierGlTax, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($SupplierGlAmount+$SupplierGlTax, $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '</tr>',
+ '<tr><td colspan="9"> </td></tr>';
+
+ $TotalGlAmount += $SupplierGlAmount;
+ $TotalGlTax += $SupplierGlTax;
+
+ } else {// Parameters: PeriodFrom, PeriodTo, ShowDetails=off.
+ // RChacon: Needs to update the table_sort function to use in this table.
+ echo '<th>', _('Supplier Code'), '</th>
+ <th>', _('Supplier Name'), '</th>
+ <th>', _('Supplier\'s Currency'), '</th>
+ <th>', _('Original Overall Amount'), '</th>
+ <th>', _('Original Overall Taxes'), '</th>
+ <th>', _('Original Overall Total'), '</th>
+ <th>', _('GL Overall Amount'), '</th>
+ <th>', _('GL Overall Taxes'), '</th>
+ <th>', _('GL Overall Total'), '</th>', $TableFoot;
+ $Sql = "SELECT
+ supptrans.supplierno,
+ suppliers.suppname,
+ suppliers.currcode,
+ SUM(supptrans.ovamount) AS SupplierOvAmount,
+ SUM(supptrans.ovgst) AS SupplierOvTax,
+ SUM(supptrans.ovamount/supptrans.rate) AS SupplierGlAmount,
+ SUM(supptrans.ovgst/supptrans.rate) AS SupplierGlTax
+ FROM supptrans
+ INNER JOIN suppliers ON supptrans.supplierno=suppliers.supplierid
+ WHERE supptrans.trandate>='" . $PeriodFrom . "'
+ AND supptrans.trandate<='" . $PeriodTo . "'
+ AND supptrans.`type`=20
+ GROUP BY
+ supptrans.supplierno
+ ORDER BY supptrans.supplierno, supptrans.trandate";
+ $Result = DB_query($Sql);
+ foreach($Result as $MyRow) {
+ if($k == 1) {
+ echo '<tr class="OddTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="EvenTableRows">';
+ $k = 1;
+ }
+ echo '<td class="text"><a href="', $RootPath, '/SupplierInquiry.php?SupplierID=', $MyRow['supplierno'], '">', $MyRow['supplierno'], '</a></td>',
+ '<td class="text">', $MyRow['suppname'], '</td>',
+ '<td class="text">', $MyRow['currcode'], '</td>',
+ '<td class="number">', locale_number_format($MyRow['SupplierOvAmount'], $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($MyRow['SupplierOvTax'], $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($MyRow['SupplierOvAmount']+$MyRow['SupplierOvTax'], $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($MyRow['SupplierGlAmount'], $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($MyRow['SupplierGlTax'], $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '<td class="number">', locale_number_format($MyRow['SupplierGlAmount']+$MyRow['SupplierGlTax'], $_SESSION['CompanyRecord']['decimalplaces']), '</td>',
+ '</tr>';
+ $TotalGlAmount += $MyRow['SupplierGlAmount'];
+ $TotalGlTax += $MyRow['SupplierGlTax'];
+ }
+ }
+ echo '<tr>
+ <td class="text" colspan="6"> </td>
+ <td class="number">', locale_number_format($TotalGlAmount, $_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($TotalGlTax, $_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ <td class="number">', locale_number_format($TotalGlAmount+$TotalGlTax, $_SESSION['CompanyRecord']['decimalplaces']), '</td>
+ </tr>',// Prints all suppliers total.
+ '</tbody></table>
+ <br />
+ <form action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '" method="post">
+ <input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />
+ <input name="PeriodFrom" type="hidden" value="', $_POST['PeriodFrom'], '" />
+ <input name="PeriodTo" type="hidden" value="', $_POST['PeriodTo'], '" />
+ <input name="ShowDetails" type="hidden" value="', $_POST['ShowDetails'], '" />
+ <div class="centre noprint">', // Form buttons:
+ '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
+ '<button name="Action" type="submit" value="New"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/reports.png" /> ', _('New Report'), '</button>', // "New Report" button.
+ '<button onclick="window.location=\'index.php?Application=PO\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
+ '</div>';
+
+} else {
+ // Shows a form to allow input of criteria for the report to generate:
+ echo '<br />',
+ '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">',
+ '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />',
+ // Input table:
+ '<table class="selection">',
+ // Content of the header and footer of the input table:
+ '<thead>
+ <tr>
+ <th colspan="2">', _('Report Parameters'), '</th>
+ </tr>
+ </thead><tfoot>
+ <tr>
+ <td colspan="2">',
+ '<div class="centre">',
+ '<button name="Action" type="submit" value="', _('Submit'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/tick.svg" /> ', _('Submit'), '</button>', // "Submit" button.
+ '<button onclick="window.location=\'index.php?Application=PO\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/return.svg" /> ', _('Return'), '</button>', // "Return" button.
+ '</div>',
+ '</td>
+ </tr>
+ </tfoot><tbody>',
+ // Content of the body of the input table:
+ // Select period from:
+ '<tr>',
+ '<td><label for="PeriodFrom">', _('Select period from'), '</label></td>';
+ if(!isset($_POST['PeriodFrom'])) {
+ $_POST['PeriodFrom'] = date($_SESSION['DefaultDateFormat'], strtotime("-1 year", time()));// One year before current date.
+ }
+ echo '<td><input alt="', $_SESSION['DefaultDateFormat'], '" class="date" id="PeriodFrom" maxlength="10" minlength="0" name="PeriodFrom" required="required" size="12" type="text" value="', $_POST['PeriodFrom'], '" />',
+ (!isset($field_help) || $field_help ? _('Select the beginning of the reporting period') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ '</td>
+ </tr>',
+ // Select period to:
+ '<tr>',
+ '<td><label for="PeriodTo">', _('Select period to'), '</label></td>';
+ if(!isset($_POST['PeriodTo'])) {
+ $_POST['PeriodTo'] = date($_SESSION['DefaultDateFormat']);
+ }
+ echo '<td><input alt="', $_SESSION['DefaultDateFormat'], '" class="date" id="PeriodTo" maxlength="10" minlength="0" name="PeriodTo" required="required" size="12" type="text" value="', $_POST['PeriodTo'], '" />',
+ (!isset($field_help) || $field_help ? _('Select the end of the reporting period') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ '</td>
+ </tr>',
+ // Show the budget for the period:
+ '<tr>',
+ '<td><label for="ShowDetails">', _('Show details'), '</label></td>
+ <td><input',($_POST['ShowDetails'] ? ' checked="checked"' : ''), ' id="ShowDetails" name="ShowDetails" type="checkbox">', // "Checked" if ShowDetails is set AND it is TRUE.
+ (!isset($field_help) || $field_help ? _('Check this box to show purchase invoices') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ '</td>
+ </tr>',
+ '</tbody></table>';
+
+}
+echo '</form>';
+include('includes/footer.inc');
+// END: Procedure division -----------------------------------------------------
+?>
Modified: trunk/doc/Manual/ManualPurchaseOrdering.html
===================================================================
--- trunk/doc/Manual/ManualPurchaseOrdering.html 2016-12-16 21:22:07 UTC (rev 7706)
+++ trunk/doc/Manual/ManualPurchaseOrdering.html 2016-12-20 14:51:38 UTC (rev 7707)
@@ -175,9 +175,22 @@
<p>The goods received note should signed off by the person who received the goods - optionally a copy to the supplier's driver. </p>
<p>An alternative short-cut method is also provided for auto-receiving purchase orders at the prices defined in the purchase order, for authorised purchase orders. After having entered a purchase order or modified a purchase order a link to automatically receive the entire order and create the supplier invoice will show if the order is authorised. This will happen automatically if the configuration option to auto authorise purchase orders is set and the user creating or modifying the order is authorised to do so. Clicking this link will receive all the items on the purchase order to the extent there is any quantity yet to be received. However, this program cannot handle controlled items. If there is even one line of controlled/serialised stock on the purchase order then this facility cannot be used.</p>
-<div class="floatright">
- <a class="minitext" href="#top">⬆ Top</a>
-</div>
+
+<div class="floatright"><a class="minitext" href="#top">⬆ Top</a></div>
+<h2>Inquiries and Reports</h2>
+
+<h3><a id="PurchasesReport">Purchases to Suppliers</a></h3>
+<p>This report shows purchases to suppliers over a period of time. It shows the overall amount, taxes and total in the supplier's currency and in the functional currency.</p>
+<p>Report parameters:</p>
+<ul>
+ <li><b>Select period from.</b> Select the beginning of the reporting period. Default: one year before current date.</li>
+ <li><b>Select period to.</b> Select the end of the reporting period. Default: current date.</li>
+ <li><b>Show details.</b> Check this box to show purchase invoices. With <i>show details <b>on</b></i>, the report as links to view where allocated and to view the General Ledger transaction. With <i>show details <b>off</b></i>, the report as links to view the supplier account inquiry. Default: off.</li>
+</ul>
+<p><b>Note</b>. The conversion between the supplier's currency and the functional currency is done with the exchange rate used in the respective transaction.</p>
+
+
+<div class="floatright"><a class="minitext" href="#top">⬆ Top</a></div>
<h2>Maintenance</h2>
<h3><a id="SupplierPriceList">Maintain Supplier Price Lists</a></h3>
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2016-12-16 21:22:07 UTC (rev 7706)
+++ trunk/includes/MainMenuLinksArray.php 2016-12-20 14:51:38 UTC (rev 7707)
@@ -188,11 +188,13 @@
$MenuItems['PO']['Reports']['Caption'] = array( _('Purchase Order Inquiry'),
_('Purchase Order Detail Or Summary Inquiries'),
- _('Supplier Price List'));
+ _('Supplier Price List'),
+ _('Purchases to Suppliers'));
$MenuItems['PO']['Reports']['URL'] = array( '/PO_SelectPurchOrder.php',
'/POReport.php',
- '/SuppPriceList.php');
+ '/SuppPriceList.php',
+ '/PurchasesReport.php');
$MenuItems['PO']['Maintenance']['Caption'] = array(_('Maintain Supplier Price Lists'));
Added: trunk/sql/mysql/upgrade4.13.1-4.14.sql
===================================================================
--- trunk/sql/mysql/upgrade4.13.1-4.14.sql (rev 0)
+++ trunk/sql/mysql/upgrade4.13.1-4.14.sql 2016-12-20 14:51:38 UTC (rev 7707)
@@ -0,0 +1,5 @@
+-- Add new script:
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('PurchasesReport.php', '2', 'Shows a report of purchases to suppliers for the range of selected dates');
+
+-- Update version number:
+UPDATE config SET confvalue='4.14' WHERE confname='VersionNumber';
|
|
From: <rc...@us...> - 2016-12-20 15:57:13
|
Revision: 7709
http://sourceforge.net/p/web-erp/reponame/7709
Author: rchacon
Date: 2016-12-20 15:57:10 +0000 (Tue, 20 Dec 2016)
Log Message:
-----------
Standardise to "Print" button.
Modified Paths:
--------------
trunk/AnalysisHorizontalIncome.php
trunk/AnalysisHorizontalPosition.php
trunk/BOMs.php
trunk/CustWhereAlloc.php
trunk/DailyBankTransactions.php
trunk/GLAccountUsers.php
trunk/GLBalanceSheet.php
trunk/GLProfit_Loss.php
trunk/GLTrialBalance.php
trunk/SuppWhereAlloc.php
trunk/UserGLAccounts.php
trunk/doc/Change.log
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/AnalysisHorizontalIncome.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -512,10 +512,10 @@
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
'<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />',
'<input type="hidden" name="FromPeriod" value="', $_POST['FromPeriod'], '" />',
- '<input type="hidden" name="ToPeriod" value="', $_POST['ToPeriod'], '" />', // Form buttons:
- '<div class="centre noprint">',
+ '<input type="hidden" name="ToPeriod" value="', $_POST['ToPeriod'], '" />',
+ '<div class="centre noprint">', // Form buttons:
'<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
'<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/AnalysisHorizontalPosition.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -352,10 +352,10 @@
echo '<br />',
'<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">',
'<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />',
- '<input type="hidden" name="BalancePeriodEnd" value="', $_POST['BalancePeriodEnd'], '" />', // Form buttons:
- '<div class="centre noprint">',
+ '<input type="hidden" name="BalancePeriodEnd" value="', $_POST['BalancePeriodEnd'], '" />',
+ '<div class="centre noprint">', // Form buttons:
'<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
'<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/BOMs.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -914,10 +914,9 @@
<br />
<div class="centre noprint">
<input tabindex="8" type="submit" name="Submit" value="' . _('Enter Information') . '" />
- <button onclick="javascript:window.print()" type="button"><img alt="" src="' . $RootPath . '/css/' . $Theme .
- '/images/printer.png" /> ' .
- _('Print This') . '</button>
- </div>
+ <button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
+ '</div>
</div>
</form>';
Modified: trunk/CustWhereAlloc.php
===================================================================
--- trunk/CustWhereAlloc.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/CustWhereAlloc.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -194,11 +194,9 @@
echo '</form>';
if(isset($Printer)) {
echo '<div class="centre noprint">
- <button onclick="javascript:window.print()" type="button"><img alt="" src="' . $RootPath . '/css/' . $Theme .
- '/images/printer.png" /> ' .
- _('Print This') . '
- </button>
- </div>';// "Print This" button.
+ <button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
+ '</div>';// "Print This" button.
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/DailyBankTransactions.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -246,10 +246,9 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<br />
- <div class="centre noprint">'.
- '<button onclick="javascript:window.print()" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/printer.png" /> ' .
- _('Print This') . '</button>'.// "Print This" button.
+ <div class="centre noprint">', // Form buttons:
+ '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" /> ' .
_('Select Another Date') . '</button>'.// "Select A Different Period" button.
Modified: trunk/GLAccountUsers.php
===================================================================
--- trunk/GLAccountUsers.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/GLAccountUsers.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -242,10 +242,10 @@
</tr>
</table>';
DB_free_result($Result);
- echo '<br>', // Form buttons:
- '<div class="centre noprint">',
+ echo '<br>',
+ '<div class="centre noprint">', // Form buttons:
'<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/printer.png" /> ', _('Print This'), '</button>', // "Print This" button.
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button formaction="GLAccountUsers.php?Cancel" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different GL account'), '</button>'; // "Select A Different GL account" button.
}
@@ -255,4 +255,4 @@
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/GLBalanceSheet.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -711,9 +711,9 @@
echo '</table>';
echo '</div>';// div id="Report".
echo '<br />
- <div class="centre noprint">'.
- '<button onclick="javascript:window.print()" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/printer.png" /> ' . _('Print This') . '</button>'.// "Print This" button.
+ <div class="centre noprint">', // Form buttons:
+ '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" /> ' . _('Select A Different Balance Date') . '</button>'.// "Select A Different Period" button.
'<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/GLProfit_Loss.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -1307,10 +1307,10 @@
/* echo '</tbody>';// See comment at the begin of the table.*/
echo '</table>';
echo '</div>';// div id="Report".
- echo '<br />', // Form buttons:
- '<div class="centre noprint">',
+ echo '<br />',
+ '<div class="centre noprint">', // Form buttons:
'<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/printer.png" /> ', _('Print This'), '</button> ', // "Print This" button.
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button name="SelectADifferentPeriod" type="submit" value="', _('Select A Different Period'), '"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" /> ', _('Select A Different Period'), '</button> ', // "Select A Different Period" button.
'<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
@@ -1320,4 +1320,4 @@
echo '</div>';// div class=?
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/GLTrialBalance.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -731,9 +731,9 @@
echo '</table><br />';
- echo '<div class="centre noprint">'.
- '<button onclick="javascript:window.print()" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/printer.png" /> ' . _('Print This') . '</button>'.// "Print This" button.
+ echo '<div class="centre noprint">', // Form buttons:
+ '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" /> ' . _('Select A Different Period') . '</button>'.// "Select A Different Period" button.
'<button onclick="window.location=\'index.php?Application=GL\'" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
Modified: trunk/SuppWhereAlloc.php
===================================================================
--- trunk/SuppWhereAlloc.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/SuppWhereAlloc.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -2,130 +2,130 @@
/* $Id: SuppWhereAlloc.php 7449 2016-01-14 10:08:51Z exsonqu $*/
/* Suppliers Where allocated */
-include('includes/session.inc');
-$Title = _('Supplier How Paid Inquiry');
-$ViewTopic = 'APInquiries';
+include('includes/session.inc');
+$Title = _('Supplier How Paid Inquiry');
+$ViewTopic = 'APInquiries';
$BookMark = 'WhereAllocated';
include('includes/header.inc');
-
-if(isset($_GET['TransNo']) AND isset($_GET['TransType'])) {
- $_POST['TransNo'] = (int)$_GET['TransNo'];
- $_POST['TransType'] = (int)$_GET['TransType'];
- $_POST['ShowResults'] = true;
-}
-
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
+
+if(isset($_GET['TransNo']) AND isset($_GET['TransType'])) {
+ $_POST['TransNo'] = (int)$_GET['TransNo'];
+ $_POST['TransType'] = (int)$_GET['TransType'];
+ $_POST['ShowResults'] = true;
+}
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<p class="page_title_text noprint"><img alt="" src="'. $RootPath. '/css/'. $Theme.
'/images/money_add.png" title="',// Icon image.
_('Supplier Where Allocated'), '" /> ',// Icon title.
$Title. '</p>',// Page title.
- '<table class="selection noprint">
- <tr>
- <td>' . _('Type') . ':</td>
- <td><select tabindex="1" name="TransType"> ';
-
-if(!isset($_POST['TransType'])) {
- $_POST['TransType']='20';
-}
-if($_POST['TransType']==20) {
- echo '<option selected="selected" value="20">' . _('Purchase Invoice') . '</option>
- <option value="22">' . _('Payment') . '</option>
- <option value="21">' . _('Debit Note') . '</option>';
-} elseif($_POST['TransType'] == 22) {
- echo '<option selected="selected" value="22">' . _('Payment') . '</option>
- <option value="20">' . _('Purchase Invoice') . '</option>
- <option value="21">' . _('Debit Note') . '</option>';
-} elseif($_POST['TransType'] == 21) {
- echo '<option selected="selected" value="21">' . _('Debit Note') . '</option>
- <option value="20">' . _('Purchase Invoice') . '</option>
- <option value="22">' . _('Payment') . '</option>';
-}
-
-echo '</select></td>';
-
-if(!isset($_POST['TransNo'])) {$_POST['TransNo']='';}
-echo '<td>' . _('Transaction Number').':</td>
- <td><input tabindex="2" type="text" class="number" name="TransNo" required="required" maxlength="20" size="20" value="'. $_POST['TransNo'] . '" /></td>
- </tr>
- </table>
- <br />
- <div class="centre noprint">
- <input tabindex="3" type="submit" name="ShowResults" value="' . _('Show How Allocated') . '" />
- </div>';
-
-if(isset($_POST['ShowResults']) AND $_POST['TransNo']=='') {
- echo '<br />';
- prnMsg(_('The transaction number to be queried must be entered first'),'warn');
-}
-
-if(isset($_POST['ShowResults']) AND $_POST['TransNo']!='') {
-
-/*First off get the DebtorTransID of the transaction (invoice normally) selected */
- $sql = "SELECT supptrans.id,
- ovamount+ovgst AS totamt,
- currencies.decimalplaces AS currdecimalplaces,
- suppliers.currcode
- FROM supptrans INNER JOIN suppliers
- ON supptrans.supplierno=suppliers.supplierid
- INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE type='" . $_POST['TransType'] . "'
- AND transno = '" . $_POST['TransNo']."'";
-
- if($_SESSION['SalesmanLogin'] != '') {
- $sql .= " AND supptrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
- }
- $result = DB_query($sql);
-
- if(DB_num_rows($result) > 0) {
- $myrow = DB_fetch_array($result);
- $AllocToID = $myrow['id'];
- $CurrCode = $myrow['currcode'];
- $CurrDecimalPlaces = $myrow['currdecimalplaces'];
- $sql = "SELECT type,
- transno,
- trandate,
- supptrans.supplierno,
- suppreference,
- supptrans.rate,
- ovamount+ovgst as totalamt,
- suppallocs.amt
- FROM supptrans
- INNER JOIN suppallocs ";
- if($_POST['TransType']==22 OR $_POST['TransType'] == 21) {
-
- $TitleInfo = ($_POST['TransType'] == 22)?_('Payment'):_('Debit Note');
- $sql .= "ON supptrans.id = suppallocs.transid_allocto
- WHERE suppallocs.transid_allocfrom = '" . $AllocToID . "'";
- } else {
- $TitleInfo = _('invoice');
- $sql .= "ON supptrans.id = suppallocs.transid_allocfrom
- WHERE suppallocs.transid_allocto = '" . $AllocToID . "'";
- }
- $sql .= " ORDER BY transno ";
-
- $ErrMsg = _('The customer transactions for the selected criteria could not be retrieved because');
- $TransResult = DB_query($sql, $ErrMsg);
-
- if(DB_num_rows($TransResult)==0) {
-
- if($myrow['totamt']>0 AND ($_POST['TransType']==22 OR $_POST['TransType'] == 21)) {
- prnMsg(_('This transaction was a receipt of funds and there can be no allocations of receipts or credits to a receipt. This inquiry is meant to be used to see how a payment which is entered as a negative receipt is settled against credit notes or receipts'),'info');
- } else {
- prnMsg(_('There are no allocations made against this transaction'),'info');
- }
- } else {
+ '<table class="selection noprint">
+ <tr>
+ <td>' . _('Type') . ':</td>
+ <td><select tabindex="1" name="TransType"> ';
+
+if(!isset($_POST['TransType'])) {
+ $_POST['TransType']='20';
+}
+if($_POST['TransType']==20) {
+ echo '<option selected="selected" value="20">' . _('Purchase Invoice') . '</option>
+ <option value="22">' . _('Payment') . '</option>
+ <option value="21">' . _('Debit Note') . '</option>';
+} elseif($_POST['TransType'] == 22) {
+ echo '<option selected="selected" value="22">' . _('Payment') . '</option>
+ <option value="20">' . _('Purchase Invoice') . '</option>
+ <option value="21">' . _('Debit Note') . '</option>';
+} elseif($_POST['TransType'] == 21) {
+ echo '<option selected="selected" value="21">' . _('Debit Note') . '</option>
+ <option value="20">' . _('Purchase Invoice') . '</option>
+ <option value="22">' . _('Payment') . '</option>';
+}
+
+echo '</select></td>';
+
+if(!isset($_POST['TransNo'])) {$_POST['TransNo']='';}
+echo '<td>' . _('Transaction Number').':</td>
+ <td><input tabindex="2" type="text" class="number" name="TransNo" required="required" maxlength="20" size="20" value="'. $_POST['TransNo'] . '" /></td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre noprint">
+ <input tabindex="3" type="submit" name="ShowResults" value="' . _('Show How Allocated') . '" />
+ </div>';
+
+if(isset($_POST['ShowResults']) AND $_POST['TransNo']=='') {
+ echo '<br />';
+ prnMsg(_('The transaction number to be queried must be entered first'),'warn');
+}
+
+if(isset($_POST['ShowResults']) AND $_POST['TransNo']!='') {
+
+/*First off get the DebtorTransID of the transaction (invoice normally) selected */
+ $sql = "SELECT supptrans.id,
+ ovamount+ovgst AS totamt,
+ currencies.decimalplaces AS currdecimalplaces,
+ suppliers.currcode
+ FROM supptrans INNER JOIN suppliers
+ ON supptrans.supplierno=suppliers.supplierid
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE type='" . $_POST['TransType'] . "'
+ AND transno = '" . $_POST['TransNo']."'";
+
+ if($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND supptrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+ $result = DB_query($sql);
+
+ if(DB_num_rows($result) > 0) {
+ $myrow = DB_fetch_array($result);
+ $AllocToID = $myrow['id'];
+ $CurrCode = $myrow['currcode'];
+ $CurrDecimalPlaces = $myrow['currdecimalplaces'];
+ $sql = "SELECT type,
+ transno,
+ trandate,
+ supptrans.supplierno,
+ suppreference,
+ supptrans.rate,
+ ovamount+ovgst as totalamt,
+ suppallocs.amt
+ FROM supptrans
+ INNER JOIN suppallocs ";
+ if($_POST['TransType']==22 OR $_POST['TransType'] == 21) {
+
+ $TitleInfo = ($_POST['TransType'] == 22)?_('Payment'):_('Debit Note');
+ $sql .= "ON supptrans.id = suppallocs.transid_allocto
+ WHERE suppallocs.transid_allocfrom = '" . $AllocToID . "'";
+ } else {
+ $TitleInfo = _('invoice');
+ $sql .= "ON supptrans.id = suppallocs.transid_allocfrom
+ WHERE suppallocs.transid_allocto = '" . $AllocToID . "'";
+ }
+ $sql .= " ORDER BY transno ";
+
+ $ErrMsg = _('The customer transactions for the selected criteria could not be retrieved because');
+ $TransResult = DB_query($sql, $ErrMsg);
+
+ if(DB_num_rows($TransResult)==0) {
+
+ if($myrow['totamt']>0 AND ($_POST['TransType']==22 OR $_POST['TransType'] == 21)) {
+ prnMsg(_('This transaction was a receipt of funds and there can be no allocations of receipts or credits to a receipt. This inquiry is meant to be used to see how a payment which is entered as a negative receipt is settled against credit notes or receipts'),'info');
+ } else {
+ prnMsg(_('There are no allocations made against this transaction'),'info');
+ }
+ } else {
$Printer = true;
echo '<br />
<div id="Report">
<table class="selection">
<thead>
<tr>
- <th class="centre" colspan="7">
- <b>' . _('Allocations made against') . ' ' . $TitleInfo . ' ' . _('number') . ' ' . $_POST['TransNo'] . '<br />' . _('Transaction Total').': '. locale_number_format($myrow['totamt'],$CurrDecimalPlaces) . ' ' . $CurrCode . '</b>
- </th>
+ <th class="centre" colspan="7">
+ <b>' . _('Allocations made against') . ' ' . $TitleInfo . ' ' . _('number') . ' ' . $_POST['TransNo'] . '<br />' . _('Transaction Total').': '. locale_number_format($myrow['totamt'],$CurrDecimalPlaces) . ' ' . $CurrCode . '</b>
+ </th>
</tr>';
$TableHeader = '<tr>
@@ -139,64 +139,62 @@
</tr>';
echo $TableHeader,
'</thead>
- <tbody>';
-
- $RowCounter = 1;
- $k = 0; //row colour counter
- $AllocsTotal = 0;
-
- while($myrow=DB_fetch_array($TransResult)) {
- if($k==1) {
- echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
- echo '<tr class="OddTableRows">';
- $k++;
- }
-
- if($myrow['type']==21) {
- $TransType = _('Debit Note');
- } elseif($myrow['type'] == 20) {
- $TransType = _('Purchase Invoice');
- } else {
- $TransType = _('Payment');
+ <tbody>';
+
+ $RowCounter = 1;
+ $k = 0; //row colour counter
+ $AllocsTotal = 0;
+
+ while($myrow=DB_fetch_array($TransResult)) {
+ if($k==1) {
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
}
+
+ if($myrow['type']==21) {
+ $TransType = _('Debit Note');
+ } elseif($myrow['type'] == 20) {
+ $TransType = _('Purchase Invoice');
+ } else {
+ $TransType = _('Payment');
+ }
echo ' <td class="centre">', ConvertSQLDate($myrow['trandate']), '</td>
<td class="text">' . $TransType . '</td>
<td class="number">' . $myrow['transno'] . '</td>
<td class="text">' . $myrow['suppreference'] . '</td>
<td class="number">' . $myrow['rate'] . '</td>
- <td class="number">' . locale_number_format($myrow['totalamt'], $CurrDecimalPlaces) . '</td>
- <td class="number">' . locale_number_format($myrow['amt'], $CurrDecimalPlaces) . '</td>
- </tr>';
-
- $RowCounter++;
- if($RowCounter == 22) {
- $RowCounter=1;
- echo $TableHeader;
- }
- //end of page full new headings if
- $AllocsTotal += $myrow['amt'];
- }
- //end of while loop
- echo '<tr>
- <td class="number" colspan="6">' . _('Total allocated') . '</td>
- <td class="number">' . locale_number_format($AllocsTotal, $CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($myrow['totalamt'], $CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($myrow['amt'], $CurrDecimalPlaces) . '</td>
+ </tr>';
+
+ $RowCounter++;
+ if($RowCounter == 22) {
+ $RowCounter=1;
+ echo $TableHeader;
+ }
+ //end of page full new headings if
+ $AllocsTotal += $myrow['amt'];
+ }
+ //end of while loop
+ echo '<tr>
+ <td class="number" colspan="6">' . _('Total allocated') . '</td>
+ <td class="number">' . locale_number_format($AllocsTotal, $CurrDecimalPlaces) . '</td>
</tr>
</tbody></table>
- </div>';
- } // end if there are allocations against the transaction
- } //got the ID of the transaction to find allocations for
-}
-echo '</div>';
-echo '</form>';
-if(isset($Printer)) {
- echo '<div class="centre noprint">
- <button onclick="javascript:window.print()" type="button"><img alt="" src="' . $RootPath . '/css/' . $Theme .
- '/images/printer.png" /> ' .
- _('Print This') . '
- </button>
- </div>';// "Print This" button.
-}
-include('includes/footer.inc');
-?>
\ No newline at end of file
+ </div>';
+ } // end if there are allocations against the transaction
+ } //got the ID of the transaction to find allocations for
+}
+echo '</div>';
+echo '</form>';
+if(isset($Printer)) {
+ echo '<div class="centre noprint">
+ <button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
+ '</div>';
+}
+include('includes/footer.inc');
+?>
Modified: trunk/UserGLAccounts.php
===================================================================
--- trunk/UserGLAccounts.php 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/UserGLAccounts.php 2016-12-20 15:57:10 UTC (rev 7709)
@@ -248,10 +248,10 @@
</tr>
</table>';
DB_free_result($Result);
- echo '<br>', // Form buttons:
- '<div class="centre noprint">',
+ echo '<br>',
+ '<div class="centre noprint">', // Form buttons:
'<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/printer.png" /> ', _('Print This'), '</button>', // "Print This" button.
+ '/images/printer.png" /> ', _('Print'), '</button>', // "Print" button.
'<button formaction="UserGLAccounts.php?Cancel" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/user.png" /> ', _('Select A Different User'), '</button>'; // "Select A Different User" button.
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-12-20 15:03:29 UTC (rev 7708)
+++ trunk/doc/Change.log 2016-12-20 15:57:10 UTC (rev 7709)
@@ -1,5 +1,6 @@
webERP Change Log
+20/12/16 RChacon: Standardise to "Print" button.
20/12/16 RChacon: Add a report of purchases to suppliers for the range of selected dates.
11/12/16 PaulT: Dashboard.php: Correct table closure. When there are no outstanding orders, causes footer artifact.
08/12/16 Exson: Fixed the variable error in stock take pdf header in includes/PDFStockCheckPageHeader.inc. And fixed undefined noise in Payments.php. Reported by shane.
|
|
From: <rc...@us...> - 2016-12-20 17:05:43
|
Revision: 7710
http://sourceforge.net/p/web-erp/reponame/7710
Author: rchacon
Date: 2016-12-20 17:05:39 +0000 (Tue, 20 Dec 2016)
Log Message:
-----------
Update translation files.
Modified Paths:
--------------
trunk/GLCashFlowsIndirect.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php 2016-12-20 15:57:10 UTC (rev 7709)
+++ trunk/GLCashFlowsIndirect.php 2016-12-20 17:05:39 UTC (rev 7710)
@@ -762,7 +762,7 @@
// Content of the header and footer of the input table:
'<thead>
<tr>
- <th colspan="2">', _('Report parameters'), '</th>
+ <th colspan="2">', _('Report Parameters'), '</th>
</tr>
</thead><tfoot>
<tr>
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-12-20 15:57:10 UTC (rev 7709)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-12-20 17:05:39 UTC (rev 7710)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-24 08:54-0600\n"
+"POT-Creation-Date: 2016-12-20 10:25-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -18,7 +18,7 @@
"X-Generator: Poedit 1.5.4\n"
"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
-#: AccountGroups.php:6 includes/MainMenuLinksArray.php:401
+#: AccountGroups.php:6 includes/MainMenuLinksArray.php:403
msgid "Account Groups"
msgstr "مجموعات العضوية"
@@ -229,7 +229,7 @@
#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:454
#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256
#: BOMIndented.php:249 BOMIndentedReverse.php:236 BOMInquiry.php:186
-#: BOMListing.php:110 BOMs.php:285 BOMs.php:991 COGSGLPostings.php:19
+#: BOMListing.php:110 BOMs.php:285 BOMs.php:990 COGSGLPostings.php:19
#: CollectiveWorkOrderCost.php:7 CollectiveWorkOrderCost.php:273
#: CompanyPreferences.php:100 CounterReturns.php:1629 CounterSales.php:2097
#: CounterSales.php:2193 CreditStatus.php:21 Credit_Invoice.php:287
@@ -240,13 +240,13 @@
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11
#: HistoricalTestResults.php:42 InternalStockRequest.php:316
-#: InternalStockRequestInquiry.php:168 InventoryPlanning.php:459
+#: InternalStockRequestInquiry.php:167 InventoryPlanning.php:459
#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:543
#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91
#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60
#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10
-#: PO_SelectOSPurchOrder.php:153 PcAssignCashTabToTab.php:57
-#: PcAssignCashTabToTab.php:137 PcAssignCashTabToTab.php:193
+#: PO_SelectOSPurchOrder.php:153 PcAssignCashTabToTab.php:76
+#: PcAssignCashTabToTab.php:156 PcAssignCashTabToTab.php:212
#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144 PcAssignCashToTab.php:160
#: PcAssignCashToTab.php:207 PriceMatrix.php:16 Prices.php:11
#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38
@@ -258,7 +258,7 @@
#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221
#: SelectCreditItems.php:292 SelectCustomer.php:258 SelectGLAccount.php:86
#: SelectOrderItems.php:559 SelectOrderItems.php:1472 SelectOrderItems.php:1572
-#: SelectProduct.php:522 SelectQASamples.php:45 SelectSalesOrder.php:545
+#: SelectProduct.php:523 SelectQASamples.php:45 SelectSalesOrder.php:545
#: SelectSupplier.php:14 SelectSupplier.php:222 SelectWorkOrder.php:9
#: SelectWorkOrder.php:174 SellThroughSupport.php:229 ShipmentCosting.php:11
#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
@@ -306,7 +306,7 @@
#: DailyBankTransactions.php:215 DeliveryDetails.php:1158
#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:101
#: GLAccountUsers.php:181 GLAccountUsers.php:190 GLTransInquiry.php:74
-#: InternalStockRequestInquiry.php:437 InternalStockRequestInquiry.php:448
+#: InternalStockRequestInquiry.php:438 InternalStockRequestInquiry.php:449
#: Labels.php:606 Labels.php:608 Labels.php:634 Locations.php:446
#: Locations.php:670 Locations.php:672 Locations.php:685 Locations.php:687
#: Locations.php:703 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566
@@ -333,7 +333,7 @@
#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:302
#: SalesCategories.php:389 SalesCategories.php:393 SalesPeople.php:227
#: SalesPeople.php:367 SalesPeople.php:369 SelectCustomer.php:757
-#: SelectProduct.php:230 SelectProduct.php:368 SelectQASamples.php:424
+#: SelectProduct.php:231 SelectProduct.php:369 SelectQASamples.php:424
#: SelectQASamples.php:518 SelectQASamples.php:520 SelectQASamples.php:574
#: SelectQASamples.php:576 SelectQASamples.php:588 SelectQASamples.php:590
#: ShipmentCosting.php:667 ShopParameters.php:289 ShopParameters.php:293
@@ -375,7 +375,7 @@
#: DailyBankTransactions.php:217 DeliveryDetails.php:1159
#: DeliveryDetails.php:1200 DeliveryDetails.php:1203 FormDesigner.php:99
#: GLAccountUsers.php:183 GLAccountUsers.php:193 GLTransInquiry.php:93
-#: InternalStockRequestInquiry.php:435 InternalStockRequestInquiry.php:446
+#: InternalStockRequestInquiry.php:436 InternalStockRequestInquiry.php:447
#: Labels.php:605 Labels.php:609 Labels.php:635 Locations.php:446
#: Locations.php:675 Locations.php:677 Locations.php:690 Locations.php:692
#: Locations.php:704 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564
@@ -402,7 +402,7 @@
#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:304
#: SalesCategories.php:390 SalesCategories.php:392 SalesPeople.php:229
#: SalesPeople.php:372 SalesPeople.php:374 SelectCustomer.php:757
-#: SelectProduct.php:232 SelectProduct.php:370 SelectQASamples.php:426
+#: SelectProduct.php:233 SelectProduct.php:371 SelectQASamples.php:426
#: SelectQASamples.php:523 SelectQASamples.php:525 SelectQASamples.php:579
#: SelectQASamples.php:581 SelectQASamples.php:593 SelectQASamples.php:595
#: ShipmentCosting.php:668 ShopParameters.php:290 ShopParameters.php:292
@@ -533,7 +533,7 @@
#: ConfirmDispatch_Invoice.php:656 ConfirmDispatch_Invoice.php:1707
#: Credit_Invoice.php:1634 CustItem.php:452 FixedAssetItems.php:132
#: FixedAssetItems.php:683 GLAccountUsers.php:153 GLBudgets.php:240
-#: GLCashFlowsSetup.php:173 GLTags.php:68 GoodsReceived.php:298
+#: GLCashFlowsSetup.php:172 GLTags.php:68 GoodsReceived.php:298
#: GoodsReceived.php:304 GoodsReceived.php:311 GoodsReceived.php:819
#: ImportBankTransAnalysis.php:154 ImportBankTransAnalysis.php:185
#: InternalStockRequest.php:255 InternalStockRequestAuthorisation.php:123
@@ -551,11 +551,12 @@
#: AccountGroups.php:378 AccountGroups.php:418 AnalysisHorizontalIncome.php:121
#: AnalysisHorizontalIncome.php:522 AnalysisHorizontalPosition.php:79
-#: AnalysisHorizontalPosition.php:362 DailyBankTransactions.php:257
+#: AnalysisHorizontalPosition.php:362 DailyBankTransactions.php:256
#: GLAccountUsers.php:253 GLBalanceSheet.php:720 GLCashFlowsIndirect.php:741
-#: GLCashFlowsIndirect.php:774 GLCashFlowsSetup.php:181 GLProfit_Loss.php:1317
-#: GLTrialBalance.php:740 InternalStockRequestInquiry.php:264
-#: SecurityTokens.php:140 SecurityTokens.php:156 UserGLAccounts.php:259
+#: GLCashFlowsIndirect.php:774 GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317
+#: GLTrialBalance.php:740 InternalStockRequestInquiry.php:263
+#: PurchasesReport.php:229 PurchasesReport.php:251 SecurityTokens.php:140
+#: SecurityTokens.php:156 UserGLAccounts.php:259
#: Z_GLAccountUsersCopyAuthority.php:96 includes/Login.php:8
msgid "Return"
msgstr ""
@@ -607,7 +608,7 @@
msgstr ""
#: AccountSections.php:6 AccountSections.php:172 AccountSections.php:173
-#: includes/MainMenuLinksArray.php:400
+#: includes/MainMenuLinksArray.php:402
msgid "Account Sections"
msgstr "أعدادات العضو"
@@ -799,12 +800,13 @@
#: AnalysisHorizontalIncome.php:169 AnalysisHorizontalPosition.php:123
#: Customers.php:1122 Customers.php:1130 GLCashFlowsIndirect.php:126
#: GLCashFlowsIndirect.php:445 PDFQuotation.php:252
-#: PDFQuotationPortrait.php:249 PcAssignCashTabToTab.php:242
-#: PcAssignCashTabToTab.php:365 PcAssignCashToTab.php:256
+#: PDFQuotationPortrait.php:249 PcAssignCashTabToTab.php:261
+#: PcAssignCashTabToTab.php:384 PcAssignCashToTab.php:256
#: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:98
#: PcClaimExpensesFromTab.php:242 PcClaimExpensesFromTab.php:409
-#: PcReportTab.php:336 SelectCustomer.php:732 ShopParameters.php:198
-#: SystemParameters.php:411 WOSerialNos.php:306 WOSerialNos.php:312
+#: PcReportTab.php:336 PurchasesReport.php:54 SelectCustomer.php:732
+#: ShopParameters.php:198 SystemParameters.php:411 WOSerialNos.php:306
+#: WOSerialNos.php:312
msgid "Notes"
msgstr ""
@@ -895,14 +897,15 @@
#: CustomerInquiry.php:252 CustomerTransInquiry.php:100 GLAccountReport.php:347
#: GLTransInquiry.php:47 GoodsReceived.php:130 MRPCalendar.php:219
#: PDFOrdersInvoiced.php:378 PDFRemittanceAdvice.php:308 PDFWOPrint.php:450
-#: PaymentAllocations.php:66 PcAssignCashTabToTab.php:238
+#: PaymentAllocations.php:66 PcAssignCashTabToTab.php:257
#: PcAssignCashToTab.php:252 PcAuthorizeExpenses.php:94 PrintCustTrans.php:822
#: PrintCustTransPortrait.php:902 PrintWOItemSlip.php:186
-#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:401
-#: SelectCustomer.php:810 SelectCustomer.php:852 ShipmentCosting.php:538
-#: ShipmentCosting.php:615 Shipments.php:489 StockDispatch.php:279
-#: StockDispatch.php:290 StockDispatch.php:301 StockLocMovements.php:92
-#: StockMovements.php:105 StockSerialItemResearch.php:82 SuppWhereAlloc.php:132
+#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 PurchasesReport.php:65
+#: ReverseGRN.php:401 SelectCustomer.php:810 SelectCustomer.php:852
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:489
+#: StockDispatch.php:279 StockDispatch.php:290 StockDispatch.php:301
+#: StockLocMovements.php:92 StockMovements.php:105
+#: StockSerialItemResearch.php:82 SuppWhereAlloc.php:132
#: SupplierAllocations.php:455 SupplierAllocations.php:569
#: SupplierAllocations.php:644 SupplierInquiry.php:204
#: SupplierTransInquiry.php:111 Tax.php:408
@@ -916,10 +919,10 @@
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:183
#: SelectCustomer.php:811 SelectCustomer.php:853 StockClone.php:942
-#: Stocks.php:1270 UpgradeDatabase.php:246 UpgradeDatabase.php:249
-#: UpgradeDatabase.php:252 UpgradeDatabase.php:255 UpgradeDatabase.php:258
-#: UpgradeDatabase.php:261 UpgradeDatabase.php:264 UpgradeDatabase.php:267
-#: UpgradeDatabase.php:270 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1270 UpgradeDatabase.php:248 UpgradeDatabase.php:251
+#: UpgradeDatabase.php:254 UpgradeDatabase.php:257 UpgradeDatabase.php:260
+#: UpgradeDatabase.php:263 UpgradeDatabase.php:266 UpgradeDatabase.php:269
+#: UpgradeDatabase.php:272 Z_Upgrade_3.10-3.11.php:62
#: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70
#: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78
#: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66
@@ -1011,12 +1014,12 @@
msgid "as-of"
msgstr ""
-#: AgedControlledInventory.php:12 GLCashFlowsSetup.php:110
+#: AgedControlledInventory.php:12 GLCashFlowsSetup.php:109
#: InventoryQuantities.php:155 InventoryValuation.php:217 Locations.php:12
#: MRP.php:542 MRPCalendar.php:21 MRPCreateDemands.php:193
#: MRPDemandTypes.php:17 MRPDemands.php:27 MRPPlannedPurchaseOrders.php:264
#: MRPPlannedWorkOrders.php:246 MRPPlannedWorkOrders.php:320 PricesByCost.php:8
-#: ReorderLevel.php:194 ReorderLevelLocation.php:12 SelectProduct.php:90
+#: ReorderLevel.php:194 ReorderLevelLocation.php:12 SelectProduct.php:91
#: StockDispatch.php:321 StockMovements.php:22 StockQties_csv.php:8
#: StockQuantityByDate.php:10 StockReorderLevel.php:20
#: StockSerialItemResearch.php:9 StockSerialItems.php:9 StockStatus.php:45
@@ -1037,7 +1040,7 @@
#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
-#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1015 CollectiveWorkOrderCost.php:45
+#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1014 CollectiveWorkOrderCost.php:45
#: CollectiveWorkOrderCost.php:317 ContractBOM.php:241 ContractBOM.php:353
#: ContractOtherReqts.php:97 CounterReturns.php:1692 CounterSales.php:2102
#: CounterSales.php:2256 CreditStatus.php:152 CreditStatus.php:243
@@ -1048,8 +1051,8 @@
#: GLTags.php:82 GLTransInquiry.php:49 GoodsReceived.php:122
#: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:350
#: InternalStockRequest.php:564 InternalStockRequest.php:634
-#: InternalStockRequestInquiry.php:222 InternalStockRequestInquiry.php:268
-#: InternalStockRequestInquiry.php:405 InventoryPlanning.php:419
+#: InternalStockRequestInquiry.php:221 InternalStockRequestInquiry.php:267
+#: InternalStockRequestInquiry.php:406 InventoryPlanning.php:419
#: InventoryQuantities.php:246 InventoryValuation.php:197 Labels.php:290
#: MRPDemandTypes.php:113 MRPDemands.php:92 MRPDemands.php:295
#: MRPPlannedWorkOrders.php:257 MRPReport.php:563 MRPReport.php:777
@@ -1065,7 +1068,7 @@
#: SecurityTokens.php:107 SecurityTokens.php:167 SelectAsset.php:264
#: SelectCompletedOrder.php:506 SelectContract.php:147
#: SelectCreditItems.php:1019 SelectOrderItems.php:1482
-#: SelectOrderItems.php:1644 SelectProduct.php:542 SelectProduct.php:830
+#: SelectOrderItems.php:1644 SelectProduct.php:543 SelectProduct.php:831
#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:603
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:695
#: StockCounts.php:142 StockDispatch.php:506 StockLocStatus.php:176
@@ -1159,7 +1162,7 @@
#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:112
#: GLBalanceSheet.php:152 GLProfit_Loss.php:188 GLTagProfit_Loss.php:195
#: GLTrialBalance.php:167 InternalStockRequest.php:325
-#: InternalStockRequestInquiry.php:251 InventoryPlanning.php:99
+#: InternalStockRequestInquiry.php:250 InventoryPlanning.php:99
#: InventoryPlanning.php:176 InventoryPlanning.php:213
#: InventoryPlanning.php:262 InventoryPlanningPrefSupplier.php:183
#: InventoryPlanningPrefSupplier.php:241 InventoryPlanningPrefSupplier.php:268
@@ -1185,7 +1188,7 @@
msgstr ""
#: AgedDebtors.php:270 CustomerAccount.php:210 CustomerInquiry.php:116
-#: CustomerInquiry.php:141 CustomerPurchases.php:29 Dashboard.php:158
+#: CustomerInquiry.php:141 CustomerPurchases.php:29 Dashboard.php:157
#: DebtorsAtPeriodEnd.php:59
msgid "The customer details could not be retrieved by the SQL because"
msgstr ""
@@ -1194,7 +1197,7 @@
#: AgedSuppliers.php:111 AgedSuppliers.php:198 BOMExtendedQty.php:157
#: BOMExtendedQty.php:244 BOMIndented.php:156 BOMIndented.php:237
#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45
-#: Credit_Invoice.php:201 Dashboard.php:159 Dashboard.php:246 Dashboard.php:399
+#: Credit_Invoice.php:201 Dashboard.php:158 Dashboard.php:245 Dashboard.php:398
#: DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72 FTP_RadioBeacon.php:187
#: GLBalanceSheet.php:116 GLBalanceSheet.php:155 GLBalanceSheet.php:334
#: GLProfit_Loss.php:191 GLProfit_Loss.php:203 GLTagProfit_Loss.php:199
@@ -1248,12 +1251,12 @@
msgid "Back to the menu"
msgstr ""
-#: AgedDebtors.php:372 Dashboard.php:245
+#: AgedDebtors.php:372 Dashboard.php:244
msgid "The details of outstanding transactions for customer"
msgstr ""
-#: AgedDebtors.php:372 AgedSuppliers.php:197 Dashboard.php:245
-#: GLAccountCSV.php:179 GLAccountInquiry.php:177 GLAccountReport.php:97
+#: AgedDebtors.php:372 AgedSuppliers.php:197 Dashboard.php:244
+#: GLAccountCSV.php:179 GLAccountInquiry.php:176 GLAccountReport.php:97
#: PO_Items.php:451 PO_Items.php:580 PO_Items.php:605
#: PurchaseByPrefSupplier.php:29 PurchaseByPrefSupplier.php:54
#: SalesAnalReptCols.php:365 SpecialOrder.php:448
@@ -1269,7 +1272,7 @@
#: CounterSales.php:1425 CounterSales.php:1439 Credit_Invoice.php:765
#: Credit_Invoice.php:786 CustItem.php:73 CustItem.php:86 CustItem.php:197
#: CustomerReceipt.php:587 CustomerReceipt.php:740 CustomerReceipt.php:768
-#: CustomerTransInquiry.php:91 Dashboard.php:248 Dashboard.php:401
+#: CustomerTransInquiry.php:91 Dashboard.php:247 Dashboard.php:400
#: DeliveryDetails.php:412 GLProfit_Loss.php:613 GLTagProfit_Loss.php:516
#: PDFRemittanceAdvice.php:85 Payments.php:389 PurchData.php:114
#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
@@ -1447,11 +1450,11 @@
msgstr ""
#: AnalysisHorizontalIncome.php:10 AnalysisHorizontalPosition.php:10
-#: BOMs.php:138 BOMs.php:144 BOMs.php:152 BOMs.php:1033 BankAccounts.php:369
+#: BOMs.php:138 BOMs.php:144 BOMs.php:152 BOMs.php:1032 BankAccounts.php:369
#: InternalStockRequest.php:584 PO_SelectOSPurchOrder.php:651
#: PaymentTerms.php:190 PaymentTerms.php:196 SalesAnalReptCols.php:285
-#: SelectProduct.php:136 SelectProduct.php:186 SelectProduct.php:247
-#: SelectProduct.php:248 SelectProduct.php:850
+#: SelectProduct.php:137 SelectProduct.php:187 SelectProduct.php:248
+#: SelectProduct.php:249 SelectProduct.php:851
#: StockCategorySalesInquiry.php:154 StockCategorySalesInquiry.php:188
#: StockCategorySalesInquiry.php:189 StockCategorySalesInquiry.php:194
#: StockCategorySalesInquiry.php:217 StockCategorySalesInquiry.php:230
@@ -1461,7 +1464,7 @@
#: AnalysisHorizontalIncome.php:15 AnalysisHorizontalIncome.php:31
#: AnalysisHorizontalIncome.php:146 AnalysisHorizontalIncome.php:147
-#: includes/MainMenuLinksArray.php:380
+#: includes/MainMenuLinksArray.php:382
msgid "Horizontal Analysis of Statement of Comprehensive Income"
msgstr ""
@@ -1503,10 +1506,12 @@
msgstr ""
#: AnalysisHorizontalIncome.php:43 GLCashFlowsIndirect.php:782
+#: PurchasesReport.php:259
msgid "Select period from"
msgstr ""
#: AnalysisHorizontalIncome.php:79 GLCashFlowsIndirect.php:803
+#: PurchasesReport.php:269
msgid "Select period to"
msgstr ""
@@ -1596,7 +1601,7 @@
msgstr ""
#: AnalysisHorizontalIncome.php:155 AnalysisHorizontalPosition.php:109
-#: GLAccountInquiry.php:54 GLAccounts.php:213 GLBalanceSheet.php:410
+#: GLAccountInquiry.php:53 GLAccounts.php:213 GLBalanceSheet.php:410
#: GLCashFlowsIndirect.php:88 GLProfit_Loss.php:635 GLTagProfit_Loss.php:537
#: GLTrialBalance.php:452 ImportBankTransAnalysis.php:206
#: PrintCustTransPortrait.php:96 SuppTransGLAnalysis.php:107
@@ -1608,7 +1613,7 @@
msgstr ""
#: AnalysisHorizontalIncome.php:156 AnalysisHorizontalPosition.php:110
-#: Dashboard.php:485 GLAccounts.php:258 GLAccounts.php:314
+#: Dashboard.php:484 GLAccounts.php:258 GLAccounts.php:314
#: GLBalanceSheet.php:411 GLCashFlowsIndirect.php:89 GLCodesInquiry.php:27
#: GLProfit_Loss.php:636 GLTagProfit_Loss.php:538 GLTrialBalance.php:453
#: SelectGLAccount.php:135 SupplierCredit.php:459 SupplierInvoice.php:833
@@ -1674,7 +1679,7 @@
#: PDFPriceList.php:431 SalesAnalReptCols.php:31 SalesAnalReptCols.php:33
#: SalesByTypePeriodInquiry.php:362 SalesCategoryPeriodInquiry.php:169
#: SalesGraph.php:195 SalesGraph.php:214 SalesGraph.php:277
-#: SelectProduct.php:181
+#: SelectProduct.php:182
#, php-format
msgid "Gross Profit"
msgstr ""
@@ -1688,26 +1693,39 @@
msgstr ""
#: AnalysisHorizontalIncome.php:518 AnalysisHorizontalPosition.php:358
-#: BOMs.php:919 CustWhereAlloc.php:199 DailyBankTransactions.php:252
-#: GLAccountUsers.php:248 GLBalanceSheet.php:716 GLCashFlowsIndirect.php:737
-#: GLProfit_Loss.php:1313 GLTrialBalance.php:736 SuppWhereAlloc.php:197
-#: UserGLAccounts.php:254
-msgid "Print This"
+#: BOMs.php:918 ConfirmDispatch_Invoice.php:1655
+#: ConfirmDispatch_Invoice.php:1657 ContractBOM.php:298 CounterReturns.php:1607
+#: CounterReturns.php:1609 CounterSales.php:2056 CounterSales.php:2058
+#: CustWhereAlloc.php:198 CustomerReceipt.php:593 DailyBankTransactions.php:251
+#: DeliveryDetails.php:605 DeliveryDetails.php:609 DeliveryDetails.php:831
+#: DeliveryDetails.php:835 GLAccountUsers.php:248 GLBalanceSheet.php:716
+#: GLCashFlowsIndirect.php:737 GLJournalInquiry.php:156
+#: GLJournalInquiry.php:158 GLProfit_Loss.php:1313 GLTagProfit_Loss.php:25
+#: GLTagProfit_Loss.php:524 GLTags.php:54 GLTrialBalance.php:736 PDFCOA.php:29
+#: PDFPrintLabel.php:64 PDFProdSpec.php:19 PDFStockLocTransfer.php:29
+#: PDFWOPrint.php:588 PDFWOPrint.php:592 PDFWOPrint.php:595 PDFWOPrint.php:671
+#: PDFWOPrint.php:675 PDFWOPrint.php:678 PO_OrderDetails.php:143
+#: PO_PDFPurchOrder.php:395 PO_PDFPurchOrder.php:399 PO_PDFPurchOrder.php:402
+#: PO_SelectOSPurchOrder.php:603 PO_SelectOSPurchOrder.php:644
+#: PrintCustStatements.php:84 PrintCustStatements.php:533
+#: PrintCustStatements.php:553 PrintCustTrans.php:531
+#: PrintCustTransPortrait.php:566 PurchasesReport.php:225
+#: SelectSalesOrder.php:918 SuppWhereAlloc.php:196 UserGLAccounts.php:254
+msgid "Print"
msgstr ""
#: AnalysisHorizontalIncome.php:519 AnalysisHorizontalIncome.php:520
#: AnalysisHorizontalPosition.php:359 AnalysisHorizontalPosition.php:360
-#: DailyBankTransactions.php:253 GLBalanceSheet.php:717
-#: GLCashFlowsIndirect.php:738 GLCashFlowsIndirect.php:739
-#: GLProfit_Loss.php:1314 GLProfit_Loss.php:1315 GLTagProfit_Loss.php:939
-#: GLTrialBalance.php:24 GLTrialBalance.php:737 GLTrialBalance.php:738
-#: SalesGraph.php:19 SalesGraph.php:28 SalesGraph.php:33
+#: DailyBankTransactions.php:252 GLBalanceSheet.php:717 GLProfit_Loss.php:1314
+#: GLProfit_Loss.php:1315 GLTagProfit_Loss.php:939 GLTrialBalance.php:24
+#: GLTrialBalance.php:737 GLTrialBalance.php:738 SalesGraph.php:19
+#: SalesGraph.php:28 SalesGraph.php:33
msgid "Select A Different Period"
msgstr ""
#: AnalysisHorizontalPosition.php:15 AnalysisHorizontalPosition.php:28
#: AnalysisHorizontalPosition.php:100 AnalysisHorizontalPosition.php:101
-#: includes/MainMenuLinksArray.php:379
+#: includes/MainMenuLinksArray.php:381
msgid "Horizontal Analysis of Statement of Financial Position"
msgstr ""
@@ -1873,10 +1891,10 @@
#: CustomerInquiry.php:198 CustomerInquiry.php:202 CustomerTransInquiry.php:32
#: DailyBankTransactions.php:72 DailySalesInquiry.php:52
#: DailySalesInquiry.php:54 FixedAssetRegister.php:59 FixedAssetRegister.php:68
-#: InternalStockRequestInquiry.php:54 InternalStockRequestInquiry.php:60
-#: InternalStockRequestInquiry.php:80 InternalStockRequestInquiry.php:88
-#: InternalStockRequestInquiry.php:108 InternalStockRequestInquiry.php:137
-#: InternalStockRequestInquiry.php:139 InventoryQuantities.php:168
+#: InternalStockRequestInquiry.php:53 InternalStockRequestInquiry.php:59
+#: InternalStockRequestInquiry.php:79 InternalStockRequestInquiry.php:87
+#: InternalStockRequestInquiry.php:107 InternalStockRequestInquiry.php:136
+#: InternalStockRequestInquiry.php:138 InventoryQuantities.php:168
#: InventoryQuantities.php:194 InventoryQuantities.php:196 MRP.php:619
#: MRPReport.php:551 MRPReport.php:553 MRPReschedules.php:145
#: NoSalesItems.php:22 NoSalesItems.php:50 NoSalesItems.php:70
@@ -1889,7 +1907,7 @@
#: SalesGraph.php:124 SalesGraph.php:126 SalesGraph.php:148 SalesGraph.php:150
#: SalesGraph.php:186 SalesInquiry.php:1096 SalesInquiry.php:1159
#: SelectCreditItems.php:983 SelectOrderItems.php:1580
-#: SelectOrderItems.php:1583 SelectProduct.php:530 SelectProduct.php:532
+#: SelectOrderItems.php:1583 SelectProduct.php:531 SelectProduct.php:533
#: SelectSalesOrder.php:575 StockCategorySalesInquiry.php:35
#: StockCategorySalesInquiry.php:37 StockDispatch.php:82 StockDispatch.php:396
#: StockDispatch.php:398 StockLocStatus.php:74 StockLocStatus.php:76
@@ -1916,7 +1934,7 @@
#: AuditTrail.php:90 GLAccountUsers.php:152 InternalStockRequest.php:598
#: LocationUsers.php:176 MRPReport.php:806 PO_SelectPurchOrder.php:432
-#: SelectContract.php:187 SelectProduct.php:865 UserGLAccounts.php:158
+#: SelectContract.php:187 SelectProduct.php:866 UserGLAccounts.php:158
#: UserLocations.php:177
msgid "View"
msgstr ""
@@ -1971,7 +1989,7 @@
msgid "Value"
msgstr ""
-#: AutomaticTranslationDescriptions.php:5 includes/MainMenuLinksArray.php:577
+#: AutomaticTranslationDescriptions.php:5 includes/MainMenuLinksArray.php:579
msgid "Translate Item Descriptions"
msgstr ""
@@ -1985,11 +2003,11 @@
msgstr ""
#: AutomaticTranslationDescriptions.php:36 BOMInquiry.php:108 BOMs.php:655
-#: BOMs.php:1014 CollectiveWorkOrderCost.php:316 ContractBOM.php:352
+#: BOMs.php:1013 CollectiveWorkOrderCost.php:316 ContractBOM.php:352
#: CounterReturns.php:1691 CounterSales.php:2101 CounterSales.php:2255
#: CustItem.php:297 CustomerBranches.php:408 CustomerReceipt.php:1216
#: GLCodesInquiry.php:26 InternalStockRequest.php:563
-#: InternalStockRequest.php:633 InternalStockRequestInquiry.php:267
+#: InternalStockRequest.php:633 InternalStockRequestInquiry.php:266
#: MRPDemands.php:91 MRPPlannedWorkOrders.php:256 MRPReport.php:776
#: MaterialsNotUsed.php:34 NoSalesItems.php:193 PDFOrderStatus.php:336
#: PDFOrdersInvoiced.php:334 PO_Header.php:561 PO_Items.php:1193
@@ -1998,7 +2016,7 @@
#: ReorderLevelLocation.php:72 RevisionTranslations.php:59 SalesPeople.php:207
#: SelectCompletedOrder.php:505 SelectCreditItems.php:1018
#: SelectCustomer.php:401 SelectGLAccount.php:134 SelectOrderItems.php:1481
-#: SelectOrderItems.php:1643 SelectProduct.php:324 SelectProduct.php:829
+#: SelectOrderItems.php:1643 SelectProduct.php:325 SelectProduct.php:830
#: SelectQASamples.php:298 SelectSalesOrder.php:602 SelectSupplier.php:282
#: SelectWorkOrder.php:218 SellThroughSupport.php:159 Shipt_Select.php:190
#: SpecialOrder.php:148 StockCategories.php:263 SuppPriceList.php:305
@@ -2082,7 +2100,7 @@
#: DeliveryDetails.php:950 GoodsReceived.php:123 GoodsReceived.php:127
#: GoodsReceived.php:131 InternalStockRequest.php:640
#: InternalStockRequestFulfill.php:323 InternalStockRequestFulfill.php:324
-#: InternalStockRequestInquiry.php:406 InventoryPlanningPrefSupplier.php:78
+#: InternalStockRequestInquiry.php:407 InventoryPlanningPrefSupplier.php:78
#: InventoryQuantities.php:248 MRPDemands.php:297 MRPDemands.php:395
#: MRPPlannedPurchaseOrders.php:340 MRPPlannedWorkOrders.php:260
#: MRPPlannedWorkOrders.php:394 MRPReport.php:440 MRPReport.php:446
@@ -2120,7 +2138,7 @@
#: includes/PDFQuotationPortraitPageHeade...
[truncated message content] |
|
From: <rc...@us...> - 2016-12-20 23:48:38
|
Revision: 7711
http://sourceforge.net/p/web-erp/reponame/7711
Author: rchacon
Date: 2016-12-20 23:48:35 +0000 (Tue, 20 Dec 2016)
Log Message:
-----------
Improve code and introduce the use of a disabled input to show a value.
Modified Paths:
--------------
trunk/GLAccounts.php
trunk/doc/Manual/ManualPurchaseOrdering.html
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2016-12-20 17:05:39 UTC (rev 7710)
+++ trunk/GLAccounts.php 2016-12-20 23:48:35 UTC (rev 7711)
@@ -1,6 +1,7 @@
<?php
/* $Id$*/
/* Defines the general ledger accounts */
+/* To delete, insert, or update an account. */
// BEGIN: Functions division ---------------------------------------------------
function CashFlowsActivityName($Activity) {
@@ -226,37 +227,29 @@
echo '<form method="post" id="GLAccounts" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if(isset($SelectedAccount)) {
- //editing an existing account
-
+ if(isset($SelectedAccount)) {// Edit an existing account.
+ echo '<input type="hidden" name="SelectedAccount" value="' . $SelectedAccount . '" />';
$Sql = "SELECT accountcode, accountname, group_, cashflowsactivity FROM chartmaster WHERE accountcode='" . $SelectedAccount ."'";
$Result = DB_query($Sql);
$MyRow = DB_fetch_array($Result);
$_POST['AccountCode'] = $MyRow['accountcode'];
- $_POST['AccountName'] = $MyRow['accountname'];
+ $_POST['AccountName'] = $MyRow['accountname'];
$_POST['Group'] = $MyRow['group_'];
$_POST['CashFlowsActivity'] = $MyRow['cashflowsactivity'];
-
- echo '<input type="hidden" name="SelectedAccount" value="' . $SelectedAccount . '" />';
- echo '<input type="hidden" name="AccountCode" value="' . $_POST['AccountCode'] .'" />';
- echo '<table class="selection">
- <tr><td>' . _('Account Code') . ':</td>
- <td>' . $_POST['AccountCode'] . '</td></tr>';
} else {
- echo '<table class="selection">';
- echo '<tr>
- <td>' . _('Account Code') . ':</td>
- <td><input type="text" name="AccountCode" required="required" autofocus="autofocus" data-type="no-illegal-chars" title="' . _('Enter up to 20 alpha-numeric characters for the general ledger account code') . '" size="20" maxlength="20" /></td>
- </tr>';
+ $_POST['AccountCode'] = '';
+ $_POST['AccountName'] = '';
}
- if(!isset($_POST['AccountName'])) {
- $_POST['AccountName']='';
- }
- echo '<tr>
+ echo '<table class="selection">
+ <tr>
+ <td>', _('Account Code'), ':</td>
+ <td><input ', (isset($_POST['AccountCode']) ? 'disabled="disabled" ' : 'autofocus="autofocus" '), 'data-type="no-illegal-chars" maxlength="20" name="AccountCode" required="required" size="20" title="', _('Enter up to 20 alpha-numeric characters for the general ledger account code'), '" type="text" value="', $_POST['AccountCode'], '" /></td>
+ </tr>
+ <tr>
<td>' . _('Account Name') . ':</td>
- <td><input type="text" size="51" required="required" ' . (isset($_POST['AccountCode']) ? 'autofocus="autofocus"':'') . ' title="' . _('Enter up to 50 alpha-numeric characters for the general ledger account name') . '" maxlength="50" name="AccountName" value="' . $_POST['AccountName'] . '" /></td></tr>';
+ <td><input ', (isset($_POST['AccountCode']) ? 'autofocus="autofocus" ' : ''), 'maxlength="50" name="AccountName" required="required" size="51" title="' . _('Enter up to 50 alpha-numeric characters for the general ledger account name') . '" type="text" value="', $_POST['AccountName'], '" /></td></tr>';
$Sql = "SELECT groupname FROM accountgroups ORDER BY sequenceintb";
$Result = DB_query($Sql);
@@ -264,18 +257,15 @@
echo '<tr>
<td>' . _('Account Group') . ':</td>
<td><select required="required" name="Group">';
-
while($MyRow = DB_fetch_array($Result)) {
+ echo '<option';
if(isset($_POST['Group']) and $MyRow[0]==$_POST['Group']) {
- echo '<option selected="selected" value="';
- } else {
- echo '<option value="';
+ echo ' selected="selected"';
}
- echo $MyRow[0] . '">' . $MyRow[0] . '</option>';
+ echo ' value="', $MyRow[0], '">', $MyRow[0], '</option>';
}
echo '</select></td>
</tr>
-
<tr>
<td><label for="CashFlowsActivity">', _('Cash Flows Activity'), ':</label></td>
<td><select id="CashFlowsActivity" name="CashFlowsActivity" required="required">
@@ -287,8 +277,6 @@
</select>
</td>
</tr>
-
-
</table>';
echo '
@@ -361,4 +349,4 @@
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Manual/ManualPurchaseOrdering.html
===================================================================
--- trunk/doc/Manual/ManualPurchaseOrdering.html 2016-12-20 17:05:39 UTC (rev 7710)
+++ trunk/doc/Manual/ManualPurchaseOrdering.html 2016-12-20 23:48:35 UTC (rev 7711)
@@ -185,7 +185,7 @@
<ul>
<li><b>Select period from.</b> Select the beginning of the reporting period. Default: one year before current date.</li>
<li><b>Select period to.</b> Select the end of the reporting period. Default: current date.</li>
- <li><b>Show details.</b> Check this box to show purchase invoices. With <i>show details <b>on</b></i>, the report as links to view where allocated and to view the General Ledger transaction. With <i>show details <b>off</b></i>, the report as links to view the supplier account inquiry. Default: off.</li>
+ <li><b>Show details.</b> Check this box to show purchase invoices. With <i>show details <b>on</b></i>, the report has links to view where allocated and to view the General Ledger transaction. With <i>show details <b>off</b></i>, the report has links to view the supplier account inquiry. Default: off.</li>
</ul>
<p><b>Note</b>. The conversion between the supplier's currency and the functional currency is done with the exchange rate used in the respective transaction.</p>
|
|
From: <rc...@us...> - 2016-12-21 23:44:28
|
Revision: 7712
http://sourceforge.net/p/web-erp/reponame/7712
Author: rchacon
Date: 2016-12-21 23:44:26 +0000 (Wed, 21 Dec 2016)
Log Message:
-----------
Fix date comparison and title. Thanks Tim.
Modified Paths:
--------------
trunk/GLAccounts.php
trunk/PurchasesReport.php
trunk/doc/Change.log
trunk/doc/Manual/ManualPurchaseOrdering.html
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.13.1-4.14.sql
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2016-12-20 23:48:35 UTC (rev 7711)
+++ trunk/GLAccounts.php 2016-12-21 23:44:26 UTC (rev 7712)
@@ -245,11 +245,11 @@
echo '<table class="selection">
<tr>
<td>', _('Account Code'), ':</td>
- <td><input ', (isset($_POST['AccountCode']) ? 'disabled="disabled" ' : 'autofocus="autofocus" '), 'data-type="no-illegal-chars" maxlength="20" name="AccountCode" required="required" size="20" title="', _('Enter up to 20 alpha-numeric characters for the general ledger account code'), '" type="text" value="', $_POST['AccountCode'], '" /></td>
+ <td><input ', (empty($_POST['AccountCode']) ? 'autofocus="autofocus" ' : 'disabled="disabled" '), 'data-type="no-illegal-chars" maxlength="20" name="AccountCode" required="required" size="20" title="', _('Enter up to 20 alpha-numeric characters for the general ledger account code'), '" type="text" value="', $_POST['AccountCode'], '" /></td>
</tr>
<tr>
<td>' . _('Account Name') . ':</td>
- <td><input ', (isset($_POST['AccountCode']) ? 'autofocus="autofocus" ' : ''), 'maxlength="50" name="AccountName" required="required" size="51" title="' . _('Enter up to 50 alpha-numeric characters for the general ledger account name') . '" type="text" value="', $_POST['AccountName'], '" /></td></tr>';
+ <td><input ', (empty($_POST['AccountCode']) ? '' : 'autofocus="autofocus" '), 'maxlength="50" name="AccountName" required="required" size="51" title="' . _('Enter up to 50 alpha-numeric characters for the general ledger account name') . '" type="text" value="', $_POST['AccountName'], '" /></td></tr>';
$Sql = "SELECT groupname FROM accountgroups ORDER BY sequenceintb";
$Result = DB_query($Sql);
Modified: trunk/PurchasesReport.php
===================================================================
--- trunk/PurchasesReport.php 2016-12-20 23:48:35 UTC (rev 7711)
+++ trunk/PurchasesReport.php 2016-12-21 23:44:26 UTC (rev 7712)
@@ -1,6 +1,6 @@
<?php
/* $Id: PurchasesReport.php 7672 2016-11-27 10:42:50Z rchacon $ */
-/* Shows a report of purchases to suppliers for the range of selected dates. */
+/* Shows a report of purchases from suppliers for the range of selected dates. */
/* This program is under the GNU General Public License, last version. Rafael E. Chacón, 2016-12-18. */
/* This creative work is under the CC BY-NC-SA, later version. Rafael E. Chacón, 2016-12-18. */
@@ -8,11 +8,12 @@
// Coding Conventions/Style: http://www.weberp.org/CodingConventions.html
// BEGIN: Functions division ---------------------------------------------------
+// RChacon: load DateFunctions.inc ? **********************************************************************************Date1GreaterThanDate2()
// END: Functions division -----------------------------------------------------
// BEGIN: Procedure division ---------------------------------------------------
include('includes/session.inc');
-$Title = _('Purchases to Suppliers');
+$Title = _('Purchases from Suppliers');
$ViewTopic = 'PurchaseOrdering';
$BookMark = 'PurchasesReport';
include('includes/header.inc');
@@ -34,11 +35,13 @@
}
// Validates the data submitted in the form:
-if($_POST['PeriodFrom'] > $_POST['PeriodTo']) {// RChacon: Is it the correct way to do this? **********************************************************************************
- // The beginning is after the end.
- unset($_POST['PeriodFrom']);
- unset($_POST['PeriodTo']);
- prnMsg(_('The beginning of the period should be before or equal to the end of the period. Please reselect the reporting period.'), 'error');
+if(isset($_POST['PeriodFrom']) AND isset($_POST['PeriodTo'])) {
+ if(Date1GreaterThanDate2($_POST['PeriodFrom'], $_POST['PeriodTo'])) {
+ // The beginning is after the end.
+ unset($_POST['PeriodFrom']);
+ unset($_POST['PeriodTo']);
+ prnMsg(_('The beginning of the period should be before or equal to the end of the period. Please reselect the reporting period.'), 'error');
+ }
}
// Main code:
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-12-20 23:48:35 UTC (rev 7711)
+++ trunk/doc/Change.log 2016-12-21 23:44:26 UTC (rev 7712)
@@ -1,5 +1,6 @@
webERP Change Log
+21/12/16 RChacon: In PurchasesReport.php, fix date comparison and title. Thanks Tim.
20/12/16 RChacon: Standardise to "Print" button.
20/12/16 RChacon: Add a report of purchases to suppliers for the range of selected dates.
11/12/16 PaulT: Dashboard.php: Correct table closure. When there are no outstanding orders, causes footer artifact.
Modified: trunk/doc/Manual/ManualPurchaseOrdering.html
===================================================================
--- trunk/doc/Manual/ManualPurchaseOrdering.html 2016-12-20 23:48:35 UTC (rev 7711)
+++ trunk/doc/Manual/ManualPurchaseOrdering.html 2016-12-21 23:44:26 UTC (rev 7712)
@@ -179,8 +179,8 @@
<div class="floatright"><a class="minitext" href="#top">⬆ Top</a></div>
<h2>Inquiries and Reports</h2>
-<h3><a id="PurchasesReport">Purchases to Suppliers</a></h3>
-<p>This report shows purchases to suppliers over a period of time. It shows the overall amount, taxes and total in the supplier's currency and in the functional currency.</p>
+<h3><a id="PurchasesReport">Purchases from Suppliers</a></h3>
+<p>This report shows purchases from suppliers over a period of time. It shows the overall amount, taxes and total in the supplier's currency and in the functional currency.</p>
<p>Report parameters:</p>
<ul>
<li><b>Select period from.</b> Select the beginning of the reporting period. Default: one year before current date.</li>
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2016-12-20 23:48:35 UTC (rev 7711)
+++ trunk/includes/MainMenuLinksArray.php 2016-12-21 23:44:26 UTC (rev 7712)
@@ -189,7 +189,7 @@
$MenuItems['PO']['Reports']['Caption'] = array( _('Purchase Order Inquiry'),
_('Purchase Order Detail Or Summary Inquiries'),
_('Supplier Price List'),
- _('Purchases to Suppliers'));
+ _('Purchases from Suppliers'));
$MenuItems['PO']['Reports']['URL'] = array( '/PO_SelectPurchOrder.php',
'/POReport.php',
Modified: trunk/sql/mysql/upgrade4.13.1-4.14.sql
===================================================================
--- trunk/sql/mysql/upgrade4.13.1-4.14.sql 2016-12-20 23:48:35 UTC (rev 7711)
+++ trunk/sql/mysql/upgrade4.13.1-4.14.sql 2016-12-21 23:44:26 UTC (rev 7712)
@@ -1,5 +1,5 @@
-- Add new script:
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('PurchasesReport.php', '2', 'Shows a report of purchases to suppliers for the range of selected dates');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('PurchasesReport.php', '2', 'Shows a report of purchases from suppliers for the range of selected dates');
-- Update version number:
UPDATE config SET confvalue='4.14' WHERE confname='VersionNumber';
|
|
From: <rc...@us...> - 2016-12-22 00:11:41
|
Revision: 7713
http://sourceforge.net/p/web-erp/reponame/7713
Author: rchacon
Date: 2016-12-22 00:11:36 +0000 (Thu, 22 Dec 2016)
Log Message:
-----------
Update translations files.
Modified Paths:
--------------
trunk/PurchasesReport.php
trunk/doc/Change.log
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/PurchasesReport.php
===================================================================
--- trunk/PurchasesReport.php 2016-12-21 23:44:26 UTC (rev 7712)
+++ trunk/PurchasesReport.php 2016-12-22 00:11:36 UTC (rev 7713)
@@ -8,7 +8,6 @@
// Coding Conventions/Style: http://www.weberp.org/CodingConventions.html
// BEGIN: Functions division ---------------------------------------------------
-// RChacon: load DateFunctions.inc ? **********************************************************************************Date1GreaterThanDate2()
// END: Functions division -----------------------------------------------------
// BEGIN: Procedure division ---------------------------------------------------
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-12-21 23:44:26 UTC (rev 7712)
+++ trunk/doc/Change.log 2016-12-22 00:11:36 UTC (rev 7713)
@@ -2,7 +2,7 @@
21/12/16 RChacon: In PurchasesReport.php, fix date comparison and title. Thanks Tim.
20/12/16 RChacon: Standardise to "Print" button.
-20/12/16 RChacon: Add a report of purchases to suppliers for the range of selected dates.
+20/12/16 RChacon: Add a report of purchases from suppliers for the range of selected dates.
11/12/16 PaulT: Dashboard.php: Correct table closure. When there are no outstanding orders, causes footer artifact.
08/12/16 Exson: Fixed the variable error in stock take pdf header in includes/PDFStockCheckPageHeader.inc. And fixed undefined noise in Payments.php. Reported by shane.
08/12/16 Exson: Fixed noise of undefined variable and string required for function_exists in Dashboard.php. Reported by Shane.
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-12-21 23:44:26 UTC (rev 7712)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2016-12-22 00:11:36 UTC (rev 7713)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-20 10:25-0600\n"
+"POT-Creation-Date: 2016-12-21 18:08-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -162,7 +162,7 @@
#: CustomerBranches.php:330 CustomerBranches.php:340 CustomerTypes.php:146
#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:109 GLAccounts.php:123
+#: FixedAssetCategories.php:137 GLAccounts.php:110 GLAccounts.php:124
#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307
#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343
#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:185
@@ -438,7 +438,7 @@
#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:253 GLAccounts.php:347 GLTags.php:96 GeocodeSetup.php:173
+#: FreightCosts.php:253 GLAccounts.php:335 GLTags.php:96 GeocodeSetup.php:173
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:297 Labels.php:333
#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
@@ -477,7 +477,7 @@
#: CustomerReceipt.php:1001 CustomerTypes.php:206 Customers.php:1166
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GLAccounts.php:348 GLJournal.php:431 GLTags.php:97 GeocodeSetup.php:174
+#: GLAccounts.php:336 GLJournal.php:431 GLTags.php:97 GeocodeSetup.php:174
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:298 Labels.php:334 Labels.php:359 Labels.php:612
#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310
@@ -555,7 +555,7 @@
#: GLAccountUsers.php:253 GLBalanceSheet.php:720 GLCashFlowsIndirect.php:741
#: GLCashFlowsIndirect.php:774 GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317
#: GLTrialBalance.php:740 InternalStockRequestInquiry.php:263
-#: PurchasesReport.php:229 PurchasesReport.php:251 SecurityTokens.php:140
+#: PurchasesReport.php:232 PurchasesReport.php:254 SecurityTokens.php:140
#: SecurityTokens.php:156 UserGLAccounts.php:259
#: Z_GLAccountUsersCopyAuthority.php:96 includes/Login.php:8
msgid "Return"
@@ -679,7 +679,7 @@
#: COGSGLPostings.php:368 CreditStatus.php:259 Currencies.php:537
#: CustLoginSetup.php:273 Departments.php:258 DiscountMatrix.php:142
#: EDIMessageFormat.php:248 FixedAssetCategories.php:350
-#: FixedAssetLocations.php:161 FreightCosts.php:371 GLAccounts.php:297
+#: FixedAssetLocations.php:161 FreightCosts.php:371 GLAccounts.php:285
#: GeocodeSetup.php:271 Labels.php:647 Locations.php:716 MRPDemandTypes.php:188
#: MRPDemands.php:424 Manufacturers.php:375 OffersReceived.php:57
#: OffersReceived.php:146 PO_AuthorisationLevels.php:264 PaymentMethods.php:302
@@ -804,7 +804,7 @@
#: PcAssignCashTabToTab.php:384 PcAssignCashToTab.php:256
#: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:98
#: PcClaimExpensesFromTab.php:242 PcClaimExpensesFromTab.php:409
-#: PcReportTab.php:336 PurchasesReport.php:54 SelectCustomer.php:732
+#: PcReportTab.php:336 PurchasesReport.php:57 SelectCustomer.php:732
#: ShopParameters.php:198 SystemParameters.php:411 WOSerialNos.php:306
#: WOSerialNos.php:312
msgid "Notes"
@@ -900,7 +900,7 @@
#: PaymentAllocations.php:66 PcAssignCashTabToTab.php:257
#: PcAssignCashToTab.php:252 PcAuthorizeExpenses.php:94 PrintCustTrans.php:822
#: PrintCustTransPortrait.php:902 PrintWOItemSlip.php:186
-#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 PurchasesReport.php:65
+#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 PurchasesReport.php:68
#: ReverseGRN.php:401 SelectCustomer.php:810 SelectCustomer.php:852
#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:489
#: StockDispatch.php:279 StockDispatch.php:290 StockDispatch.php:301
@@ -1506,12 +1506,12 @@
msgstr ""
#: AnalysisHorizontalIncome.php:43 GLCashFlowsIndirect.php:782
-#: PurchasesReport.php:259
+#: PurchasesReport.php:262
msgid "Select period from"
msgstr ""
#: AnalysisHorizontalIncome.php:79 GLCashFlowsIndirect.php:803
-#: PurchasesReport.php:269
+#: PurchasesReport.php:272
msgid "Select period to"
msgstr ""
@@ -1601,7 +1601,7 @@
msgstr ""
#: AnalysisHorizontalIncome.php:155 AnalysisHorizontalPosition.php:109
-#: GLAccountInquiry.php:53 GLAccounts.php:213 GLBalanceSheet.php:410
+#: GLAccountInquiry.php:53 GLAccounts.php:214 GLBalanceSheet.php:410
#: GLCashFlowsIndirect.php:88 GLProfit_Loss.php:635 GLTagProfit_Loss.php:537
#: GLTrialBalance.php:452 ImportBankTransAnalysis.php:206
#: PrintCustTransPortrait.php:96 SuppTransGLAnalysis.php:107
@@ -1613,7 +1613,7 @@
msgstr ""
#: AnalysisHorizontalIncome.php:156 AnalysisHorizontalPosition.php:110
-#: Dashboard.php:484 GLAccounts.php:258 GLAccounts.php:314
+#: Dashboard.php:484 GLAccounts.php:251 GLAccounts.php:302
#: GLBalanceSheet.php:411 GLCashFlowsIndirect.php:89 GLCodesInquiry.php:27
#: GLProfit_Loss.php:636 GLTagProfit_Loss.php:538 GLTrialBalance.php:453
#: SelectGLAccount.php:135 SupplierCredit.php:459 SupplierInvoice.php:833
@@ -1709,7 +1709,7 @@
#: PO_SelectOSPurchOrder.php:603 PO_SelectOSPurchOrder.php:644
#: PrintCustStatements.php:84 PrintCustStatements.php:533
#: PrintCustStatements.php:553 PrintCustTrans.php:531
-#: PrintCustTransPortrait.php:566 PurchasesReport.php:225
+#: PrintCustTransPortrait.php:566 PurchasesReport.php:228
#: SelectSalesOrder.php:918 SuppWhereAlloc.php:196 UserGLAccounts.php:254
msgid "Print"
msgstr ""
@@ -1827,7 +1827,7 @@
msgstr ""
#: Areas.php:131 CustomerTypes.php:167 Factors.php:140
-#: FixedAssetCategories.php:142 GLAccounts.php:213
+#: FixedAssetCategories.php:142 GLAccounts.php:214
#: InternalStockCategoriesByRole.php:102 Locations.php:380 MRPDemands.php:250
#: Manufacturers.php:197 PcAssignCashToTab.php:149
#: PcClaimExpensesFromTab.php:134 PcExpenses.php:169 PcExpensesTypeTab.php:100
@@ -3709,7 +3709,7 @@
#: CustomerTransInquiry.php:103 DailyBankTransactions.php:154 Dashboard.php:59
#: GLAccountReport.php:346 PDFRemittanceAdvice.php:309
#: PaymentAllocations.php:64 PaymentAllocations.php:65 Payments.php:964
-#: PurchasesReport.php:67 ShiptsList.php:37 StockCounts.php:144
+#: PurchasesReport.php:70 ShiptsList.php:37 StockCounts.php:144
#: StockCounts.php:169 StockCounts.php:216 StockLocMovements.php:95
#: StockMovements.php:110 SuppWhereAlloc.php:135 SupplierInquiry.php:207
#: Tax.php:412 WorkOrderEntry.php:799 Z_CheckAllocs.php:64
@@ -4144,8 +4144,8 @@
#: InternalStockRequest.php:306 MRPCreateDemands.php:285
#: MailingGroupMaintenance.php:145 PDFCOA.php:43 PDFCOA.php:73
#: PDFProdSpec.php:31 PDFProdSpec.php:57 PricesByCost.php:295
-#: ProductSpecs.php:100 ProductSpecs.php:127 PurchasesReport.php:248
-#: PurchasesReport.php:249 ReorderLevelLocation.php:201
+#: ProductSpecs.php:100 ProductSpecs.php:127 PurchasesReport.php:251
+#: PurchasesReport.php:252 ReorderLevelLocation.php:201
#: SupplierGRNAndInvoiceInquiry.php:46
msgid "Submit"
msgstr ""
@@ -9603,7 +9603,7 @@
msgstr ""
#: CustomerInquiry.php:329 CustomerInquiry.php:456 CustomerInquiry.php:531
-#: CustomerInquiry.php:587 CustomerInquiry.php:637 PurchasesReport.php:137
+#: CustomerInquiry.php:587 CustomerInquiry.php:637 PurchasesReport.php:140
#: SupplierInquiry.php:260
msgid "Click to view the GL entries"
msgstr ""
@@ -13772,174 +13772,173 @@
msgid "Select A Different GL account"
msgstr ""
-#: GLAccounts.php:9 GLCashFlowsIndirect.php:15
+#: GLAccounts.php:10 GLCashFlowsIndirect.php:15
msgid "Without setting up"
msgstr ""
-#: GLAccounts.php:10 GLAccounts.php:282 GLCashFlowsIndirect.php:16
+#: GLAccounts.php:11 GLAccounts.php:272 GLCashFlowsIndirect.php:16
msgid "No effect on cash flow"
msgstr ""
-#: GLAccounts.php:11 GLAccounts.php:283
+#: GLAccounts.php:12 GLAccounts.php:273
msgid "Operating activity"
msgstr ""
-#: GLAccounts.php:12 GLAccounts.php:284
+#: GLAccounts.php:13 GLAccounts.php:274
msgid "Investing activity"
msgstr ""
-#: GLAccounts.php:13 GLAccounts.php:285
+#: GLAccounts.php:14 GLAccounts.php:275
msgid "Financing activity"
msgstr ""
-#: GLAccounts.php:14 GLAccounts.php:286 GLCashFlowsIndirect.php:20
+#: GLAccounts.php:15 GLAccounts.php:276 GLCashFlowsIndirect.php:20
msgid "Cash or cash equivalent"
msgstr ""
-#: GLAccounts.php:15 GLCashFlowsIndirect.php:21
+#: GLAccounts.php:16 GLCashFlowsIndirect.php:21
msgid "Unknown"
msgstr ""
-#: GLAccounts.php:22
+#: GLAccounts.php:23
msgid "General Ledger Accounts"
msgstr ""
-#: GLAccounts.php:55
+#: GLAccounts.php:56
msgid "The account name must be fifty characters or less long"
msgstr ""
-#: GLAccounts.php:65
+#: GLAccounts.php:66
msgid "Could not update the account because"
msgstr ""
-#: GLAccounts.php:68
+#: GLAccounts.php:69
msgid "The general ledger account has been updated"
msgstr ""
-#: GLAccounts.php:83 GLCashFlowsSetup.php:201
+#: GLAccounts.php:84 GLCashFlowsSetup.php:201
msgid "Could not add the new account code"
msgstr ""
-#: GLAccounts.php:86
+#: GLAccounts.php:87
msgid "The new general ledger account has been added"
msgstr ""
-#: GLAccounts.php:108
+#: GLAccounts.php:109
msgid ""
"Cannot delete this account because chart details have been created using "
"this account and at least one period has postings to it"
msgstr ""
-#: GLAccounts.php:109
+#: GLAccounts.php:110
msgid "chart details that require this account code"
msgstr ""
-#: GLAccounts.php:116
+#: GLAccounts.php:117
msgid "Could not test for existing transactions because"
msgstr ""
-#: GLAccounts.php:122
+#: GLAccounts.php:123
msgid ""
"Cannot delete this account because transactions have been created using this "
"account"
msgstr ""
-#: GLAccounts.php:123
+#: GLAccounts.php:124
msgid "transactions that require this account code"
msgstr ""
-#: GLAccounts.php:136
+#: GLAccounts.php:137
msgid "Could not test for default company GL codes because"
msgstr ""
-#: GLAccounts.php:142
+#: GLAccounts.php:143
msgid ""
"Cannot delete this account because it is used as one of the company default "
"accounts"
msgstr ""
-#: GLAccounts.php:149
+#: GLAccounts.php:150
msgid "Could not test for tax authority GL codes because"
msgstr ""
-#: GLAccounts.php:155
+#: GLAccounts.php:156
msgid ""
"Cannot delete this account because it is used as one of the tax authority "
"accounts"
msgstr ""
-#: GLAccounts.php:161
+#: GLAccounts.php:162
msgid "Could not test for existing sales interface GL codes because"
msgstr ""
-#: GLAccounts.php:167
+#: GLAccounts.php:168
msgid ""
"Cannot delete this account because it is used by one of the sales GL posting "
"interface records"
msgstr ""
-#: GLAccounts.php:173
+#: GLAccounts.php:174
msgid "Could not test for existing cost of sales interface codes because"
msgstr ""
-#: GLAccounts.php:179
+#: GLAccounts.php:180
msgid ""
"Cannot delete this account because it is used by one of the cost of sales GL "
"posting interface records"
msgstr ""
-#: GLAccounts.php:189
+#: GLAccounts.php:190
msgid "Could not test for existing stock GL codes because"
msgstr ""
-#: GLAccounts.php:195
+#: GLAccounts.php:196
msgid ""
"Cannot delete this account because it is used by one of the stock GL posting "
"interface records"
msgstr ""
-#: GLAccounts.php:200
+#: GLAccounts.php:201
msgid "Could not test for existing bank account GL codes because"
msgstr ""
-#: GLAccounts.php:206
+#: GLAccounts.php:207
msgid ""
"Cannot delete this account because it is used by one the defined bank "
"accounts"
msgstr ""
-#: GLAccounts.php:244 GLAccounts.php:249 GLAccounts.php:313
-#: GLJournalInquiry.php:99 ImportBankTransAnalysis.php:256 PcExpenses.php:191
-#: PcExpenses.php:301 SuppTransGLAnalysis.php:191
-#: Z_CreateCompanyTemplateFile.php:236 Z_UpdateChartDetailsBFwd.php:81
-#: includes/PDFGLJournalHeader.inc:19
+#: GLAccounts.php:247 GLAccounts.php:301 GLJournalInquiry.php:99
+#: ImportBankTransAnalysis.php:256 PcExpenses.php:191 PcExpenses.php:301
+#: SuppTransGLAnalysis.php:191 Z_CreateCompanyTemplateFile.php:236
+#: Z_UpdateChartDetailsBFwd.php:81 includes/PDFGLJournalHeader.inc:19
msgid "Account Code"
msgstr ""
-#: GLAccounts.php:250
+#: GLAccounts.php:248
msgid ""
"Enter up to 20 alpha-numeric characters for the general ledger account code"
msgstr ""
-#: GLAccounts.php:259
+#: GLAccounts.php:252
msgid ""
"Enter up to 50 alpha-numeric characters for the general ledger account name"
msgstr ""
-#: GLAccounts.php:265 GLAccounts.php:315 Z_ImportChartOfAccounts.php:81
+#: GLAccounts.php:258 GLAccounts.php:303 Z_ImportChartOfAccounts.php:81
#: Z_ImportGLAccountGroups.php:26
msgid "Account Group"
msgstr ""
-#: GLAccounts.php:280 GLAccounts.php:317
+#: GLAccounts.php:270 GLAccounts.php:305
msgid "Cash Flows Activity"
msgstr ""
-#: GLAccounts.php:316
+#: GLAccounts.php:304
msgid "P/L or B/S"
msgstr ""
-#: GLAccounts.php:325 GLBalanceSheet.php:9 GLBalanceSheet.php:23
+#: GLAccounts.php:313 GLBalanceSheet.php:9 GLBalanceSheet.php:23
#: GLBalanceSheet.php:88 GLBalanceSheet.php:89 GLBalanceSheet.php:112
#: GLBalanceSheet.php:152 GLBalanceSheet.php:400 SelectGLAccount.php:23
#: SelectGLAccount.php:42 SelectGLAccount.php:63
@@ -13947,21 +13946,21 @@
msgid "Balance Sheet"
msgstr ""
-#: GLAccounts.php:325
+#: GLAccounts.php:313
msgid "Profit/Loss"
msgstr ""
-#: GLAccounts.php:330
+#: GLAccounts.php:318
msgid "The chart accounts could not be retrieved because"
msgstr ""
-#: GLAccounts.php:348
+#: GLAccounts.php:336
msgid ""
"Are you sure you wish to delete this account? Additional checks will be "
"performed in any event to ensure data integrity is not compromised."
msgstr ""
-#: GLAccounts.php:360
+#: GLAccounts.php:348
msgid "Show All Accounts"
msgstr ""
@@ -14115,7 +14114,7 @@
msgid "Statement of Cash Flows, Indirect Method"
msgstr ""
-#: GLCashFlowsIndirect.php:63 PurchasesReport.php:41
+#: GLCashFlowsIndirect.php:63 PurchasesReport.php:43
msgid ""
"The beginning of the period should be before or equal to the end of the "
"period. Please reselect the reporting period."
@@ -14186,7 +14185,7 @@
msgid "Run Setup"
msgstr ""
-#: GLCashFlowsIndirect.php:739 PurchasesReport.php:227
+#: GLCashFlowsIndirect.php:739 PurchasesReport.php:230
msgid "New Report"
msgstr ""
@@ -14219,15 +14218,15 @@
"expenses are owed based on the supplier invoice date."
msgstr ""
-#: GLCashFlowsIndirect.php:765
-msgid "Report parameters"
+#: GLCashFlowsIndirect.php:765 PurchasesReport.php:245
+msgid "Report Parameters"
msgstr ""
-#: GLCashFlowsIndirect.php:798 PurchasesReport.php:264
+#: GLCashFlowsIndirect.php:798 PurchasesReport.php:267
msgid "Select the beginning of the reporting period"
msgstr ""
-#: GLCashFlowsIndirect.php:812 PurchasesReport.php:274
+#: GLCashFlowsIndirect.php:812 PurchasesReport.php:277
msgid "Select the end of the reporting period"
msgstr ""
@@ -18513,7 +18512,7 @@
#: POReport.php:1306 POReport.php:1318 POReport.php:1371 POReport.php:1428
#: POReport.php:1439 POReport.php:1571 POReport.php:1626 POReport.php:1640
#: PO_Header.php:562 PO_OrderDetails.php:98 PurchData.php:470 PurchData.php:571
-#: PurchData.php:576 PurchasesReport.php:163 SelectSupplier.php:283
+#: PurchData.php:576 PurchasesReport.php:166 SelectSupplier.php:283
#: SellThroughSupport.php:160 SupplierPriceList.php:467
#: SupplierTenderCreate.php:414 SupplierTenderCreate.php:618 Suppliers.php:698
#: Suppliers.php:940
@@ -21198,7 +21197,7 @@
msgid "Order Header Details"
msgstr ""
-#: PO_OrderDetails.php:96 PurchasesReport.php:162 SelectProduct.php:562
+#: PO_OrderDetails.php:96 PurchasesReport.php:165 SelectProduct.php:562
#: SupplierTenderCreate.php:413 Suppliers.php:693 Suppliers.php:934
#: WWW_Users.php:324 WWW_Users.php:573
msgid "Supplier Code"
@@ -24467,63 +24466,59 @@
"the grid above for immediate delivery. Are you sure?"
msgstr ""
-#: PurchasesReport.php:15 includes/MainMenuLinksArray.php:192
-msgid "Purchases to Suppliers"
+#: PurchasesReport.php:16 includes/MainMenuLinksArray.php:192
+msgid "Purchases from Suppliers"
msgstr ""
-#: PurchasesReport.php:55
+#: PurchasesReport.php:58
msgid ""
"Original amounts in the supplier's currency. GL amounts in the functional "
"currency."
msgstr ""
-#: PurchasesReport.php:66 SuppWhereAlloc.php:33 SuppWhereAlloc.php:38
+#: PurchasesReport.php:69 SuppWhereAlloc.php:33 SuppWhereAlloc.php:38
#: SuppWhereAlloc.php:42 SuppWhereAlloc.php:160
#: includes/DatabaseTranslations.php:34
msgid "Purchase Invoice"
msgstr ""
-#: PurchasesReport.php:68 PurchasesReport.php:165
+#: PurchasesReport.php:71 PurchasesReport.php:168
msgid "Original Overall Amount"
msgstr ""
-#: PurchasesReport.php:69 PurchasesReport.php:166
+#: PurchasesReport.php:72 PurchasesReport.php:169
msgid "Original Overall Taxes"
msgstr ""
-#: PurchasesReport.php:70 PurchasesReport.php:167
+#: PurchasesReport.php:73 PurchasesReport.php:170
msgid "Original Overall Total"
msgstr ""
-#: PurchasesReport.php:71 PurchasesReport.php:168
+#: PurchasesReport.php:74 PurchasesReport.php:171
msgid "GL Overall Amount"
msgstr ""
-#: PurchasesReport.php:72 PurchasesReport.php:169
+#: PurchasesReport.php:75 PurchasesReport.php:172
msgid "GL Overall Taxes"
msgstr ""
-#: PurchasesReport.php:73 PurchasesReport.php:170
+#: PurchasesReport.php:76 PurchasesReport.php:173
msgid "GL Overall Total"
msgstr ""
-#: PurchasesReport.php:134
+#: PurchasesReport.php:137
msgid "Click to view where allocated"
msgstr ""
-#: PurchasesReport.php:164
+#: PurchasesReport.php:167
msgid "Supplier's Currency"
msgstr ""
-#: PurchasesReport.php:242
-msgid "Report Parameters"
-msgstr ""
-
-#: PurchasesReport.php:279
+#: PurchasesReport.php:282
msgid "Show details"
msgstr ""
-#: PurchasesReport.php:281
+#: PurchasesReport.php:284
msgid "Check this box to show purchase invoices"
msgstr ""
Modified: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2016-12-21 23:44:26 UTC (rev 7712)
+++ trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2016-12-22 00:11:36 UTC (rev 7713)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-20 10:25-0600\n"
+"POT-Creation-Date: 2016-12-21 18:08-0600\n"
"PO-Revision-Date: 2015-11-12 20:40+0200\n"
"Last-Translator: JC_Chuck <Unknown>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -165,7 +165,7 @@
#: CustomerBranches.php:330 CustomerBranches.php:340 CustomerTypes.php:146
#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:109 GLAccounts.php:123
+#: FixedAssetCategories.php:137 GLAccounts.php:110 GLAccounts.php:124
#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307
#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343
#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:185
@@ -441,7 +441,7 @@
#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:253 GLAccounts.php:347 GLTags.php:96 GeocodeSetup.php:173
+#: FreightCosts.php:253 GLAccounts.php:335 GLTags.php:96 GeocodeSetup.php:173
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:297 Labels.php:333
#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
@@ -481,7 +481,7 @@
#: CustomerReceipt.php:1001 CustomerTypes.php:206 Customers.php:1166
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GLAccounts.php:348 GLJournal.php:431 GLTags.php:97 GeocodeSetup.php:174
+#: GLAccounts.php:336 GLJournal.php:431 GLTags.php:97 GeocodeSetup.php:174
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:298 Labels.php:334 Labels.php:359 Labels.php:612
#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310
@@ -560,7 +560,7 @@
#: GLAccountUsers.php:253 GLBalanceSheet.php:720 GLCashFlowsIndirect.php:741
#: GLCashFlowsIndirect.php:774 GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317
#: GLTrialBalance.php:740 InternalStockRequestInquiry.php:263
-#: PurchasesReport.php:229 PurchasesReport.php:251 SecurityTokens.php:140
+#: PurchasesReport.php:232 PurchasesReport.php:254 SecurityTokens.php:140
#: SecurityTokens.php:156 UserGLAccounts.php:259
#: Z_GLAccountUsersCopyAuthority.php:96 includes/Login.php:8
msgid "Return"
@@ -686,7 +686,7 @@
#: COGSGLPostings.php:368 CreditStatus.php:259 Currencies.php:537
#: CustLoginSetup.php:273 Departments.php:258 DiscountMatrix.php:142
#: EDIMessageFormat.php:248 FixedAssetCategories.php:350
-#: FixedAssetLocations.php:161 FreightCosts.php:371 GLAccounts.php:297
+#: FixedAssetLocations.php:161 FreightCosts.php:371 GLAccounts.php:285
#: GeocodeSetup.php:271 Labels.php:647 Locations.php:716 MRPDemandTypes.php:188
#: MRPDemands.php:424 Manufacturers.php:375 OffersReceived.php:57
#: OffersReceived.php:146 PO_AuthorisationLevels.php:264 PaymentMethods.php:302
@@ -814,7 +814,7 @@
#: PcAssignCashTabToTab.php:384 PcAssignCashToTab.php:256
#: PcAssignCashToTab.php:394 PcAuthorizeExpenses.php:98
#: PcClaimExpensesFromTab.php:242 PcClaimExpensesFromTab.php:409
-#: PcReportTab.php:336 PurchasesReport.php:54 SelectCustomer.php:732
+#: PcReportTab.php:336 PurchasesReport.php:57 SelectCustomer.php:732
#: ShopParameters.php:198 SystemParameters.php:411 WOSerialNos.php:306
#: WOSerialNos.php:312
msgid "Notes"
@@ -910,7 +910,7 @@
#: PaymentAllocations.php:66 PcAssignCashTabToTab.php:257
#: PcAssignCashToTab.php:252 PcAuthorizeExpenses.php:94 PrintCustTrans.php:822
#: PrintCustTransPortrait.php:902 PrintWOItemSlip.php:186
-#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 PurchasesReport.php:65
+#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 PurchasesReport.php:68
#: ReverseGRN.php:401 SelectCustomer.php:810 SelectCustomer.php:852
#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:489
#: StockDispatch.php:279 StockDispatch.php:290 StockDispatch.php:301
@@ -1517,12 +1517,12 @@
msgstr ""
#: AnalysisHorizontalIncome.php:43 GLCashFlowsIndirect.php:782
-#: PurchasesReport.php:259
+#: PurchasesReport.php:262
msgid "Select period from"
msgstr ""
#: AnalysisHorizontalIncome.php:79 GLCashFlowsIndirect.php:803
-#: PurchasesReport.php:269
+#: PurchasesReport.php:272
msgid "Select period to"
msgstr ""
@@ -1612,7 +1612,7 @@
msgstr ""
#: AnalysisHorizontalIncome.php:155 AnalysisHorizontalPosition.php:109
-#: GLAccountInquiry.php:53 GLAccounts.php:213 GLBalanceSheet.php:410
+#: GLAccountInquiry.php:53 GLAccounts.php:214 GLBalanceSheet.php:410
#: GLCashFlowsIndirect.php:88 GLProfit_Loss.php:635 GLTagProfit_Loss.php:537
#: GLTrialBalance.php:452 ImportBankTransAnalysis.php:206
#: PrintCustTransPortrait.php:96 SuppTransGLAnalysis.php:107
@@ -1624,7 +1624,7 @@
msgstr ""
#: AnalysisHorizontalIncome.php:156 AnalysisHorizontalPosition.php:110
-#: Dashboard.php:484 GLAccounts.php:258 GLAccounts.php:314
+#: Dashboard.php:484 GLAccounts.php:251 GLAccounts.php:302
#: GLBalanceSheet.php:411 GLCashFlowsIndirect.php:89 GLCodesInquiry.php:27
#: GLProfit_Loss.php:636 GLTagProfit_Loss.php:538 GLTrialBalance.php:453
#: SelectGLAccount.php:135 SupplierCredit...
[truncated message content] |
|
From: <rc...@us...> - 2017-01-05 18:23:33
|
Revision: 7717
http://sourceforge.net/p/web-erp/reponame/7717
Author: rchacon
Date: 2017-01-05 18:23:30 +0000 (Thu, 05 Jan 2017)
Log Message:
-----------
For strict Standards, removes the "&" before the variable in DB_fetch_row() and in DB_fetch_array() in ConnectDB_XXX.inc. Thanks Tim.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/ConnectDB_mysql.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/includes/ConnectDB_postgres.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-01-05 00:11:17 UTC (rev 7716)
+++ trunk/doc/Change.log 2017-01-05 18:23:30 UTC (rev 7717)
@@ -1,5 +1,6 @@
webERP Change Log
+05/01/17 RChacon: For strict Standards, removes the "&" before the variable in DB_fetch_row() and in DB_fetch_array() in ConnectDB_XXX.inc. Thanks Tim.
21/12/16 RChacon: In PurchasesReport.php, fix date comparison and title. Thanks Tim.
20/12/16 RChacon: Standardise to "Print" button.
20/12/16 RChacon: Add a report of purchases from suppliers for the range of selected dates.
Modified: trunk/includes/ConnectDB_mysql.inc
===================================================================
--- trunk/includes/ConnectDB_mysql.inc 2017-01-05 00:11:17 UTC (rev 7716)
+++ trunk/includes/ConnectDB_mysql.inc 2017-01-05 18:23:30 UTC (rev 7717)
@@ -2,58 +2,58 @@
/* $Id$ */
/* Database abstraction for mysql */
-define ('LIKE','LIKE');
+define('LIKE', 'LIKE');
-global $db; // Make sure it IS global, regardless of our context
-if (!isset($mysqlport)){
+global $db;// Make sure it IS global, regardless of our context
+if(!isset($mysqlport)) {
$mysqlport = 3306;
}
-$db = mysql_connect($host.':'.$mysqlport , $DBUser, $DBPassword);
+$db = mysql_connect($host . ':' . $mysqlport, $DBUser, $DBPassword);
//this statement sets the charset to be used for sending data to and from the db server
//if not set, both mysql server and mysql client/library may assume otherwise
mysql_set_charset('utf8', $db);
-//$varabc = mysql_client_encoding($db);
+//$varabc = mysql_client_encoding($db);
//printf("client encoding is %s\n", $varabc);
-if ( !$db ) {
+if(!$db) {
echo '<br />' . _('The configuration in the file config.php for the database user name and password do not provide the information required to connect to the database server');
session_unset();
session_destroy();
- echo '<p>' . _('Click') . ' ' . '<a href="index.php">' . _('here') . '</a>' . ' ' ._('to try logging in again') . '</p>';
+ echo '<p>' . _('Click') . ' ' . '<a href="index.php">' . _('here') . '</a>' . ' ' ._('to try logging in again') . '</p>';
exit;
}
/* Update to allow RecurringSalesOrdersProcess.php to run via cron */
-if (isset($DatabaseName)) {
+if(isset($DatabaseName)) {
- if (! mysql_select_db($_SESSION['DatabaseName'],$db)) {
+ if(! mysql_select_db($_SESSION['DatabaseName'],$db)) {
echo '<br />' . _('The company name entered does not correspond to a database on the database server specified in the config.php configuration file. Try logging in with a different company name');
echo '<br /><a href="index.php">' . _('Back to login page') . '</A>';
- unset ($_SESSION['DatabaseName']);
+ unset($_SESSION['DatabaseName']);
exit;
}
} else {
- if (! mysql_select_db($_SESSION['DatabaseName'],$db)) {
+ if(! mysql_select_db($_SESSION['DatabaseName'],$db)) {
echo '<br />' . _('The company name entered does not correspond to a database on the database server specified in the config.php configuration file. Try logging in with a different company name');
echo '<br /><a href="index.php">' . _('Back to login page') . '</A>';
- unset ($_SESSION['DatabaseName']);
+ unset($_SESSION['DatabaseName']);
exit;
}
}
-require_once ($PathPrefix .'includes/MiscFunctions.php');
+require_once($PathPrefix . 'includes/MiscFunctions.php');
//DB wrapper functions to change only once for whole application
-function DB_query ($SQL,
+function DB_query($SQL,
$ErrorMessage='',
$DebugMessage= '',
$Transaction=false,
- $TrapErrors=true){
+ $TrapErrors=true) {
global $debug;
global $PathPrefix;
@@ -62,38 +62,38 @@
$result=mysql_query($SQL,$db);
$_SESSION['LastInsertId'] = mysql_insert_id($db);
- if ($DebugMessage == '') {
+ if($DebugMessage == '') {
$DebugMessage = _('The SQL that failed was');
}
- if (DB_error_no() != 0 AND $TrapErrors==true){
- if ($TrapErrors){
+ if(DB_error_no() != 0 AND $TrapErrors==true) {
+ if($TrapErrors) {
require_once($PathPrefix . 'includes/header.inc');
}
- prnMsg($ErrorMessage . '<br />' . DB_error_msg(),'error', _('Database Error'));
- if ($debug==1){
- prnMsg($DebugMessage. '<br />' . $SQL . '<br />','error',_('Database SQL Failure'));
+ prnMsg($ErrorMessage . '<br />' . DB_error_msg(), 'error', _('Database Error'));
+ if($debug == 1) {
+ prnMsg($DebugMessage . '<br />' . $SQL . '<br />', 'error', _('Database SQL Failure'));
}
- if ($Transaction){
+ if($Transaction) {
$SQL = 'rollback';
$Result = DB_query($SQL);
- if (DB_error_no() !=0){
+ if(DB_error_no() != 0) {
prnMsg(_('Error Rolling Back Transaction'), '', _('Database Rollback Error') );
}
}
- if ($TrapErrors){
+ if($TrapErrors) {
include($PathPrefix . 'includes/footer.inc');
exit;
}
- } elseif (isset($_SESSION['MonthsAuditTrail']) and (DB_error_no()==0 AND $_SESSION['MonthsAuditTrail']>0)){
+ } elseif(isset($_SESSION['MonthsAuditTrail']) and (DB_error_no()==0 AND $_SESSION['MonthsAuditTrail']>0)) {
$SQLArray = explode(' ', $SQL);
- if (($SQLArray[0] == 'INSERT')
+ if(($SQLArray[0] == 'INSERT')
OR ($SQLArray[0] == 'UPDATE')
OR ($SQLArray[0] == 'DELETE')) {
- if ($SQLArray[2]!='audittrail'){ // to ensure the auto delete of audit trail history is not logged
+ if($SQLArray[2] != 'audittrail') { // to ensure the auto delete of audit trail history is not logged
$AuditSQL = "INSERT INTO audittrail (transactiondate,
userid,
querystring)
@@ -110,50 +110,48 @@
}
-function DB_fetch_row (&$ResultIndex) {
-
- $RowPointer=mysql_fetch_row($ResultIndex);
+function DB_fetch_row($ResultIndex) {
+ $RowPointer = mysql_fetch_row($ResultIndex);
Return $RowPointer;
}
-function DB_fetch_assoc (&$ResultIndex) {
-
- $RowPointer=mysql_fetch_assoc($ResultIndex);
+function DB_fetch_assoc(&$ResultIndex) {
+ $RowPointer = mysql_fetch_assoc($ResultIndex);
Return $RowPointer;
}
-function DB_fetch_array(&$ResultIndex) {
+function DB_fetch_array($ResultIndex) {
$RowPointer = mysql_fetch_array($ResultIndex);
Return $RowPointer;
}
-function DB_data_seek (&$ResultIndex,$Record) {
+function DB_data_seek(&$ResultIndex,$Record) {
mysql_data_seek($ResultIndex,$Record);
}
-function DB_free_result (&$ResultIndex){
+function DB_free_result(&$ResultIndex) {
mysql_free_result($ResultIndex);
}
-function DB_num_rows (&$ResultIndex){
+function DB_num_rows(&$ResultIndex) {
return mysql_num_rows($ResultIndex);
}
-function DB_affected_rows(&$ResultIndex){
+function DB_affected_rows(&$ResultIndex) {
return mysql_affected_rows($ResultIndex);
}
-function DB_error_no(){
+function DB_error_no() {
global $db;
return mysql_errno($db);
}
-function DB_error_msg(){
+function DB_error_msg() {
global $db;
return mysql_error($db);
}
-function DB_Last_Insert_ID(&$Conn='',$table, $fieldname){
+function DB_Last_Insert_ID(&$Conn='',$table, $fieldname) {
// return mysql_insert_id($db);
if (isset($_SESSION['LastInsertId'])) {
$Last_Insert_ID = $_SESSION['LastInsertId'];
@@ -164,30 +162,29 @@
return $Last_Insert_ID;
}
-function DB_escape_string($String){
+function DB_escape_string($String) {
return mysql_real_escape_string($String);
}
-function DB_show_tables(&$Conn=''){
+function DB_show_tables(&$Conn='') {
$Result = DB_query('SHOW TABLES');
Return $Result;
}
-function DB_show_fields($TableName, &$Conn=''){
+function DB_show_fields($TableName, &$Conn='') {
$Result = DB_query("DESCRIBE $TableName");
Return $Result;
}
-function interval( $val, $Inter ){
+function interval( $val, $Inter ) {
global $DBType;
return "\n".'interval ' . $val . ' '. $Inter."\n";
}
-function DB_Maintenance(){
-
+function DB_Maintenance() {
prnMsg(_('The system has just run the regular database administration and optimisation routine.'),'info');
$TablesResult = DB_query('SHOW TABLES');
- while ($myrow = DB_fetch_row($TablesResult)){
+ while ($myrow = DB_fetch_row($TablesResult)) {
$Result = DB_query('OPTIMIZE TABLE ' . $myrow[0]);
}
@@ -196,31 +193,31 @@
WHERE confname='DB_Maintenance_LastRun'");
}
-
-function DB_Txn_Begin(){
+function DB_Txn_Begin() {
global $db;
mysql_query("SET autocommit=0",$db);
mysql_query("START TRANSACTION",$db);
}
-function DB_Txn_Commit(){
+function DB_Txn_Commit() {
global $db;
mysql_query("COMMIT",$db);
mysql_query("SET autocommit=1",$db);
}
-function DB_Txn_Rollback(){
+function DB_Txn_Rollback() {
global $db;
- mysql_query("ROLLBACK",$db);
+ mysql_query("ROLLBACK",$db);
}
-function DB_IgnoreForeignKeys(){
+function DB_IgnoreForeignKeys() {
global $db;
mysql_query("SET FOREIGN_KEY_CHECKS=0",$db);
}
-function DB_ReinstateForeignKeys(){
+
+function DB_ReinstateForeignKeys() {
global $db;
mysql_query("SET FOREIGN_KEY_CHECKS=1",$db);
}
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/ConnectDB_mysqli.inc
===================================================================
--- trunk/includes/ConnectDB_mysqli.inc 2017-01-05 00:11:17 UTC (rev 7716)
+++ trunk/includes/ConnectDB_mysqli.inc 2017-01-05 18:23:30 UTC (rev 7717)
@@ -7,9 +7,9 @@
20071102 Add $db to DB_escape_string();
*/
-define ('LIKE','LIKE');
+define ('LIKE', 'LIKE');
-if (!isset($mysqlport)){
+if(!isset($mysqlport)) {
$mysqlport = 3306;
}
global $db; // Make sure it IS global, regardless of our context
@@ -23,7 +23,7 @@
mysqli_set_charset($db, 'utf8');
/* check connection */
-if (mysqli_connect_errno()) {
+if(mysqli_connect_errno()) {
printf("Connect failed: %s\n", mysqli_connect_error());
session_unset();
session_destroy();
@@ -31,21 +31,21 @@
exit();
}
-if ( !$db ) {
+if(!$db) {
echo '<br />' . _('The configuration in the file config.php for the database user name and password do not provide the information required to connect to the database server');
exit;
}
/* Update to allow RecurringSalesOrdersProcess.php to run via cron */
-if (isset($DatabaseName)) {
- if (!mysqli_select_db($db,$DatabaseName)) {
+if(isset($DatabaseName)) {
+ if(!mysqli_select_db($db,$DatabaseName)) {
echo '<br />' . _('The company name entered does not correspond to a database on the database server specified in the config.php configuration file. Try logging in with a different company name');
echo '<br /><a href="index.php">' . _('Back to login page') . '</A>';
unset ($DatabaseName);
exit;
}
} else {
- if (!mysqli_select_db($db,$_SESSION['DatabaseName'])) {
+ if(!mysqli_select_db($db,$_SESSION['DatabaseName'])) {
echo '<br />' . _('The company name entered does not correspond to a database on the database server specified in the config.php configuration file. Try logging in with a different company name');
echo '<br /><a href="index.php">' . _('Back to login page') . '</A>';
@@ -56,11 +56,11 @@
//DB wrapper functions to change only once for whole application
-function DB_query ($SQL,
+function DB_query($SQL,
$ErrorMessage='',
$DebugMessage= '',
$Transaction=false,
- $TrapErrors=true){
+ $TrapErrors=true) {
global $debug;
global $PathPrefix;
@@ -70,40 +70,40 @@
$_SESSION['LastInsertId'] = mysqli_insert_id($db);
- if ($DebugMessage == '') {
+ if($DebugMessage == '') {
$DebugMessage = _('The SQL that failed was');
}
- if (DB_error_no() != 0 AND $TrapErrors==true){
- if ($TrapErrors){
+ if(DB_error_no() != 0 AND $TrapErrors==true) {
+ if($TrapErrors) {
require_once($PathPrefix . 'includes/header.inc');
}
prnMsg($ErrorMessage . '<br />' . DB_error_msg(),'error', _('Database Error'). ' ' .DB_error_no());
- if ($debug==1){
+ if($debug==1) {
prnMsg($DebugMessage. '<br />' . $SQL . '<br />','error',_('Database SQL Failure'));
}
- if ($Transaction){
+ if($Transaction) {
$SQL = 'rollback';
$Result = DB_query($SQL);
- if (DB_error_no() !=0){
+ if(DB_error_no() != 0) {
prnMsg(_('Error Rolling Back Transaction'), 'error', _('Database Rollback Error'). ' ' .DB_error_no() );
}else{
prnMsg(_('Rolling Back Transaction OK'), 'error', _('Database Rollback Due to Error Above'));
}
}
- if ($TrapErrors){
+ if($TrapErrors) {
include($PathPrefix . 'includes/footer.inc');
exit;
}
- } elseif (isset($_SESSION['MonthsAuditTrail']) and (DB_error_no()==0 AND $_SESSION['MonthsAuditTrail']>0) AND (DB_affected_rows($result)>0)){
+ } elseif(isset($_SESSION['MonthsAuditTrail']) and (DB_error_no()==0 AND $_SESSION['MonthsAuditTrail']>0) AND (DB_affected_rows($result)>0)) {
$SQLArray = explode(' ', $SQL);
- if (($SQLArray[0] == 'INSERT')
+ if(($SQLArray[0] == 'INSERT')
OR ($SQLArray[0] == 'UPDATE')
OR ($SQLArray[0] == 'DELETE')) {
- if ($SQLArray[2]!='audittrail'){ // to ensure the auto delete of audit trail history is not logged
+ if($SQLArray[2] != 'audittrail') { // to ensure the auto delete of audit trail history is not logged
$AuditSQL = "INSERT INTO audittrail (transactiondate,
userid,
querystring)
@@ -116,57 +116,56 @@
}
}
return $result;
-
}
-function DB_fetch_row (&$ResultIndex) {
+function DB_fetch_row($ResultIndex) {
$RowPointer=mysqli_fetch_row($ResultIndex);
Return $RowPointer;
}
-function DB_fetch_assoc (&$ResultIndex) {
+function DB_fetch_assoc(&$ResultIndex) {
$RowPointer=mysqli_fetch_assoc($ResultIndex);
Return $RowPointer;
}
-function DB_fetch_array(&$ResultIndex) {
+function DB_fetch_array($ResultIndex) {
$RowPointer = mysqli_fetch_array($ResultIndex);
Return $RowPointer;
}
-function DB_data_seek (&$ResultIndex,$Record) {
+function DB_data_seek(&$ResultIndex,$Record) {
mysqli_data_seek($ResultIndex,$Record);
}
-function DB_free_result (&$ResultIndex){
- if (is_resource($ResultIndex)) {
+function DB_free_result(&$ResultIndex) {
+ if(is_resource($ResultIndex)) {
mysqli_free_result($ResultIndex);
}
}
-function DB_num_rows (&$ResultIndex){
+function DB_num_rows(&$ResultIndex) {
return mysqli_num_rows($ResultIndex);
}
-function DB_affected_rows(&$ResultIndex){
+function DB_affected_rows(&$ResultIndex) {
global $db;
return mysqli_affected_rows($db);
}
-function DB_error_no(){
+function DB_error_no() {
global $db;
return mysqli_errno($db);
}
-function DB_error_msg(){
+function DB_error_msg() {
global $db;
return mysqli_error($db);
}
-function DB_Last_Insert_ID($Conn='', $Table, $FieldName){
+function DB_Last_Insert_ID($Conn='', $Table, $FieldName) {
// return mysqli_insert_id($Conn);
- if (isset($_SESSION['LastInsertId'])) {
+ if(isset($_SESSION['LastInsertId'])) {
$Last_Insert_ID = $_SESSION['LastInsertId'];
} else {
$Last_Insert_ID = 0;
@@ -175,33 +174,32 @@
return $Last_Insert_ID;
}
-function DB_escape_string($String){
+function DB_escape_string($String) {
global $db;
return mysqli_real_escape_string($db, $String);
}
-function DB_show_tables($Conn=''){
+function DB_show_tables($Conn='') {
global $db;
$Result = DB_query('SHOW TABLES');
Return $Result;
}
-function DB_show_fields($TableName, $Conn=''){
+function DB_show_fields($TableName, $Conn='') {
$Result = DB_query("DESCRIBE $TableName");
Return $Result;
}
-function interval( $val, $Inter ){
+function interval($val, $Inter) {
global $dbtype;
- return "\n".'interval ' . $val . ' '. $Inter."\n";
+ return "\n".'interval ' . $val . ' ' . $Inter . "\n";
}
-function DB_Maintenance(){
-
+function DB_Maintenance() {
prnMsg(_('The system has just run the regular database administration and optimisation routine.'),'info');
$TablesResult = DB_query("SHOW TABLES");
- while ($myrow = DB_fetch_row($TablesResult)){
+ while ($myrow = DB_fetch_row($TablesResult)) {
$Result = DB_query('OPTIMIZE TABLE ' . $myrow[0]);
}
@@ -210,28 +208,30 @@
WHERE confname='DB_Maintenance_LastRun'");
}
-function DB_Txn_Begin(){
+function DB_Txn_Begin() {
global $db;
mysqli_query($db,'SET autocommit=0');
mysqli_query($db,'START TRANSACTION');
}
-function DB_Txn_Commit(){
+function DB_Txn_Commit() {
global $db;
mysqli_query($db,'COMMIT');
mysqli_query($db,'SET autocommit=1');
}
-function DB_Txn_Rollback(){
+function DB_Txn_Rollback() {
global $db;
mysqli_query($db,'ROLLBACK');
}
-function DB_IgnoreForeignKeys(){
+
+function DB_IgnoreForeignKeys() {
global $db;
mysqli_query($db,'SET FOREIGN_KEY_CHECKS=0');
}
-function DB_ReinstateForeignKeys(){
+
+function DB_ReinstateForeignKeys() {
global $db;
mysqli_query($db, 'SET FOREIGN_KEY_CHECKS=1');
}
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/ConnectDB_postgres.inc
===================================================================
--- trunk/includes/ConnectDB_postgres.inc 2017-01-05 00:11:17 UTC (rev 7716)
+++ trunk/includes/ConnectDB_postgres.inc 2017-01-05 18:23:30 UTC (rev 7717)
@@ -6,14 +6,14 @@
/* $PgConnStr = $PgConnStr = "host=".$host." dbname=".$_SESSION['DatabaseName']; */
$PgConnStr = 'dbname='.$_SESSION['DatabaseName'];
-if ( isset($host) && ($host != "")) {
+if( isset($host) && ($host != "")) {
$PgConnStr = 'host='.$host.' '.$PgConnStr;
}
-if ( isset( $DBUser ) && ($DBUser != "") ) {
+if( isset( $DBUser ) && ($DBUser != "") ) {
// if we have a user we need to use password if supplied
$PgConnStr .= " user=".$DBUser;
- if ( isset( $DBPassword ) && ($DBPassword != "") ) {
+ if( isset( $DBPassword ) && ($DBPassword != "") ) {
$PgConnStr .= " password=".$DBPassword;
}
}
@@ -21,8 +21,8 @@
global $db; // Make sure it IS global, regardless of our context
$db = pg_connect( $PgConnStr );
-if ( !$db ) {
- if ($debug==1){
+if( !$db ) {
+ if($debug==1) {
echo '<BR>' . $PgConnStr . '<BR>';
}
echo '<BR>' . _('The company name entered together with the configuration in the file config.php for the database user name and password do not provide the information required to connect to the database.') . '<BR><BR>' . _(' Try logging in with an alternative company name.');
@@ -39,32 +39,32 @@
$ErrorMessage='',
$DebugMessage= '',
$Transaction=false,
- $TrapErrors=true){
+ $TrapErrors=true) {
global $debug;
global $PathPrefix;
$result = pg_query($db, $SQL);
- if ($DebugMessage == '') {
+ if($DebugMessage == '') {
$DebugMessage = _('The SQL that failed was:');
}
- //if (DB_error_no($Conn) != 0){
- if ( !$result AND $TrapErrors){
- if ($TrapErrors){
+ //if(DB_error_no($Conn) != 0) {
+ if( !$result AND $TrapErrors) {
+ if($TrapErrors) {
require_once($PathPrefix . 'includes/header.inc');
}
prnMsg($ErrorMessage . '<BR>' . DB_error_msg(),'error', _('DB ERROR:'));
- if ($debug==1){
+ if($debug==1) {
echo '<BR>' . $DebugMessage. "<BR>$SQL<BR>";
}
- if ($Transaction){
+ if($Transaction) {
$SQL = 'rollback';
$Result = DB_query($SQL);
- if (DB_error_no($Conn) !=0){
+ if(DB_error_no($Conn) !=0) {
prnMsg('<br />' . _('Error Rolling Back Transaction!!'), '', _('DB DEBUG:') );
}
}
- if ($TrapErrors){
+ if($TrapErrors) {
include($PathPrefix . 'includes/footer.inc');
exit;
}
@@ -73,43 +73,42 @@
}
-function DB_fetch_row (&$ResultIndex) {
+function DB_fetch_row($ResultIndex) {
$RowPointer=pg_fetch_row($ResultIndex);
Return $RowPointer;
}
-function DB_fetch_assoc (&$ResultIndex) {
-
+function DB_fetch_assoc(&$ResultIndex) {
$RowPointer=pg_fetch_assoc($ResultIndex);
Return $RowPointer;
}
-function DB_fetch_array(&$ResultIndex) {
+function DB_fetch_array($ResultIndex) {
$RowPointer = pg_fetch_array($ResultIndex);
Return $RowPointer;
}
-function DB_data_seek (&$ResultIndex,$Record) {
+function DB_data_seek(&$ResultIndex,$Record) {
pg_result_seek($ResultIndex,$Record);
}
-function DB_free_result (&$ResultIndex){
+function DB_free_result(&$ResultIndex) {
pg_free_result($ResultIndex);
}
-function DB_num_rows (&$ResultIndex){
+function DB_num_rows(&$ResultIndex) {
return pg_num_rows($ResultIndex);
}
// Added by MGT
-function DB_affected_rows (&$ResultIndex){
+function DB_affected_rows(&$ResultIndex) {
return pg_affected_rows($ResultIndex);
}
-function DB_error_no(){
+function DB_error_no() {
return DB_error_msg() == ""?0:-1;
}
-function DB_error_msg(){
+function DB_error_msg() {
return pg_last_error($db);
}
@@ -120,7 +119,7 @@
return $Res;
}
-function DB_escape_string($String){
+function DB_escape_string($String) {
Return pg_escape_string(htmlspecialchars($String, ENT_COMPAT, 'ISO-8859-1'));
}
@@ -128,18 +127,18 @@
global $dbtype;
return "\n(CAST( (" . $val . ") as text ) || ' ". $Inter ."')::interval\n";
}
-function DB_show_tables (&$Conn){
+function DB_show_tables(&$Conn) {
$Result =DB_query("SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'");
Return $Result;
}
-function DB_show_fields($TableName,&$Conn){
+function DB_show_fields($TableName,&$Conn) {
$Result = DB_query("SELECT table_name FROM information_schema.tables WHERE table_schema='public' AND table_name='" . $TableName . "'");
- if (DB_num_rows($Result)==1){
+ if(DB_num_rows($Result)==1) {
$Result = DB_query("SELECT column_name FROM information_schema.columns WHERE table_name ='$TableName'");
Return $Result;
}
}
-function DB_Maintenance(){
+function DB_Maintenance() {
prnMsg(_('The system has just run the regular database administration and optimisation routine'),'info');
@@ -150,4 +149,4 @@
WHERE confname='DB_Maintenance_LastRun'");
}
-?>
\ No newline at end of file
+?>
|
|
From: <rc...@us...> - 2017-01-06 00:44:23
|
Revision: 7718
http://sourceforge.net/p/web-erp/reponame/7718
Author: rchacon
Date: 2017-01-06 00:44:21 +0000 (Fri, 06 Jan 2017)
Log Message:
-----------
Fix named key in Associative array with config value. Thanks Tim.
Modified Paths:
--------------
trunk/GLCashFlowsIndirect.php
trunk/doc/Change.log
Modified: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php 2017-01-05 18:23:30 UTC (rev 7717)
+++ trunk/GLCashFlowsIndirect.php 2017-01-06 00:44:21 UTC (rev 7718)
@@ -112,7 +112,8 @@
$Result = DB_query("SELECT retainedearnings FROM companies WHERE coycode = 1");
$MyRow = DB_fetch_array($Result);
if($MyRow) {
- $_SESSION['RetainedEarningsAccount'] = $MyRow['confvalue'];
+/* $_SESSION['RetainedEarningsAccount'] = $MyRow['confvalue'];// RChacon: See above comment */
+ $_SESSION['RetainedEarningsAccount'] = $MyRow['retainedearnings'];
}
}
include('includes/GLPostings.inc');// Posts pending GL transactions.
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-01-05 18:23:30 UTC (rev 7717)
+++ trunk/doc/Change.log 2017-01-06 00:44:21 UTC (rev 7718)
@@ -1,5 +1,6 @@
webERP Change Log
+05/01/17 RChacon: In GLCashFlowsIndirect.php, fix named key in Associative array with config value. Thanks Tim.
05/01/17 RChacon: For strict Standards, removes the "&" before the variable in DB_fetch_row() and in DB_fetch_array() in ConnectDB_XXX.inc. Thanks Tim.
21/12/16 RChacon: In PurchasesReport.php, fix date comparison and title. Thanks Tim.
20/12/16 RChacon: Standardise to "Print" button.
|
|
From: <rc...@us...> - 2017-01-06 04:30:40
|
Revision: 7719
http://sourceforge.net/p/web-erp/reponame/7719
Author: rchacon
Date: 2017-01-06 04:30:38 +0000 (Fri, 06 Jan 2017)
Log Message:
-----------
Add Turn off/on the page help and the field help.
Modified Paths:
--------------
trunk/GLCashFlowsIndirect.php
trunk/PurchasesReport.php
trunk/WWW_Users.php
trunk/doc/Change.log
trunk/includes/UserLogin.php
trunk/sql/mysql/upgrade4.13.1-4.14.sql
Modified: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php 2017-01-06 00:44:21 UTC (rev 7718)
+++ trunk/GLCashFlowsIndirect.php 2017-01-06 04:30:38 UTC (rev 7719)
@@ -76,10 +76,8 @@
$Title, '" /> ', // Icon title.
$Title, '<br />', // Page title, reporting statement.
stripslashes($_SESSION['CompanyRecord']['coyname']), '<br />'; // Page title, reporting entity.
- $Result = DB_query('SELECT lastdate_in_period FROM `periods` WHERE `periodno`=' . $_POST['PeriodFrom']);
- $PeriodFromName = DB_fetch_array($Result);
- $Result = DB_query('SELECT lastdate_in_period FROM `periods` WHERE `periodno`=' . $_POST['PeriodTo']);
- $PeriodToName = DB_fetch_array($Result);
+ $PeriodFromName = DB_fetch_array(DB_query('SELECT lastdate_in_period FROM `periods` WHERE `periodno`=' . $_POST['PeriodFrom']));
+ $PeriodToName = DB_fetch_array(DB_query('SELECT lastdate_in_period FROM `periods` WHERE `periodno`=' . $_POST['PeriodTo']));
echo _('From'), ' ', MonthAndYearFromSQLDate($PeriodFromName['lastdate_in_period']), ' ', _('to'), ' ', MonthAndYearFromSQLDate($PeriodToName['lastdate_in_period']), '<br />'; // Page title, reporting period.
include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
echo _('All amounts stated in'), ': ', _($CurrencyName[$_SESSION['CompanyRecord']['currencydefault']]), '</p>';// Page title, reporting presentation currency and level of rounding used.
@@ -99,8 +97,7 @@
// Gets the net profit for the period GL account:
if(!isset($_SESSION['PeriodProfitAccount'])) {
$_SESSION['PeriodProfitAccount'] = '';
- $Result = DB_query("SELECT confvalue FROM `config` WHERE confname ='PeriodProfitAccount'");
- $MyRow = DB_fetch_array($Result);
+ $MyRow = DB_fetch_array(DB_query("SELECT confvalue FROM `config` WHERE confname ='PeriodProfitAccount'"));
if($MyRow) {
$_SESSION['PeriodProfitAccount'] = $MyRow['confvalue'];
}
@@ -470,8 +467,7 @@
INNER JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode
INNER JOIN accountgroups ON chartmaster.group_=accountgroups.groupname
WHERE accountgroups.pandl=1";
- $Result1 = DB_query($Sql);
- $MyRow1 = DB_fetch_array($Result1);
+ $MyRow1 = DB_fetch_array(DB_query($Sql));
echo colDebitCredit($MyRow1['ActualProfit']),
colDebitCredit($MyRow1['LastProfit']),
'</tr>
@@ -488,8 +484,7 @@
WHERE accountgroups.pandl=0
AND chartdetails.accountcode!='" . $_SESSION['PeriodProfitAccount'] . "'
AND chartdetails.accountcode!='" . $_SESSION['RetainedEarningsAccount'] . "'";// Gets retained earnings by the complement method to include differences. The complement method: Changes(retained earnings) = -Changes(other accounts).
- $Result2 = DB_query($Sql);
- $MyRow2 = DB_fetch_array($Result2);
+ $MyRow2 = DB_fetch_array(DB_query($Sql));
echo colDebitCredit($MyRow2['ActualRetained'] - $MyRow1['ActualProfit']),
colDebitCredit($MyRow2['LastRetained'] - $MyRow1['LastProfit']),
'</tr><tr>',
@@ -752,7 +747,7 @@
'/images/reports.png" title="', // Icon image.
$Title, '" /> ', // Icon title.
$Title, '</p>';// Page title.
- if(!isset($page_help) OR $page_help) {// If it is not set the $page_help parameter OR it is TRUE, shows the page help text:
+ if(!isset($_SESSION['ShowPageHelp']) OR $_SESSION['ShowPageHelp']) {// If it is not set the $_SESSION['ShowPageHelp'] parameter OR it is TRUE, shows the page help text:
echo '<div class="page_help_text">',
_('The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities.'), '<br />',
_('The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.'), '<br />',
@@ -802,7 +797,7 @@
echo '<option',($MyRow['periodno'] == $_POST['PeriodFrom'] ? ' selected="selected"' : '' ), ' value="', $MyRow['periodno'], '">', MonthAndYearFromSQLDate($MyRow['lastdate_in_period']), '</option>';
}
echo '</select>',
- (!isset($field_help) || $field_help ? _('Select the beginning of the reporting period') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Select the beginning of the reporting period') : ''), // If it is not set the $_SESSION['ShowFieldHelp'] parameter OR it is TRUE, shows the page help text.
'</td>
</tr>',
// Select period to:
@@ -816,28 +811,28 @@
echo '<option',($MyRow['periodno'] == $_POST['PeriodTo'] ? ' selected="selected"' : '' ), ' value="', $MyRow['periodno'], '">', MonthAndYearFromSQLDate($MyRow['lastdate_in_period']), '</option>';
}
echo '</select>',
- (!isset($field_help) || $field_help ? _('Select the end of the reporting period') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Select the end of the reporting period') : ''), // If it is not set the $_SESSION['ShowFieldHelp'] parameter OR it is TRUE, shows the page help text.
'</td>
</tr>',
// Show the budget for the period:
'<tr>',
- '<td><label for="ShowBudget">', _('Show the budget for the period'), ':</label></td>
+ '<td><label for="ShowBudget">', _('Show the budget for the period'), '</label></td>
<td><input',($_POST['ShowBudget'] ? ' checked="checked"' : ''), ' id="ShowBudget" name="ShowBudget" type="checkbox">', // "Checked" if ShowBudget is set AND it is TRUE.
- (!isset($field_help) || $field_help ? _('Check this box to show the budget for the period') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Check this box to show the budget for the period') : ''), // If it is not set the $_SESSION['ShowFieldHelp'] parameter OR it is TRUE, shows the page help text.
'</td>
</tr>',
// Show accounts with zero balance:
'<tr>',
- '<td><label for="ShowZeroBalance">', _('Show accounts with zero balance'), ':</label></td>
+ '<td><label for="ShowZeroBalance">', _('Show accounts with zero balance'), '</label></td>
<td><input',(isset($_POST['ShowZeroBalance']) && $_POST['ShowZeroBalance'] ? ' checked="checked"' : ''), ' id="ShowZeroBalance" name="ShowZeroBalance" type="checkbox">', // "Checked" if ShowZeroBalance is set AND it is TRUE.
- (!isset($field_help) || $field_help ? _('Check this box to show all accounts including those with zero balance') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Check this box to show all accounts including those with zero balance') : ''), // If it is not set the $_SESSION['ShowFieldHelp'] parameter OR it is TRUE, shows the page help text.
'</td>
</tr>',
// Show cash and cash equivalents accounts:
'<tr>',
- '<td><label for="ShowCash">', _('Show cash and cash equivalents accounts'), ':</label></td>
+ '<td><label for="ShowCash">', _('Show cash and cash equivalents accounts'), '</label></td>
<td><input',($_POST['ShowCash'] ? ' checked="checked"' : ''), ' id="ShowCash" name="ShowCash" type="checkbox">', // "Checked" if ShowZeroBalance is set AND it is TRUE.
- (!isset($field_help) || $field_help ? _('Check this box to show cash and cash equivalents accounts') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Check this box to show cash and cash equivalents accounts') : ''), // If it is not set the $_SESSION['ShowFieldHelp'] parameter OR it is TRUE, shows the page help text.
'</td>
</tr>',
'</tbody></table>';
Modified: trunk/PurchasesReport.php
===================================================================
--- trunk/PurchasesReport.php 2017-01-06 00:44:21 UTC (rev 7718)
+++ trunk/PurchasesReport.php 2017-01-06 04:30:38 UTC (rev 7719)
@@ -263,7 +263,7 @@
$_POST['PeriodFrom'] = date($_SESSION['DefaultDateFormat'], strtotime("-1 year", time()));// One year before current date.
}
echo '<td><input alt="', $_SESSION['DefaultDateFormat'], '" class="date" id="PeriodFrom" maxlength="10" minlength="0" name="PeriodFrom" required="required" size="12" type="text" value="', $_POST['PeriodFrom'], '" />',
- (!isset($field_help) || $field_help ? _('Select the beginning of the reporting period') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Select the beginning of the reporting period') : ''), // If it is not set the $_SESSION['ShowFieldHelp'] parameter OR it is TRUE, shows the page help text.
'</td>
</tr>',
// Select period to:
@@ -273,14 +273,14 @@
$_POST['PeriodTo'] = date($_SESSION['DefaultDateFormat']);
}
echo '<td><input alt="', $_SESSION['DefaultDateFormat'], '" class="date" id="PeriodTo" maxlength="10" minlength="0" name="PeriodTo" required="required" size="12" type="text" value="', $_POST['PeriodTo'], '" />',
- (!isset($field_help) || $field_help ? _('Select the end of the reporting period') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Select the end of the reporting period') : ''), // If it is not set the $_SESSION['ShowFieldHelp'] parameter OR it is TRUE, shows the page help text.
'</td>
</tr>',
// Show the budget for the period:
'<tr>',
'<td><label for="ShowDetails">', _('Show details'), '</label></td>
<td><input',($_POST['ShowDetails'] ? ' checked="checked"' : ''), ' id="ShowDetails" name="ShowDetails" type="checkbox">', // "Checked" if ShowDetails is set AND it is TRUE.
- (!isset($field_help) || $field_help ? _('Check this box to show purchase invoices') : ''), // If it is not set the $field_help parameter OR it is TRUE, shows the page help text.
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Check this box to show purchase invoices') : ''), // If it is not set the $_SESSION['ShowFieldHelp'] parameter OR it is TRUE, shows the page help text.
'</td>
</tr>',
'</tbody></table>';
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2017-01-06 00:44:21 UTC (rev 7718)
+++ trunk/WWW_Users.php 2017-01-06 04:30:38 UTC (rev 7719)
@@ -173,12 +173,16 @@
defaultlocation='" . $_POST['DefaultLocation'] ."',
modulesallowed='" . $ModulesAllowed . "',
showdashboard='" . $_POST['ShowDashboard'] . "',
+ showpagehelp='" . $_POST['ShowPageHelp'] . "',
+ showfieldhelp='" . $_POST['ShowFieldHelp'] . "',
blocked='" . $_POST['Blocked'] . "',
pdflanguage='" . $_POST['PDFLanguage'] . "',
department='" . $_POST['Department'] . "'
WHERE userid = '". $SelectedUser . "'";
+ prnMsg( _('The selected user record has been updated'), 'success' );
+ $_SESSION['ShowPageHelp'] = $_POST['ShowPageHelp'];
+ $_SESSION['ShowFieldHelp'] = $_POST['ShowFieldHelp'];
- prnMsg( _('The selected user record has been updated'), 'success' );
} elseif($InputError !=1) {
$sql = "INSERT INTO www_users (userid,
@@ -220,6 +224,8 @@
'" . $_POST['PDFLanguage'] . "',
'" . $_POST['Department'] . "')";
prnMsg( _('A new user record has been inserted'), 'success' );
+ $_SESSION['ShowPageHelp'] = $_POST['ShowPageHelp'];
+ $_SESSION['ShowFieldHelp'] = $_POST['ShowFieldHelp'];
$LocationSql = "INSERT INTO locationusers (loccode,
userid,
@@ -267,6 +273,8 @@
unset($_POST['DefaultLocation']);
unset($_POST['ModulesAllowed']);
unset($_POST['ShowDashboard']);
+ unset($_POST['ShowPageHelp']);
+ unset($_POST['ShowFieldHelp']);
unset($_POST['Blocked']);
unset($_POST['Theme']);
unset($_POST['UserLanguage']);
@@ -411,6 +419,8 @@
defaultlocation,
modulesallowed,
showdashboard,
+ showpagehelp,
+ showfieldhelp,
blocked,
theme,
language,
@@ -438,6 +448,8 @@
$_POST['Theme'] = $myrow['theme'];
$_POST['UserLanguage'] = $myrow['language'];
$_POST['ShowDashboard'] = $myrow['showdashboard'];
+ $_POST['ShowPageHelp'] = $myrow['showpagehelp'];
+ $_POST['ShowFieldHelp'] = $myrow['showfieldhelp'];
$_POST['Blocked'] = $myrow['blocked'];
$_POST['PDFLanguage'] = $myrow['pdflanguage'];
$_POST['Department'] = $myrow['department'];
@@ -719,6 +731,34 @@
echo '</select></td>
</tr>';
+// Turn off/on page help:
+echo '<tr>
+ <td><label for="ShowPageHelp">', _('Display page help'), ':</label></td>
+ <td><select id="ShowPageHelp" name="ShowPageHelp">';
+if($_POST['ShowPageHelp']==0) {
+ echo '<option selected="selected" value="0">' . _('No') . '</option>',
+ '<option value="1">', _('Yes'), '</option>';
+} else {
+ echo '<option value="0">', _('No'), '</option>',
+ '<option selected="selected" value="1">' . _('Yes') . '</option>';
+}
+echo '</select></td>
+ </tr>';
+
+// Turn off/on field help:
+echo '<tr>
+ <td><label for="ShowFieldHelp">', _('Display field help'), ':</label></td>
+ <td><select id="ShowFieldHelp" name="ShowFieldHelp">';
+if($_POST['ShowFieldHelp']==0) {
+ echo '<option selected="selected" value="0">' . _('No') . '</option>',
+ '<option value="1">', _('Yes'), '</option>';
+} else {
+ echo '<option value="0">', _('No'), '</option>',
+ '<option selected="selected" value="1">' . _('Yes') . '</option>';
+}
+echo '</select></td>
+ </tr>';
+
if(!isset($_POST['PDFLanguage'])) {
$_POST['PDFLanguage']=0;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-01-06 00:44:21 UTC (rev 7718)
+++ trunk/doc/Change.log 2017-01-06 04:30:38 UTC (rev 7719)
@@ -1,5 +1,6 @@
webERP Change Log
+06/01/17 RChacon: Add Turn off/on the page help and the field help.
05/01/17 RChacon: In GLCashFlowsIndirect.php, fix named key in Associative array with config value. Thanks Tim.
05/01/17 RChacon: For strict Standards, removes the "&" before the variable in DB_fetch_row() and in DB_fetch_array() in ConnectDB_XXX.inc. Thanks Tim.
21/12/16 RChacon: In PurchasesReport.php, fix date comparison and title. Thanks Tim.
Modified: trunk/includes/UserLogin.php
===================================================================
--- trunk/includes/UserLogin.php 2017-01-06 00:44:21 UTC (rev 7718)
+++ trunk/includes/UserLogin.php 2017-01-06 04:30:38 UTC (rev 7719)
@@ -111,6 +111,8 @@
$_SESSION['CanCreateTender'] = $myrow['cancreatetender'];
$_SESSION['AllowedDepartment'] = $myrow['department'];
$_SESSION['ShowDashboard'] = $myrow['showdashboard'];
+ $_SESSION['ShowPageHelp'] = $myrow['showpagehelp'];
+ $_SESSION['ShowFieldHelp'] = $myrow['showfieldhelp'];
if (isset($myrow['pdflanguage'])) {
$_SESSION['PDFLanguage'] = $myrow['pdflanguage'];
Modified: trunk/sql/mysql/upgrade4.13.1-4.14.sql
===================================================================
--- trunk/sql/mysql/upgrade4.13.1-4.14.sql 2017-01-06 00:44:21 UTC (rev 7718)
+++ trunk/sql/mysql/upgrade4.13.1-4.14.sql 2017-01-06 04:30:38 UTC (rev 7719)
@@ -1,5 +1,8 @@
--- Add new script:
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('PurchasesReport.php', '2', 'Shows a report of purchases from suppliers for the range of selected dates');
+-- Add the CashFlowsSection identificator:
+ALTER TABLE `chartmaster` ADD `cashflowsactivity` TINYINT(1) NOT NULL DEFAULT '-1' COMMENT 'Cash flows activity' AFTER `group_`;
+-- Add new user's options:
+ALTER TABLE `www_users` ADD `showpagehelp` TINYINT(1) NOT NULL DEFAULT '1' COMMENT 'Turn off/on page help' AFTER `showdashboard`, ADD `showfieldhelp` TINYINT(1) NOT NULL DEFAULT '1' COMMENT 'Turn off/on field help' AFTER `showpagehelp`;
+
-- Update version number:
UPDATE config SET confvalue='4.14' WHERE confname='VersionNumber';
|
Thanks for helping keep SourceForge clean.
X