[Web-erp-svn] SF.net SVN: web-erp:[7180] trunk

[<rc...@us...>]

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"