From: Rafael C. <raf...@gm...> - 2014-10-17 21:13:37
|
Hi, Please take note that, with this change, the tax category 'Freight' inside database must be in en-GB (British English), not translated. Translation is done in a normal way inside DatabaseTranslations.php. Best regards, Rafael. ---------- Forwarded message ---------- From: <rc...@us...> Date: 2014-10-17 15:08 GMT-06:00 Subject: [Web-erp-svn] SF.net SVN: web-erp:[6922] trunk To: web...@li... Revision: 6922 http://sourceforge.net/p/web-erp/reponame/6922 Author: rchacon Date: 2014-10-17 21:08:14 +0000 (Fri, 17 Oct 2014) Log Message: ----------- Remove translation of tax category 'Freight' inside database. Modified Paths: -------------- trunk/doc/Change.log trunk/includes/DefineCartClass.php Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2014-10-17 06:23:51 UTC (rev 6921) +++ trunk/doc/Change.log 2014-10-17 21:08:14 UTC (rev 6922) @@ -1,4 +1,5 @@ webERP Change Log +17/10/14 RChacon: Remove translation of tax category 'Freight' inside database. 17/10/14 Exson: Add po line and due date result in OrderDetails.php. 15/10/14 Exson: Fixed no receipt data displayed retrieved bugs for sales login in CustomerInquiry.php. 14/10/14 Jiro Akits: Update Chinese traditional translation. Modified: trunk/includes/DefineCartClass.php =================================================================== --- trunk/includes/DefineCartClass.php 2014-10-17 06:23:51 UTC (rev 6921) +++ trunk/includes/DefineCartClass.php 2014-10-17 21:08:14 UTC (rev 6922) @@ -374,7 +374,7 @@ /*Gets the Taxes and rates applicable to the freight based on the tax group of the branch combined with the tax category for this particular freight and SESSION['FreightTaxCategory'] the taxprovince of the dispatch location */ - $sql = "SELECT taxcatid FROM taxcategories WHERE taxcatname='" . _('Freight') . "'";// To allow translations of tax category "Freight". + $sql = "SELECT taxcatid FROM taxcategories WHERE taxcatname='" . 'Freight' . "'";// To allow translations of tax category "Freight".*********************** $TaxCatQuery = DB_query($sql, $db); if ($TaxCatRow = DB_fetch_array($TaxCatQuery)) { ------------------------------------------------------------------------------ Comprehensive Server Monitoring with Site24x7. Monitor 10 servers for $9/Month. Get alerted through email, SMS, voice calls or mobile push notifications. Take corrective actions from your mobile device. http://p.sf.net/sfu/Zoho _______________________________________________ Web-erp-svn mailing list Web...@li... https://lists.sourceforge.net/lists/listinfo/web-erp-svn |