Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6518] trunk
|
From: <rc...@us...> - 2013-12-26 17:15:53
|
Revision: 6518
http://sourceforge.net/p/web-erp/reponame/6518
Author: rchacon
Date: 2013-12-26 17:15:48 +0000 (Thu, 26 Dec 2013)
Log Message:
-----------
Shows Default Tax Category. Shows Stock Type name instead of Stock Type code. Minor Spanish translation adjustments.
Modified Paths:
--------------
trunk/StockCategories.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/StockCategories.php
===================================================================
--- trunk/StockCategories.php 2013-12-25 08:18:30 UTC (rev 6517)
+++ trunk/StockCategories.php 2013-12-26 17:15:48 UTC (rev 6518)
@@ -3,11 +3,29 @@
include('includes/session.inc');
-$Title = _('Stock Category Maintenance');
+$Title = _('Inventory Categories Maintenance');
$ViewTopic= 'Inventory';
$BookMark = 'InventoryCategories';
include('includes/header.inc');
+// BEGIN: Stock Type Name array.
+$StockTypeName = array();
+$StockTypeName['D'] = _('Dummy Item - (No Movements)');
+$StockTypeName['F'] = _('Finished Goods');
+$StockTypeName['L'] = _('Labour');
+$StockTypeName['M'] = _('Raw Materials');
+asort($StockTypeName);
+// END: Stock Type Name array.
+
+// BEGIN: Tax Category Name array.
+$TaxCategoryName = array();
+$Query = "SELECT taxcatid, taxcatname FROM taxcategories ORDER BY taxcatname";
+$Result = DB_query($Query, $db);
+while ($Row = DB_fetch_array($Result)) {
+ $TaxCategoryName[$Row['taxcatid']] = $Row['taxcatname'];
+}
+// END: Tax Category Name array.
+
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Inventory Adjustment') . '" alt="" />' . ' ' . $Title . '</p>';
if (isset($_GET['SelectedCategory'])){
@@ -150,17 +168,17 @@
purchpricevaract,
materialuseagevarac,
wipact)
- VALUES (
- '" . $_POST['CategoryID'] . "',
- '" . $_POST['StockType'] . "',
- '" . $_POST['CategoryDescription'] . "',
- '" . $_POST['DefaultTaxCatID'] . "',
- '" . $_POST['StockAct'] . "',
- '" . $_POST['AdjGLAct'] . "',
- '" . $_POST['IssueGLAct'] . "',
- '" . $_POST['PurchPriceVarAct'] . "',
- '" . $_POST['MaterialUseageVarAc'] . "',
- '" . $_POST['WIPAct'] . "')";
+ VALUES ('" .
+ $_POST['CategoryID'] . "','" .
+ $_POST['StockType'] . "','" .
+ $_POST['CategoryDescription'] . "','" .
+ $_POST['DefaultTaxCatID'] . "','" .
+ $_POST['StockAct'] . "','" .
+ $_POST['AdjGLAct'] . "','" .
+ $_POST['IssueGLAct'] . "','" .
+ $_POST['PurchPriceVarAct'] . "','" .
+ $_POST['MaterialUseageVarAc'] . "','" .
+ $_POST['WIPAct'] . "')";
$ErrMsg = _('Could not insert the new stock category') . $_POST['CategoryDescription'] . _('because');
$result = DB_query($sql,$db,$ErrMsg);
prnMsg(_('A new stock category record has been added for') . ' ' . $_POST['CategoryDescription'],'success');
@@ -219,9 +237,10 @@
links to delete or edit each. These will call the same page again and allow update/input
or deletion of the records*/
- $sql = "SELECT categoryid,
+ $sql = "SELECT categoryid,
categorydescription,
stocktype,
+ defaulttaxcatid,
stockact,
adjglact,
issueglact,
@@ -234,15 +253,17 @@
echo '<br />
<table class="selection">
<tr>
- <th>' . _('Cat Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Type') . '</th>
- <th>' . _('Stock GL') . '</th>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Category Description') . '</th>' . '
+ <th>' . _('Stock Type') . '</th>' . '
+ <th>' . _('Default Tax Category') . '</th>' . '
+ <th>' . _('Stock GL') . '</th>' . '
<th>' . _('Adjts GL') . '</th>
<th>' . _('Issues GL') . '</th>
<th>' . _('Price Var GL') . '</th>
<th>' . _('Usage Var GL') . '</th>
<th>' . _('WIP GL') . '</th>
+ <th colspan="2">' . _('Maintenance') . '</th>
</tr>';
$k=0; //row colour counter
@@ -258,6 +279,7 @@
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
@@ -269,7 +291,8 @@
</tr>',
$myrow['categoryid'],
$myrow['categorydescription'],
- $myrow['stocktype'],
+ $StockTypeName[$myrow['stocktype']],
+ $TaxCategoryName[$myrow['defaulttaxcatid']],
$myrow['stockact'],
$myrow['adjglact'],
$myrow['issueglact'],
@@ -369,65 +392,46 @@
$PnLAccountsResult = DB_query($sql,$db);
+// Category Description input.
if (!isset($_POST['CategoryDescription'])) {
$_POST['CategoryDescription'] = '';
}
+echo '<tr><td><label for="CategoryDescription">' . _('Category Description') .
+ ':</label></td><td><input id="CategoryDescription" maxlength="20" name="CategoryDescription" required="required" size="22" title="' .
+ _('A description of the inventory category is required') .
+ '" type="text" value="' . $_POST['CategoryDescription'] .
+ '" /></td></tr>';
-echo '<tr>
- <td>' . _('Category Description') . ':</td>
- <td><input type="text" name="CategoryDescription" required="required" title="' . _('A description of the inventory category is required') . '" size="22" maxlength="20" value="' . $_POST['CategoryDescription'] . '" /></td>
- </tr>';
-
-
-echo '<tr>
- <td>' . _('Stock Type') . ':</td>
- <td><select name="StockType" onChange="ReloadForm(CategoryForm.UpdateTypes)" >';
-if (isset($_POST['StockType']) and $_POST['StockType']=='F') {
- echo '<option selected="selected" value="F">' . _('Finished Goods') . '</option>';
-} else {
- echo '<option value="F">' . _('Finished Goods') . '</option>';
+// Stock Type input.
+echo '<tr><td><label for="StockType">' . _('Stock Type') .
+ ':</label></td><td><select id="StockType" name="StockType" onChange="ReloadForm(CategoryForm.UpdateTypes)" >';
+foreach ($StockTypeName as $StockTypeId => $Row) {
+ echo '<option';
+ if (isset($_POST['StockType']) and $_POST['StockType']==$StockTypeId) {
+ echo ' selected="selected"';
+ }
+ echo ' value="' . $StockTypeId . '">' . $Row . '</option>';
}
-if (isset($_POST['StockType']) and $_POST['StockType']=='M') {
- echo '<option selected="selected" value="M">' . _('Raw Materials') . '</option>';
-} else {
- echo '<option value="M">' . _('Raw Materials') . '</option>';
-}
-if (isset($_POST['StockType']) and $_POST['StockType']=='D') {
- echo '<option selected="selected" value="D">' . _('Dummy Item - (No Movements)') . '</option>';
-} else {
- echo '<option value="D">' . _('Dummy Item - (No Movements)') . '</option>';
-}
-if (isset($_POST['StockType']) and $_POST['StockType']=='L') {
- echo '<option selected="selected" value="L">' . _('Labour') . '</option>';
-} else {
- echo '<option value="L">' . _('Labour') . '</option>';
-}
+echo '</select></td></tr>';
-echo '</select></td>
- </tr>';
-
-echo '<tr>
- <td>' . _('Default Tax Category') . ':</td>
- <td><select name="DefaultTaxCatID">';
-$sql = "SELECT taxcatid, taxcatname FROM taxcategories ORDER BY taxcatname";
-$result = DB_query($sql, $db);
-
-if (!isset($_POST['DefaultTaxCatID'])){
+// Default Tax Category input.
+if (!isset($_POST['DefaultTaxCatID'])) {
$_POST['DefaultTaxCatID'] = $_SESSION['DefaultTaxCategory'];
}
-
-while ($myrow = DB_fetch_array($result)) {
- if ($_POST['DefaultTaxCatID'] == $myrow['taxcatid']){
- echo '<option selected="selected" value="' . $myrow['taxcatid'] . '">' . $myrow['taxcatname'] . '</option>';
- } else {
- echo '<option value="' . $myrow['taxcatid'] . '">' . $myrow['taxcatname'] . '</option>';
+echo '<tr><td><label for="DefaultTaxCatID">' . _('Default Tax Category') .
+ ':</label></td><td><select id="DefaultTaxCatID" name="DefaultTaxCatID">';
+foreach ($TaxCategoryName as $TaxCategoryId => $Row) {
+ echo '<option';
+ if ($_POST['DefaultTaxCatID'] == $TaxCategoryId) {
+ echo ' selected="selected"';
}
-} //end while loop
+ echo ' value="' . $TaxCategoryId . '">' . $Row . '</option>';
+}
+echo '</select></td></tr>';
-echo '</select></td>
- </tr>';
-
-echo '<tr><td><input type="submit" name="UpdateTypes" style="visibility:hidden;width:1px" value="Not Seen" />';
+// Recovery or Stock GL Code input.
+echo '<tr>
+<td><input type="submit" name="UpdateTypes" style="visibility:hidden;width:1px" value="Not Seen" />';
if (isset($_POST['StockType']) and $_POST['StockType']=='L') {
$Result = $PnLAccountsResult;
echo _('Recovery GL Code');
@@ -435,7 +439,8 @@
$Result = $BSAccountsResult;
echo _('Stock GL Code');
}
-echo ':</td><td><select name="StockAct">';
+echo ':</td>
+<td><select name="StockAct">';
while ($myrow = DB_fetch_array($Result)){
@@ -449,20 +454,21 @@
DB_data_seek($BSAccountsResult,0);
echo '</select></td></tr>';
+// WIP GL Code input.
echo '<tr><td>' . _('WIP GL Code') . ':</td><td><select name="WIPAct">';
-
while ($myrow = DB_fetch_array($BSAccountsResult)) {
-
+ echo '<option';
if (isset($_POST['WIPAct']) and $myrow['accountcode']==$_POST['WIPAct']) {
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
- } else {
- echo '<option value="' . $myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . ' ('.$myrow['accountcode'].')' . '</option>';
+ echo ' selected="selected"';
}
-
-} //end while loop
+ echo ' value="' . $myrow['accountcode'] . '">' .
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) .
+ ' ('.$myrow['accountcode'].')' . '</option>';
+}
echo '</select></td></tr>';
DB_data_seek($BSAccountsResult,0);
+// Stock Adjustments GL Code input.
echo '<tr>
<td>' . _('Stock Adjustments GL Code') . ':</td>
<td><select name="AdjGLAct">';
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 2013-12-25 08:18:30 UTC (rev 6517)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-12-26 17:15:48 UTC (rev 6518)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-12-01 20:34+1300\n"
-"PO-Revision-Date: 2013-12-14 08:01-0600\n"
+"PO-Revision-Date: 2013-12-26 11:02-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -2699,7 +2699,7 @@
#: Z_ChangeStockCategory.php:92 Z_ChangeStockCode.php:177
#: ../webSHOP/includes/PlaceOrder.php:235
msgid "Stock Code"
-msgstr "Código de Inventario"
+msgstr "Código de inventario"
#: BOMInquiry.php:35 BOMs.php:875 ContractBOM.php:342 Contracts.php:769
#: CounterReturns.php:1642 CounterSales.php:2253 CustomerReceipt.php:1155
@@ -11763,7 +11763,7 @@
#: InternalStockCategoriesByRole.php:167 StockCategories.php:336
#: StockCategories.php:346
msgid "Category Code"
-msgstr "Código de la Categoría"
+msgstr "Código de categoría"
#: FixedAssetCategories.php:255
#, fuzzy
@@ -11774,7 +11774,7 @@
#: FixedAssetCategories.php:283 POReport.php:741 POReport.php:1435
#: SalesInquiry.php:977 StockCategories.php:377
msgid "Category Description"
-msgstr "Descripción de la Categoría"
+msgstr "Descripción de categoría"
#: FixedAssetCategories.php:284
#, fuzzy
@@ -15154,9 +15154,8 @@
msgstr "¿Seguro que desea eliminar esta categoría de impuestos?"
#: InternalStockCategoriesByRole.php:201
-#, fuzzy
msgid "Select Stock Category Code"
-msgstr "Seleccionar una Categoría de Existencia"
+msgstr "Seleccionar un código de categoría de inventario"
#: InternalStockRequestAuthorisation.php:7 includes/MainMenuLinksArray.php:203
msgid "Authorise Internal Stock Requests"
@@ -15431,7 +15430,7 @@
#: SupplierPriceList.php:14 SupplierPriceList.php:224
#: SupplierTenderCreate.php:659 SupplierTenders.php:388
msgid "Search for Inventory Items"
-msgstr "Buscar Artículos del Inventario"
+msgstr "Buscar artículos de inventario"
#: InternalStockRequest.php:319 InventoryQuantities.php:181 MRPReport.php:508
#: ReorderLevel.php:231 SelectProduct.php:43 StockDispatch.php:378
@@ -15820,14 +15819,14 @@
#: InventoryValuation.php:15 MailInventoryValuation.php:51
#: MailInventoryValuation.php:230 includes/MainMenuLinksArray.php:226
msgid "Inventory Valuation Report"
-msgstr "Informe de Valoración del Inventario"
+msgstr "Informe de valoración de inventario"
#: InventoryValuation.php:16 InventoryValuation.php:78
#: MailInventoryValuation.php:21 MailInventoryValuation.php:52
#: MailInventoryValuation.php:119 MailSalesReport_csv.php:30
#: MailSalesReport.php:23
msgid "Inventory Valuation"
-msgstr "Valoración del Inventario"
+msgstr "Valoración de inventario"
#: InventoryValuation.php:80 MailInventoryValuation.php:121
msgid "The inventory valuation could not be retrieved by the SQL because"
@@ -16320,9 +16319,8 @@
msgstr "Cumplir con las Solicitudes de Existencia Internas"
#: MailingGroupMaintenance.php:3 includes/MainMenuLinksArray.php:449
-#, fuzzy
msgid "Mailing Group Maintenance"
-msgstr "Administrar Grupos de Impuestos"
+msgstr "Administrar grupos de correo"
#: MailingGroupMaintenance.php:18
msgid ""
@@ -16343,9 +16341,8 @@
msgstr "La forma de pago no puede contener caracteres prohibidos"
#: MailingGroupMaintenance.php:43
-#, fuzzy
msgid "The Group Id must be integer"
-msgstr "El código de la cuenta debe ser un entero"
+msgstr "El código de grupo debe ser un entero"
#: MailingGroupMaintenance.php:51
#, fuzzy
@@ -16363,9 +16360,8 @@
msgstr ""
#: MailingGroupMaintenance.php:71
-#, fuzzy
msgid "The group id must be numeric"
-msgstr "El período final debe ser numérico"
+msgstr "El código de grupo debe ser un entero"
#: MailingGroupMaintenance.php:87 MailingGroupMaintenance.php:107
#: MailingGroupMaintenance.php:125
@@ -16452,9 +16448,8 @@
msgstr "Por favor, vea el informe de valoración de existencias adjunto"
#: MailInventoryValuation.php:239
-#, fuzzy
msgid "Print Inventory Valuation"
-msgstr "Imprimir Error de Valoración del Inventario"
+msgstr "Imprimir valoración de inventario"
#: MailInventoryValuation.php:241
#, fuzzy
@@ -16860,7 +16855,7 @@
#: MRPCreateDemands.php:211 MRPShortages.php:267 PDFDeliveryDifferences.php:40
#: PDFDIFOT.php:49 PDFOrdersInvoiced.php:49 PDFOrderStatus.php:45
msgid "Inventory Category"
-msgstr "Categorìa de Inventario"
+msgstr "Categoría de inventario"
#: MRPCreateDemands.php:213 MRPShortages.php:268
msgid "All Stock Categories"
@@ -25131,9 +25126,8 @@
msgstr "Enviar Información"
#: SalesCategories.php:434
-#, fuzzy
msgid "Add Inventory to this category"
-msgstr "Añadir Inventario a esta Categoría."
+msgstr "Añadir inventario a esta categoría."
#: SalesCategories.php:437
msgid "Select Item"
@@ -25158,9 +25152,8 @@
msgstr "No hay más artículos de Inventario que añadir"
#: SalesCategories.php:505
-#, fuzzy
msgid "Inventory items for"
-msgstr "Artículos de Inventario"
+msgstr "Artículos de inventario para"
#: SalesCategories.php:511
#, fuzzy
@@ -28536,18 +28529,16 @@
msgstr ""
#: ShopParameters.php:591
-#, fuzzy
msgid "vendor"
-msgstr "inventario"
+msgstr "proveedor"
#: ShopParameters.php:594
msgid "Pay Flow Pro Merchant"
msgstr ""
#: ShopParameters.php:596
-#, fuzzy
msgid "merchant"
-msgstr "Por Ciento"
+msgstr ""
#: ShopParameters.php:599
msgid "SwipeHQ Merchant ID"
@@ -29140,11 +29131,11 @@
#: StockCategories.php:208
msgid "The stock category"
-msgstr "La categoría de existencia"
+msgstr "La categoría de inventario"
#: StockCategories.php:240
msgid "Stock GL"
-msgstr "CC Stock"
+msgstr "CC Inventario"
#: StockCategories.php:241
msgid "Adjts GL"
@@ -29156,15 +29147,15 @@
#: StockCategories.php:243
msgid "Price Var GL"
-msgstr "CC Variación Precio"
+msgstr "CC Varianza en precio"
#: StockCategories.php:244
msgid "Usage Var GL"
-msgstr "CC Variación Uso"
+msgstr "CC Varianza en cantidad"
#: StockCategories.php:245
msgid "WIP GL"
-msgstr "CC Trabajo en Progreso"
+msgstr "CC Trabajo en proceso"
#: StockCategories.php:268
#, php-format
@@ -29179,7 +29170,7 @@
#: StockCategories.php:293
msgid "Show All Stock Categories"
-msgstr "Mostrar todas las categorías de existencia"
+msgstr "Mostrar todas las categorías de inventario"
#: StockCategories.php:347
msgid ""
@@ -29194,11 +29185,11 @@
#: StockCategories.php:383
msgid "Stock Type"
-msgstr "Tipo de Stock"
+msgstr "Tipo de inventario"
#: StockCategories.php:386 StockCategories.php:388
msgid "Finished Goods"
-msgstr "Bienes Terminados"
+msgstr "Bienes terminados"
#: StockCategories.php:396 StockCategories.php:398
msgid "Dummy Item - (No Movements)"
@@ -29206,11 +29197,11 @@
#: StockCategories.php:401 StockCategories.php:403
msgid "Labour"
-msgstr "Mano de Obra"
+msgstr "Mano de obra"
#: StockCategories.php:410 SystemParameters.php:635
msgid "Default Tax Category"
-msgstr "Clase de Impuesto Predeterminado"
+msgstr "Categoría predeterminada de impuesto"
#: StockCategories.php:433
msgid "Recovery GL Code"
@@ -29218,15 +29209,15 @@
#: StockCategories.php:436
msgid "Stock GL Code"
-msgstr "Cuenta Contable de Existencias"
+msgstr "Cuenta contable de inventario"
#: StockCategories.php:452
msgid "WIP GL Code"
-msgstr "Cuenta Contable de Trabajo en Progreso"
+msgstr "Cuenta contable de trabajo en proceso"
#: StockCategories.php:467
msgid "Stock Adjustments GL Code"
-msgstr "Cuenta Contable de Ajustes Inventario"
+msgstr "Cuenta contable de ajustes de inventario"
#: StockCategories.php:482
msgid "Internal Stock Issues GL Code"
@@ -29234,15 +29225,15 @@
#: StockCategories.php:497
msgid "Price Variance GL Code"
-msgstr "Cuenta Contable de Variación de Precio"
+msgstr "Cuenta contable de varianza en precio"
#: StockCategories.php:515
msgid "Labour Efficiency Variance GL Code"
-msgstr "Código Contable de Variación de Eficiencia Laboral"
+msgstr "Código contable de varianza en mano de obra"
#: StockCategories.php:517
msgid "Usage Variance GL Code"
-msgstr "Cuenta Contable de Variación de Uso"
+msgstr "Cuenta contable de varianza en cantidad"
#: StockCategories.php:561
msgid "Property Label"
@@ -29258,15 +29249,15 @@
#: StockCategories.php:564
msgid "Numeric Value"
-msgstr "Valor Númerico"
+msgstr "Valor númerico"
#: StockCategories.php:565
msgid "Minimum Value"
-msgstr "Valor Mínimo"
+msgstr "Valor mínimo"
#: StockCategories.php:566
msgid "Maximum Value"
-msgstr "Valor Máximo"
+msgstr "Valor máximo"
#: StockCategories.php:567
msgid "Require in SO"
@@ -29286,7 +29277,7 @@
#: StockCategories.php:591 StockCategories.php:593 StockCategories.php:625
msgid "Date Box"
-msgstr "Fecha Caja"
+msgstr "Caja de fecha"
#: StockCategories.php:613
msgid ""
@@ -43872,7 +43863,7 @@
#: includes/MainMenuLinksArray.php:501
msgid "Inventory Categories Maintenance"
-msgstr "Administrar Categorías de Inventario"
+msgstr "Administrar categorías de inventario"
#: includes/MainMenuLinksArray.php:502
msgid "Inventory Locations Maintenance"
@@ -49062,9 +49053,8 @@
msgstr ""
#: ../webSHOP/ItemDetails.php:116
-#, fuzzy
msgid "In Stock QTY"
-msgstr "Tipo de Stock"
+msgstr "Cantidad en inventario"
#: ../webSHOP/ItemDetails.php:124
#, fuzzy
@@ -49488,9 +49478,8 @@
msgstr "Cambiando la la información de la orden de trabajo"
#: ../webSHOP/includes/Functions.php:50
-#, fuzzy
msgid "Stock QTY"
-msgstr "Tipo de Stock"
+msgstr "Cantidad en inventario"
#: ../webSHOP/includes/Functions.php:64 ../webSHOP/includes/header.php:227
msgid "View Order"
|
