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

[<dai...@us...>]

Revision: 5737
          http://sourceforge.net/p/web-erp/reponame/5737
Author:   daintree
Date:     2012-11-08 07:34:28 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
Craig Craven updated Japanese translation

Modified Paths:
--------------
    trunk/PDFQuotation.php
    trunk/PDFQuotationPortrait.php
    trunk/SelectProduct.php
    trunk/doc/Change.log
    trunk/includes/PDFStarter.php
    trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
    trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po

Modified: trunk/PDFQuotation.php
===================================================================
--- trunk/PDFQuotation.php	2012-11-03 04:35:52 UTC (rev 5736)
+++ trunk/PDFQuotation.php	2012-11-08 07:34:28 UTC (rev 5737)
@@ -240,7 +240,7 @@
 	$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,locale_number_format($QuotationTotal,$myrow['currdecimalplaces']),'right');
 
 	$YPos -= ($line_height);
-	$LeftOvers = $pdf->addTextWrap($XPos,$YPos,20,10,_('Notes:'));
+	$LeftOvers = $pdf->addTextWrap($XPos,$YPos,30,10,_('Notes:'));
 	$myrow['comments'] = str_replace('\r','',$myrow['comments']);
 	$myrow['comments'] = str_replace('\n','',$myrow['comments']);
 	$LeftOvers = $pdf->addTextWrap($XPos+28,$YPos,800,10,$myrow['comments']);

Modified: trunk/PDFQuotationPortrait.php
===================================================================
--- trunk/PDFQuotationPortrait.php	2012-11-03 04:35:52 UTC (rev 5736)
+++ trunk/PDFQuotationPortrait.php	2012-11-08 07:34:28 UTC (rev 5737)
@@ -228,7 +228,7 @@
 		include ('includes/PDFQuotationPageHeader.inc');
 	} //end if need a new page headed up
 
-	$LeftOvers = $pdf->addTextWrap($XPos,$YPos-80,200,10,_('Notes:'));
+	$LeftOvers = $pdf->addTextWrap($XPos,$YPos-80,30,10,_('Notes:'));
 	$LeftOvers = $pdf->addText($XPos,$YPos-95,10,$myrow['comments']);
 
 	if (mb_strlen($LeftOvers)>1){

Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php	2012-11-03 04:35:52 UTC (rev 5736)
+++ trunk/SelectProduct.php	2012-11-08 07:34:28 UTC (rev 5737)
@@ -68,8 +68,8 @@
 								stockmaster.volume,
 								stockmaster.kgs,
 								stockcategory.categorydescription
-								FROM stockmaster INNER JOIN stockcategory
-								ON stockmaster.categoryid=stockcategory.categoryid
+						FROM stockmaster INNER JOIN stockcategory
+						ON stockmaster.categoryid=stockcategory.categoryid
 						WHERE stockid='" . $StockID . "'", $db);
 	$myrow = DB_fetch_array($result);
 	$Its_A_Kitset_Assembly_Or_Dummy = false;
@@ -138,7 +138,8 @@
 		echo '<tr><th colspan="2">' . _('Sell Price') . ':</th>
 				<td class="select">';
 		$PriceResult = DB_query("SELECT typeabbrev,
-										price FROM prices
+										price 
+								FROM prices
 								WHERE currabrev ='" . $_SESSION['CompanyRecord']['currencydefault'] . "'
 								AND typeabbrev = '" . $_SESSION['DefaultPriceList'] . "'
 								AND debtorno=''
@@ -147,8 +148,7 @@
 								AND stockid='" . $StockID . "'", $db);
 		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
+									FROM bom INNER JOIN stockmaster
 									ON bom.component=stockmaster.stockid
 									WHERE bom.parent='" . $StockID . "'
 									AND bom.effectiveto > '" . Date('Y-m-d') . "'
@@ -164,7 +164,8 @@
 		} else {
 			$PriceRow = DB_fetch_row($PriceResult);
 			$Price = $PriceRow[1];
-			echo $PriceRow[0] . '</td><td class="select">' . locale_number_format($Price, $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+			echo $PriceRow[0] . '</td>
+				<td class="select">' . locale_number_format($Price, $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
 				<th class="number">' . _('Gross Profit') . '</th>
 				<td class="select">';
 			if ($Price > 0) {
@@ -368,7 +369,7 @@
 				<th style="width:10%">' . _('Lead Time') . '</th>
 				<th style="width:10%">' . _('Min Order Qty') . '</th>
 				<th style="width:5%">' . _('Prefer') . '</th></tr>';
-	$SuppResult = DB_query("SELECT  suppliers.suppname,
+	$SuppResult = DB_query("SELECT suppliers.suppname,
 									suppliers.currcode,
 									suppliers.supplierid,
 									purchdata.price,

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2012-11-03 04:35:52 UTC (rev 5736)
+++ trunk/doc/Change.log	2012-11-08 07:34:28 UTC (rev 5737)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+8/11/12 Craig Craven: Updated Japanese translation
 3/11/12 Phil: Fixed BAD bug wtth CounterSales.php it was possible to make sales where the invoice didn't agree with the sum of the lines sold!!
 3/11/12 Phil: Added CounterReturns.php script to handle cash returns
 3/11/12 Jesus Aguirre: Added tag selection to purchase invoice gl analysis 

Modified: trunk/includes/PDFStarter.php
===================================================================
--- trunk/includes/PDFStarter.php	2012-11-03 04:35:52 UTC (rev 5736)
+++ trunk/includes/PDFStarter.php	2012-11-08 07:34:28 UTC (rev 5737)
@@ -174,11 +174,12 @@
 /* Javier: I have brought this piece from the pdf class constructor to get it closer to the admin/user,
 	I corrected it to match TCPDF, but it still needs check, after which,
 	I think it should be moved to each report to provide flexible Document Header and Margins in a per-report basis. */
- 	$pdf->SetAutoPageBreak(true, 0);	// Javier: needs check.
+
 	$pdf->SetPrintHeader(false);	// Javier: I added this must be called before Add Pa