From: <dai...@us...> - 2015-02-08 02:15:35
|
Revision: 7137 http://sourceforge.net/p/web-erp/reponame/7137 Author: daintree Date: 2015-02-08 02:15:28 +0000 (Sun, 08 Feb 2015) Log Message: ----------- New option to export 24 months sales net of credits to CSV Modified Paths: -------------- trunk/InventoryPlanning.php trunk/doc/Change.log trunk/includes/DateFunctions.inc Modified: trunk/InventoryPlanning.php =================================================================== --- trunk/InventoryPlanning.php 2015-02-07 21:50:57 UTC (rev 7136) +++ trunk/InventoryPlanning.php 2015-02-08 02:15:28 UTC (rev 7137) @@ -345,6 +345,111 @@ $pdf-> __destruct(); } +} elseif (isset($_POST['ExportToCSV'])){ //send the data to a CSV + + function stripcomma($str) { //because we're using comma as a delimiter + return str_replace(',', '', str_replace(';','', $str)); + } + /*Now figure out the inventory data to report for the category range under review + need QOH, QOO, QDem, Sales Mth -1, Sales Mth -2, Sales Mth -3, Sales Mth -4*/ + if ($_POST['Location']=='All'){ + $SQL = "SELECT stockmaster.categoryid, + stockmaster.description, + stockcategory.categorydescription, + locstock.stockid, + SUM(locstock.quantity) AS qoh + FROM locstock + INNER JOIN locationusers ON locationusers.loccode=locstock.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1, + stockmaster, + stockcategory + WHERE locstock.stockid=stockmaster.stockid + AND stockmaster.discontinued = 0 + AND stockmaster.categoryid=stockcategory.categoryid + AND (stockmaster.mbflag='B' OR stockmaster.mbflag='M') + AND stockmaster.categoryid IN ('". implode("','",$_POST['Categories'])."') + GROUP BY stockmaster.categoryid, + stockmaster.description, + stockcategory.categorydescription, + locstock.stockid, + stockmaster.stockid + ORDER BY stockmaster.categoryid, + stockmaster.stockid"; + } else { + $SQL = "SELECT stockmaster.categoryid, + locstock.stockid, + stockmaster.description, + stockcategory.categorydescription, + locstock.quantity AS qoh + FROM locstock + INNER JOIN locationusers ON locationusers.loccode=locstock.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1, + stockmaster, + stockcategory + WHERE locstock.stockid=stockmaster.stockid + AND stockmaster.discontinued = 0 + AND stockmaster.categoryid IN ('". implode("','",$_POST['Categories'])."') + AND stockmaster.categoryid=stockcategory.categoryid + AND (stockmaster.mbflag='B' OR stockmaster.mbflag='M') + AND locstock.loccode = '" . $_POST['Location'] . "' + ORDER BY stockmaster.categoryid, + stockmaster.stockid"; + } + $InventoryResult = DB_query($SQL); + $CurrentPeriod = GetPeriod(Date($_SESSION['DefaultDateFormat']), $db); + $Periods = array(); + for ($i=0;$i<24;$i++) { + $Periods[$i]['Period'] = $CurrentPeriod - $i; + $Periods[$i]['Month'] = GetMonthText(Date('m',mktime(0,0,0,Date('m') - $i,Date('d'),Date('Y')))) . ' ' . Date('Y',mktime(0,0,0,Date('m') - $i,Date('d'),Date('Y'))); + } + $SQLStarter = "SELECT stockmoves.stockid,"; + for ($i=0;$i<24;$i++) { + $SQLStarter .= "SUM(CASE WHEN prd='" . $Periods[$i]['Period'] . "' THEN -qty ELSE 0 END) AS prd" . $i . ' '; + if ($i<23) { + $SQLStarter .= ', '; + } + } + $SQLStarter .= "FROM stockmoves + INNER JOIN locationusers ON locationusers.loccode=stockmoves.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 + WHERE (type=10 OR type=11) + AND stockmoves.hidemovt=0"; + if ($_POST['Location']!='All'){ + $SQLStarter .= " AND stockmoves.loccode ='" . $_POST['Location'] . "'"; + } + + + $CSVListing = _('Category ID') .','. _('Category Description') .','. _('Stock ID') .','. _('Description') .',' . _('QOH') . ','; + for ($i=0;$i<24;$i++) { + $CSVListing .= $Periods[$i]['Month'] . ','; + } + $CSVListing .= "\r\n"; + + $Category =''; + + while ($InventoryPlan = DB_fetch_array($InventoryResult)){ + + $SQL = $SQLStarter . " AND stockid='" . $InventoryPlan['stockid'] . "' GROUP BY stockmoves.stockid"; + $SalesResult = DB_query($SQL,_('The stock usage of this item could not be retrieved because')); + + if (DB_num_rows($SalesResult)==0) { + $CSVListing .= stripcomma($InventoryPlan['categoryid']) . ',' . stripcomma($InventoryPlan['categorydescription']) . ',' .stripcomma($InventoryPlan['stockid']) . ',' . stripcomma($InventoryPlan['description']) . ',' . stripcomma($InventoryPlan['qoh']) . "\r\n"; + } else { + $SalesRow = DB_fetch_array($SalesResult); + $CSVListing .= stripcomma($InventoryPlan['categoryid']) . ',' . stripcomma($InventoryPlan['categorydescription']) . ',' .stripcomma($InventoryPlan['stockid']) . ',' . stripcomma($InventoryPlan['description']) . ',' . stripcomma($InventoryPlan['qoh']); + for ($i=0;$i<24;$i++) { + $CSVListing .= ',' . $SalesRow['prd' .$i]; + } + $CSVListing .= "\r\n"; + } + + } + header('Content-Encoding: UTF-8'); + header('Content-type: text/csv; charset=UTF-8'); + header("Content-disposition: attachment; filename=InventoryPlanning_" . Date('Y-m-d:h:m:s') .'.csv'); + header("Pragma: public"); + header("Expires: 0"); + echo "\xEF\xBB\xBF"; // UTF-8 + echo $CSVListing; + exit; + } else { /*The option to print PDF was not hit */ $Title=_('Inventory Planning Reporting'); @@ -361,8 +466,8 @@ <tr> <td>' . _('Select Inventory Categories') . ':</td> <td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]"multiple="multiple">'; - $SQL = 'SELECT categoryid, categorydescription - FROM stockcategory + $SQL = 'SELECT categoryid, categorydescription + FROM stockcategory ORDER BY categorydescription'; $CatResult = DB_query($SQL); while ($MyRow = DB_fetch_array($CatResult)) { @@ -375,7 +480,7 @@ echo '</select> </td> </tr>'; - + echo '<tr> <td>' . _('For Inventory in Location') . ':</td> <td><select name="Location">'; @@ -414,6 +519,7 @@ <br /> <div class="centre"> <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /> + <input type="submit" name="ExportToCSV" value="' . _('Export 24 months to CSV') . '" /> </div> </div> </form>'; Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-07 21:50:57 UTC (rev 7136) +++ trunk/doc/Change.log 2015-02-08 02:15:28 UTC (rev 7137) @@ -1,5 +1,6 @@ webERP Change Log +8/2/15 InventoryPlanning.php now has an option to export the last 24 months usage to CSV 7/2/15 New script CustomerAccount.php - on screen statement similar to CustomerInquiry.php 6/2/15 Version 4.12.2 Modified: trunk/includes/DateFunctions.inc =================================================================== --- trunk/includes/DateFunctions.inc 2015-02-07 21:50:57 UTC (rev 7136) +++ trunk/includes/DateFunctions.inc 2015-02-08 02:15:28 UTC (rev 7137) @@ -139,6 +139,9 @@ case 12: $Month = _('December'); break; + default: + $Month = _('error'); + break; } return $Month; } |
From: <rc...@us...> - 2015-02-08 04:08:16
|
Revision: 7139 http://sourceforge.net/p/web-erp/reponame/7139 Author: rchacon Date: 2015-02-08 04:08:13 +0000 (Sun, 08 Feb 2015) Log Message: ----------- Changes from email.gif to email.png. Delete email.gif. Modified Paths: -------------- trunk/CustomerAccount.php trunk/SMTPServer.php trunk/doc/Change.log Removed Paths: ------------- trunk/css/aguapop/images/email.gif trunk/css/default/images/email.gif trunk/css/fluid/images/email.gif trunk/css/fresh/images/email.gif trunk/css/gel/images/email.gif trunk/css/professional/images/email.gif trunk/css/professional-rtl/images/email.gif trunk/css/silverwolf/images/email.gif trunk/css/wood/images/email.gif trunk/css/xenos/images/email.gif Modified: trunk/CustomerAccount.php =================================================================== --- trunk/CustomerAccount.php 2015-02-08 02:17:15 UTC (rev 7138) +++ trunk/CustomerAccount.php 2015-02-08 04:08:13 UTC (rev 7139) @@ -1,11 +1,11 @@ <?php /* $Id: CustomerAccount.php 7004 2014-11-24 15:56:19Z rchacon $*/ +/* This script is <create a description for script table>. */ include('includes/session.inc'); -$Title = _('Customer Account'); -/* Manual links before header.inc */ -$ViewTopic = 'ARInquiries'; // Filename in ManualContents.php's TOC. -$BookMark = 'CustomerAccount'; // Anchor's id in the manual's html document. +$Title = _('Customer Account');// Screen identification. +$ViewTopic = 'ARInquiries';// Filename in ManualContents.php's TOC. +$BookMark = 'CustomerAccount';// Anchor's id in the manual's html document. include('includes/header.inc'); // always figure out the SQL required from the inputs available @@ -313,7 +313,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the invoice'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" /> </a> </td> <td></td> @@ -343,7 +343,7 @@ </td> <td> <a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), ' - <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the credit note'), '" alt="" /> + <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" /> </a> </td> <td> Modified: trunk/SMTPServer.php =================================================================== --- trunk/SMTPServer.php 2015-02-08 02:17:15 UTC (rev 7138) +++ trunk/SMTPServer.php 2015-02-08 04:08:13 UTC (rev 7139) @@ -1,12 +1,16 @@ <?php /* $Id: SMTPServer.php 4469 2011-01-15 02:28:37Z daintree $*/ +/* This script is <create a description for script table>. */ + include('includes/session.inc'); - -$Title = _('SMTP Server details'); - +$Title = _('SMTP Server details');// Screen identification. +$ViewTopic = 'CreatingNewSystem';// Filename's id in ManualContents.php's TOC. +$BookMark = 'SMTPServer';// Anchor's id in the manual's html document. include('includes/header.inc'); - -echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/email.gif" title="' . _('SMTP Server') . '" alt="" />' . ' ' . _('SMTP Server Settings') . '</p>'; +echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme. + '/images/email.png" title="' .// Icon image. + _('SMTP Server') . '" /> ' .// Icon title. + _('SMTP Server Settings') . '</p>';// Page title. // First check if there are smtp server data or not @@ -18,7 +22,7 @@ username='".$_POST['UserName']."', password='".$_POST['Password']."', auth='".$_POST['Auth']."'"; - + $ErrMsg = _('The email setting information failed to update'); $DbgMsg = _('The SQL failed to update is '); $result1=DB_query($sql, $ErrMsg, $DbgMsg); Deleted: trunk/css/aguapop/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/default/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/fluid/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/fresh/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/gel/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/professional/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/professional-rtl/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/silverwolf/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/wood/images/email.gif =================================================================== (Binary files differ) Deleted: trunk/css/xenos/images/email.gif =================================================================== (Binary files differ) Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-08 02:17:15 UTC (rev 7138) +++ trunk/doc/Change.log 2015-02-08 04:08:13 UTC (rev 7139) @@ -1,6 +1,8 @@ webERP Change Log +8/2/15 RChacon: Changes from email.gif to email.png. Delete email.gif. 8/2/15 InventoryPlanning.php now has an option to export the last 24 months usage to CSV +8/2/15 RChacon: Add credit.png, email.png, folders.png and currency.png. Delete bank.gif. 7/2/15 New script CustomerAccount.php - on screen statement similar to CustomerInquiry.php 6/2/15 Version 4.12.2 |
From: <rc...@us...> - 2015-02-09 00:07:48
|
Revision: 7143 http://sourceforge.net/p/web-erp/reponame/7143 Author: rchacon Date: 2015-02-09 00:07:40 +0000 (Mon, 09 Feb 2015) Log Message: ----------- Standardise to currency.png. Delete currency.gif. Modified Paths: -------------- trunk/Currencies.php trunk/ExchangeRateTrend.php trunk/css/professional-rtl/images/credit.png trunk/doc/Change.log Removed Paths: ------------- trunk/css/default/images/currency.gif trunk/css/fluid/images/currency.gif trunk/css/fresh/images/currency.gif trunk/css/professional/images/currency.gif trunk/css/xenos/images/currency.gif Modified: trunk/Currencies.php =================================================================== --- trunk/Currencies.php 2015-02-08 23:29:03 UTC (rev 7142) +++ trunk/Currencies.php 2015-02-09 00:07:40 UTC (rev 7143) @@ -1,12 +1,13 @@ <?php - /* $Id$*/ +/* This script defines the currencies available. Each customer and supplier must be defined as transacting in one of the currencies defined here. */ include('includes/session.inc'); -$Title = _('Currencies Maintenance'); -$ViewTopic= 'Currencies'; -$BookMark = 'Currencies'; +$Title = _('Currencies Maintenance');// Screen identification. +$ViewTopic= 'Currencies';// Filename's id in ManualContents.php's TOC. +$BookMark = 'Currencies';// Anchor's id in the manual's html document. include('includes/header.inc'); + include('includes/CurrenciesArray.php'); // To get the currency name from the currency code. include('includes/SQL_CommonFunctions.inc'); @@ -27,8 +28,10 @@ $Errors = array(); -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p> - <br />'; +echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme. + '/images/currency.png" title="' .// Icon image. + _('Currencies') . '" /> ' .// Icon title. + _('Currencies Maintenance') . '</p>';// Page title. if (isset($_POST['submit'])) { Modified: trunk/ExchangeRateTrend.php =================================================================== --- trunk/ExchangeRateTrend.php 2015-02-08 23:29:03 UTC (rev 7142) +++ trunk/ExchangeRateTrend.php 2015-02-09 00:07:40 UTC (rev 7143) @@ -1,9 +1,11 @@ <?php - /* $Id$*/ +/* This script shows the trend in exchange rates as retrieved from ECB. */ include('includes/session.inc'); -$Title = _('View Currency Trends'); +$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. include('includes/header.inc'); $FunctionalCurrency = $_SESSION['CompanyRecord']['currencydefault']; @@ -21,9 +23,12 @@ 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"><p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . - _('View Currency Trend') . '" alt="" />' . ' ' . _('View Currency Trend') . '</p></div>'; - echo '<table>'; // First column + 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 $SQL = "SELECT currabrev FROM currencies"; $result=DB_query($SQL); @@ -73,4 +78,4 @@ </table>'; include('includes/footer.inc'); -?> \ No newline at end of file +?> Deleted: trunk/css/default/images/currency.gif =================================================================== (Binary files differ) Deleted: trunk/css/fluid/images/currency.gif =================================================================== (Binary files differ) Deleted: trunk/css/fresh/images/currency.gif =================================================================== --- trunk/css/fresh/images/currency.gif 2015-02-08 23:29:03 UTC (rev 7142) +++ trunk/css/fresh/images/currency.gif 2015-02-09 00:07:40 UTC (rev 7143) @@ -1,6 +0,0 @@ -GIF89a -\x86\xA2\xA4\x860Hcs@Vlv\xA2\x95\xB1\x86h$\x8FLU>\x94\xB2 -DLDDY\x9F\x84 --\xD1\xC6Y\xD6_)\xEC\xDE\xCD?"W,\xF6\xFC\xDE\xB1\xED\xDA\xF1\xCBA\xB0 Apޘ<x\x80TA\ No newline at end of file Deleted: trunk/css/professional/images/currency.gif =================================================================== (Binary files differ) Modified: trunk/css/professional-rtl/images/credit.png =================================================================== (Binary files differ) Deleted: trunk/css/xenos/images/currency.gif =================================================================== (Binary files differ) Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-08 23:29:03 UTC (rev 7142) +++ trunk/doc/Change.log 2015-02-09 00:07:40 UTC (rev 7143) @@ -1,5 +1,6 @@ webERP Change Log +9/2/15 RChacon: Standardise to currency.png. Delete currency.gif. 8/2/15 RChacon: Changes from email.gif to email.png. Delete email.gif. 8/2/15 InventoryPlanning.php now has an option to export the last 24 months usage to CSV 8/2/15 RChacon: Add credit.png, email.png, folders.png and currency.png. Delete bank.gif. |
From: <rc...@us...> - 2015-02-09 23:07:24
|
Revision: 7144 http://sourceforge.net/p/web-erp/reponame/7144 Author: rchacon Date: 2015-02-09 23:07:16 +0000 (Mon, 09 Feb 2015) Log Message: ----------- Upload preview.png to professional-rtl and Spanish update. Modified Paths: -------------- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po Added Paths: ----------- trunk/css/professional-rtl/images/preview.png Added: trunk/css/professional-rtl/images/preview.png =================================================================== (Binary files differ) Index: trunk/css/professional-rtl/images/preview.png =================================================================== --- trunk/css/professional-rtl/images/preview.png 2015-02-09 00:07:40 UTC (rev 7143) +++ trunk/css/professional-rtl/images/preview.png 2015-02-09 23:07:16 UTC (rev 7144) Property changes on: trunk/css/professional-rtl/images/preview.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-09 00:07:40 UTC (rev 7143) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-09 23:07:16 UTC (rev 7144) @@ -8,7 +8,7 @@ "Project-Id-Version: webERP 4.12.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-06 19:17+1300\n" -"PO-Revision-Date: 2015-02-06 12:45-0600\n" +"PO-Revision-Date: 2015-02-09 17:02-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: TecnoSoluciones.com <web...@te...>\n" "Language: es_ES\n" @@ -7554,7 +7554,7 @@ #: Credit_Invoice.php:1614 msgid "Credit note text" -msgstr "Texto de la nota de crédito" +msgstr "Texto de nota de crédito" #: Credit_Invoice.php:1626 msgid "Process Credit" @@ -15699,7 +15699,7 @@ #: index.php:23 msgid "Create a new offer" -msgstr "Crear una Nueva Oferta" +msgstr "Crear una nueva oferta" #: index.php:28 msgid "View any open tenders without an offer" @@ -17471,7 +17471,7 @@ #: MRPCalendar.php:302 msgid "Create Calendar" -msgstr "Crear Calendario" +msgstr "Crear calendario" #: MRPCalendar.php:303 msgid "List Date Range" @@ -27327,7 +27327,7 @@ #: SelectCreditItems.php:944 msgid "Credit Note Text" -msgstr "" +msgstr "Texto de nota de crédito" #: SelectCreditItems.php:957 msgid "Are you sure you wish to cancel the whole of this credit note?" @@ -31263,7 +31263,7 @@ #: StockDispatch.php:423 msgid "Create Batch" -msgstr "Crear Lote" +msgstr "Crear lote" #: StockDispatch.php:424 msgid "Report Only" @@ -41069,7 +41069,7 @@ #: Z_ExportSalesAnalysis.php:17 msgid "Create and send sales analysis files" -msgstr "" +msgstr "Crear y enviar archivos de análisis de ventas" #: Z_ExportSalesAnalysis.php:20 msgid "Export Sales Analysis Files" @@ -45004,7 +45004,7 @@ #: includes/MainMenuLinksArray.php:95 msgid "Create A Credit Note" -msgstr "Crear una nota de Crédito (Abono)" +msgstr "Crear una nota de crédito (Abono)" #: includes/MainMenuLinksArray.php:97 msgid "Allocate Receipts or Credit Notes" |
From: <dai...@us...> - 2015-02-10 04:55:47
|
Revision: 7145 http://sourceforge.net/p/web-erp/reponame/7145 Author: daintree Date: 2015-02-10 04:55:43 +0000 (Tue, 10 Feb 2015) Log Message: ----------- Reinstate Andews custitems search option in searching for items in order entry Modified Paths: -------------- trunk/SelectOrderItems.php trunk/doc/Change.log trunk/includes/MainMenuLinksArray.php trunk/sql/mysql/upgrade4.12-4.13.sql Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2015-02-09 23:07:16 UTC (rev 7144) +++ trunk/SelectOrderItems.php 2015-02-10 04:55:43 UTC (rev 7145) @@ -707,10 +707,10 @@ } if(!empty($_POST['CustItemFlag'])){ $IncludeCustItem = " INNER JOIN custitem ON custitem.stockid=stockmaster.stockid - AND custitem.debtorno='" . $_SESSION['Items'.$identifier]->DebtorNo . "'"; - }else{ + AND custitem.debtorno='" . $_SESSION['Items'.$identifier]->DebtorNo . "' "; + } else { $IncludeCustItem = " LEFT OUTER JOIN custitem ON custitem.stockid=stockmaster.stockid - AND custitem.debtorno='" . $_SESSION['Items'.$identifier]->DebtorNo . "'"; + AND custitem.debtorno='" . $_SESSION['Items'.$identifier]->DebtorNo . "' "; } if ($_POST['Keywords']!='' AND $_POST['StockCode']=='') { @@ -721,14 +721,18 @@ $msg='<div class="page_help_text">' . _('Stock Category has been used in search') . '.</div>'; } $SQL = "SELECT stockmaster.stockid, - stockmaster.description, - stockmaster.longdescription, - stockmaster.units - FROM stockmaster INNER JOIN stockcategory - ON stockmaster.categoryid=stockcategory.categoryid - WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L') - AND stockmaster.mbflag <>'G' - AND stockmaster.discontinued=0 "; + stockmaster.description, + stockmaster.longdescription, + stockmaster.units, + custitem.cust_part, + custitem.cust_description + FROM stockmaster INNER JOIN stockcategory + ON stockmaster.categoryid=stockcategory.categoryid + " . $IncludeCustItem . " + WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L') + AND stockmaster.mbflag <>'G' + AND stockmaster.discontinued=0 "; + if (isset($_POST['Keywords']) AND mb_strlen($_POST['Keywords'])>0) { //insert wildcard characters in spaces $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']); Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-09 23:07:16 UTC (rev 7144) +++ trunk/doc/Change.log 2015-02-10 04:55:43 UTC (rev 7145) @@ -1,10 +1,11 @@ webERP Change Log +10/2/15 Phil: Reinstate Andrew Galuski's lost functionality that shows only the items that are defined for a customer (in the custitems table) when searching for items for a sales order/quote. 9/2/15 RChacon: Standardise to currency.png. Delete currency.gif. 8/2/15 RChacon: Changes from email.gif to email.png. Delete email.gif. -8/2/15 InventoryPlanning.php now has an option to export the last 24 months usage to CSV +8/2/15 Phil: InventoryPlanning.php now has an option to export the last 24 months usage to CSV 8/2/15 RChacon: Add credit.png, email.png, folders.png and currency.png. Delete bank.gif. -7/2/15 New script CustomerAccount.php - on screen statement similar to CustomerInquiry.php +7/2/15 Phil: New script CustomerAccount.php - on screen statement similar to CustomerInquiry.php 6/2/15 Version 4.12.2 Modified: trunk/includes/MainMenuLinksArray.php =================================================================== --- trunk/includes/MainMenuLinksArray.php 2015-02-09 23:07:16 UTC (rev 7144) +++ trunk/includes/MainMenuLinksArray.php 2015-02-10 04:55:43 UTC (rev 7145) @@ -56,6 +56,7 @@ _('Daily Sales Inquiry'), _('Sales By Sales Type Inquiry'), _('Sales By Category Inquiry'), + _('Sales By Category By Item Inquiry'), _('Top Sellers Inquiry'), _('Order Delivery Differences Report'), _('Delivery In Full On Time (DIFOT) Report'), @@ -73,6 +74,7 @@ '/DailySalesInquiry.php', '/SalesByTypePeriodInquiry.php', '/SalesCategoryPeriodInquiry.php', + '/StockCategorySalesInquiry.php', '/SalesTopItemsInquiry.php', '/PDFDeliveryDifferences.php', '/PDFDIFOT.php', Modified: trunk/sql/mysql/upgrade4.12-4.13.sql =================================================================== --- trunk/sql/mysql/upgrade4.12-4.13.sql 2015-02-09 23:07:16 UTC (rev 7144) +++ trunk/sql/mysql/upgrade4.12-4.13.sql 2015-02-10 04:55:43 UTC (rev 7145) @@ -1,3 +1,3 @@ INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('CustomerAccount.php', '1', 'Shows customer account/statement on screen rather than PDF'); - +INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('StockCategorySalesInquiry.php', '2', 'Sales inquiry by stock category showing top items'); -----UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber'; \ No newline at end of file |
From: <dai...@us...> - 2015-02-10 05:02:24
|
Revision: 7146 http://sourceforge.net/p/web-erp/reponame/7146 Author: daintree Date: 2015-02-10 05:02:22 +0000 (Tue, 10 Feb 2015) Log Message: ----------- New Stock Category Sales Inquiry Modified Paths: -------------- trunk/doc/Change.log Added Paths: ----------- trunk/StockCategorySalesInquiry.php Added: trunk/StockCategorySalesInquiry.php =================================================================== --- trunk/StockCategorySalesInquiry.php (rev 0) +++ trunk/StockCategorySalesInquiry.php 2015-02-10 05:02:22 UTC (rev 7146) @@ -0,0 +1,237 @@ +<?php + +/* $Id: StockCategorySalesInquiry.php 4261 2010-12-22 15:56:50Z $*/ + +include('includes/session.inc'); +$Title = _('Sales By Category By Item Inquiry'); +include('includes/header.inc'); + +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales By Category By Item Inquiry') . '</p>'; +echo '<div class="page_help_text">' . _('Select the parameters for the inquiry') . '</div><br />'; + +if (!isset($_POST['DateRange'])){ + /* then assume report is for This Month - maybe wrong to do this but hey better than reporting an error?*/ + $_POST['DateRange']='ThisMonth'; +} + +echo '<form id="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; +echo '<div>'; +echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; +// stock category selection + $SQL="SELECT categoryid, + categorydescription + FROM stockcategory + ORDER BY categorydescription"; + $result1 = DB_query($SQL); + +echo '<table cellpadding="2" class="selection"> + <tr> + <td style="width:150px">' . _('In Stock Category') . ':</td> + <td><select name="StockCat">'; +if (!isset($_POST['StockCat'])){ + $_POST['StockCat']='All'; +} +if ($_POST['StockCat']=='All'){ + echo '<option selected="selected" value="All">' . _('All') . '</option>'; +} else { + echo '<option value="All">' . _('All') . '</option>'; +} +while ($myrow1 = DB_fetch_array($result1)) { + if ($myrow1['categoryid']==$_POST['StockCat']){ + echo '<option selected="selected" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>'; + } else { + echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>'; + } +} +echo '</select></td> + </tr> + <tr> + <th colspan="2" class="centre">' . _('Date Selection') . '</th> + </tr>'; + +if (!isset($_POST['FromDate'])){ + unset($_POST['ShowSales']); + $_POST['FromDate'] = Date($_SESSION['DefaultDateFormat'],mktime(1,1,1,Date('m')-12,Date('d')+1,Date('Y'))); + $_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']); +} +echo '<tr> + <td>' . _('Date From') . ':</td> + <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . $_POST['FromDate'] . '" /></td> + </tr>'; +echo '<tr> + <td>' . _('Date To') . ':</td> + <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td> + </tr> +</table> +<br /> +<div class="centre"> + <input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" /> +</div> +</div> +</form> +<br />'; + + +if (isset($_POST['ShowSales'])){ + $InputError=0; //assume no input errors now test for errors + if (!Is_Date($_POST['FromDate'])){ + $InputError = 1; + prnMsg(_('The date entered for the from date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error'); + } + if (!Is_Date($_POST['ToDate'])){ + $InputError = 1; + prnMsg(_('The date entered for the to date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error'); + } + if (Date1GreaterThanDate2($_POST['FromDate'],$_POST['ToDate'])){ + $InputError = 1; + prnMsg(_('The from date is expected to be a date prior to the to date. Please review the selected date range'),'error'); + } + $FromDate = FormatDateForSQL($_POST['FromDate']); + $ToDate = FormatDateForSQL($_POST['ToDate']); + + $sql = "SELECT stockmaster.categoryid, + stockcategory.categorydescription, + stockmaster.stockid, + stockmaster.description, + SUM(price*(1-discountpercent)* -qty) as salesvalue, + SUM(-qty) as quantitysold, + SUM(standardcost * -qty) as cogs + FROM stockmoves INNER JOIN stockmaster + ON stockmoves.stockid=stockmaster.stockid + INNER JOIN stockcategory + ON stockmaster.categoryid=stockcategory.categoryid + WHERE (stockmoves.type=10 OR stockmoves.type=11) + AND show_on_inv_crds =1 + AND trandate>='" . $FromDate . "' + AND trandate<='" . $ToDate . "' + GROUP BY stockmaster.categoryid, + stockcategory.categorydescription, + stockmaster.stockid, + stockmaster.description + ORDER BY stockmaster.categoryid, + salesvalue DESC"; + + $ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg(); + $SalesResult = DB_query($sql,$ErrMsg); + + echo '<table cellpadding="2" class="selection">'; + + echo'<tr> + <th>' . _('Item Code') . '</th> + <th>' . _('Item Description') . '</th> + <th>' . _('Qty Sold') . '</td> + <th>' . _('Sales Revenue') . '</th> + <th>' . _('COGS') . '</th> + <th>' . _('Gross Margin') . '</th> + <th>' . _('Avg Unit') . '<br/>' . _('Sale Price') . '</th> + <th>' . _('Avg Unit') . '<br/>' . _('Cost') . '</th> + <th>' . _('Margin %') . '</th> + </tr>'; + + $CumulativeTotalSales = 0; + $CumulativeTotalQty = 0; + $CumulativeTotalCOGS = 0; + $CategorySales = 0; + $CategoryQty = 0; + $CategoryCOGS = 0; + + $k=0; + $CategoryID =''; + while ($SalesRow=DB_fetch_array($SalesResult)) { + if ($CategoryID != $SalesRow['categoryid']) { + if ($CategoryID !='') { + //print out the previous category totals + echo '<tr> + <td colspan="2" class="number">' . _('Category Total') . '</td> + <td class="number">' . locale_number_format($CategoryQty,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($CategorySales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($CategoryCOGS,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($CategorySales - $CategoryCOGS,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td colspan="2"></td>'; + if ($CumulativeTotalSales !=0) { + echo '<td class="number">' . locale_number_format(($CategorySales-$CategoryCOGS)*100/$CategorySales,$_SESSION['CompanyRecord']['decimalplaces']) . '%</td>'; + } else { + echo '<td>' . _('N/A') . '</td>'; + } + echo '</tr>'; + + //reset the totals + $CategorySales = 0; + $CategoryQty = 0; + $CategoryCOGS = 0; + + } + echo '<tr> + <th colspan="9">' . _('Stock Category') . ': ' . $SalesRow['categoryid'] . ' - ' . $SalesRow['categorydescription'] . '</th> + </tr>'; + $CategoryID = $SalesRow['categoryid']; + } + + if ($k==1){ + echo '<tr class="EvenTableRows">'; + $k=0; + } else { + echo '<tr class="OddTableRows">'; + $k=1; + } + + echo '<td>' . $SalesRow['stockid'] . '</td> + <td>' . $SalesRow['description'] . '</td> + <td class="number">' . locale_number_format($SalesRow['quantitysold'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($SalesRow['salesvalue'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($SalesRow['cogs'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($SalesRow['salesvalue']-$SalesRow['cogs'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>'; + if ($SalesRow['quantitysold']!=0) { + echo '<td class="number">' . locale_number_format(($SalesRow['salesvalue']/$SalesRow['quantitysold']),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>'; + echo '<td class="number">' . locale_number_format(($SalesRow['cogs']/$SalesRow['quantitysold']),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>'; + } else { + echo '<td>' . _('N/A') . '</td> + <td>' . _('N/A') . '</td>'; + } + if ($SalesRow['salesvalue']!=0) { + echo '<td class="number">' . locale_number_format((($SalesRow['salesvalue']-$SalesRow['cogs'])*100/$SalesRow['salesvalue']),$_SESSION['CompanyRecord']['decimalplaces']) . '%</td>'; + } else { + echo '<td>' . _('N/A') . '</td>'; + } + echo '</tr>'; + + $CumulativeTotalSales += $SalesRow['salesvalue']; + $CumulativeTotalCOGS += $SalesRow['cogs']; + $CumulativeTotalQty += $SalesRow['quantitysold']; + $CategorySales += $SalesRow['salesvalue']; + $CategoryQty += $SalesRow['quantitysold']; + $CategoryCOGS += $SalesRow['cogs']; + + } //loop around category sales for the period +//print out the previous category totals + echo '<tr> + <td colspan="2" class="number">' . _('Category Total') . '</td> + <td class="number">' . locale_number_format($CategoryQty,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($CategorySales,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($CategoryCOGS,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td class="number">' . locale_number_format($CategorySales - $CategoryCOGS,$_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <td colspan="2"></td>'; + if ($CumulativeTotalSales !=0) { + echo '<td class="number">' . locale_number_format(($CategorySales-$CategoryCOGS)*100/$CategorySales,$_SESSION['CompanyRecord']['decimalplaces']) . '%</td>'; + } else { + echo '<td>' . _('N/A') . '</td>'; + } + echo '</tr> + <tr> + <th colspan="2" class="number">' . _('GRAND Total') . '</th> + <th class="number">' . locale_number_format($CumulativeTotalQty,$_SESSION['CompanyRecord']['decimalplaces']) . '</th> + <th class="number">' . locale_number_format($CumulativeTotalSales,$_SESSION['CompanyRecord']['decimalplaces']) . '</th> + <th class="number">' . locale_number_format($CumulativeTotalCOGS,$_SESSION['CompanyRecord']['decimalplaces']) . '</th> + <th class="number">' . locale_number_format($CumulativeTotalSales - $CumulativeTotalCOGS,$_SESSION['CompanyRecord']['decimalplaces']) . '</th> + <th colspan="2"></td>'; + if ($CumulativeTotalSales !=0) { + echo '<th class="number">' . locale_number_format(($CumulativeTotalSales-$CumulativeTotalCOGS)*100/$CumulativeTotalSales,$_SESSION['CompanyRecord']['decimalplaces']) . '%</th>'; + } else { + echo '<th>' . _('N/A') . '</th>'; + } + echo '</tr> + </table>'; + +} //end of if user hit show sales +include('includes/footer.inc'); +?> \ No newline at end of file Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-10 04:55:43 UTC (rev 7145) +++ trunk/doc/Change.log 2015-02-10 05:02:22 UTC (rev 7146) @@ -1,5 +1,6 @@ webERP Change Log +10/2/15 Phil: New script StockCategorySalesInquiry.php - shows category sales by item for a selected custom date range 10/2/15 Phil: Reinstate Andrew Galuski's lost functionality that shows only the items that are defined for a customer (in the custitems table) when searching for items for a sales order/quote. 9/2/15 RChacon: Standardise to currency.png. Delete currency.gif. 8/2/15 RChacon: Changes from email.gif to email.png. Delete email.gif. |
From: <dai...@us...> - 2015-02-11 07:12:47
|
Revision: 7147 http://sourceforge.net/p/web-erp/reponame/7147 Author: daintree Date: 2015-02-11 07:12:39 +0000 (Wed, 11 Feb 2015) Log Message: ----------- Vitaly: BOMIndented.php fix bug that duplicated components - error with SQL to restrict to only those users with permission to view a locations Modified Paths: -------------- trunk/BOMIndented.php trunk/doc/Change.log Modified: trunk/BOMIndented.php =================================================================== --- trunk/BOMIndented.php 2015-02-10 05:02:22 UTC (rev 7146) +++ trunk/BOMIndented.php 2015-02-11 07:12:39 UTC (rev 7147) @@ -108,11 +108,12 @@ bom.effectiveafter, bom.effectiveto, bom.quantity - FROM bom, passbom - INNER JOIN locationusers ON locationusers.loccode=loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE bom.parent = passbom.part - AND bom.effectiveafter <= '" . date('Y-m-d') . "' - AND bom.effectiveto > '" . date('Y-m-d') . "'"; + FROM bom + INNER JOIN passbom ON bom.parent = passbom.part + INNER JOIN locationusers ON locationusers.loccode=bom.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 + WHERE bom.effectiveafter <= '" . date('Y-m-d') . "' + AND bom.effectiveafter <= '" . date('Y-m-d') . "' + AND bom.effectiveto > '" . date('Y-m-d') . "'"; $result = DB_query($sql); $sql = "DROP TABLE IF EXISTS passbom2"; Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-10 05:02:22 UTC (rev 7146) +++ trunk/doc/Change.log 2015-02-11 07:12:39 UTC (rev 7147) @@ -1,5 +1,6 @@ webERP Change Log +11/2/15 Vitaly: BOMIndented.php fix bug that duplicated components - error with SQL to restrict to only those users with permission to view a locations 10/2/15 Phil: New script StockCategorySalesInquiry.php - shows category sales by item for a selected custom date range 10/2/15 Phil: Reinstate Andrew Galuski's lost functionality that shows only the items that are defined for a customer (in the custitems table) when searching for items for a sales order/quote. 9/2/15 RChacon: Standardise to currency.png. Delete currency.gif. |
From: <vv...@us...> - 2015-02-17 20:14:35
|
Revision: 7155 http://sourceforge.net/p/web-erp/reponame/7155 Author: vvs2012 Date: 2015-02-17 20:14:32 +0000 (Tue, 17 Feb 2015) Log Message: ----------- Added print.css Modified Paths: -------------- trunk/GLBalanceSheet.php trunk/GLProfit_Loss.php trunk/GLTrialBalance.php trunk/doc/Change.log trunk/includes/header.inc Added Paths: ----------- trunk/css/print.css Modified: trunk/GLBalanceSheet.php =================================================================== --- trunk/GLBalanceSheet.php 2015-02-17 18:32:23 UTC (rev 7154) +++ trunk/GLBalanceSheet.php 2015-02-17 20:14:32 UTC (rev 7155) @@ -384,7 +384,7 @@ chartdetails.accountcode"; $AccountsResult = DB_query($SQL,_('No general ledger accounts were returned by the SQL because')); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/preview.gif" title="' . _('Search') . '" alt="" /> ' . _('HTML View') . '</p>'; + echo '<p class="page_title_text noprint"><img src="'.$RootPath.'/css/'.$Theme.'/images/preview.gif" title="' . _('Search') . '" alt="" /> ' . _('HTML View') . '</p>'; echo '<div class="invoice"> <table class="selection"> @@ -701,7 +701,7 @@ echo '</table>'; echo '</div>'; - echo '<br /><div class="centre"><input type="submit" name="SelectADifferentPeriod" value="'._('Select A Different Balance Date').'" /></div>'; + echo '<br /><div class="centre noprint"><input type="submit" name="SelectADifferentPeriod" value="'._('Select A Different Balance Date').'" /></div>'; echo '</div></form>'; } Modified: trunk/GLProfit_Loss.php =================================================================== --- trunk/GLProfit_Loss.php 2015-02-17 18:32:23 UTC (rev 7154) +++ trunk/GLProfit_Loss.php 2015-02-17 20:14:32 UTC (rev 7155) @@ -608,7 +608,8 @@ $AccountsResult = DB_query($SQL,_('No general ledger accounts were returned by the SQL because'),_('The SQL that failed was')); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('General Ledger Profit Loss Inquiry') . '" alt="" />' . ' ' . _('Statement of Profit and Loss for the') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' and including ' . $PeriodToDate . '</p>'; + echo '<p class="page_title_text"><img class="noprint" src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('General Ledger Profit Loss Inquiry') . '" alt="" /> + <h2>' . ' ' . _('Statement of Profit and Loss for the') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' and including ' . $PeriodToDate . '</h2></p>'; /*show a table of the accounts info returned by the SQL Account Code , Account Name , Month Actual, Month Budget, Period Actual, Period Budget */ @@ -1290,7 +1291,7 @@ <td colspan="6"><hr /></td> </tr>'; echo '</table>'; - echo '<br /><div class="centre"><input type="submit" name="SelectADifferentPeriod" value="' . _('Select A Different Period') . '" /></div>'; + echo '<br /><div class="centre noprint"><input type="submit" name="SelectADifferentPeriod" value="' . _('Select A Different Period') . '" /></div>'; } echo '</div>'; echo '</form>'; Modified: trunk/GLTrialBalance.php =================================================================== --- trunk/GLTrialBalance.php 2015-02-17 18:32:23 UTC (rev 7154) +++ trunk/GLTrialBalance.php 2015-02-17 20:14:32 UTC (rev 7155) @@ -435,7 +435,7 @@ $AccountsResult = DB_query($SQL, _('No general ledger accounts were returned by the SQL because'), _('The SQL that failed was:')); - echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . + echo '<p class="page_title_text noprint"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Trial Balance') . '" alt="" />' . ' ' . _('Trial Balance Report') . '</p>'; /*show a table of the accounts info returned by the SQL @@ -727,7 +727,7 @@ locale_number_format($CheckPeriodBudget,$_SESSION['CompanyRecord']['decimalplaces'])); echo '</table><br />'; - echo '<div class="centre"> + echo '<div class="centre noprint"> <input type="submit" name="SelectADifferentPeriod" value="' . _('Select A Different Period') . '" /> </div>'; } Added: trunk/css/print.css =================================================================== --- trunk/css/print.css (rev 0) +++ trunk/css/print.css 2015-02-17 20:14:32 UTC (rev 7155) @@ -0,0 +1,67 @@ +@media print { + +#HeaderDiv {display:none;} +#FooterDiv {display:none;} +#MainMenuDiv {display:none;} +.noprint {display:none;} + +#content p { + color: black; +} + +#content img { + display:block; + page-break-after: avoid; + page-break-inside: avoid; +} + +#content ul, li { + display:block; + page-break-inside:avoid; +} + +hr { + color: black; +} + +a { + color:navy; + text-decoration:none; +} + +#CanvasDiv, body { + font-family: Arial, Verdana, Helvetica, sans-serif; + font-size:11pt; + background: white; + background-image: none; + margin: 0; + border: none; + border-radius: 0; + padding: 0; + box-shadow: none; +} + +#BodyDiv { + background: white; + background-image: none; + width: 100%; + margin: 0; + float: none; + border: none; + border-radius: 0; + padding: 0; + box-shadow: none; +} + +#BodyDiv table{ + background: white; + border: none; + padding: 0; + box-shadow: none; + border-radius:0; +} + +.site-description {display:none;} +.site-title {display:none;} + +} Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-17 18:32:23 UTC (rev 7154) +++ trunk/doc/Change.log 2015-02-17 20:14:32 UTC (rev 7155) @@ -1,5 +1,6 @@ webERP Change Log +17/2/15 Vitaly: Added print.css to allow printing pages off the screen 15/2/2015: Exson: Fixed date format error for request date and start date in WorkOrderEntry.php. 12/2/15 RChacon: Fix on PrintCustTransPortrait.php: Do not need to escape special characters in a string for use in an SQL statement. 11/2/15 Vitaly: BOMIndented.php fix bug that duplicated components - error with SQL to restrict to only those users with permission to view a locations Modified: trunk/includes/header.inc =================================================================== --- trunk/includes/header.inc 2015-02-17 18:32:23 UTC (rev 7154) +++ trunk/includes/header.inc 2015-02-17 20:14:32 UTC (rev 7155) @@ -37,7 +37,8 @@ } else { echo '<meta http-equiv="Content-Type" content="application/html; charset=utf-8" />'; } - echo '<link href="' . $RootPath . '/css/'. $_SESSION['Theme'] .'/default.css" rel="stylesheet" type="text/css" />'; + echo '<link href="' . $RootPath . '/css/print.css" rel="stylesheet" type="text/css" media="print" />'; + echo '<link href="' . $RootPath . '/css/'. $_SESSION['Theme'] .'/default.css" rel="stylesheet" type="text/css" media="screen"/>'; echo '<script type="text/javascript" src = "'.$RootPath.'/javascripts/MiscFunctions.js"></script>'; echo '</head>'; echo '<body>'; |
From: <vv...@us...> - 2015-02-19 22:47:06
|
Revision: 7158 http://sourceforge.net/p/web-erp/reponame/7158 Author: vvs2012 Date: 2015-02-19 22:46:29 +0000 (Thu, 19 Feb 2015) Log Message: ----------- Align numbers to the right in print.css Modified Paths: -------------- trunk/css/print.css trunk/doc/Change.log Modified: trunk/css/print.css =================================================================== --- trunk/css/print.css 2015-02-17 22:27:35 UTC (rev 7157) +++ trunk/css/print.css 2015-02-19 22:46:29 UTC (rev 7158) @@ -28,6 +28,10 @@ color:navy; text-decoration:none; } + +.number{ + text-align:right; +} #CanvasDiv, body { font-family: Arial, Verdana, Helvetica, sans-serif; Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-17 22:27:35 UTC (rev 7157) +++ trunk/doc/Change.log 2015-02-19 22:46:29 UTC (rev 7158) @@ -1,5 +1,6 @@ webERP Change Log +19/2/15 Tim: Align numbers to the right in print.css 17/2/15 Vitaly: Added print.css to allow printing pages off the screen 15/2/2015: Exson: Fixed date format error for request date and start date in WorkOrderEntry.php. 12/2/15 RChacon: Fix on PrintCustTransPortrait.php: Do not need to escape special characters in a string for use in an SQL statement. |
From: <rc...@us...> - 2015-02-20 16:08:21
|
Revision: 7159 http://sourceforge.net/p/web-erp/reponame/7159 Author: rchacon Date: 2015-02-20 16:08:13 +0000 (Fri, 20 Feb 2015) Log Message: ----------- Fix AddTextWrap split behaviour (thanks Andrew Galuski). Add code documentation. Modified Paths: -------------- trunk/doc/Change.log trunk/includes/class.pdf.php Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-19 22:46:29 UTC (rev 7158) +++ trunk/doc/Change.log 2015-02-20 16:08:13 UTC (rev 7159) @@ -1,5 +1,6 @@ webERP Change Log +19/2/15 RChacon: Fix AddTextWrap split behaviour (thanks Andrew Galuski). Add code documentation. 19/2/15 Tim: Align numbers to the right in print.css 17/2/15 Vitaly: Added print.css to allow printing pages off the screen 15/2/2015: Exson: Fixed date format error for request date and start date in WorkOrderEntry.php. Modified: trunk/includes/class.pdf.php =================================================================== --- trunk/includes/class.pdf.php 2015-02-19 22:46:29 UTC (rev 7158) +++ trunk/includes/class.pdf.php 2015-02-20 16:08:13 UTC (rev 7159) @@ -73,107 +73,88 @@ function addText($xb,$YPos,$size,$text/*,$angle=0,$wordSpaceAdjust=0*/) { // Javier $text = html_entity_decode($text); - $this->SetFontSize($size); - $this->Text($xb, $this->h-$YPos, $text); + $this->SetFontSize($size);// Public function SetFontSize() in ~/includes/tcpdf/tcpdf.php. + $this->Text($xb, $this->h-$YPos, $text);// Public function Text() in ~/includes/tcpdf/tcpdf.php. } - function addTextWrap($XPos, $YPos, $Width, $Height, $Text, $Align='J', $border=0, $fill=0) { - // R&OS version 0.12.2: "addTextWrap function is no more, use addText instead". - /* Returns the balance of the string that could not fit in the width - * XPos = pdf horizontal coordinate - * YPos = pdf vertical coordiante - */ - //some special characters are html encoded - //this code serves to make them appear human readable in pdf file - $Text = html_entity_decode($Text, ENT_QUOTES, 'UTF-8'); +//------------------------------------------------------------------------------ +public function addTextWrap($xpos, $ypos, $linewidth, $fontsize, $text, $justification='left', $angle=0, $test=0) { +// Adds text to the page, but ensure that it fits within a certain width. If it does not fit then put in as much as possible, splitting at white space or soft hyphen character and return the remainder. Justification can also be specified for the text. It use UTF-8 encoding. +// $xpos = cell horizontal coordinate from page left side to cell left side in dpi (72dpi = 25.4mm). +// $ypos = cell vertical coordinate from page bottom side to cell bottom? side in dpi (72dpi = 25.4mm). +// $linewidth = cell (line) width in dpi (72dpi = 25.4mm). +// $fontsize = font size in dpi (72dpi = 25.4mm). +// $text = text to be split in portion to be add to the page and the remainder to be returned. +// $justification = 'left', 'right', 'center', 'centre' or 'full'. +// Ignores $angle and $test. +// @access public. - $this->x = $XPos; - $this->y = $this->h - $YPos - $Height;//RChacon: This -$Height is the difference in yPos between AddText() and AddTextWarp(). +if($linewidth == 0) { + $linewidth = $this->w -$this->rMargin -$xpos;// Line_width = Page_width - Right_margin - Cell_horizontal_coordinate. +} - switch($Align) { - case 'right': - $Align = 'R'; break; - case 'center': - $Align = 'C'; break; - default: - $Align = 'L'; - } - $this->SetFontSize($Height); +$this->SetFontSize($fontsize);// Public function SetFontSize() in ~/includes/tcpdf/tcpdf.php. - if($Width==0) { - $Width=$this->w-$this->rMargin-$this->x; - } - $wmax=($Width-2*$this->cMargin); - $s=str_replace("\r",'',$Text); - $s=str_replace("\n",' ',$s); - $s = trim($s).' '; - $nb=mb_strlen($s); - $b=0; - if ($border) { - if ($border==1) { - $border='LTRB'; - $b='LRT'; - $b2='LR'; - } else { - $b2=''; - if(is_int(mb_strpos($border,'L'))) { - $b2.='L'; - } - if(is_int(mb_strpos($border,'R'))) { - $b2.='R'; - } - $b=is_int(mb_strpos($border,'T')) ? $b2.'T' : $b2; - } - } - $sep=-1; - $i=0; - $l= $ls=0; - $ns=0; - $cw = $this->GetStringWidth($s, '', '', 0, true); - while($i<$nb) { - $c=$s{$i}; - if($c==' ' AND $i>0) { - $sep=$i; - $ls=$l; - $ns++; - } - if (isset($cw[$i])) { - $l += $cw[$i]; - } - if($l>$wmax){ - break; - } else { - $i++; - } - } - if($sep==-1) { - if($i==0) { - $i++; - } +$text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');// Convert all HTML entities to their applicable characters. - if(isset($this->ws) and $this->ws>0) { - $this->ws=0; - $this->_out('0 Tw'); - } - $sep = $i; - } else { - if($Align=='J') { - $this->ws=($ns>1) ? ($wmax-$ls)/($ns-1) : 0; - $this->_out(sprintf('%.3f Tw',$this->ws*$this->k)); - } - } +switch($justification) {// Translate from Pdf-Creator to TCPDF. + case 'left': + $justification = 'L'; break; + case 'right': + $justification = 'R'; break; + case 'center': + $justification = 'C'; break; + case 'centre': + $justification = 'C'; break; + case 'full': + $justification = 'J'; break; + default: + $justification = 'L'; break; +} - $this->Cell($Width,$Height,mb_substr($s,0,$sep),$b,2,$Align,$fill); - $this->x=$this->lMargin; - return mb_substr($s, $sep); - }// End function addTextWrap. +$this->MultiCell($linewidth, $fontsize, $text, 0, $justification, false, 1, $xpos, $this->h - $ypos - $fontsize);// COMMENT: In "$this->h -$ypos -$fontsize", "-$fontsize" is the difference in the yPos between AddText() and AddTextWarp(). It is better "$this->h -$ypos", but that requires to recode all the pdf generator scripts. +} +//------------------------------------------------------------------------------ +function TextWrap($xpos, $ypos, $linewidth, $fontsize, $text, $justification='left', $angle=0, $test=0) { + // Adds text to the page, but ensure that it fits within a certain width. If it does not fit then put in as much as possible, splitting at white space or soft hyphen character and return the remainder. Justification can also be specified for the text. It use UTF-8 encoding. + // $xpos = cell horizontal coordinate from page left side to cell left side in dpi (72dpi = 25.4mm). + // $ypos = cell vertical coordinate from page bottom side to cell bottom? side in dpi (72dpi = 25.4mm). + // $linewidth = cell (line) width in dpi (72dpi = 25.4mm). + // $fontsize = font size in dpi (72dpi = 25.4mm). + // $text = text to be split in portion to be add to the page and the remainder to be returned. + // $justification = 'left', 'right', 'center', 'centre' or 'full'. + // Ignores $angle and $test. + // @access public. + if($linewidth == 0) { + $linewidth = $this->w -$this->rMargin -$xpos;// Line_width = Page_width - Right_margin - Cell_horizontal_coordinate. + } + $this->SetFontSize($fontsize);// Public function SetFontSize() in ~/includes/tcpdf/tcpdf.php. + $text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');// Convert all HTML entities to their applicable characters. + switch($justification) {// Translate from Pdf-Creator to TCPDF. + case 'left': + $justification = 'L'; break; + case 'right': + $justification = 'R'; break; + case 'center': + $justification = 'C'; break; + case 'centre': + $justification = 'C'; break; + case 'full': + $justification = 'J'; break; + default: + $justification = 'L'; break; + } + $this->MultiCell($linewidth, $fontsize, $text, 0, $justification, false, 1, $xpos, $this->h - $ypos); + return $this->h - $this->y;// yPos is the same as in addText(). +} +//=========================================================================================== function addInfo($label, $value) { if ($label == 'Creator') { /* Javier: Some scripts set the creator to be WebERP like this $pdf->addInfo('Creator', 'WebERP http://www.weberp.org'); - But the Creator is TCPDF by Nicola Asuni, PDF_CREATOR is defined as 'TCPDF' in tcpdf/config/tcpdfconfig.php + But the Creator is TCPDF by Nicola Asuni, PDF_CREATOR is defined as 'TCPDF' in ~/includes/tcpdf/config/tcpdfconfig.php */ $this->SetCreator(PDF_CREATOR); } if ($label == 'Author') { @@ -194,7 +175,7 @@ } function addJpegFromFile($img,$XPos,$YPos,$Width=0,$Height=0,$Type=''){ - $this->Image($img, $x=$XPos, $y=$this->h-$YPos-$Height, $w=$Width, $h=$Height,$type=$Type); + $this->Image($img, $x=$XPos, $y=$this->h-$YPos/*-$Height*/, $w=$Width, $h=$Height,$type=$Type); } /* |
From: <aga...@us...> - 2015-02-20 17:23:20
|
Revision: 7161 http://sourceforge.net/p/web-erp/reponame/7161 Author: agaluski Date: 2015-02-20 17:23:17 +0000 (Fri, 20 Feb 2015) Log Message: ----------- Added ability for blank grouping in Product Spec and Cert printing Modified Paths: -------------- trunk/PDFCOA.php trunk/PDFProdSpec.php Modified: trunk/PDFCOA.php =================================================================== --- trunk/PDFCOA.php 2015-02-20 16:12:16 UTC (rev 7160) +++ trunk/PDFCOA.php 2015-02-20 17:23:17 UTC (rev 7161) @@ -162,11 +162,12 @@ $line_height=$FontSize*1.25; $RectHeight=12; $SectionHeading=0; -$CurSection=''; +$CurSection='NULL'; $SectionTitle=''; $SectionTrailer=''; $SectionsArray=array(array('PhysicalProperty',3, _('Physical Properties'), '', array(260,110,135),array(_('Physical Property'),_('Value'),_('Test Method')),array('left','center','center')), + array('',3, _('Header'), _('* Trailer'), array(260,110,135), array(_('Physical Property'),_('Value'),_('Test Method')),array('left','center','center')), array('Processing',2, _('Injection Molding Processing Guidelines'), _('* Desicant type dryer required.'), array(240,265),array(_('Setting'),_('Value')),array('left','center')), array('RegulatoryCompliance',2, _('Regulatory Compliance'), '', array(240,265),array(_('Regulatory Compliance'),_('Value')),array('left','center'))); @@ -192,7 +193,7 @@ if ($CurSection!=$myrow['groupby']) { $SectionHeading=0; - if ($CurSection!='' AND $PrintTrailer==1) { + if ($CurSection!='NULL' AND $PrintTrailer==1) { $pdf->line($XPos+1, $YPos+$RectHeight,$XPos+506, $YPos+$RectHeight); } $PrevTrailer=$SectionTrailer; Modified: trunk/PDFProdSpec.php =================================================================== --- trunk/PDFProdSpec.php 2015-02-20 16:12:16 UTC (rev 7160) +++ trunk/PDFProdSpec.php 2015-02-20 17:23:17 UTC (rev 7161) @@ -123,11 +123,12 @@ $line_height=$FontSize*1.25; $RectHeight=12; $SectionHeading=0; -$CurSection=''; +$CurSection='NULL'; $SectionTitle=''; $SectionTrailer=''; $SectionsArray=array(array('PhysicalProperty',3, _('Technical Data Sheet Properties'), _('* Data herein is typical and not to be construed as specifications.'), array(260,110,135),array(_('Physical Property'),_('Value'),_('Test Method')),array('left','center','center')), + array('',3, _('Header'), _('* Trailer'), array(260,110,135), array(_('Physical Property'),_('Value'),_('Test Method')),array('left','center','center')), array('Processing',2, _('Injection Molding Processing Guidelines'), _('* Desicant type dryer required.'), array(240,265),array(_('Setting'),_('Value')),array('left','center')), array('RegulatoryCompliance',2, _('Regulatory Compliance'), '', array(240,265),array(_('Regulatory Compliance'),_('Value')),array('left','center'))); @@ -152,7 +153,7 @@ if ($CurSection!=$myrow['groupby']) { $SectionHeading=0; - if ($CurSection!='' AND $PrintTrailer==1) { + if ($CurSection!='NULL' AND $PrintTrailer==1) { $pdf->line($XPos+1, $YPos+$RectHeight,$XPos+506, $YPos+$RectHeight); } $PrevTrailer=$SectionTrailer; |
From: <rc...@us...> - 2015-02-21 00:30:26
|
Revision: 7163 http://sourceforge.net/p/web-erp/reponame/7163 Author: rchacon Date: 2015-02-21 00:30:18 +0000 (Sat, 21 Feb 2015) Log Message: ----------- Fix heading 2 html-tags inside paragraph html-tags. Add code documentation. Modified Paths: -------------- trunk/GLProfit_Loss.php trunk/doc/Change.log Modified: trunk/GLProfit_Loss.php =================================================================== --- trunk/GLProfit_Loss.php 2015-02-20 20:27:01 UTC (rev 7162) +++ trunk/GLProfit_Loss.php 2015-02-21 00:30:18 UTC (rev 7163) @@ -1,14 +1,14 @@ <?php - /* $Id$*/ +/* This script shows the profit and loss of the company for the range of periods entered. */ include ('includes/session.inc'); -$Title = _('Profit and Loss'); +$Title = _('Profit and Loss');// Screen identification. +$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC. +$BookMark = 'ProfitAndLoss';// Anchor's id in the manual's html document. include('includes/SQL_CommonFunctions.inc'); include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable -$ViewTopic= 'GeneralLedger'; -$BookMark = 'ProfitAndLoss'; if (isset($_POST['FromPeriod']) and ($_POST['FromPeriod'] > $_POST['ToPeriod'])){ prnMsg(_('The selected period from is actually after the period to') . '! ' . _('Please reselect the reporting period'),'error'); @@ -20,10 +20,11 @@ OR isset($_POST['SelectADifferentPeriod'])){ include('includes/header.inc'); + echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme. + '/images/printer.png" title="' .// Icon image. + _('Print') . '" /> ' .// Icon title. + _('Print Profit and Loss Report') . '</p>';// Page title. - echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Profit and Loss Report') . ' - </p>'; echo '<div class="page_help_text">' . _('Profit and loss statement (P&L), also called an Income Statement, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') . '<br />' . _('The purpose of the income statement is to show whether the company made or lost money during the period being reported.') . '<br />' @@ -608,8 +609,10 @@ $AccountsResult = DB_query($SQL,_('No general ledger accounts were returned by the SQL because'),_('The SQL that failed was')); - echo '<p class="page_title_text"><img class="noprint" src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('General Ledger Profit Loss Inquiry') . '" alt="" /> - <h2>' . ' ' . _('Statement of Profit and Loss for the') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' and including ' . $PeriodToDate . '</h2></p>'; + echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme. + '/images/transactions.png" title="' .// Icon image. + _('General Ledger Profit Loss Inquiry') . '" /> ' .// Icon title. + _('Statement of Profit and Loss for the') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' and including ' . $PeriodToDate . '</p>';// Page title. /*show a table of the accounts info returned by the SQL Account Code , Account Name , Month Actual, Month Budget, Period Actual, Period Budget */ @@ -1297,4 +1300,4 @@ echo '</form>'; include('includes/footer.inc'); -?> \ No newline at end of file +?> Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-20 20:27:01 UTC (rev 7162) +++ trunk/doc/Change.log 2015-02-21 00:30:18 UTC (rev 7163) @@ -1,5 +1,6 @@ webERP Change Log +20/2/15 RChacon: Fix heading 2 html-tags inside paragraph html-tags. Add code documentation. 19/2/15 RChacon: Fix AddTextWrap split behaviour (thanks Andrew Galuski). Add code documentation. 19/2/15 Tim: Align numbers to the right in print.css 17/2/15 Vitaly: Added print.css to allow printing pages off the screen |
From: <dai...@us...> - 2015-02-21 04:04:29
|
Revision: 7164 http://sourceforge.net/p/web-erp/reponame/7164 Author: daintree Date: 2015-02-21 04:04:27 +0000 (Sat, 21 Feb 2015) Log Message: ----------- Modified Paths: -------------- trunk/BOMIndented.php trunk/PrintCustTransPortrait.php trunk/WorkOrderEntry.php Modified: trunk/BOMIndented.php =================================================================== --- trunk/BOMIndented.php 2015-02-21 00:30:18 UTC (rev 7163) +++ trunk/BOMIndented.php 2015-02-21 04:04:27 UTC (rev 7164) @@ -108,11 +108,12 @@ bom.effectiveafter, bom.effectiveto, bom.quantity - FROM bom + FROM bom INNER JOIN passbom ON bom.parent = passbom.part INNER JOIN locationusers ON locationusers.loccode=bom.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 - WHERE bom.effectiveafter <= '" . date('Y-m-d') . "' - AND bom.effectiveto > '" . date('Y-m-d') . "'"; + WHERE bom.effectiveafter <= '" . date('Y-m-d') . "' + AND bom.effectiveafter <= '" . date('Y-m-d') . "' + AND bom.effectiveto > '" . date('Y-m-d') . "'"; $result = DB_query($sql); $sql = "DROP TABLE IF EXISTS passbom2"; Modified: trunk/PrintCustTransPortrait.php =================================================================== --- trunk/PrintCustTransPortrait.php 2015-02-21 00:30:18 UTC (rev 7163) +++ trunk/PrintCustTransPortrait.php 2015-02-21 04:04:27 UTC (rev 7164) @@ -465,7 +465,7 @@ $pdf->addTextWrap($Left_Margin, $YPos+3, 280, $FontSize,_('Payment Terms') . ': ' . $myrow['terms']); $FontSize =8; - $LeftOvers=explode("\r\n",$myrow['invtext']); + $LeftOvers=explode("\r\n",DB_escape_string($myrow['invtext'])); for ($i=0;$i<sizeOf($LeftOvers);$i++) { $pdf->addText($Left_Margin, $YPos-8-($i*8), $FontSize, $LeftOvers[$i]); } Modified: trunk/WorkOrderEntry.php =================================================================== --- trunk/WorkOrderEntry.php 2015-02-21 00:30:18 UTC (rev 7163) +++ trunk/WorkOrderEntry.php 2015-02-21 04:04:27 UTC (rev 7164) @@ -22,13 +22,13 @@ if (isset($_GET['ReqDate'])){ $ReqDate = $_GET['ReqDate']; } else { - $ReqDate=Date('Y-m-d'); + $ReqDate=Date($_SESSION['DefaultDateFormat']); } if (isset($_GET['StartDate'])){ $StartDate = $_GET['StartDate']; } else { - $StartDate=Date('Y-m-d'); + $StartDate=Date($_SESSION['DefaultDateFormat']); } if (isset($_GET['loccode'])){ |
From: <rc...@us...> - 2015-02-21 14:48:07
|
Revision: 7165 http://sourceforge.net/p/web-erp/reponame/7165 Author: rchacon Date: 2015-02-21 14:47:59 +0000 (Sat, 21 Feb 2015) Log Message: ----------- Add headings, page-title and centre-align styles to print.css. Improve page title to use with print.css and add code documentation in GLBalanceSheet.php. Modified Paths: -------------- trunk/GLBalanceSheet.php trunk/css/print.css trunk/doc/Change.log trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po Modified: trunk/GLBalanceSheet.php =================================================================== --- trunk/GLBalanceSheet.php 2015-02-21 04:04:27 UTC (rev 7164) +++ trunk/GLBalanceSheet.php 2015-02-21 14:47:59 UTC (rev 7165) @@ -1,25 +1,28 @@ <?php - /* $Id$*/ +/* This script shows the balance sheet for the company as at a specified date. */ /*Through deviousness and cunning, this system allows shows the balance sheets as at the end of any period selected - so first off need to show the input of criteria screen while the user is selecting the period end of the balance date meanwhile the system is posting any unposted transactions */ include ('includes/session.inc'); -$Title = _('Balance Sheet'); +$Title = _('Balance Sheet');// Screen identification. +$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC. +$BookMark = 'BalanceSheet';// Anchor's id in the manual's html document. include('includes/SQL_CommonFunctions.inc'); include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable -$ViewTopic= 'GeneralLedger'; -$BookMark = 'BalanceSheet'; - if (! isset($_POST['BalancePeriodEnd']) or isset($_POST['SelectADifferentPeriod'])){ /*Show a form to allow input of criteria for TB to show */ include('includes/header.inc'); - echo '<div class="centre"><p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' - . _('Print') . '" alt="" />' . ' ' . _('Balance Sheet') . '</p></div>'; + echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme. + '/images/printer.png" title="' .// Icon image. + _('Print Statement of Financial Position') . '" /> ' .// Icon title. + _('Balance Sheet') . '</p>';// Page title. +// _('Print Statement of Financial Position') . '</p>';// Page title. + echo '<div class="page_help_text">' . _('Balance Sheet (or statement of financial position) is a summary of balances. Assets, liabilities and ownership equity are listed as of a specific date, such as the end of its financial year. Of the four basic financial statements, the balance sheet is the only statement which applies to a single point in time.') . '<br />' . _('The balance sheet has three parts: assets, liabilities and ownership equity. The main categories of assets are listed first and are followed by the liabilities. The difference between the assets and the liabilities is known as equity or the net assets or the net worth or capital of the company and according to the accounting equation, net worth must equal assets minus liabilities.') . '<br />' @@ -384,17 +387,20 @@ chartdetails.accountcode"; $AccountsResult = DB_query($SQL,_('No general ledger accounts were returned by the SQL because')); - echo '<p class="page_title_text noprint"><img src="'.$RootPath.'/css/'.$Theme.'/images/preview.gif" title="' . _('Search') . '" alt="" /> ' . _('HTML View') . '</p>'; + // Page title as IAS1 numerals 10 and 51: + include_once('includes/CurrenciesArray.php');// Array to retrieve currency name. + echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme. + '/images/gl.png" title="' .// Icon image. + _('Statement of Financial Position') . '" /> ' .// Icon title. + _('Balance Sheet') . '<br />' .// Page title, reporting statement. +// _('Statement of Financial Position') . '<br />' .// Page title, reporting statement. + stripslashes($_SESSION['CompanyRecord']['coyname']) . '<br />' .// Page title, reporting entity. + _('as at') . ' ' . $BalanceDate . '<br />' .// Page title, reporting period. + _('All amounts stated in').': '. _($CurrencyName[$_SESSION['CompanyRecord']['currencydefault']]).'</p>';// Page title, reporting presentation currency and level of rounding used. + echo '<div class="invoice"> - <table class="selection"> - <tr> - <th colspan="6"> - <div class="centre"><h1>' . - _('Balance Sheet as at') . ' ' . $BalanceDate . '</h1> - </div> - </th> - </tr>'; + <table class="selection">'; if ($_POST['Detail']=='Detailed'){ $TableHeader = '<tr> @@ -577,9 +583,9 @@ echo '<tr class="EvenTableRows">'; $k++; } - + $ActEnquiryURL = '<a href="' . $RootPath . '/GLAccountInquiry.php?Period=' . $_POST['BalancePeriodEnd'] . '&Account=' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . '</a>'; - + printf('<td>%s</td> <td>%s</td> <td class="number">%s</td> @@ -706,4 +712,4 @@ } include('includes/footer.inc'); -?> \ No newline at end of file +?> Modified: trunk/css/print.css =================================================================== --- trunk/css/print.css 2015-02-21 04:04:27 UTC (rev 7164) +++ trunk/css/print.css 2015-02-21 14:47:59 UTC (rev 7165) @@ -1,74 +1,103 @@ /* $Id: print.css 7158 2015-02-19 23:25:13Z vvs2012 $*/ /* Print style sheet. */ -@media print { - -#HeaderDiv {display:none;} -#FooterDiv {display:none;} -#MainMenuDiv {display:none;} -.noprint {display:none;} - -#content p { - color: black; -} - -#content img { - display:block; - page-break-after: avoid; - page-break-inside: avoid; -} - -#content ul, li { - display:block; - page-break-inside:avoid; -} - -hr { - color: black; -} - -a { - color:navy; - text-decoration:none; -} - -.number{ - text-align:right; -} - -#CanvasDiv, body { - font-family: Arial, Verdana, Helvetica, sans-serif; - font-size:11pt; - background: white; - background-image: none; - margin: 0; - border: none; - border-radius: 0; - padding: 0; - box-shadow: none; -} - -#BodyDiv { - background: white; - background-image: none; - width: 100%; - margin: 0; - float: none; - border: none; - border-radius: 0; - padding: 0; - box-shadow: none; -} - -#BodyDiv table{ - background: white; - border: none; - padding: 0; - box-shadow: none; - border-radius:0; -} - -.site-description {display:none;} -.site-title {display:none;} - -} +@media print { + +#FooterDiv, #HeaderDiv, #MainMenuDiv, .noprint, .site-description, .site-title { + display:none; + /* Remove unwanted elements. */ +} + +h1 { + font-size: 173%; + font-weight:bold; + /* Heading 1. */ +} + +h2 { + font-size: 144%; + font-weight:bold; + /* Heading 2. */ +} + +h3 { + font-size: 120%; + font-weight:bold; + /* Heading 3. */ +} + +#content p { + color:black; +} + +#content img { + display:block; + page-break-after:avoid; + page-break-inside:avoid; +} + +#content ul, li { + display:block; + page-break-inside:avoid; +} + +hr { + color:black; +} + +a { + color:navy; + text-decoration:none; +} + +.centre { + text-align:center; + /* centre class (general). */ +} + +.number { + text-align:right; + /* number class (general). */ +} + +.page_title_text { + font-weight:bold; + font-size: 207%; + text-align:center; + /* Page title class. */ +} + +body, #CanvasDiv { + background-image:none; + background:white; + border:none; + border-radius:0; + box-shadow:none; + font-family:Arial, Verdana, Helvetica, sans-serif; + font-size:11pt; + margin:0; + padding:0; +} + +#BodyDiv { + background-image:none; + background:white; + border:none; + border-radius:0; + box-shadow:none; + float:none; + margin:0; + padding:0; + width:100%; + /* BodyDiv id */ +} + +#BodyDiv table { + background:white; + border:none; + border-radius:0; + box-shadow:none; + padding:0; +} + +} Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-21 04:04:27 UTC (rev 7164) +++ trunk/doc/Change.log 2015-02-21 14:47:59 UTC (rev 7165) @@ -1,5 +1,6 @@ webERP Change Log +21/2/15 RChacon: Add headings, page-title and centre-align styles to print.css. Improve page title to use with print.css and add code documentation in GLBalanceSheet.php. 20/2/15 RChacon: Fix heading 2 html-tags inside paragraph html-tags. Add code documentation. 19/2/15 RChacon: Fix AddTextWrap split behaviour (thanks Andrew Galuski). Add code documentation. 19/2/15 Tim: Align numbers to the right in print.css Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-21 04:04:27 UTC (rev 7164) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-21 14:47:59 UTC (rev 7165) @@ -8,7 +8,7 @@ "Project-Id-Version: webERP 4.12.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-06 19:17+1300\n" -"PO-Revision-Date: 2015-02-17 12:27-0600\n" +"PO-Revision-Date: 2015-02-21 08:31-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: TecnoSoluciones.com <web...@te...>\n" "Language: es_ES\n" @@ -37861,7 +37861,7 @@ #: UserLocations.php:203 #, php-format msgid "Are you sure you wish to un-authorise this location?" -msgstr "" +msgstr "¿Está seguro que desea desautorizar esta ubicación?" #: UserSettings.php:6 UserSettings.php:10 msgid "User Settings" @@ -45029,7 +45029,7 @@ #: includes/MainMenuLinksArray.php:109 msgid "Debtor Balances At A Prior Month End" -msgstr "Saldos de Deudores a Fin de Mes Previo" +msgstr "Saldos de clientes al final del mes previo" #: includes/MainMenuLinksArray.php:110 msgid "Customer Listing By Area/Salesperson" @@ -45057,7 +45057,7 @@ #: includes/MainMenuLinksArray.php:149 msgid "Supplier Balances At A Prior Month End" -msgstr "Balances de proveedores a Fin de Mes Previo" +msgstr "Saldos de proveedores al final del mes previo" #: includes/MainMenuLinksArray.php:151 msgid "Supplier Transaction Inquiries" @@ -46137,7 +46137,7 @@ #: includes/PDFDebtorBalsPageHeader.inc:17 #: includes/PDFSupplierBalsPageHeader.inc:17 msgid "as at" -msgstr "según en" +msgstr "al" #: includes/PDFDebtorBalsPageHeader.inc:32 #: includes/PDFSupplierBalsPageHeader.inc:35 |
From: <dai...@us...> - 2015-02-21 23:23:56
|
Revision: 7166 http://sourceforge.net/p/web-erp/reponame/7166 Author: daintree Date: 2015-02-21 23:23:54 +0000 (Sat, 21 Feb 2015) Log Message: ----------- Fix errors my machines config snags - unsynced versions Modified Paths: -------------- trunk/BOMIndented.php trunk/WorkOrderEntry.php Modified: trunk/BOMIndented.php =================================================================== --- trunk/BOMIndented.php 2015-02-21 14:47:59 UTC (rev 7165) +++ trunk/BOMIndented.php 2015-02-21 23:23:54 UTC (rev 7166) @@ -112,7 +112,6 @@ INNER JOIN passbom ON bom.parent = passbom.part INNER JOIN locationusers ON locationusers.loccode=bom.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1 WHERE bom.effectiveafter <= '" . date('Y-m-d') . "' - AND bom.effectiveafter <= '" . date('Y-m-d') . "' AND bom.effectiveto > '" . date('Y-m-d') . "'"; $result = DB_query($sql); Modified: trunk/WorkOrderEntry.php =================================================================== --- trunk/WorkOrderEntry.php 2015-02-21 14:47:59 UTC (rev 7165) +++ trunk/WorkOrderEntry.php 2015-02-21 23:23:54 UTC (rev 7166) @@ -22,13 +22,13 @@ if (isset($_GET['ReqDate'])){ $ReqDate = $_GET['ReqDate']; } else { - $ReqDate=Date($_SESSION['DefaultDateFormat']); + $ReqDate=Date('Y-m-d'); } if (isset($_GET['StartDate'])){ $StartDate = $_GET['StartDate']; } else { - $StartDate=Date($_SESSION['DefaultDateFormat']); + $StartDate=Date('Y-m-d'); } if (isset($_GET['loccode'])){ |
From: <dai...@us...> - 2015-02-21 23:36:20
|
Revision: 7167 http://sourceforge.net/p/web-erp/reponame/7167 Author: daintree Date: 2015-02-21 23:36:17 +0000 (Sat, 21 Feb 2015) Log Message: ----------- Simon Rhodes: added global $db; statements to functions in ConnectDB_mysql.inc that had been missed for the transaction functions Modified Paths: -------------- trunk/doc/Change.log trunk/includes/ConnectDB_mysql.inc Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-21 23:23:54 UTC (rev 7166) +++ trunk/doc/Change.log 2015-02-21 23:36:17 UTC (rev 7167) @@ -1,5 +1,6 @@ webERP Change Log +22/2/15 Simon Rhodes: added global $db; statements to functions in ConnectDB_mysql.inc that had been missed for the transaction functions 21/2/15 RChacon: Add headings, page-title and centre-align styles to print.css. Improve page title to use with print.css and add code documentation in GLBalanceSheet.php. 20/2/15 RChacon: Fix heading 2 html-tags inside paragraph html-tags. Add code documentation. 19/2/15 RChacon: Fix AddTextWrap split behaviour (thanks Andrew Galuski). Add code documentation. Modified: trunk/includes/ConnectDB_mysql.inc =================================================================== --- trunk/includes/ConnectDB_mysql.inc 2015-02-21 23:23:54 UTC (rev 7166) +++ trunk/includes/ConnectDB_mysql.inc 2015-02-21 23:36:17 UTC (rev 7167) @@ -180,7 +180,7 @@ } function interval( $val, $Inter ){ - global $dbtype; + global $DBType; return "\n".'interval ' . $val . ' '. $Inter."\n"; } @@ -199,23 +199,28 @@ function DB_Txn_Begin(){ + global $db; mysql_query("SET autocommit=0",$db); mysql_query("START TRANSACTION",$db); } function DB_Txn_Commit(){ + global $db; mysql_query("COMMIT",$db); mysql_query("SET autocommit=1",$db); } function DB_Txn_Rollback(){ + global $db; mysql_query("ROLLBACK",$db); } function DB_IgnoreForeignKeys(){ + global $db; mysql_query("SET FOREIGN_KEY_CHECKS=0",$db); } function DB_ReinstateForeignKeys(){ + global $db; mysql_query("SET FOREIGN_KEY_CHECKS=1",$db); } |
From: <rc...@us...> - 2015-02-22 04:57:54
|
Revision: 7169 http://sourceforge.net/p/web-erp/reponame/7169 Author: rchacon Date: 2015-02-22 04:57:51 +0000 (Sun, 22 Feb 2015) Log Message: ----------- Add missing preview.png and new previous.png icons. Add "Print This" and "Return" buttons with icon in GLBalanceSheet.php. Modified Paths: -------------- trunk/GLBalanceSheet.php trunk/css/aguapop/default.css trunk/css/default/default.css trunk/css/fluid/default.css trunk/css/fresh/default.css trunk/css/gel/default.css trunk/css/professional/default.css trunk/css/professional-rtl/default.css trunk/css/silverwolf/default.css trunk/css/wood/default.css trunk/css/wood/images/bank.png trunk/css/wood/images/gl.png trunk/css/wood/images/printer.png trunk/css/xenos/default.css trunk/doc/Change.log Added Paths: ----------- trunk/css/aguapop/images/previous.png trunk/css/default/images/previous.png trunk/css/fluid/images/preview.png trunk/css/fluid/images/previous.png trunk/css/fresh/images/preview.png trunk/css/fresh/images/previous.png trunk/css/gel/images/preview.png trunk/css/gel/images/previous.png trunk/css/professional/images/previous.png trunk/css/professional-rtl/images/previous.png trunk/css/silverwolf/images/preview.png trunk/css/silverwolf/images/previous.png trunk/css/wood/images/preview.png trunk/css/wood/images/previous.png trunk/css/xenos/images/preview.png trunk/css/xenos/images/previous.png Modified: trunk/GLBalanceSheet.php =================================================================== --- trunk/GLBalanceSheet.php 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/GLBalanceSheet.php 2015-02-22 04:57:51 UTC (rev 7169) @@ -707,7 +707,18 @@ echo '</table>'; echo '</div>'; - echo '<br /><div class="centre noprint"><input type="submit" name="SelectADifferentPeriod" value="'._('Select A Different Balance Date').'" /></div>'; + echo '<br />'; +/* <div class="centre noprint"><input type="submit" name="SelectADifferentPeriod" value="'._('Select A Different Balance Date').'" /></div>';*/ + +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. + '<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 formaction="index.php" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme. + '/images/previous.png" /> ' . ('Return') . '</button>'.// "Return" button. + '</div>'; + echo '</div></form>'; } Modified: trunk/css/aguapop/default.css =================================================================== --- trunk/css/aguapop/default.css 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/aguapop/default.css 2015-02-22 04:57:51 UTC (rev 7169) @@ -1,3 +1,4 @@ +/* $Id: default.css 7166 2015-02-21 21:18:59Z Joshua $*/ /* New "AguaPop" Theme for WebERP @@ -481,5 +482,9 @@ float:right; margin-top:15px; } +.centre { + text-align:center; + /* centre class (general). */ +} /**** END ***/ Added: trunk/css/aguapop/images/previous.png =================================================================== (Binary files differ) Index: trunk/css/aguapop/images/previous.png =================================================================== --- trunk/css/aguapop/images/previous.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/aguapop/images/previous.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/aguapop/images/previous.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/css/default/default.css =================================================================== --- trunk/css/default/default.css 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/default/default.css 2015-02-22 04:57:51 UTC (rev 7169) @@ -1,3 +1,4 @@ +/* $Id$*/ /*** New Default Theme for WebERP @@ -448,3 +449,7 @@ float:right; margin-top:15px; } +.centre { + text-align:center; + /* centre class (general). */ +} Added: trunk/css/default/images/previous.png =================================================================== (Binary files differ) Index: trunk/css/default/images/previous.png =================================================================== --- trunk/css/default/images/previous.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/default/images/previous.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/default/images/previous.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/css/fluid/default.css =================================================================== --- trunk/css/fluid/default.css 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/fluid/default.css 2015-02-22 04:57:51 UTC (rev 7169) @@ -1,3 +1,4 @@ +/* $Id: default.css 7166 2015-02-21 21:18:59Z Joshua $*/ /* "Fluid Tabs" theme for webERP @@ -389,3 +390,7 @@ } #FooterVersionDiv{} #FooterTimeDiv{} +.centre { + text-align:center; + /* centre class (general). */ +} Added: trunk/css/fluid/images/preview.png =================================================================== (Binary files differ) Index: trunk/css/fluid/images/preview.png =================================================================== --- trunk/css/fluid/images/preview.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/fluid/images/preview.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/fluid/images/preview.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/fluid/images/previous.png =================================================================== (Binary files differ) Index: trunk/css/fluid/images/previous.png =================================================================== --- trunk/css/fluid/images/previous.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/fluid/images/previous.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/fluid/images/previous.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/css/fresh/default.css =================================================================== --- trunk/css/fresh/default.css 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/fresh/default.css 2015-02-22 04:57:51 UTC (rev 7169) @@ -1,3 +1,4 @@ +/* $Id$*/ /*** New "Fresh" Theme for WebERP @@ -502,5 +503,9 @@ #FooterTimeDiv{ clear:left; /* below */ } +.centre { + text-align:center; + /* centre class (general). */ +} /*** END ***/ Added: trunk/css/fresh/images/preview.png =================================================================== (Binary files differ) Index: trunk/css/fresh/images/preview.png =================================================================== --- trunk/css/fresh/images/preview.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/fresh/images/preview.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/fresh/images/preview.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/fresh/images/previous.png =================================================================== (Binary files differ) Index: trunk/css/fresh/images/previous.png =================================================================== --- trunk/css/fresh/images/previous.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/fresh/images/previous.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/fresh/images/previous.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/css/gel/default.css =================================================================== --- trunk/css/gel/default.css 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/gel/default.css 2015-02-22 04:57:51 UTC (rev 7169) @@ -1,3 +1,4 @@ +/* $Id$*/ /*** New "Gel" Theme for WebERP @@ -539,5 +540,9 @@ line-height:2.8em; /* Center the text vertically. [vertical-align has no effect on text alone] */ } +.centre { + text-align:center; + /* centre class (general). */ +} /*** END ***/ Added: trunk/css/gel/images/preview.png =================================================================== (Binary files differ) Index: trunk/css/gel/images/preview.png =================================================================== --- trunk/css/gel/images/preview.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/gel/images/preview.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/gel/images/preview.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/gel/images/previous.png =================================================================== (Binary files differ) Index: trunk/css/gel/images/previous.png =================================================================== --- trunk/css/gel/images/previous.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/gel/images/previous.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/gel/images/previous.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/css/professional/default.css =================================================================== --- trunk/css/professional/default.css 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/professional/default.css 2015-02-22 04:57:51 UTC (rev 7169) @@ -1,3 +1,4 @@ +/* $Id$*/ /*** New "Professional" Theme for WebERP @@ -527,5 +528,9 @@ #FooterTimeDiv{ clear:left; /* below */ } +.centre { + text-align:center; + /* centre class (general). */ +} /*** END ***/ Added: trunk/css/professional/images/previous.png =================================================================== (Binary files differ) Index: trunk/css/professional/images/previous.png =================================================================== --- trunk/css/professional/images/previous.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/professional/images/previous.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/professional/images/previous.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/css/professional-rtl/default.css =================================================================== --- trunk/css/professional-rtl/default.css 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/professional-rtl/default.css 2015-02-22 04:57:51 UTC (rev 7169) @@ -1,3 +1,4 @@ +/* $Id$*/ /*** New "Professional RTL" Theme for WebERP @@ -547,5 +548,9 @@ #FooterTimeDiv{ clear:right; /* below */ } +.centre { + text-align:center; + /* centre class (general). */ +} /*** END ***/ Added: trunk/css/professional-rtl/images/previous.png =================================================================== (Binary files differ) Index: trunk/css/professional-rtl/images/previous.png =================================================================== --- trunk/css/professional-rtl/images/previous.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/professional-rtl/images/previous.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/professional-rtl/images/previous.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/css/silverwolf/default.css =================================================================== --- trunk/css/silverwolf/default.css 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/silverwolf/default.css 2015-02-22 04:57:51 UTC (rev 7169) @@ -1,3 +1,4 @@ +/* $Id$*/ /*** New "SilverWolf" Theme for WebERP @@ -500,5 +501,9 @@ line-height:2.8em; /* Center the text vertically. [vertical-align has no effect on text alone] */ } +.centre { + text-align:center; + /* centre class (general). */ +} /*** END ***/ Added: trunk/css/silverwolf/images/preview.png =================================================================== (Binary files differ) Index: trunk/css/silverwolf/images/preview.png =================================================================== --- trunk/css/silverwolf/images/preview.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/silverwolf/images/preview.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/silverwolf/images/preview.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/silverwolf/images/previous.png =================================================================== (Binary files differ) Index: trunk/css/silverwolf/images/previous.png =================================================================== --- trunk/css/silverwolf/images/previous.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/silverwolf/images/previous.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/silverwolf/images/previous.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/css/wood/default.css =================================================================== --- trunk/css/wood/default.css 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/wood/default.css 2015-02-22 04:57:51 UTC (rev 7169) @@ -1,3 +1,4 @@ +/* $Id: default.css 7166 2015-02-21 21:18:59Z Joshua $*/ /* "Wood" Theme for WebERP @@ -571,5 +572,9 @@ float:right; margin-top:17px; } +.centre { + text-align:center; + /* centre class (general). */ +} /* END */ Modified: trunk/css/wood/images/bank.png =================================================================== (Binary files differ) Modified: trunk/css/wood/images/gl.png =================================================================== (Binary files differ) Added: trunk/css/wood/images/preview.png =================================================================== (Binary files differ) Index: trunk/css/wood/images/preview.png =================================================================== --- trunk/css/wood/images/preview.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/wood/images/preview.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/wood/images/preview.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/wood/images/previous.png =================================================================== (Binary files differ) Index: trunk/css/wood/images/previous.png =================================================================== --- trunk/css/wood/images/previous.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/wood/images/previous.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/wood/images/previous.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/css/wood/images/printer.png =================================================================== (Binary files differ) Modified: trunk/css/xenos/default.css =================================================================== --- trunk/css/xenos/default.css 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/xenos/default.css 2015-02-22 04:57:51 UTC (rev 7169) @@ -1,3 +1,4 @@ +/* $Id: default.css 7166 2015-02-21 21:18:59Z Khwunchai $*/ /*** Xenos Theme @@ -635,5 +636,9 @@ #FooterTimeDiv{ clear:left; /* below */ } +.centre { + text-align:center; + /* centre class (general). */ +} -/*** END ***/ \ No newline at end of file +/*** END ***/ Added: trunk/css/xenos/images/preview.png =================================================================== (Binary files differ) Index: trunk/css/xenos/images/preview.png =================================================================== --- trunk/css/xenos/images/preview.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/xenos/images/preview.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/xenos/images/preview.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/xenos/images/previous.png =================================================================== (Binary files differ) Index: trunk/css/xenos/images/previous.png =================================================================== --- trunk/css/xenos/images/previous.png 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/css/xenos/images/previous.png 2015-02-22 04:57:51 UTC (rev 7169) Property changes on: trunk/css/xenos/images/previous.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-21 23:37:31 UTC (rev 7168) +++ trunk/doc/Change.log 2015-02-22 04:57:51 UTC (rev 7169) @@ -1,5 +1,6 @@ webERP Change Log +22/2/15 RChacon: Add missing preview.png and new previous.png icons. Add "Print This" and "Return" buttons with icon in GLBalanceSheet.php. 22/2/15 Simon Rhodes: added global $db; statements to functions in ConnectDB_mysql.inc that had been missed for the transaction functions 21/2/15 RChacon: Add headings, page-title and centre-align styles to print.css. Improve page title to use with print.css and add code documentation in GLBalanceSheet.php. 20/2/15 RChacon: Fix heading 2 html-tags inside paragraph html-tags. Add code documentation. |
From: <rc...@us...> - 2015-02-22 17:16:44
|
Revision: 7170 http://sourceforge.net/p/web-erp/reponame/7170 Author: rchacon Date: 2015-02-22 17:16:36 +0000 (Sun, 22 Feb 2015) Log Message: ----------- Adjust page_title and add "Print This" and "Return" buttons with icon to Statement of Comprehensive Income and Trial Balance scripts. Add code documentation and removes redundant $ViewTopic and $BookMark in GLTrialBalance.php. Modified Paths: -------------- trunk/GLProfit_Loss.php trunk/GLTrialBalance.php trunk/doc/Change.log Modified: trunk/GLProfit_Loss.php =================================================================== --- trunk/GLProfit_Loss.php 2015-02-22 04:57:51 UTC (rev 7169) +++ trunk/GLProfit_Loss.php 2015-02-22 17:16:36 UTC (rev 7170) @@ -1,6 +1,6 @@ <?php /* $Id$*/ -/* This script shows the profit and loss of the company for the range of periods entered. */ +/* Shows the profit and loss of the company for the range of periods entered. */ include ('includes/session.inc'); $Title = _('Profit and Loss');// Screen identification. @@ -22,8 +22,9 @@ include('includes/header.inc'); echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme. '/images/printer.png" title="' .// Icon image. - _('Print') . '" /> ' .// Icon title. + _('Print Statement of Comprehensive Income') . '" /> ' .// Icon title. _('Print Profit and Loss Report') . '</p>';// Page title. +// _('Print Statement of Comprehensive Income') . '</p>';// Page title. echo '<div class="page_help_text">' . _('Profit and loss statement (P&L), also called an Income Statement, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') . '<br />' @@ -407,7 +408,7 @@ $SectionPrdBudget +=$AccountPeriodBudget; if ($_POST['Detail'] == 'Detailed') { - + if (isset($_POST['ShowZeroBalances']) OR (!isset($_POST['ShowZeroBalances']) AND ($AccountPeriodActual <> 0 OR $AccountPeriodBudget <> 0 OR $AccountPeriodLY <> 0))){ //condition for pdf $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,$myrow['accountcode']); $LeftOvers = $pdf->addTextWrap($Left_Margin+60,$YPos,190,$FontSize,$myrow['accountname']); @@ -609,10 +610,17 @@ $AccountsResult = DB_query($SQL,_('No general ledger accounts were returned by the SQL because'),_('The SQL that failed was')); + // Page title as IAS1 numerals 10 and 51: + include_once('includes/CurrenciesArray.php');// Array to retrieve currency name. echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme. - '/images/transactions.png" title="' .// Icon image. - _('General Ledger Profit Loss Inquiry') . '" /> ' .// Icon title. - _('Statement of Profit and Loss for the') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' and including ' . $PeriodToDate . '</p>';// Page title. + '/images/gl.png" title="' .// Icon image. + _('Statement of Comprehensive Income') . '" /> ' .// Icon title. + _('Profit and Loss Statement') . '<br />' .// Page title, reporting statement. +// _('Statement of Comprehensive Income') . '<br />' .// Page title, reporting statement. + stripslashes($_SESSION['CompanyRecord']['coyname']) . '<br />' .// Page title, reporting entity. + _('For') . ' ' . $NumberOfMonths . ' ' . _('months to') . ' ' . $PeriodToDate . '<br />' .// Page title, reporting period. +// _('From') . ' ' . $PeriodFromDate? . ' ' . _('to') . ' ' . $PeriodToDate . '<br />' .// Page title, reporting period. ?????????? + _('All amounts stated in').': '. _($CurrencyName[$_SESSION['CompanyRecord']['currencydefault']]).'</p>';// Page title, reporting presentation currency and level of rounding used. /*show a table of the accounts info returned by the SQL Account Code , Account Name , Month Actual, Month Budget, Period Actual, Period Budget */ @@ -1294,7 +1302,15 @@ <td colspan="6"><hr /></td> </tr>'; echo '</table>'; - echo '<br /><div class="centre noprint"><input type="submit" name="SelectADifferentPeriod" value="' . _('Select A Different Period') . '" /></div>'; + 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. + '<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 formaction="index.php" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme. + '/images/previous.png" /> ' . ('Return') . '</button>'.// "Return" button. + '</div>'; } echo '</div>'; echo '</form>'; Modified: trunk/GLTrialBalance.php =================================================================== --- trunk/GLTrialBalance.php 2015-02-22 04:57:51 UTC (rev 7169) +++ trunk/GLTrialBalance.php 2015-02-22 17:16:36 UTC (rev 7170) @@ -1,14 +1,17 @@ <?php - /* $Id$*/ +/* Shows the trial balance for the month and the for the period selected together with the budgeted trial balances. */ -/*Through deviousness AND cunning, this system allows trial balances for any date range that recalcuates the p & l balances +/*Through deviousness AND cunning, this system allows trial balances for any date range that recalculates the P&L balances and shows the balance sheets as at the end of the period selected - so first off need to show the input of criteria screen while the user is selecting the criteria the system is posting any unposted transactions */ include ('includes/session.inc'); -$Title = _('Trial Balance'); +$Title = _('Trial Balance');// Screen identification. +$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC. +$BookMark = 'TrialBalance';// Anchor's id in the manual's html document. + include('includes/SQL_CommonFunctions.inc'); include('includes/AccountSectionsDef.inc'); //this reads in the Accounts Sections array @@ -25,13 +28,12 @@ AND ! isset($_POST['ToPeriod'])) OR isset($_POST['SelectADifferentPeriod'])){ - $ViewTopic = 'GeneralLedger'; - $BookMark = 'TrialBalance'; + include ('includes/header.inc'); + echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme. + '/images/printer.png" title="' .// Icon image. + _('Print Trial Balance') . '" /> ' .// Icon title. + _('Trial Balance') . '</p>';// Page title. - include ('includes/header.inc'); - echo '<p class="page_title_text"> - <img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Trial Balance') . '" alt="" />' . ' ' . $Title . ' - </p>'; echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; @@ -161,8 +163,6 @@ $AccountsResult = DB_query($SQL); if (DB_error_no() !=0) { $Title = _('Trial Balance') . ' - ' . _('Problem Report') . '....'; - $ViewTopic = 'GeneralLedger'; - $BookMark = 'TrialBalance'; include('includes/header.inc'); prnMsg( _('No general ledger accounts were returned by the SQL because') . ' - ' . DB_error_msg() ); echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu'). '</a>'; @@ -174,8 +174,6 @@ } if (DB_num_rows($AccountsResult)==0){ $Title = _('Print Trial Balance Error'); - $ViewTopic = 'GeneralLedger'; - $BookMark = 'TrialBalance'; include('includes/header.inc'); echo '<p>'; prnMsg( _('There were no entries to print out for the selections specified') ); @@ -435,16 +433,17 @@ $AccountsResult = DB_query($SQL, _('No general ledger accounts were returned by the SQL because'), _('The SQL that failed was:')); - echo '<p class="page_title_text noprint"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . - _('Trial Balance') . '" alt="" />' . ' ' . _('Trial Balance Report') . '</p>'; + echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme. + '/images/gl.png" title="' .// Icon image. + _('Trial Balance') . '" /> ' .// Icon title. + _('Trial Balance for the month of ') . $PeriodToDate . '<br />' . + _(' AND for the ') . $NumberOfMonths . ' ' . _('months to') . ' ' . $PeriodToDate;// Page title. /*show a table of the accounts info returned by the SQL - Account Code , Account Name , Month Actual, Month Budget, Period Actual, Period Budget */ + Account Code, Account Name, Month Actual, Month Budget, Period Actual, Period Budget */ echo '<table cellpadding="2" class="selection">'; - echo '<tr> - <th colspan="6"><b>' . _('Trial Balance for the month of ') . $PeriodToDate . _(' AND for the ') . $NumberOfMonths . _(' months to ') . $PeriodToDate . '</b></th> - </tr>'; + $TableHeader = '<tr> <th>' . _('Account') . '</th> <th>' . _('Account Name') . '</th> @@ -727,12 +726,18 @@ locale_number_format($CheckPeriodBudget,$_SESSION['CompanyRecord']['decimalplaces'])); echo '</table><br />'; - echo '<div class="centre noprint"> - <input type="submit" name="SelectADifferentPeriod" value="' . _('Select A Different Period') . '" /> - </div>'; + + 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. + '<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 formaction="index.php" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme. + '/images/previous.png" /> ' . ('Return') . '</button>'.// "Return" button. + '</div>'; } echo '</div> </form>'; include('includes/footer.inc'); -?> \ No newline at end of file +?> Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-22 04:57:51 UTC (rev 7169) +++ trunk/doc/Change.log 2015-02-22 17:16:36 UTC (rev 7170) @@ -1,5 +1,6 @@ webERP Change Log +22/2/15 RChacon: Adjust page_title and add "Print This" and "Return" buttons with icon to Statement of Comprehensive Income and Trial Balance scripts. Add code documentation and removes redundant $ViewTopic and $BookMark in GLTrialBalance.php. 22/2/15 RChacon: Add missing preview.png and new previous.png icons. Add "Print This" and "Return" buttons with icon in GLBalanceSheet.php. 22/2/15 Simon Rhodes: added global $db; statements to functions in ConnectDB_mysql.inc that had been missed for the transaction functions 21/2/15 RChacon: Add headings, page-title and centre-align styles to print.css. Improve page title to use with print.css and add code documentation in GLBalanceSheet.php. |
From: <vv...@us...> - 2015-02-22 17:37:39
|
Revision: 7171 http://sourceforge.net/p/web-erp/reponame/7171 Author: vvs2012 Date: 2015-02-22 17:37:31 +0000 (Sun, 22 Feb 2015) Log Message: ----------- Missing closing tags Modified Paths: -------------- trunk/GLBalanceSheet.php trunk/SelectOrderItems.php Modified: trunk/GLBalanceSheet.php =================================================================== --- trunk/GLBalanceSheet.php 2015-02-22 17:16:36 UTC (rev 7170) +++ trunk/GLBalanceSheet.php 2015-02-22 17:37:31 UTC (rev 7171) @@ -64,7 +64,7 @@ </tr> <tr> <td>' . _('Show all Accounts including zero balances') . '</td> - <td><input type="checkbox" title="' . _('Check this box to display all accounts including those accounts with no balance') . '" name="ShowZeroBalances"></td> + <td><input type="checkbox" title="' . _('Check this box to display all accounts including those accounts with no balance') . '" name="ShowZeroBalances" /></td> </tr> </table>'; Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2015-02-22 17:16:36 UTC (rev 7170) +++ trunk/SelectOrderItems.php 2015-02-22 17:37:31 UTC (rev 7171) @@ -1735,11 +1735,12 @@ </div>'; }#end if SearchResults to show + echo '</form>'; } /*end of PartSearch options to be displayed */ elseif( isset($_POST['QuickEntry'])) { /* show the quick entry form variable */ /*FORM VARIABLES TO POST TO THE ORDER WITH PART CODE AND QUANTITY */ echo '<div class="page_help_text"><b>' . _('Use this screen for the '). _('Quick Entry')._(' of products to be ordered') . '</b></div><br /> - <table border="1"> + <table class="selection"> <tr>'; /*do not display colum unless customer requires po line number by sales order line*/ if($_SESSION['Items'.$identifier]->DefaultPOLine ==1){ @@ -1812,6 +1813,7 @@ <div class="centre"> <input name="CancelOrder" type="submit" value="' . _('Cancel Whole Order') . '" onclick="return confirm(\'' . _('Are you sure you wish to cancel this entire order?') . '\');" /> </div> + </div> </form>'; } }#end of else not selecting a customer |
From: <rc...@us...> - 2015-02-22 19:45:24
|
Revision: 7173 http://sourceforge.net/p/web-erp/reponame/7173 Author: rchacon Date: 2015-02-22 19:45:21 +0000 (Sun, 22 Feb 2015) Log Message: ----------- Fix missing gettext. Modified Paths: -------------- trunk/GLBalanceSheet.php trunk/GLProfit_Loss.php trunk/GLTrialBalance.php trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po Modified: trunk/GLBalanceSheet.php =================================================================== --- trunk/GLBalanceSheet.php 2015-02-22 17:43:08 UTC (rev 7172) +++ trunk/GLBalanceSheet.php 2015-02-22 19:45:21 UTC (rev 7173) @@ -716,7 +716,7 @@ '<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 formaction="index.php" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme. - '/images/previous.png" /> ' . ('Return') . '</button>'.// "Return" button. + '/images/previous.png" /> ' . _('Return') . '</button>'.// "Return" button. '</div>'; echo '</div></form>'; Modified: trunk/GLProfit_Loss.php =================================================================== --- trunk/GLProfit_Loss.php 2015-02-22 17:43:08 UTC (rev 7172) +++ trunk/GLProfit_Loss.php 2015-02-22 19:45:21 UTC (rev 7173) @@ -1309,7 +1309,7 @@ '<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 formaction="index.php" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme. - '/images/previous.png" /> ' . ('Return') . '</button>'.// "Return" button. + '/images/previous.png" /> ' . _('Return') . '</button>'.// "Return" button. '</div>'; } echo '</div>'; Modified: trunk/GLTrialBalance.php =================================================================== --- trunk/GLTrialBalance.php 2015-02-22 17:43:08 UTC (rev 7172) +++ trunk/GLTrialBalance.php 2015-02-22 19:45:21 UTC (rev 7173) @@ -733,7 +733,7 @@ '<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 formaction="index.php" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme. - '/images/previous.png" /> ' . ('Return') . '</button>'.// "Return" button. + '/images/previous.png" /> ' . _('Return') . '</button>'.// "Return" button. '</div>'; } echo '</div> Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-22 17:43:08 UTC (rev 7172) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-22 19:45:21 UTC (rev 7173) @@ -8,7 +8,7 @@ "Project-Id-Version: webERP 4.12.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-22 11:19-0600\n" -"PO-Revision-Date: 2015-02-22 11:41-0600\n" +"PO-Revision-Date: 2015-02-22 11:50-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: TecnoSoluciones.com <web...@te...>\n" "Language: es_ES\n" @@ -24277,7 +24277,7 @@ #: ProductSpecs.php:396 QATests.php:401 #: reportwriter/languages/en_US/reports.php:53 msgid "Active" -msgstr "" +msgstr "Activo" #: ProductSpecs.php:466 #, php-format @@ -50551,7 +50551,7 @@ #: reportwriter/languages/en_US/reports.php:213 msgid "No Border" -msgstr "" +msgstr "Sin borde" #: reportwriter/languages/en_US/reports.php:214 msgid "No Fill" @@ -52026,25 +52026,3 @@ #: ../webSHOP/includes/session.php:137 msgid "Bank Transfer" msgstr "Transferencia bancaria" - -#~ msgid "HTML View" -#~ msgstr "Ver como HTML" - -#~ msgid "General Ledger Profit Loss Inquiry" -#~ msgstr "Consultar Ganancias y Pérdidas Contables" - -#~ msgid "Statement of Profit and Loss for the" -#~ msgstr "Estado de Ganancias y Pérdidas para el" - -#~ msgid "Trial Balance Report" -#~ msgstr "Reporte de balance de comprobación" - -#~ msgid "Account:" -#~ msgstr "Cuenta:" - -#~ msgid "" -#~ "Select a csv file containing the details of the account codes that you " -#~ "wish to import into webERP. " -#~ msgstr "" -#~ "Seleccione un archivo CSV con los detalles de los códigos contables que " -#~ "desea importar al webERP. " |
From: <tu...@us...> - 2015-02-26 01:44:21
|
Revision: 7179 http://sourceforge.net/p/web-erp/reponame/7179 Author: turbopt Date: 2015-02-26 01:44:19 +0000 (Thu, 26 Feb 2015) Log Message: ----------- Fix Z_ImportSupplier bug reported in forum by: Bill Schlaerth. Modified Paths: -------------- trunk/Z_ImportSuppliers.php trunk/doc/Change.log Modified: trunk/Z_ImportSuppliers.php =================================================================== --- trunk/Z_ImportSuppliers.php 2015-02-25 00:44:12 UTC (rev 7178) +++ trunk/Z_ImportSuppliers.php 2015-02-26 01:44:19 UTC (rev 7179) @@ -199,7 +199,9 @@ $sql="SELECT COUNT(supplierid) FROM suppliers WHERE supplierid='".$SupplierID."'"; $result=DB_query($sql); $myrow=DB_fetch_row($result); - $SuppExists=(DB_num_rows($result)>0); + + $SuppExists = ($myrow[0]>0); + if ($SuppExists AND $_POST['UpdateIfExists']!=1) { $UpdatedNum++; }elseif($SuppExists){ Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-25 00:44:12 UTC (rev 7178) +++ trunk/doc/Change.log 2015-02-26 01:44:19 UTC (rev 7179) @@ -1,5 +1,6 @@ webERP Change Log +25/2/15 TurboPT: Fix Z_ImportSupplier bug reported in forum by: Bill Schlaerth. 22/2/15 TurboPT: Fix supplier delivery address bug reported in form by: Giusba 22/2/15 RChacon: Adjust page_title and add "Print This" and "Return" buttons with icon to Statement of Comprehensive Income and Trial Balance scripts. Add code documentation and removes redundant $ViewTopic and $BookMark in GLTrialBalance.php. 22/2/15 RChacon: Add missing preview.png and new previous.png icons. Add "Print This" and "Return" buttons with icon in GLBalanceSheet.php. |
From: <rc...@us...> - 2015-03-02 15:48:27
|
Revision: 7180 http://sourceforge.net/p/web-erp/reponame/7180 Author: rchacon Date: 2015-03-02 15:48:19 +0000 (Mon, 02 Mar 2015) Log Message: ----------- Completes table-row colums, regroups price, cost and gross profit in one table-row, uses company decimal places for gross profit in SelectProduct.php. Modified Paths: -------------- trunk/SelectProduct.php trunk/doc/Change.log trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po Modified: trunk/SelectProduct.php =================================================================== --- trunk/SelectProduct.php 2015-02-26 01:44:19 UTC (rev 7179) +++ trunk/SelectProduct.php 2015-03-02 15:48:19 UTC (rev 7180) @@ -92,7 +92,7 @@ echo '<tr> <td style="width:40%" valign="top"> <table>'; //nested table - echo '<tr><th class="number">' . _('Category') . ':</th> <td colspan="2" class="select">' . $myrow['categorydescription'] , '</td></tr>'; + echo '<tr><th class="number">' . _('Category') . ':</th> <td colspan="6" class="select">' . $myrow['categorydescription'] , '</td></tr>'; echo '<tr><th class="number">' . _('Item Type') . ':</th> <td colspan="2" class="select">'; switch ($myrow['mbflag']) { @@ -137,8 +137,6 @@ <th class="number">' . _('EOQ') . ':</th> <td class="select">' . locale_number_format($myrow['eoq'], $myrow['decimalplaces']) . '</td></tr>'; if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) { - echo '<tr><th colspan="2">' . _('Sell Price') . ':</th> - <td class="select">'; $PriceResult = DB_query("SELECT typeabbrev, price FROM prices @@ -160,6 +158,9 @@ } else { $Cost = $myrow['cost']; } + echo '<tr> + <th class="number">' . _('Price') . ':</th> + <td class="select">'; if (DB_num_rows($PriceResult) == 0) { echo _('No Default Price Set in Home Currency') . '</td></tr>'; $Price = 0; @@ -168,33 +169,18 @@ $Price = $PriceRow[1]; echo $PriceRow[0] . '</td> <td class="select">' . locale_number_format($Price, $_SESSION['CompanyRecord']['decimalplaces']) . '</td> + <th class="number">' . _('Cost') . '</th> + <td class="select">' . locale_number_format($Cost, $_SESSION['StandardCostDecimalPlaces']) . '</td> <th class="number">' . _('Gross Profit') . '</th> <td class="select">'; if ($Price > 0) { - $GP = locale_number_format(($Price - $Cost) * 100 / $Price, 1); + echo locale_number_format(($Price - $Cost) * 100 / $Price, $_SESSION['CompanyRecord']['decimalplaces']) . '%'; } else { - $GP = _('N/A'); + echo _('N/A'); } - echo $GP . '%' . '</td> + echo '</td> </tr>'; } - if ($myrow['mbflag'] == 'K' OR $myrow['mbflag'] == 'A') { - $CostResult = DB_query("SELECT SUM(bom.quantity * (stockmaster.materialcost+stockmaster.labourcost+stockmaster.overheadcost)) AS cost - FROM bom INNER JOIN - stockmaster - ON bom.component=stockmaster.stockid - WHERE bom.parent = '" . $StockID . "' - AND bom.effectiveafter <= '" . date('Y-m-d') . "' - AND bom.effectiveto > '" . date('Y-m-d') . "'"); - $CostRow = DB_fetch_row($CostResult); - $Cost = $CostRow[0]; - } else { - $Cost = $myrow['cost']; - } - echo '<tr> - <th class="number">' . _('Cost') . '</th> - <td class="select">' . locale_number_format($Cost, $_SESSION['StandardCostDecimalPlaces']) . '</td> - </tr>'; } //end of if PricesSecuirty allows viewing of prices echo '</table>'; //end of first nested table // Item Category Property mod: display the item properties @@ -811,4 +797,4 @@ /* end display list if there is more than one record */ include ('includes/footer.inc'); -?> \ No newline at end of file +?> Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-02-26 01:44:19 UTC (rev 7179) +++ trunk/doc/Change.log 2015-03-02 15:48:19 UTC (rev 7180) @@ -1,5 +1,6 @@ webERP Change Log +2/3/15 RChacon: Completes table-row colums, regroups price, cost and gross profit in one table-row, uses company decimal places for gross profit in SelectProduct.php. 25/2/15 TurboPT: Fix Z_ImportSupplier bug reported in forum by: Bill Schlaerth. 22/2/15 TurboPT: Fix supplier delivery address bug reported in form by: Giusba 22/2/15 RChacon: Adjust page_title and add "Print This" and "Return" buttons with icon to Statement of Comprehensive Income and Trial Balance scripts. Add code documentation and removes redundant $ViewTopic and $BookMark in GLTrialBalance.php. Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-02-26 01:44:19 UTC (rev 7179) +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-03-02 15:48:19 UTC (rev 7180) @@ -8,7 +8,7 @@ "Project-Id-Version: webERP 4.12.2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-24 17:34-0600\n" -"PO-Revision-Date: 2015-02-22 11:50-0600\n" +"PO-Revision-Date: 2015-03-02 09:36-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: TecnoSoluciones.com <web...@te...>\n" "Language: es_ES\n" @@ -17680,7 +17680,7 @@ #: MRPReport.php:181 msgid "EOQ:" -msgstr "COE:" +msgstr "Cantidad económica de pedido:" #: MRPReport.php:183 msgid "On Hand:" @@ -28173,7 +28173,7 @@ #: SelectProduct.php:137 msgid "EOQ" -msgstr "Cantidad Económica para Reordenar" +msgstr "Cantidad económica de pedido" #: SelectProduct.php:164 msgid "No Default Price Set in Home Currency" |
From: <rc...@us...> - 2015-03-03 23:51:34
|
Revision: 7183 http://sourceforge.net/p/web-erp/reponame/7183 Author: rchacon Date: 2015-03-03 23:51:31 +0000 (Tue, 03 Mar 2015) Log Message: ----------- Adds cross.png to all css images for use in Reset or Cancel buttons as needed. Modified Paths: -------------- trunk/doc/Change.log Added Paths: ----------- trunk/css/aguapop/images/cross.png trunk/css/default/images/cross.png trunk/css/fluid/images/cross.png trunk/css/fresh/images/cross.png trunk/css/gel/images/cross.png trunk/css/professional/images/cross.png trunk/css/professional-rtl/images/cross.png trunk/css/silverwolf/images/cross.png trunk/css/wood/images/cross.png trunk/css/xenos/images/cross.png Added: trunk/css/aguapop/images/cross.png =================================================================== (Binary files differ) Index: trunk/css/aguapop/images/cross.png =================================================================== --- trunk/css/aguapop/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182) +++ trunk/css/aguapop/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183) Property changes on: trunk/css/aguapop/images/cross.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/default/images/cross.png =================================================================== (Binary files differ) Index: trunk/css/default/images/cross.png =================================================================== --- trunk/css/default/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182) +++ trunk/css/default/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183) Property changes on: trunk/css/default/images/cross.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/fluid/images/cross.png =================================================================== (Binary files differ) Index: trunk/css/fluid/images/cross.png =================================================================== --- trunk/css/fluid/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182) +++ trunk/css/fluid/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183) Property changes on: trunk/css/fluid/images/cross.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/fresh/images/cross.png =================================================================== (Binary files differ) Index: trunk/css/fresh/images/cross.png =================================================================== --- trunk/css/fresh/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182) +++ trunk/css/fresh/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183) Property changes on: trunk/css/fresh/images/cross.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/gel/images/cross.png =================================================================== (Binary files differ) Index: trunk/css/gel/images/cross.png =================================================================== --- trunk/css/gel/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182) +++ trunk/css/gel/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183) Property changes on: trunk/css/gel/images/cross.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/professional/images/cross.png =================================================================== (Binary files differ) Index: trunk/css/professional/images/cross.png =================================================================== --- trunk/css/professional/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182) +++ trunk/css/professional/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183) Property changes on: trunk/css/professional/images/cross.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/professional-rtl/images/cross.png =================================================================== (Binary files differ) Index: trunk/css/professional-rtl/images/cross.png =================================================================== --- trunk/css/professional-rtl/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182) +++ trunk/css/professional-rtl/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183) Property changes on: trunk/css/professional-rtl/images/cross.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/silverwolf/images/cross.png =================================================================== (Binary files differ) Index: trunk/css/silverwolf/images/cross.png =================================================================== --- trunk/css/silverwolf/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182) +++ trunk/css/silverwolf/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183) Property changes on: trunk/css/silverwolf/images/cross.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/wood/images/cross.png =================================================================== (Binary files differ) Index: trunk/css/wood/images/cross.png =================================================================== --- trunk/css/wood/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182) +++ trunk/css/wood/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183) Property changes on: trunk/css/wood/images/cross.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/css/xenos/images/cross.png =================================================================== (Binary files differ) Index: trunk/css/xenos/images/cross.png =================================================================== --- trunk/css/xenos/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182) +++ trunk/css/xenos/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183) Property changes on: trunk/css/xenos/images/cross.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-03-03 14:38:37 UTC (rev 7182) +++ trunk/doc/Change.log 2015-03-03 23:51:31 UTC (rev 7183) @@ -1,5 +1,6 @@ webERP Change Log +3/3/15 RChacon: Adds cross.png to all css images for use in Reset or Cancel buttons as needed. 2/3/15 RChacon: Completes table-row colums, regroups price, cost and gross profit in one table-row, uses company decimal places for gross profit in SelectProduct.php. 25/2/15 TurboPT: Fix Z_ImportSupplier bug reported in forum by: Bill Schlaerth. 22/2/15 TurboPT: Fix supplier delivery address bug reported in form by: Giusba |
From: <rc...@us...> - 2015-03-04 00:06:22
|
Revision: 7184 http://sourceforge.net/p/web-erp/reponame/7184 Author: rchacon Date: 2015-03-04 00:06:20 +0000 (Wed, 04 Mar 2015) Log Message: ----------- Replaces preview.gif with preview.png and deletes preview.gif. Modified Paths: -------------- trunk/CustomerTransInquiry.php Removed Paths: ------------- trunk/css/aguapop/images/preview.gif trunk/css/default/images/preview.gif trunk/css/fluid/images/preview.gif trunk/css/fresh/images/preview.gif trunk/css/gel/images/preview.gif trunk/css/professional/images/preview.gif trunk/css/professional-rtl/images/preview.gif trunk/css/silverwolf/images/preview.gif trunk/css/wood/images/preview.gif trunk/css/xenos/images/preview.gif Modified: trunk/CustomerTransInquiry.php =================================================================== --- trunk/CustomerTransInquiry.php 2015-03-03 23:51:31 UTC (rev 7183) +++ trunk/CustomerTransInquiry.php 2015-03-04 00:06:20 UTC (rev 7184) @@ -152,7 +152,7 @@ $myrow['currcode'], $RootPath, $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images/preview.gif'); + $RootPath.'/css/'.$Theme.'/images/preview.png'); } elseif($_POST['TransType']==11) { /* credit notes */ printf($format_base . @@ -171,7 +171,7 @@ $myrow['currcode'], $RootPath, $myrow['transno'], - $RootPath.'/css/'.$Theme.'/images/preview.gif'); + $RootPath.'/css/'.$Theme.'/images/preview.png'); } else { /* otherwise */ printf($format_base . '</tr>', _($myrow['typename']), Deleted: trunk/css/aguapop/images/preview.gif =================================================================== (Binary files differ) Deleted: trunk/css/default/images/preview.gif =================================================================== (Binary files differ) Deleted: trunk/css/fluid/images/preview.gif =================================================================== (Binary files differ) Deleted: trunk/css/fresh/images/preview.gif =================================================================== (Binary files differ) Deleted: trunk/css/gel/images/preview.gif =================================================================== (Binary files differ) Deleted: trunk/css/professional/images/preview.gif =================================================================== (Binary files differ) Deleted: trunk/css/professional-rtl/images/preview.gif =================================================================== (Binary files differ) Deleted: trunk/css/silverwolf/images/preview.gif =================================================================== (Binary files differ) Deleted: trunk/css/wood/images/preview.gif =================================================================== (Binary files differ) Deleted: trunk/css/xenos/images/preview.gif =================================================================== (Binary files differ) |
From: <rc...@us...> - 2015-03-04 00:20:28
|
Revision: 7185 http://sourceforge.net/p/web-erp/reponame/7185 Author: rchacon Date: 2015-03-04 00:20:21 +0000 (Wed, 04 Mar 2015) Log Message: ----------- Replaces credit.gif with credit.png and deletes credit.gif. Modified Paths: -------------- trunk/Credit_Invoice.php Removed Paths: ------------- trunk/css/aguapop/images/credit.gif trunk/css/default/images/credit.gif trunk/css/fluid/images/credit.gif trunk/css/fresh/images/credit.gif trunk/css/gel/images/credit.gif trunk/css/professional/images/credit.gif trunk/css/professional-rtl/images/credit.gif trunk/css/silverwolf/images/credit.gif trunk/css/wood/images/credit.gif trunk/css/xenos/images/credit.gif Modified: trunk/Credit_Invoice.php =================================================================== --- trunk/Credit_Invoice.php 2015-03-04 00:06:20 UTC (rev 7184) +++ trunk/Credit_Invoice.php 2015-03-04 00:20:21 UTC (rev 7185) @@ -273,7 +273,7 @@ /* Always display credit quantities NB QtyDispatched in the LineItems array is used for the quantity to credit */ -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/credit.gif" title="' . _('Search') . '" alt="" />' . $Title . '</p>'; +echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/credit.png" title="' . _('Search') . '" alt="" />' . $Title . '</p>'; if(!isset($_POST['ProcessCredit'])) { Deleted: trunk/css/aguapop/images/credit.gif =================================================================== (Binary files differ) Deleted: trunk/css/default/images/credit.gif =================================================================== (Binary files differ) Deleted: trunk/css/fluid/images/credit.gif =================================================================== (Binary files differ) Deleted: trunk/css/fresh/images/credit.gif =================================================================== (Binary files differ) Deleted: trunk/css/gel/images/credit.gif =================================================================== (Binary files differ) Deleted: trunk/css/professional/images/credit.gif =================================================================== (Binary files differ) Deleted: trunk/css/professional-rtl/images/credit.gif =================================================================== (Binary files differ) Deleted: trunk/css/silverwolf/images/credit.gif =================================================================== (Binary files differ) Deleted: trunk/css/wood/images/credit.gif =================================================================== (Binary files differ) Deleted: trunk/css/xenos/images/credit.gif =================================================================== (Binary files differ) |