Menu
▾
▴
web-erp-svn
|
From: <rc...@us...> - 2015-01-17 03:14:29
|
Revision: 7081
http://sourceforge.net/p/web-erp/reponame/7081
Author: rchacon
Date: 2015-01-17 03:14:28 +0000 (Sat, 17 Jan 2015)
Log Message:
-----------
Inserts HTML line breaks before all newlines in the default language's long description.
Modified Paths:
--------------
trunk/RevisionTranslations.php
trunk/doc/Change.log
Modified: trunk/RevisionTranslations.php
===================================================================
--- trunk/RevisionTranslations.php 2015-01-16 22:59:26 UTC (rev 7080)
+++ trunk/RevisionTranslations.php 2015-01-17 03:14:28 UTC (rev 7081)
@@ -76,10 +76,10 @@
}
echo '<td>' . $myrow['stockid'] . '</td>
- <td>'. $_SESSION['Language']. '</td>
+ <td>' . $_SESSION['Language']. '</td>
<td>' . $myrow['description'] . '</td>
- <td>' . $myrow['longdescription'] . '</td>
- </tr>';
+ <td>' . nl2br($myrow['longdescription']) . '</td>
+ <td> </td></tr>';// nl2br: Inserts HTML line breaks before all newlines in a string.
if($k==1) {
echo '<tr class="EvenTableRows">';
@@ -89,21 +89,18 @@
$k=1;
}
- echo '<td></td>
+ echo '<td> </td>
<td>' . $myrow['language_id'] . '</td>';
+ echo '<td><input class="text" maxlength="50" name="DescriptionTranslation' . $i .'" size="52" type="text" value="'. $myrow['descriptiontranslation'] .'" /></td>
+ <td><textarea name="LongDescriptionTranslation' . $i .'" cols="70" rows="5">'. $myrow['longdescriptiontranslation'] .'" </textarea></td>';
+
echo '<td>
- <input type="text" class="text" name="DescriptionTranslation' . $i .'" maxlength="50" size="52" value="'. $myrow['descriptiontranslation'] .'" />
+ <input name="Revised' . $i . '" type="checkbox" value="1" />
+ <input name="StockID' . $i . '" type="hidden" value="' . $myrow['stockid'] . '" />
+ <input name="LanguageID' . $i . '" type="hidden" value="' . $myrow['language_id'] . '" />
</td>
- <td>
- <textarea name="LongDescriptionTranslation' . $i .'" cols="70" rows="5">'. $myrow['longdescriptiontranslation'] .'" </textarea></td>
- </td>';
-
- echo '<td><input type="checkbox" name="Revised' . $i.'" value="1" />
- </td>
</tr>';
- echo '<input type="hidden" value="' . $myrow['stockid'] . '" name="StockID' . $i . '" />
- <input type="hidden" value="' . $myrow['language_id'] . '" name="LanguageID' . $i . '" />';
$i++;
} //end of looping
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-01-16 22:59:26 UTC (rev 7080)
+++ trunk/doc/Change.log 2015-01-17 03:14:28 UTC (rev 7081)
@@ -1,4 +1,6 @@
webERP Change Log
+
+16/01/15 RChacon: Inserts HTML line breaks before all newlines in the default language's long description.
12/1/15 Exson: Remove redundant code from Prices.php.
12/1/15 Exson: Fixed bug in Z_AutoCustomerAllocations.php to make it workable.
9/1/15 Bob Thomas: Removed reference to AliasNbPages() now no longer part of TCPDF
|
|
From: <rc...@us...> - 2015-01-17 03:32:48
|
Revision: 7082
http://sourceforge.net/p/web-erp/reponame/7082
Author: rchacon
Date: 2015-01-17 03:32:38 +0000 (Sat, 17 Jan 2015)
Log Message:
-----------
Standardise RevisionTranslations.php's titles to Stocks.php's titles.
Modified Paths:
--------------
trunk/RevisionTranslations.php
trunk/doc/Change.log
Modified: trunk/RevisionTranslations.php
===================================================================
--- trunk/RevisionTranslations.php 2015-01-17 03:14:28 UTC (rev 7081)
+++ trunk/RevisionTranslations.php 2015-01-17 03:32:38 UTC (rev 7082)
@@ -58,8 +58,8 @@
echo '<tr>
<th>' . _('Code') . '</th>
<th>' . _('Language') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Long Description') . '</th>
+ <th>' . _('Part Description (short)') . '</th>
+ <th>' . _('Part Description (long)') . '</th>
<th>' . _('Revised?') . '</th>
</tr>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-01-17 03:14:28 UTC (rev 7081)
+++ trunk/doc/Change.log 2015-01-17 03:32:38 UTC (rev 7082)
@@ -1,5 +1,6 @@
webERP Change Log
+16/01/15 RChacon: Standardise RevisionTranslations.php's titles to Stocks.php's titles.
16/01/15 RChacon: Inserts HTML line breaks before all newlines in the default language's long description.
12/1/15 Exson: Remove redundant code from Prices.php.
12/1/15 Exson: Fixed bug in Z_AutoCustomerAllocations.php to make it workable.
|
|
From: <rc...@us...> - 2015-01-17 16:47:19
|
Revision: 7083
http://sourceforge.net/p/web-erp/reponame/7083
Author: rchacon
Date: 2015-01-17 16:47:12 +0000 (Sat, 17 Jan 2015)
Log Message:
-----------
Fix Czech language code, add info for Croatian language, add the script name and revision number and sort by language code.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/LanguagesArray.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-01-17 03:32:38 UTC (rev 7082)
+++ trunk/doc/Change.log 2015-01-17 16:47:12 UTC (rev 7083)
@@ -1,5 +1,6 @@
webERP Change Log
+17/01/15 RChacon: Fix Czech language code, add info for Croatian language, add the script name and revision number and sort by language code.
16/01/15 RChacon: Standardise RevisionTranslations.php's titles to Stocks.php's titles.
16/01/15 RChacon: Inserts HTML line breaks before all newlines in the default language's long description.
12/1/15 Exson: Remove redundant code from Prices.php.
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2015-01-17 03:32:38 UTC (rev 7082)
+++ trunk/includes/LanguagesArray.php 2015-01-17 16:47:12 UTC (rev 7083)
@@ -1,30 +1,18 @@
<?php
+/* $Id: LanguagesArray.php 6966 2014-11-06 09:15:09Z daintree $*/
+/* Script to define a set of parameters that defines the user's language, decimal separator and thousands separator. */
+
$LanguagesArray = array();
-$LanguagesArray['en_GB.utf8']['LanguageName'] = 'English United Kingdom';
-$LanguagesArray['en_GB.utf8']['WindowsLocale'] = 'english-uk';
-$LanguagesArray['en_GB.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['en_GB.utf8']['ThousandsSeparator'] = ',';
-
-$LanguagesArray['en_IN.utf8']['LanguageName'] = 'English India';
-$LanguagesArray['en_IN.utf8']['WindowsLocale'] = 'english-in';
-$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ',';
-
-$LanguagesArray['en_US.utf8']['LanguageName'] = 'English United States';
-$LanguagesArray['en_US.utf8']['WindowsLocale'] = 'english-us';
-$LanguagesArray['en_US.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['en_US.utf8']['ThousandsSeparator'] = ',';
-
$LanguagesArray['ar_EG.utf8']['LanguageName'] = 'مصرى';
$LanguagesArray['ar_EG.utf8']['WindowsLocale'] = 'arabic';
$LanguagesArray['ar_EG.utf8']['DecimalPoint'] = ',';
$LanguagesArray['ar_EG.utf8']['ThousandsSeparator'] = ' ';
-$LanguagesArray['cz_CZ.utf8']['LanguageName'] = 'Čeština';
-$LanguagesArray['cz_CZ.utf8']['WindowsLocale'] = 'czech';
-$LanguagesArray['cz_CZ.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['cz_CZ.utf8']['ThousandsSeparator'] = ' ';
+$LanguagesArray['cs_CZ.utf8']['LanguageName'] = 'Čeština';
+$LanguagesArray['cs_CZ.utf8']['WindowsLocale'] = 'czech';
+$LanguagesArray['cs_CZ.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['cs_CZ.utf8']['ThousandsSeparator'] = ' ';
$LanguagesArray['de_DE.utf8']['LanguageName'] = 'Deutsch';
$LanguagesArray['de_DE.utf8']['WindowsLocale'] = 'german';
@@ -36,6 +24,21 @@
$LanguagesArray['el_GR.utf8']['DecimalPoint'] = ',';
$LanguagesArray['el_GR.utf8']['ThousandsSeparator'] = '.';
+$LanguagesArray['en_GB.utf8']['LanguageName'] = 'English United Kingdom';
+$LanguagesArray['en_GB.utf8']['WindowsLocale'] = 'english-uk';
+$LanguagesArray['en_GB.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['en_GB.utf8']['ThousandsSeparator'] = ',';
+
+$LanguagesArray['en_IN.utf8']['LanguageName'] = 'English India';
+$LanguagesArray['en_IN.utf8']['WindowsLocale'] = 'english-in';
+$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ',';
+
+$LanguagesArray['en_US.utf8']['LanguageName'] = 'English United States';
+$LanguagesArray['en_US.utf8']['WindowsLocale'] = 'english-us';
+$LanguagesArray['en_US.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['en_US.utf8']['ThousandsSeparator'] = ',';
+
$LanguagesArray['es_ES.utf8']['LanguageName'] = 'Español';
$LanguagesArray['es_ES.utf8']['WindowsLocale'] = 'spanish';
$LanguagesArray['es_ES.utf8']['DecimalPoint'] = ',';
@@ -66,10 +69,10 @@
$LanguagesArray['hi_IN.utf8']['DecimalPoint'] = '.';
$LanguagesArray['hi_IN.utf8']['ThousandsSeparator'] = ',';
-$LanguagesArray['mr_IN.utf8']['LanguageName'] = _('Marathi');
-$LanguagesArray['mr_IN.utf8']['WindowsLocale'] = 'marathi';
-$LanguagesArray['mr_IN.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['mr_IN.utf8']['ThousandsSeparator'] = ',';
+$LanguagesArray['hr_HR.utf8']['LanguageName'] = _('Hrvatski');
+$LanguagesArray['hr_HR.utf8']['WindowsLocale'] = 'croatian';
+$LanguagesArray['hr_HR.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['hr_HR.utf8']['ThousandsSeparator'] = ' ';
$LanguagesArray['hr_HR.utf8']['LanguageName'] = 'Magyar';
$LanguagesArray['hr_HR.utf8']['WindowsLocale'] = 'hungarian';
@@ -96,6 +99,11 @@
$LanguagesArray['lv_LV.utf8']['DecimalPoint'] = ',';
$LanguagesArray['lv_LV.utf8']['ThousandsSeparator'] = '.';
+$LanguagesArray['mr_IN.utf8']['LanguageName'] = _('Marathi');
+$LanguagesArray['mr_IN.utf8']['WindowsLocale'] = 'marathi';
+$LanguagesArray['mr_IN.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['mr_IN.utf8']['ThousandsSeparator'] = ',';
+
$LanguagesArray['nl_NL.utf8']['LanguageName'] = 'Nederlands';
$LanguagesArray['nl_NL.utf8']['WindowsLocale'] = 'dutch';
$LanguagesArray['nl_NL.utf8']['DecimalPoint'] = ',';
|
|
From: <rc...@us...> - 2015-01-17 22:54:01
|
Revision: 7085
http://sourceforge.net/p/web-erp/reponame/7085
Author: rchacon
Date: 2015-01-17 22:53:55 +0000 (Sat, 17 Jan 2015)
Log Message:
-----------
Update languages files. Include short/long description translation.
Modified Paths:
--------------
trunk/includes/LanguagesArray.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2015-01-17 17:17:01 UTC (rev 7084)
+++ trunk/includes/LanguagesArray.php 2015-01-17 22:53:55 UTC (rev 7085)
@@ -1,5 +1,5 @@
<?php
-/* $Id: LanguagesArray.php 6966 2014-11-06 09:15:09Z daintree $*/
+/* $Id: LanguagesArray.php 7083 2015-01-17 17:17:01Z rchacon $*/
/* Script to define a set of parameters that defines the user's language, decimal separator and thousands separator. */
$LanguagesArray = array();
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-01-17 17:17:01 UTC (rev 7084)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-01-17 22:53:55 UTC (rev 7085)
@@ -1,13 +1,13 @@
-# Arabic translation for web-erp
+# webERP - Arabic Translation File.
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the web-erp package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: web-erp\n"
+"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-16 16:56-0600\n"
+"POT-Creation-Date: 2015-01-17 16:16-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -979,10 +979,9 @@
#: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178
#: PcTypeTabs.php:164 PricesByCost.php:153 RelatedItemsUpdate.php:154
#: ReorderLevel.php:298 ReorderLevelLocation.php:73 ReverseGRN.php:397
-#: RevisionTranslations.php:61 SalesCategories.php:509 SecurityTokens.php:94
-#: SecurityTokens.php:103 SecurityTokens.php:120 SelectAsset.php:264
-#: SelectCompletedOrder.php:505 SelectContract.php:147
-#: SelectCreditItems.php:1021 SelectOrderItems.php:1452
+#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103
+#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505
+#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1452
#: SelectOrderItems.php:1614 SelectProduct.php:531 SelectProduct.php:757
#: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680
@@ -3691,7 +3690,7 @@
#: MRPCalendar.php:315 PO_AuthoriseMyOrders.php:142 Payments.php:932
#: PcAuthorizeExpenses.php:108 PcAuthorizeExpenses.php:293
#: PricesByCost.php:223 PurchData.php:758 ReorderLevelLocation.php:140
-#: RevisionTranslations.php:114 SMTPServer.php:122 SecurityTokens.php:97
+#: RevisionTranslations.php:111 SMTPServer.php:122 SecurityTokens.php:97
#: SelectCreditItems.php:956 SellThroughSupport.php:476 ShopParameters.php:610
#: StockCostUpdate.php:196 StockReorderLevel.php:111 Stocks.php:1442
#: SystemParameters.php:1246 UserLocations.php:178 WOSerialNos.php:345
@@ -23987,10 +23986,14 @@
msgid "Translations to revise"
msgstr ""
-#: RevisionTranslations.php:62 Stocks.php:1037
-msgid "Long Description"
-msgstr ""
+#: RevisionTranslations.php:61
+msgid "Part Description (short)"
+msgstr "شرح قسمت (کوتاه)"
+#: RevisionTranslations.php:62
+msgid "Part Description (long)"
+msgstr "شرح قسمت (طولانی)"
+
#: RevisionTranslations.php:63
msgid "Revised?"
msgstr ""
@@ -30522,6 +30525,10 @@
"to maintain here can be configured in the system parameters page"
msgstr ""
+#: Stocks.php:1037
+msgid "Long Description"
+msgstr ""
+
#: Stocks.php:1335
msgid "Order multiple. It is the minimum packing quantity."
msgstr ""
@@ -45188,11 +45195,15 @@
msgid "End:"
msgstr ""
-#: includes/LanguagesArray.php:64
+#: includes/LanguagesArray.php:67
msgid "Hindi"
msgstr ""
-#: includes/LanguagesArray.php:69
+#: includes/LanguagesArray.php:72
+msgid "Hrvatski"
+msgstr ""
+
+#: includes/LanguagesArray.php:102
msgid "Marathi"
msgstr ""
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2015-01-17 17:17:01 UTC (rev 7084)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2015-01-17 22:53:55 UTC (rev 7085)
@@ -1,17 +1,17 @@
-# SOME DESCRIPTIVE TITLE.
+# webERP - Czech Translation File.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 3.08\n"
+"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-16 16:56-0600\n"
+"POT-Creation-Date: 2015-01-17 16:16-0600\n"
"PO-Revision-Date: 2013-06-01 11:20-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Czech <cs...@li...>\n"
-"Language: cs\n"
+"Language: cs_cZ\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -994,10 +994,9 @@
#: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178
#: PcTypeTabs.php:164 PricesByCost.php:153 RelatedItemsUpdate.php:154
#: ReorderLevel.php:298 ReorderLevelLocation.php:73 ReverseGRN.php:397
-#: RevisionTranslations.php:61 SalesCategories.php:509 SecurityTokens.php:94
-#: SecurityTokens.php:103 SecurityTokens.php:120 SelectAsset.php:264
-#: SelectCompletedOrder.php:505 SelectContract.php:147
-#: SelectCreditItems.php:1021 SelectOrderItems.php:1452
+#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103
+#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505
+#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1452
#: SelectOrderItems.php:1614 SelectProduct.php:531 SelectProduct.php:757
#: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680
@@ -3745,7 +3744,7 @@
#: MRPCalendar.php:315 PO_AuthoriseMyOrders.php:142 Payments.php:932
#: PcAuthorizeExpenses.php:108 PcAuthorizeExpenses.php:293
#: PricesByCost.php:223 PurchData.php:758 ReorderLevelLocation.php:140
-#: RevisionTranslations.php:114 SMTPServer.php:122 SecurityTokens.php:97
+#: RevisionTranslations.php:111 SMTPServer.php:122 SecurityTokens.php:97
#: SelectCreditItems.php:956 SellThroughSupport.php:476 ShopParameters.php:610
#: StockCostUpdate.php:196 StockReorderLevel.php:111 Stocks.php:1442
#: SystemParameters.php:1246 UserLocations.php:178 WOSerialNos.php:345
@@ -24654,10 +24653,14 @@
msgid "Translations to revise"
msgstr ""
-#: RevisionTranslations.php:62 Stocks.php:1037
-msgid "Long Description"
-msgstr ""
+#: RevisionTranslations.php:61
+msgid "Part Description (short)"
+msgstr "Popis části (krátký)"
+#: RevisionTranslations.php:62
+msgid "Part Description (long)"
+msgstr "Popis části (dlouho)"
+
#: RevisionTranslations.php:63
msgid "Revised?"
msgstr ""
@@ -31420,6 +31423,10 @@
"to maintain here can be configured in the system parameters page"
msgstr ""
+#: Stocks.php:1037
+msgid "Long Description"
+msgstr ""
+
#: Stocks.php:1335
msgid "Order multiple. It is the minimum packing quantity."
msgstr ""
@@ -46808,11 +46815,15 @@
msgid "End:"
msgstr "Konec:"
-#: includes/LanguagesArray.php:64
+#: includes/LanguagesArray.php:67
msgid "Hindi"
msgstr ""
-#: includes/LanguagesArray.php:69
+#: includes/LanguagesArray.php:72
+msgid "Hrvatski"
+msgstr ""
+
+#: includes/LanguagesArray.php:102
msgid "Marathi"
msgstr ""
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2015-01-17 17:17:01 UTC (rev 7084)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2015-01-17 22:53:55 UTC (rev 7085)
@@ -1,4 +1,4 @@
-# webERP German Translation File.
+# webERP - German Translation File.
# Copyright (C) 2014 www.weberp.org
# This file is distributed under the same license as the webERP package.
# Harald Ringehahn <hri...@us...>, 2014.
@@ -6,9 +6,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.11.3\n"
+"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-16 16:56-0600\n"
+"POT-Creation-Date: 2015-01-17 16:16-0600\n"
"PO-Revision-Date: 2014-12-05 07:08-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Deutsch <web...@li...>\n"
@@ -1005,10 +1005,9 @@
#: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178
#: PcTypeTabs.php:164 PricesByCost.php:153 RelatedItemsUpdate.php:154
#: ReorderLevel.php:298 ReorderLevelLocation.php:73 ReverseGRN.php:397
-#: RevisionTranslations.php:61 SalesCategories.php:509 SecurityTokens.php:94
-#: SecurityTokens.php:103 SecurityTokens.php:120 SelectAsset.php:264
-#: SelectCompletedOrder.php:505 SelectContract.php:147
-#: SelectCreditItems.php:1021 SelectOrderItems.php:1452
+#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103
+#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505
+#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1452
#: SelectOrderItems.php:1614 SelectProduct.php:531 SelectProduct.php:757
#: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680
@@ -3880,7 +3879,7 @@
#: MRPCalendar.php:315 PO_AuthoriseMyOrders.php:142 Payments.php:932
#: PcAuthorizeExpenses.php:108 PcAuthorizeExpenses.php:293
#: PricesByCost.php:223 PurchData.php:758 ReorderLevelLocation.php:140
-#: RevisionTranslations.php:114 SMTPServer.php:122 SecurityTokens.php:97
+#: RevisionTranslations.php:111 SMTPServer.php:122 SecurityTokens.php:97
#: SelectCreditItems.php:956 SellThroughSupport.php:476 ShopParameters.php:610
#: StockCostUpdate.php:196 StockReorderLevel.php:111 Stocks.php:1442
#: SystemParameters.php:1246 UserLocations.php:178 WOSerialNos.php:345
@@ -25516,10 +25515,14 @@
msgid "Translations to revise"
msgstr ""
-#: RevisionTranslations.php:62 Stocks.php:1037
-msgid "Long Description"
-msgstr ""
+#: RevisionTranslations.php:61
+msgid "Part Description (short)"
+msgstr "Artikelbezeichnung (Kurztext)"
+#: RevisionTranslations.php:62
+msgid "Part Description (long)"
+msgstr "Artikelbezeichnung (Langtext)"
+
#: RevisionTranslations.php:63
msgid "Revised?"
msgstr ""
@@ -32515,6 +32518,10 @@
"ist. In welchen Sprachen die Artikelbezeichnungen gepflegt werden, wird in "
"den Systemparametern festgelegt"
+#: Stocks.php:1037
+msgid "Long Description"
+msgstr ""
+
#: Stocks.php:1335
msgid "Order multiple. It is the minimum packing quantity."
msgstr ""
@@ -48589,11 +48596,15 @@
msgid "End:"
msgstr "Ende:"
-#: includes/LanguagesArray.php:64
+#: includes/LanguagesArray.php:67
msgid "Hindi"
msgstr "Hindi"
-#: includes/LanguagesArray.php:69
+#: includes/LanguagesArray.php:72
+msgid "Hrvatski"
+msgstr ""
+
+#: includes/LanguagesArray.php:102
msgid "Marathi"
msgstr "Marathisch"
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2015-01-17 17:17:01 UTC (rev 7084)
+++ trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2015-01-17 22:53:55 UTC (rev 7085)
@@ -1,13 +1,13 @@
-# SOME DESCRIPTIVE TITLE.
+# webERP - Greek Translation File.
# Copyright (C) 2007
# This file is distributed under the same license as the PACKAGE package.
# Gregoris Tsintaris <gr...@ex...>, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-16 16:56-0600\n"
+"POT-Creation-Date: 2015-01-17 16:16-0600\n"
"PO-Revision-Date: 2013-06-01 11:22-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1006,10 +1006,9 @@
#: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178
#: PcTypeTabs.php:164 PricesByCost.php:153 RelatedItemsUpdate.php:154
#: ReorderLevel.php:298 ReorderLevelLocation.php:73 ReverseGRN.php:397
-#: RevisionTranslations.php:61 SalesCategories.php:509 SecurityTokens.php:94
-#: SecurityTokens.php:103 SecurityTokens.php:120 SelectAsset.php:264
-#: SelectCompletedOrder.php:505 SelectContract.php:147
-#: SelectCreditItems.php:1021 SelectOrderItems.php:1452
+#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103
+#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505
+#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1452
#: SelectOrderItems.php:1614 SelectProduct.php:531 SelectProduct.php:757
#: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680
@@ -3808,7 +3807,7 @@
#: MRPCalendar.php:315 PO_AuthoriseMyOrders.php:142 Payments.php:932
#: PcAuthorizeExpenses.php:108 PcAuthorizeExpenses.php:293
#: PricesByCost.php:223 PurchData.php:758 ReorderLevelLocation.php:140
-#: RevisionTranslations.php:114 SMTPServer.php:122 SecurityTokens.php:97
+#: RevisionTranslations.php:111 SMTPServer.php:122 SecurityTokens.php:97
#: SelectCreditItems.php:956 SellThroughSupport.php:476 ShopParameters.php:610
#: StockCostUpdate.php:196 StockReorderLevel.php:111 Stocks.php:1442
#: SystemParameters.php:1246 UserLocations.php:178 WOSerialNos.php:345
@@ -25447,10 +25446,14 @@
msgid "Translations to revise"
msgstr ""
-#: RevisionTranslations.php:62 Stocks.php:1037
-msgid "Long Description"
-msgstr ""
+#: RevisionTranslations.php:61
+msgid "Part Description (short)"
+msgstr "Μέρος Περιγραφή (σύντομο)"
+#: RevisionTranslations.php:62
+msgid "Part Description (long)"
+msgstr "Μέρος Περιγραφή (μακράς)"
+
#: RevisionTranslations.php:63
msgid "Revised?"
msgstr ""
@@ -32411,6 +32414,10 @@
"to maintain here can be configured in the system parameters page"
msgstr ""
+#: Stocks.php:1037
+msgid "Long Description"
+msgstr ""
+
#: Stocks.php:1335
msgid "Order multiple. It is the minimum packing quantity."
msgstr ""
@@ -48399,11 +48406,15 @@
msgid "End:"
msgstr "Λήξη:"
-#: includes/LanguagesArray.php:64
+#: includes/LanguagesArray.php:67
msgid "Hindi"
msgstr ""
-#: includes/LanguagesArray.php:69
+#: includes/LanguagesArray.php:72
+msgid "Hrvatski"
+msgstr ""
+
+#: includes/LanguagesArray.php:102
msgid "Marathi"
msgstr ""
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2015-01-17 17:17:01 UTC (rev 7084)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2015-01-17 22:53:55 UTC (rev 7085)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-16 16:56-0600\n"
+"POT-Creation-Date: 2015-01-17 16:37-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -948,10 +948,9 @@
#: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178
#: PcTypeTabs.php:164 PricesByCost.php:153 RelatedItemsUpdate.php:154
#: ReorderLevel.php:298 ReorderLevelLocation.php:73 ReverseGRN.php:397
-#: RevisionTranslations.php:61 SalesCategories.php:509 SecurityTokens.php:94
-#: SecurityTokens.php:103 SecurityTokens.php:120 SelectAsset.php:264
-#: SelectCompletedOrder.php:505 SelectContract.php:147
-#: SelectCreditItems.php:1021 SelectOrderItems.php:1452
+#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103
+#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505
+#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1452
#: SelectOrderItems.php:1614 SelectProduct.php:531 SelectProduct.php:757
#: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680
@@ -3535,7 +3534,7 @@
#: MRPCalendar.php:315 PO_AuthoriseMyOrders.php:142 Payments.php:932
#: PcAuthorizeExpenses.php:108 PcAuthorizeExpenses.php:293
#: PricesByCost.php:223 PurchData.php:758 ReorderLevelLocation.php:140
-#: RevisionTranslations.php:114 SMTPServer.php:122 SecurityTokens.php:97
+#: RevisionTranslations.php:111 SMTPServer.php:122 SecurityTokens.php:97
#: SelectCreditItems.php:956 SellThroughSupport.php:476 ShopParameters.php:610
#: StockCostUpdate.php:196 StockReorderLevel.php:111 Stocks.php:1442
#: SystemParameters.php:1246 UserLocations.php:178 WOSerialNos.php:345
@@ -22725,10 +22724,14 @@
msgid "Translations to revise"
msgstr ""
-#: RevisionTranslations.php:62 Stocks.php:1037
-msgid "Long Description"
+#: RevisionTranslations.php:61
+msgid "Part Description (short)"
msgstr ""
+#: RevisionTranslations.php:62
+msgid "Part Description (long)"
+msgstr ""
+
#: RevisionTranslations.php:63
msgid "Revised?"
msgstr ""
@@ -28868,6 +28871,10 @@
msgid "This language translation of the item will be used in invoices and credits to customers who are defined to use this language. The language translations to maintain here can be configured in the system parameters page"
msgstr ""
+#: Stocks.php:1037
+msgid "Long Description"
+msgstr ""
+
#: Stocks.php:1335
msgid "Order multiple. It is the minimum packing quantity."
msgstr ""
@@ -42437,11 +42444,15 @@
msgid "End:"
msgstr ""
-#: includes/LanguagesArray.php:64
+#: includes/LanguagesArray.php:67
msgid "Hindi"
msgstr ""
-#: includes/LanguagesArray.php:69
+#: includes/LanguagesArray.php:72
+msgid "Hrvatski"
+msgstr ""
+
+#: includes/LanguagesArray.php:102
msgid "Marathi"
msgstr ""
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2015-01-17 17:17:01 UTC (rev 7084)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2015-01-17 22:53:55 UTC (rev 7085)
@@ -1,4 +1,4 @@
-# US English
+# webERP - US English Translation File.
# Copyright (C) 2007 Karl Schmidt
# Released under the GNU General Public License (GPLv2)
# For details see http://www.gnu.org/licenses/info/GPLv2.html
@@ -6,9 +6,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.11.3\n"
+"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-16 16:56-0600\n"
+"POT-Creation-Date: 2015-01-17 16:16-0600\n"
"PO-Revision-Date: 2014-08-18 13:58-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: WebERP Translation Team <web-erp-translation@lists."
@@ -979,10 +979,9 @@
#: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178
#: PcTypeTabs.php:164 PricesByCost.php:153 RelatedItemsUpdate.php:154
#: ReorderLevel.php:298 ReorderLevelLocation.php:73 ReverseGRN.php:397
-#: RevisionTranslations.php:61 SalesCategories.php:509 SecurityTokens.php:94
-#: SecurityTokens.php:103 SecurityTokens.php:120 SelectAsset.php:264
-#: SelectCompletedOrder.php:505 SelectContract.php:147
-#: SelectCreditItems.php:1021 SelectOrderItems.php:1452
+#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103
+#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505
+#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1452
#: SelectOrderItems.php:1614 SelectProduct.php:531 SelectProduct.php:757
#: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680
@@ -3693,7 +3692,7 @@
#: MRPCalendar.php:315 PO_AuthoriseMyOrders.php:142 Payments.php:932
#: PcAuthorizeExpenses.php:108 PcAuthorizeExpenses.php:293
#: PricesByCost.php:223 PurchData.php:758 ReorderLevelLocation.php:140
-#: RevisionTranslations.php:114 SMTPServer.php:122 SecurityTokens.php:97
+#: RevisionTranslations.php:111 SMTPServer.php:122 SecurityTokens.php:97
#: SelectCreditItems.php:956 SellThroughSupport.php:476 ShopParameters.php:610
#: StockCostUpdate.php:196 StockReorderLevel.php:111 Stocks.php:1442
#: SystemParameters.php:1246 UserLocations.php:178 WOSerialNos.php:345
@@ -24033,10 +24032,14 @@
msgid "Translations to revise"
msgstr ""
-#: RevisionTranslations.php:62 Stocks.php:1037
-msgid "Long Description"
-msgstr ""
+#: RevisionTranslations.php:61
+msgid "Part Description (short)"
+msgstr "Part Description (short)"
+#: RevisionTranslations.php:62
+msgid "Part Description (long)"
+msgstr "Part Description (long)"
+
#: RevisionTranslations.php:63
msgid "Revised?"
msgstr ""
@@ -30576,6 +30579,10 @@
"to maintain here can be configured in the system parameters page"
msgstr ""
+#: Stocks.php:1037
+msgid "Long Description"
+msgstr ""
+
#: Stocks.php:1335
msgid "Order multiple. It is the minimum packing quantity."
msgstr ""
@@ -45267,11 +45274,15 @@
msgid "End:"
msgstr ""
-#: includes/LanguagesArray.php:64
+#: includes/LanguagesArray.php:67
msgid "Hindi"
msgstr ""
-#: includes/LanguagesArray.php:69
+#: includes/LanguagesArray.php:72
+msgid "Hrvatski"
+msgstr ""
+
+#: includes/LanguagesArray.php:102
msgid "Marathi"
msgstr ""
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-01-17 17:17:01 UTC (rev 7084)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-17 22:53:55 UTC (rev 7085)
@@ -1,14 +1,14 @@
-# webERP - SPANISH Translation File
+# webERP - Spanish Translation File.
# Copyright (C) 2009 WebERP Team
# This file is distributed under the same license as the WebERP package.
# Javier De Lorenzo-Cáceres <in...@ci...>, 2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.11.3\n"
+"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-16 16:56-0600\n"
-"PO-Revision-Date: 2015-01-04 16:48-0600\n"
+"POT-Creation-Date: 2015-01-17 16:16-0600\n"
+"PO-Revision-Date: 2015-01-17 09:03-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -1008,10 +1008,9 @@
#: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178
#: PcTypeTabs.php:164 PricesByCost.php:153 RelatedItemsUpdate.php:154
#: ReorderLevel.php:298 ReorderLevelLocation.php:73 ReverseGRN.php:397
-#: RevisionTranslations.php:61 SalesCategories.php:509 SecurityTokens.php:94
-#: SecurityTokens.php:103 SecurityTokens.php:120 SelectAsset.php:264
-#: SelectCompletedOrder.php:505 SelectContract.php:147
-#: SelectCreditItems.php:1021 SelectOrderItems.php:1452
+#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103
+#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505
+#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1452
#: SelectOrderItems.php:1614 SelectProduct.php:531 SelectProduct.php:757
#: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680
@@ -1955,7 +1954,7 @@
#: POReport.php:1315 POReport.php:1366 POReport.php:1420 StockClone.php:668
#: StockClone.php:692 Stocks.php:1001 Stocks.php:1025
msgid "Part Description"
-msgstr "Descripción parcial"
+msgstr "Descripción del artículo"
#: BOMExtendedQty.php:338 MRPShortages.php:356
msgid "Shortage"
@@ -3834,7 +3833,7 @@
#: MRPCalendar.php:315 PO_AuthoriseMyOrders.php:142 Payments.php:932
#: PcAuthorizeExpenses.php:108 PcAuthorizeExpenses.php:293
#: PricesByCost.php:223 PurchData.php:758 ReorderLevelLocation.php:140
-#: RevisionTranslations.php:114 SMTPServer.php:122 SecurityTokens.php:97
+#: RevisionTranslations.php:111 SMTPServer.php:122 SecurityTokens.php:97
#: SelectCreditItems.php:956 SellThroughSupport.php:476 ShopParameters.php:610
#: StockCostUpdate.php:196 StockReorderLevel.php:111 Stocks.php:1442
#: SystemParameters.php:1246 UserLocations.php:178 WOSerialNos.php:345
@@ -25427,10 +25426,14 @@
msgid "Translations to revise"
msgstr ""
-#: RevisionTranslations.php:62 Stocks.php:1037
-msgid "Long Description"
-msgstr ""
+#: RevisionTranslations.php:61
+msgid "Part Description (short)"
+msgstr "Descripción del artículo (corta)"
+#: RevisionTranslations.php:62
+msgid "Part Description (long)"
+msgstr "Descripción del artículo (larga)"
+
#: RevisionTranslations.php:63
msgid "Revised?"
msgstr ""
@@ -32403,6 +32406,10 @@
"to maintain here can be configured in the system parameters page"
msgstr ""
+#: Stocks.php:1037
+msgid "Long Description"
+msgstr ""
+
#: Stocks.php:1335
msgid "Order multiple. It is the minimum packing quantity."
msgstr "Múltiplo de pedido. Es la cantidad mínima de embalaje."
@@ -48481,11 +48488,15 @@
msgid "End:"
msgstr "Fin:"
-#: includes/LanguagesArray.php:64
+#: includes/LanguagesArray.php:67
msgid "Hindi"
msgstr "Hindi"
-#: includes/LanguagesArray.php:69
+#: includes/LanguagesArray.php:72
+msgid "Hrvatski"
+msgstr ""
+
+#: includes/LanguagesArray.php:102
msgid "Marathi"
msgstr ""
@@ -50298,7 +50309,7 @@
#: reportwriter/languages/en_US/reports.php:220
msgid "Page Margins"
-msgstr ""
+msgstr "Márgenes de página"
#: reportwriter/languages/en_US/reports.php:221
msgid "Rename Report"
@@ -50442,7 +50453,7 @@
#: reportwriter/languages/en_US/reports.php:276
msgid "Page Number"
-msgstr ""
+msgstr "Número de página"
#: reportwriter/languages/en_US/reports.php:277
msgid "Uppercase"
Modified: trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
===================================================================
...
[truncated message content] |
|
From: <rc...@us...> - 2015-01-20 13:44:23
|
Revision: 7090
http://sourceforge.net/p/web-erp/reponame/7090
Author: rchacon
Date: 2015-01-20 13:44:18 +0000 (Tue, 20 Jan 2015)
Log Message:
-----------
Add translation for transaction type, script ID, manual references, class="number" to columns.
Modified Paths:
--------------
trunk/CustomerPurchases.php
trunk/SelectOrderItems.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/CustomerPurchases.php
===================================================================
--- trunk/CustomerPurchases.php 2015-01-20 08:04:05 UTC (rev 7089)
+++ trunk/CustomerPurchases.php 2015-01-20 13:44:18 UTC (rev 7090)
@@ -1,15 +1,19 @@
<?php
+/* $Id: CustomerPurchases.php 7090 2015-01-20 13:43:08Z daintree $*/
+/* This script is to view the items purchased by a customer. */
+
include('includes/session.inc');
-$Title = _('Customer Purchases');
+$Title = _('Customer Purchases');// Screen identificator.
+$ViewTopic = 'ARInquiries';// Filename's id in ManualContents.php's TOC.
+/* This help needs to be writing...
+$BookMark = 'CustomerPurchases';// Anchor's id in the manual's html document.*/
include('includes/header.inc');
-if (isset($_GET['DebtorNo'])) {
- $DebtorNo = $_GET['DebtorNo'];
-} //isset($_GET['DebtorNo'])
-else if (isset($_POST['DebtorNo'])) {
- $DebtorNo = $_POST['DebtorNo'];
-} //isset($_POST['DebtorNo'])
-else {
+if(isset($_GET['DebtorNo'])) {
+ $DebtorNo = $_GET['DebtorNo'];// Set DebtorNo from $_GET['DebtorNo'].
+} elseif(isset($_POST['DebtorNo'])) {
+ $DebtorNo = $_POST['DebtorNo'];// Set DebtorNo from $_POST['DebtorNo'].
+} else {
prnMsg(_('This script must be called with a customer code.'), 'info');
include('includes/footer.inc');
exit;
@@ -26,9 +30,10 @@
$CustomerResult = DB_query($SQL, $ErrMsg);
$CustomerRecord = DB_fetch_array($CustomerResult);
-echo '<p class="page_title_text">
- <img src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . _('Items Purchased by Customer') . ' : ' . $CustomerRecord['name'] . '
- </p>';
+echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/customer.png" title="' .
+ _('Customer') . '" /> ' .// Icon title.
+ _('Items Purchased by Customer') . '<br />' . $DebtorNo . " - " . $CustomerRecord['name'] . '</p>';// Page title.
$SQL = "SELECT stockmoves.stockid,
stockmaster.description,
@@ -90,14 +95,14 @@
<td>' . ConvertSQLDate($StockMovesRow['trandate']) . '</td>
<td>' . $StockMovesRow['stockid'] . '</td>
<td>' . $StockMovesRow['description'] . '</td>
- <td>' . $StockMovesRow['typename'] . '</td>
- <td>' . $StockMovesRow['transno'] . '</td>
+ <td>' . _($StockMovesRow['typename']) . '</td>
+ <td class="number">' . $StockMovesRow['transno'] . '</td>
<td>' . $StockMovesRow['locationname'] . '</td>
<td>' . $StockMovesRow['branchcode'] . '</td>
<td class="number">' . locale_number_format($StockMovesRow['price'], $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format(-$StockMovesRow['qty'], $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format((-$StockMovesRow['qty'] * $StockMovesRow['price']), $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
- <td>' . $StockMovesRow['reference'] . '</td>
+ <td class="number">' . $StockMovesRow['reference'] . '</td>
<td>' . $StockMovesRow['narrative'] . '</td>
</tr>';
@@ -109,4 +114,4 @@
echo '<br /><div class="centre"><a href="SelectCustomer.php">' . _('Return to customer selection screen') . '</a></div><br />';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2015-01-20 08:04:05 UTC (rev 7089)
+++ trunk/SelectOrderItems.php 2015-01-20 13:44:18 UTC (rev 7090)
@@ -561,7 +561,7 @@
echo '<div class="page_help_text">' . _('Orders/Quotations are placed against the Customer Branch. A Customer may have several Branches.') . '</div>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">
<div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />
<table cellpadding="3" class="selection">
<tr>
<td>' . _('Part of the Customer Branch Name') . ':</td>
@@ -585,8 +585,8 @@
if (isset($result_CustSelect)) {
echo '<div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <input type="hidden" name="JustSelectedACustomer" value="Yes" />
+ <input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />
+ <input name="JustSelectedACustomer" type="hidden" value="Yes" />
<br />
<table class="selection">';
@@ -613,8 +613,8 @@
echo ' <td>' . htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false) . '</td>
<td><input tabindex="'.strval($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES, 'UTF-8', false). '" />
- <input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].'" />
- <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" /></td>
+ <input name="SelectedCustomer' . $j .'" type="hidden" value="'.$myrow['debtorno'].'" />
+ <input name="SelectedBranch' . $j .'" type="hidden" value="'. $myrow['branchcode'].'" /></td>
<td>' . $myrow['contactname'] . '</td>
<td>' . $myrow['phoneno'] . '</td>
<td>' . $myrow['faxno'] . '</td>
@@ -800,7 +800,7 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" id="SelectParts" method="post">';
echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />';
//Get The exchange rate used for GPPercent calculations on adding or amending items
if ($_SESSION['Items'.$identifier]->DefaultCurrency != $_SESSION['CompanyRecord']['currencydefault']){
@@ -1278,11 +1278,24 @@
/* This is where the order as selected should be displayed reflecting any deletions or insertions*/
+ if($_SESSION['Items'.$identifier]->DefaultPOLine ==1) {// Does customer require PO Line number by sales order line?
+ $ShowPOLine=1;// Show one additional column: 'PO Line'.
+ } else {
+ $ShowPOLine=0;// Do NOT show 'PO Line'.
+ }
+
+ if(in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])) {//Is it an internal user with appropriate permissions?
+ $ShowDiscountGP=2;// Show two additional columns: 'Discount' and 'GP %'.
+ } else {
+ $ShowDiscountGP=0;// Do NOT show 'Discount' and 'GP %'.
+ }
+
echo '<div class="page_help_text">' . _('Quantity (required) - Enter the number of units ordered. Price (required) - Enter the unit price. Discount (optional) - Enter a percentage discount. GP% (optional) - Enter a percentage Gross Profit (GP) to add to the unit cost. Due Date (optional) - Enter a date for delivery.') . '</div><br />';
echo '<br />
<table width="90%" cellpadding="2">
<tr style="background-color:#800000">';
- if($_SESSION['Items'.$identifier]->DefaultPOLine == 1){
+/* if($_SESSION['Items'.$identifier]->DefaultPOLine == 1){*/
+ if($ShowPOLine) {
echo '<th>' . _('PO Line') . '</th>';
}
echo '<th>' . _('Item Code') . '</th>
@@ -1292,12 +1305,14 @@
<th>' . _('Unit') . '</th>
<th>' . _('Price') . '</th>';
- if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
+/* if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){*/
+ if($ShowDiscountGP) {
echo '<th>' . _('Discount') . '</th>
<th>' . _('GP %') . '</th>';
}
echo '<th>' . _('Total') . '</th>
- <th>' . _('Due Date') . '</th></tr>';
+ <th>' . _('Due Date') . '</th>
+ <th> </th></tr>';
$_SESSION['Items'.$identifier]->total = 0;
$_SESSION['Items'.$identifier]->totalVolume = 0;
@@ -1324,16 +1339,17 @@
echo $RowStarter;
echo '<td>';
- if($_SESSION['Items'.$identifier]->DefaultPOLine ==1){ //show the input field only if required
- echo '<input tabindex="1" type="text" name="POLine_' . $OrderLine->LineNumber . '" size="20" maxlength="20" value="' . $OrderLine->POLine . '" title="' . _('Enter the customer\'s purchase order reference if required by the customer') . '" /></td><td>';
+/* if($_SESSION['Items'.$identifier]->DefaultPOLine ==1){ //show the input field only if required*/
+ if($ShowPOLine) {// Show the input field only if required.
+ echo '<input maxlength="20" name="POLine_' . $OrderLine->LineNumber . '" size="20" title="' . _('Enter the customer\'s purchase order reference if required by the customer') . '" type="text" value="' . $OrderLine->POLine . '" /></td><td>';
} else {
- echo '<input type="hidden" name="POLine_' . $OrderLine->LineNumber . '" value="" />';
+ echo '<input name="POLine_' . $OrderLine->LineNumber . '" type="hidden" value="" />';
}
- echo '<a target="_blank" href="' . $RootPath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td>
+ echo '<a href="' . $RootPath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '" target="_blank">' . $OrderLine->StockID . '</a></td>
<td title="' . $OrderLine->LongDescription . '">' . $OrderLine->ItemDescription . '</td>';
- echo '<td><input class="number" tabindex="2" type="text" required="required" name="Quantity_' . $OrderLine->LineNumber . '" size="6" maxlength="8" value="' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces) . '" title="' . _('Enter the quantity of this item ordered by the customer') . '" />';
+ echo '<td><input class="number" maxlength="8" name="Quantity_' . $OrderLine->LineNumber . '" required="required" size="6" title="' . _('Enter the quantity of this item ordered by the customer') . '" type="text" value="' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces) . '" />';
if ($QtyRemain != $QtyOrdered){
echo '<br />' . locale_number_format($OrderLine->QtyInv,$OrderLine->DecimalPlaces) .' ' . _('of') . ' ' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces).' ' . _('invoiced');
}
@@ -1341,16 +1357,18 @@
<td class="number">' . locale_number_format($OrderLine->QOHatLoc,$OrderLine->DecimalPlaces) . '</td>
<td>' . $OrderLine->Units . '</td>';
- /*OK to display with discount if it is an internal user with appropriate permissions */
- if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
- echo '<td><input class="number" type="text" required="required" name="Price_' . $OrderLine->LineNumber . '" size="16" maxlength="16" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" title="' . _('Enter the price to charge the customer for this item') . '" /></td>
- <td><input class="number" type="text" required="required" name="Discount_' . $OrderLine->LineNumber . '" size="5" maxlength="4" value="' . locale_number_format(($OrderLine->DiscountPercent * 100),2) . '" title="' . _('Enter the discount percentage to apply to the price for this item') . '" /></td>
- <td><input class="number" type="text" required="required" name="GPPercent_' . $OrderLine->LineNumber . '" size="4" maxlength="40" value="' . locale_number_format($OrderLine->GPPercent,2) . '" title="' . _('Enter a gross profit percentage to use as the basis to calculate the price to charge the customer for this line item') . '" /></td>';
+ /*OK to display with discount if it is an internal user with appropriate permissions */
+/* if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){*/
+ if ($ShowDiscountGP){
+ echo '<td><input class="number" maxlength="16" name="Price_' . $OrderLine->LineNumber . '" required="required" size="16" title="' . _('Enter the price to charge the customer for this item') . '" type="text" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>
+ <td><input class="number" maxlength="4" name="Discount_' . $OrderLine->LineNumber . '" required="required" size="5" title="' . _('Enter the discount percentage to apply to the price for this item') . '" type="text" value="' . locale_number_format(($OrderLine->DiscountPercent * 100),2) . '" /></td>
+ <td><input class="number" maxlength="40" name="GPPercent_' . $OrderLine->LineNumber . '" required="required" size="4" value="' . locale_number_format($OrderLine->GPPercent,2) . '" title="' . _('Enter a gross profit percentage to use as the basis to calculate the price to charge the customer for this line item') . '" type="text" /></td>';
} else {
echo '<td class="number">' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- echo '<input class="number" type="hidden" name="GPPercent_' . $OrderLine->LineNumber . '" size="4" maxlength="40" value="' . locale_number_format($OrderLine->GPPercent,2) . '" />';
- echo '<input type="hidden" name="Price_' . $OrderLine->LineNumber . '" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>';
+ echo '<input class="number" maxlength="40" name="GPPercent_' . $OrderLine->LineNumber . '" size="4" type="hidden" value="' . locale_number_format($OrderLine->GPPercent,2) . '" />';
+ echo '<input name="Price_' . $OrderLine->LineNumber . '" type="hidden" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>';
}
+
if ($_SESSION['Items'.$identifier]->Some_Already_Delivered($OrderLine->LineNumber)){
$RemTxt = _('Clear Remaining');
} else {
@@ -1363,17 +1381,18 @@
$_SESSION['Items'.$identifier]->LineItems[$OrderLine->LineNumber]->ItemDue= $LineDueDate;
}
- echo '<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ItemDue_' . $OrderLine->LineNumber . '" size="10" maxlength="10" value="' . $LineDueDate . '" /></td>';
+ echo '<td><input alt="' . $_SESSION['DefaultDateFormat'] . '" class="date" maxlength="10" name="ItemDue_' . $OrderLine->LineNumber . '" size="10" type="text" value="' . $LineDueDate . '" /></td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '&Delete=' . $OrderLine->LineNumber . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . $RemTxt . '</a></td></tr>';
+ echo '<td rowspan="2"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '&Delete=' . $OrderLine->LineNumber . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');">' . $RemTxt . '</a></td></tr>';
if ($_SESSION['AllowOrderLineItemNarrative'] == 1){
echo $RowStarter;
- echo '<td colspan="10">' . _('Narrative') . ':<textarea name="Narrative_' . $OrderLine->LineNumber . '" cols="100%" rows="1" title="' . _('Enter any narrative to describe to the customer the nature of the charge for this line') . '" >' . stripslashes(AddCarriageReturns($OrderLine->Narrative)) . '</textarea><br /></td>
+ $varColSpan=8+$ShowPOLine+$ShowDiscountGP;
+ echo '<td colspan="' . $varColSpan . '">' . _('Narrative') . ':<textarea name="Narrative_' . $OrderLine->LineNumber . '" cols="100%" rows="1" title="' . _('Enter any narrative to describe to the customer the nature of the charge for this line') . '" >' . stripslashes(AddCarriageReturns($OrderLine->Narrative)) . '</textarea><br /></td>
</tr>';
} else {
echo '<tr>
- <td><input type="hidden" name="Narrative" value="" /></td>
+ <td><input name="Narrative" type="hidden" value="" /></td>
</tr>';
}
@@ -1384,14 +1403,16 @@
} /* end of loop around items */
$DisplayTotal = locale_number_format($_SESSION['Items'.$identifier]->total,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
+/* if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
$ColSpanNumber = 2;
} else {
$ColSpanNumber = 1;
- }
+ }*/
+ $varColSpan=1+$ShowPOLine+$ShowDiscountGP;
echo '<tr class="EvenTableRows">
<td class="number" colspan="6"><b>' . _('TOTAL Excl Tax/Freight') . '</b></td>
- <td colspan="' . $ColSpanNumber . '" class="number">' . $DisplayTotal . '</td>
+ <td colspan="' . $varColSpan . '" class="number"><b>' . $DisplayTotal . '</b></td>
+ <td colspan="2">' . $ShowDiscountGP . ' </td>
</tr>
</table>';
@@ -1417,7 +1438,7 @@
if ((!isset($_POST['QuickEntry'])
AND !isset($_POST['SelectAsset']))){
- echo '<input type="hidden" name="PartSearch" value="' . _('Yes Please') . '" />';
+ echo '<input name="PartSearch" type="hidden" value="' . _('Yes Please') . '" />';
if ($_SESSION['FrequentlyOrderedItems']>0){ //show the Frequently Order Items selection where configured to do so
@@ -1516,7 +1537,7 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td><input class="number" ' . ($i==0 ? 'autofocus="autofocus"':'') . ' tabindex="%s" type="text" required="required" size="6" name="OrderQty%s" value="0" />
- <input type="hidden" name="StockID%s" value="%s" />
+ <input name="StockID%s" type="hidden" value="%s" />
</td>
</tr>',
$myrow['stockid'],
@@ -1535,7 +1556,7 @@
#end of page full new headings if
}
#end of while loop for Frequently Ordered Items
- echo '<td style="text-align:center" colspan="8"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'.strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td></tr>';
+ echo '<td style="text-align:center" colspan="8"><input name="SelectingOrderItems" type="hidden" value="1" /><input tabindex="'.strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td></tr>';
echo '</table>';
} //end of if Frequently Ordered Items > 0
echo '<br /><div class="centre">' . $msg;
@@ -1604,11 +1625,11 @@
$j = 1;
//echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post" name="orderform">';
echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="table1">';
- echo '<tr><td colspan="1"><input type="hidden" name="PreviousList" value="'.strval($Offset-1).'" /><input tabindex="'.strval($j+8).'" type="submit" name="Previous" value="'._('Previous').'" /></td>';
- echo '<td style="text-align:center" colspan="6"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'.strval($j+9).'" type="submit" value="'._('Add to Sales Order').'" /></td>';
- echo '<td colspan="1"><input type="hidden" name="NextList" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+10).'" type="submit" name="Next" value="'._('Next').'" /></td></tr>';
+ echo '<tr><td colspan="1"><input name="PreviousList" type="hidden" value="'.strval($Offset-1).'" /><input tabindex="'.strval($j+8).'" type="submit" name="Previous" value="'._('Previous').'" /></td>';
+ echo '<td style="text-align:center" colspan="6"><input name="SelectingOrderItems" type="hidden" value="1" /><input tabindex="'.strval($j+9).'" type="submit" value="'._('Add to Sales Order').'" /></td>';
+ echo '<td colspan="1"><input name="NextList" type="hidden" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+10).'" name="Next" type="submit" value="'._('Next').'" /></td></tr>';
echo '<tr>
<th class="ascending" >' . _('Code') . '</th>
<th class="ascending" >' . _('Description') . '</th>
@@ -1680,7 +1701,7 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td><input class="number" tabindex="%s" type="text" size="6" name="OrderQty%s" ' . ($i==0 ? 'autofocus="autofocus"':'') . ' value="0" min="0"/>
- <input type="hidden" name="StockID%s" value="%s" />
+ <input name="StockID%s" type="hidden" value="%s" />
</td>
</tr>',
$myrow['stockid'],
@@ -1702,9 +1723,9 @@
}
#end of while loop
echo '<tr>
- <td><input type="hidden" name="PreviousList" value="'. strval($Offset-1).'" /><input tabindex="'. strval($j+7).'" type="submit" name="Previous" value="'._('Previous').'" /></td>
- <td style="text-align:center" colspan="6"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'. strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td>
- <td><input type="hidden" name="NextList" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+9).'" type="submit" name="Next" value="'._('Next').'" /></td>
+ <td><input name="PreviousList" type="hidden" value="'. strval($Offset-1).'" /><input tabindex="'. strval($j+7).'" type="submit" name="Previous" value="'._('Previous').'" /></td>
+ <td style="text-align:center" colspan="6"><input name="SelectingOrderItems" type="hidden" value="1" /><input tabindex="'. strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td>
+ <td><input name="NextList" type="hidden" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+9).'" name="Next" type="submit" value="'._('Next').'" /></td>
</tr>
</table>
</div>';
@@ -1783,10 +1804,10 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier .
'" method="post" name="deleteform">';
echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ echo '<input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />
<br />
<div class="centre">
- <input type="submit" name="CancelOrder" value="' . _('Cancel Whole Order') . '" onclick="return confirm(\'' . _('Are you sure you wish to cancel this entire order?') . '\');" />
+ <input name="CancelOrder" type="submit" value="' . _('Cancel Whole Order') . '" onclick="return confirm(\'' . _('Are you sure you wish to cancel this entire order?') . '\');" />
</div>
</form>';
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-01-20 08:04:05 UTC (rev 7089)
+++ trunk/doc/Change.log 2015-01-20 13:44:18 UTC (rev 7090)
@@ -1,5 +1,6 @@
webERP Change Log
+20/01/15 RChacon: Add translation for transaction type, script ID, manual references, class="number" to columns.
20/1/15 Exson: Remove die() function from Suppliers.php which will make adding or updating suppliers' data failed when google map is activated. Reported by Terry.
17/01/15 RChacon: Fix Czech language code, add info for Croatian language, add the script name and revision number and sort by language code.
16/01/15 RChacon: Standardise RevisionTranslations.php's titles to Stocks.php's titles.
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-01-20 08:04:05 UTC (rev 7089)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-20 13:44:18 UTC (rev 7090)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-01-17 17:09-0600\n"
-"PO-Revision-Date: 2015-01-17 09:03-0600\n"
+"PO-Revision-Date: 2015-01-19 16:08-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -6981,7 +6981,7 @@
#: CounterSales.php:950
msgid "Amount Paid"
-msgstr "Cantidad Pagada"
+msgstr "Monto pagado"
#: CounterSales.php:951
msgid ""
@@ -8529,7 +8529,7 @@
#: CustomerAllocations.php:51
msgid "Amount entered was negative"
-msgstr "Se indicó una cantidad negativa"
+msgstr "Monto ingresado fue negativo"
#: CustomerAllocations.php:51
msgid "Only positive amounts are allowed"
@@ -8608,7 +8608,7 @@
#: CustomerAllocations.php:371
msgid "Amount in customer currency"
-msgstr "Importe en la moneda del cliente"
+msgstr "Monto en la moneda del cliente"
#: CustomerAllocations.php:371 SupplierAllocations.php:443
msgid "converted into local currency at an exchange rate of"
@@ -9460,7 +9460,7 @@
#: api/api_xml-rpc.php:2493 api/api_xml-rpc.php:2529 api/api_xml-rpc.php:2575
#: api/api_xml-rpc.php:2771 api/api_xml-rpc.php:3048
msgid "Stock ID"
-msgstr "ID de Existencia"
+msgstr "ID de existencia"
#: CustomerPurchases.php:78
msgid "Transaction No."
@@ -9469,15 +9469,15 @@
#: CustomerPurchases.php:79 SelectOrderItems.php:696
#: StockLocTransferReceive.php:343
msgid "From Location"
-msgstr "Desde Ubicación"
+msgstr "Desde ubicación"
#: CustomerPurchases.php:83
msgid "Amount of Sale"
-msgstr "Importe de venta"
+msgstr "Monto de la venta"
#: CustomerPurchases.php:109
msgid "Return to customer selection screen"
-msgstr ""
+msgstr "Volver a la pantalla de selección del cliente"
#: CustomerReceipt.php:8
msgid "Receipt Entry"
@@ -9575,7 +9575,7 @@
#: CustomerReceipt.php:277 CustomerReceipt.php:1139
msgid "Amount of Receipt"
-msgstr "Importe del Ingreso"
+msgstr "Monto del recibo"
#: CustomerReceipt.php:301
msgid "Print a Customer Receipt"
@@ -9813,7 +9813,7 @@
#: CustomerReceipt.php:1145 Payments.php:1132
msgid "Amount of Discount"
-msgstr "Descuento"
+msgstr "Monto del descuento"
#: CustomerReceipt.php:1146
msgid "agreed prompt payment discount is"
@@ -10453,7 +10453,7 @@
#: DailyBankTransactions.php:129 DailyBankTransactions.php:131
msgid "Amount in"
-msgstr "Cantidad en"
+msgstr "Monto en"
#: DailyBankTransactions.php:130 DailyBankTransactions.php:132
msgid "Running Total"
@@ -22109,7 +22109,7 @@
#: Payments.php:1125
msgid "Amount of Payment"
-msgstr "Importe del Pago"
+msgstr "Monto del pago"
#: PcAssignCashToTab.php:5
msgid "Assignment of Cash to Petty Cash Tab"
@@ -23625,7 +23625,7 @@
#: PrintCustStatements.php:416
msgid "Amount received was"
-msgstr "La cantidad recibida fue"
+msgstr "el monto recibido fue"
#: PrintCustStatements.php:421
msgid "Please make payments to our account:"
@@ -32499,7 +32499,7 @@
#: SuppContractChgs.php:165
msgid "Amount must be numeric"
-msgstr ""
+msgstr "Monto debe ser numérico"
#: SuppContractChgs.php:165
msgid "Non zero amount"
@@ -33411,7 +33411,7 @@
#: SupplierAllocations.php:441 SupplierInvoice.php:861 SupplierInvoice.php:868
msgid "Amount in supplier currency"
-msgstr "Importe en la moneda del proveedor"
+msgstr "Monto en la moneda del proveedor"
#: SupplierAllocations.php:447
msgid "Transaction total"
|
|
From: <rc...@us...> - 2015-01-22 14:17:13
|
Revision: 7092
http://sourceforge.net/p/web-erp/reponame/7092
Author: rchacon
Date: 2015-01-22 14:17:10 +0000 (Thu, 22 Jan 2015)
Log Message:
-----------
Standardise bank.png, add code comments, complete parameters for calling manual.
Modified Paths:
--------------
trunk/BankAccountUsers.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/DailyBankTransactions.php
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/BankAccountUsers.php
===================================================================
--- trunk/BankAccountUsers.php 2015-01-21 14:00:57 UTC (rev 7091)
+++ trunk/BankAccountUsers.php 2015-01-22 14:17:10 UTC (rev 7092)
@@ -1,12 +1,18 @@
<?php
+/* $Id: BankAccountUsers.php 6946 2014-10-27 07:30:11Z daintree $*/
+/* This script maintains table bankaccountusers (Authorized users to work with a bank account in webERP). */
include('includes/session.inc');
-$Title = _('Maintenance Of Bank Account Authorised Users');
+$Title = _('Bank Account Users');;// Screen identificator.
+$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+/* To do this section in the manual.
+$BookMark = 'BankAccountUsers';// Anchor's id in the manual's html document.*/
include('includes/header.inc');
+echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .
+ _('Bank Account Authorised Users') . '" /> ' .// Icon title.
+ _('Maintenance Of Bank Account Authorised Users') . '</p>';// Page title.
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank Account Authorised Users')
- . '" alt="" />' . ' ' . $Title . '</p>';
-
if (isset($_POST['SelectedUser'])){
$SelectedUser = mb_strtoupper($_POST['SelectedUser']);
} elseif (isset($_GET['SelectedUser'])){
@@ -137,7 +143,7 @@
$result = DB_query($SQLName);
$myrow = DB_fetch_array($result);
$SelectedBankName = $myrow['bankaccountname'];
-
+
echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Authorised users for') . ' ' .$SelectedBankName . ' ' . _('bank account') .'</a></div>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
@@ -229,4 +235,4 @@
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2015-01-21 14:00:57 UTC (rev 7091)
+++ trunk/BankAccounts.php 2015-01-22 14:17:10 UTC (rev 7092)
@@ -1,15 +1,17 @@
<?php
-
/* $Id$*/
+/* This script defines the general ledger code for bank accounts and specifies that bank transactions be created for these accounts for the purposes of reconciliation. */
include('includes/session.inc');
-
-$Title = _('Bank Accounts Maintenance');
-$ViewTopic= 'GeneralLedger';
-$BookMark = 'BankAccounts';
+$Title = _('Bank Accounts');// Screen identificator.
+$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'BankAccounts';// Anchor's id in the manual's html document.
include('includes/header.inc');
+echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .
+ _('Bank') . '" /> ' .// Icon title.
+ _('Bank Accounts Maintenance') . '</p>';// Page title.
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $Title . '</p>';
echo '<div class="page_help_text">' . _('Update Bank Account details. Account Code is for SWIFT or BSB type Bank Codes. Set Default for Invoices to Currency Default or Fallback Default to print Account details on Invoices (only one account should be set to Fall Back Default).') . '.</div><br />';
if (isset($_GET['SelectedBankAccount'])) {
@@ -432,4 +434,4 @@
</div>
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2015-01-21 14:00:57 UTC (rev 7091)
+++ trunk/BankMatching.php 2015-01-22 14:17:10 UTC (rev 7092)
@@ -1,13 +1,11 @@
<?php
-
/* $Id$*/
+/* This script allows payments and receipts to be matched off against bank statements. */
include('includes/session.inc');
-$Title = _('Bank Account Matching');
-
-$ViewTopic = 'GeneralLedger';
-$BookMark = 'BankMatching';
-
+$Title = _('Bank Matching');// Screen identificator.
+$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'BankMatching';// Filename's id in ManualContents.php's TOC.
include('includes/header.inc');
if ((isset($_GET['Type']) AND $_GET['Type']=='Receipts')
@@ -15,18 +13,20 @@
$Type = 'Receipts';
$TypeName =_('Receipts');
- echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Receipts') . '
- </p>';
+ echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .
+ _('Bank Matching') . '" /> ' .// Icon title.
+ _('Bank Account Matching - Receipts') . '</p>';// Page title.
} elseif ((isset($_GET['Type']) AND $_GET['Type']=='Payments')
OR (isset($_POST['Type']) AND $_POST['Type']=='Payments')) {
$Type = 'Payments';
$TypeName =_('Payments');
- echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/money_delete.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Payments') . '
- </p>';
+ echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .
+ _('Bank Matching') . '" /> ' .// Icon title.
+ _('Bank Account Matching - Payments') . '</p>';// Page title.
} else {
@@ -353,4 +353,4 @@
echo '</div>';
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2015-01-21 14:00:57 UTC (rev 7091)
+++ trunk/BankReconciliation.php 2015-01-22 14:17:10 UTC (rev 7092)
@@ -1,20 +1,20 @@
<?php
-
/* $Id$*/
+/* This script displays the bank reconciliation for a selected bank account. */
-include ('includes/session.inc');
-
-$Title = _('Bank Reconciliation');
-
-$ViewTopic= 'GeneralLedger';
-$BookMark = 'BankAccounts';
-
+include('includes/session.inc');
+$Title = _('Bank Reconciliation');;// Screen identificator.
+$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'BankAccounts';// Anchor's id in the manual's html document.
include('includes/header.inc');
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-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/bank.png" title="' .
+ _('Bank Reconciliation') . '" /> ' .// Icon title.
+ _('Bank Reconciliation') . '</p>';// Page title.
if (isset($_GET['Account'])) {
$_POST['BankAccount']=$_GET['Account'];
@@ -99,8 +99,8 @@
echo '<table class="selection">';
-$SQL = "SELECT bankaccounts.accountcode,
- bankaccounts.bankaccountname
+$SQL = "SELECT bankaccounts.accountcode,
+ bankaccounts.bankaccountname
FROM bankaccounts, bankaccountusers
WHERE bankaccounts.accountcode=bankaccountusers.accountcode
AND bankaccountusers.userid = '" . $_SESSION['UserID'] ."'
@@ -403,4 +403,4 @@
echo '</div>';
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2015-01-21 14:00:57 UTC (rev 7091)
+++ trunk/DailyBankTransactions.php 2015-01-22 14:17:10 UTC (rev 7092)
@@ -1,15 +1,17 @@
<?php
/* $Id: DailyBankTransactions.php 4556 2011-04-26 11:03:36Z daintree $ */
+/* This script allows you to view all bank transactions for a selected date range, and the inquiry can be filtered by matched or unmatched transactions, or all transactions can be chosen. */
-include ('includes/session.inc');
-$Title = _('Bank Transactions Inquiry');
-$ViewTopic= 'GeneralLedger';
-$BookMark = 'DailyBankTransactions';
-
+include('includes/session.inc');
+$Title = _('Daily Bank Transactions');// Screen identificator.
+$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'DailyBankTransactions';// Anchor's id in the manual's html document.
include('includes/header.inc');
+echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .
+ _('Bank Transactions Inquiry') . '" /> ' .// Icon title.
+ _('Bank Transactions Inquiry') . '</p>';// Page title.
-echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/money_add.png" title="' . _('Search') . '" />' . ' ' . $Title . '</p>';
-
if (!isset($_POST['Show'])) {
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
echo '<div>';
@@ -21,7 +23,7 @@
bankaccounts.accountcode,
bankaccounts.currcode
FROM bankaccounts,
- chartmaster,
+ chartmaster,
bankaccountusers
WHERE bankaccounts.accountcode=chartmaster.accountcode
AND bankaccounts.accountcode=bankaccountusers.accountcode
@@ -140,7 +142,7 @@
$AccountCurrTotal += $myrow['amount'];
$LocalCurrTotal += $myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'];
-
+
if ($myrow['amount']==$myrow['amountcleared']) {
$Matched=_('Yes');
} else {
@@ -174,4 +176,4 @@
</form>';
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2015-01-21 14:00:57 UTC (rev 7091)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2015-01-22 14:17:10 UTC (rev 7092)
@@ -183,4 +183,9 @@
ALTER TABLE `suppliercontacts`
ADD CONSTRAINT `suppliercontacts_ibfk_1` FOREIGN KEY (`supplierid`) REFERENCES `suppliers` (`supplierid`);
+
+-- Add a description for the script:
+UPDATE `scripts` SET `description` = 'Allows you to view all bank transactions for a selected date range, and the inquiry can be filtered by matched or unmatched transactions, or all transactions can be chosen' WHERE `scripts`.`script` = 'DailyBankTransactions.php';
+
+
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
|
|
From: <vv...@us...> - 2015-01-22 20:15:49
|
Revision: 7093
http://sourceforge.net/p/web-erp/reponame/7093
Author: vvs2012
Date: 2015-01-22 20:15:40 +0000 (Thu, 22 Jan 2015)
Log Message:
-----------
effectiveafter <= '" . date('Y-m-d') . "' AND effectiveto > '" .
date('Y-m-d') . "'
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/ConfirmDispatch_Invoice.php
trunk/CounterReturns.php
trunk/CounterSales.php
trunk/Credit_Invoice.php
trunk/MRP.php
trunk/PrintCustOrder_generic.php
trunk/PrintWOItemSlip.php
trunk/SelectCreditItems.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/WOCanBeProducedNow.php
trunk/WhereUsedInquiry.php
trunk/api/api_debtortransactions.php
trunk/api/api_salesorders.php
trunk/includes/SQL_CommonFunctions.inc
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/BOMExtendedQty.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -53,8 +53,8 @@
CONCAT(bom.parent,bom.component) AS sortpart
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= '" . date('Y-m-d') . "'
- AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$result = DB_query($sql);
$LevelCounter = 2;
@@ -80,8 +80,8 @@
(" . filter_number_format($_POST['Quantity']) . " * bom.quantity) as extendedqpa
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= '" . date('Y-m-d') . "'
- AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$result = DB_query($sql);
//echo "<br />sql is $sql<br />";
// This while routine finds the other levels as long as $ComponentCounter - the
@@ -112,8 +112,8 @@
(bom.quantity * passbom.extendedqpa)
FROM bom,passbom
WHERE bom.parent = passbom.part
- AND bom.effectiveto >= '" . date('Y-m-d') . "'
- AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$result = DB_query($sql);
$result = DB_query("DROP TABLE IF EXISTS passbom2");
@@ -134,8 +134,8 @@
FROM bom
INNER JOIN passbom2
ON bom.parent = passbom2.part
- WHERE bom.effectiveto >= '" . date('Y-m-d') . "'
- AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
+ WHERE bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$result = DB_query($sql);
$sql = "SELECT COUNT(bom.parent) AS components
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/BOMIndented.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -49,8 +49,8 @@
CONCAT(bom.parent,bom.component) AS sortpart
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= '" . date('Y-m-d') . "'
- AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$result = DB_query($sql);
$LevelCounter = 2;
@@ -77,8 +77,8 @@
FROM bom
INNER JOIN locationusers ON locationusers.loccode=bom.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= '" . date('Y-m-d') . "'
- AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$result = DB_query($sql);
//echo "<br />sql is $sql<br />";
// This while routine finds the other levels as long as $ComponentCounter - the
@@ -111,7 +111,8 @@
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.effectiveto >= '" . date('Y-m-d') . "' AND 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";
@@ -134,8 +135,8 @@
CONCAT(passbom2.sortpart,bom.component) AS sortpart
FROM bom,passbom2
WHERE bom.parent = passbom2.part
- AND bom.effectiveto >= '" . date('Y-m-d') . "'
- AND 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/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/BOMIndentedReverse.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -48,8 +48,8 @@
CONCAT(bom.component,bom.parent) AS sortpart
FROM bom
WHERE bom.component ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= '" . date('Y-m-d') . "'
- AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$result = DB_query($sql);
$LevelCounter = 2;
@@ -75,8 +75,8 @@
bom.quantity
FROM bom
WHERE bom.component ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= '" . date('Y-m-d') . "'
- AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$result = DB_query($sql);
// This while routine finds the other levels as long as $ComponentCounter - the
@@ -106,8 +106,8 @@
bom.quantity
FROM bom,passbom
WHERE bom.component = passbom.part
- AND bom.effectiveto >= '" . date('Y-m-d') . "'
- AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$result = DB_query($sql);
$result = DB_query("DROP TABLE IF EXISTS passbom2");
@@ -126,8 +126,8 @@
CONCAT(passbom2.sortpart,bom.parent) AS sortpart
FROM bom,passbom2
WHERE bom.component = passbom2.part
- AND bom.effectiveto >= '" . date('Y-m-d') . "'
- AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$result = DB_query($sql);
$result = DB_query("SELECT COUNT(*) FROM bom,passbom WHERE bom.component = passbom.part");
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/BOMInquiry.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -172,9 +172,8 @@
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') . "'
- OR bom.effectiveto='0000-00-00')";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('The bill of material could not be retrieved because');
$BOMResult = DB_query ($sql,$ErrMsg);
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/ConfirmDispatch_Invoice.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -632,8 +632,8 @@
ON stockmaster.stockid=bom.component
WHERE bom.parent='" . $OrderLine->StockID . "'
AND locstock.loccode='" . $_SESSION['Items'.$identifier]->Location . "'
- AND effectiveafter <'" . Date('Y-m-d') . "'
- AND effectiveto >='" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve the component quantity left at the location once the assembly item on this order is invoiced (for the purposes of checking that stock will not go negative because)');
$Result = DB_query($SQL,$ErrMsg);
@@ -994,8 +994,8 @@
FROM bom INNER JOIN stockmaster
ON bom.component=stockmaster.stockid
WHERE bom.parent='" . $OrderLine->StockID . "'
- AND bom.effectiveto >= '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Could not retrieve assembly components from the database for'). ' '. $OrderLine->StockID . _('because').' ';
$DbgMsg = _('The SQL that failed was');
Modified: trunk/CounterReturns.php
===================================================================
--- trunk/CounterReturns.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/CounterReturns.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -413,8 +413,8 @@
bom.quantity
FROM bom
WHERE bom.parent='" . $NewItem . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve kitset components from the database because') . ' ';
$KitResult = DB_query($sql,$ErrMsg,$DbgMsg);
@@ -526,8 +526,8 @@
bom.quantity
FROM bom
WHERE bom.parent='" . $ReturnItemLine->StockID. "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve kitset components from the database because');
$KitResult = DB_query($sql,$ErrMsg);
@@ -575,8 +575,8 @@
bom.quantity
FROM bom
WHERE bom.parent='" . $NewItem . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve kitset components from the database because');
$KitResult = DB_query($sql,$ErrMsg);
@@ -626,8 +626,8 @@
bom.quantity
FROM bom
WHERE bom.parent='" . $NewItem . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve kitset components from the database because');
$KitResult = DB_query($sql,$ErrMsg);
@@ -1017,8 +1017,8 @@
stockmaster
WHERE bom.component=stockmaster.stockid
AND bom.parent='" . $ReturnItemLine->StockID . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Could not retrieve assembly components from the database for'). ' '. $ReturnItemLine->StockID . _('because').' ';
$DbgMsg = _('The SQL that failed was');
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/CounterSales.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -456,8 +456,8 @@
bom.quantity
FROM bom
WHERE bom.parent='" . $NewItem . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve kitset components from the database because') . ' ';
$KitResult = DB_query($sql,$ErrMsg,$DbgMsg);
@@ -567,8 +567,8 @@
bom.quantity
FROM bom
WHERE bom.parent='" . $OrderLine->StockID. "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve kitset components from the database because');
$KitResult = DB_query($sql,$ErrMsg);
@@ -617,8 +617,8 @@
bom.quantity
FROM bom
WHERE bom.parent='" . $NewItem . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve kitset components from the database because');
$KitResult = DB_query($sql,$ErrMsg);
@@ -669,8 +669,8 @@
bom.quantity
FROM bom
WHERE bom.parent='" . $NewItem . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve kitset components from the database because');
$KitResult = DB_query($sql,$ErrMsg);
@@ -1017,8 +1017,8 @@
ON stockmaster.stockid=bom.component
WHERE bom.parent='" . $OrderLine->StockID . "'
AND locstock.loccode='" . $_SESSION['Items'.$identifier]->Location . "'
- AND effectiveafter <'" . Date('Y-m-d') . "'
- AND effectiveto >='" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve the component quantity left at the location once the assembly item on this order is invoiced (for the purposes of checking that stock will not go negative because)');
$Result = DB_query($SQL,$ErrMsg);
@@ -1418,8 +1418,8 @@
stockmaster
WHERE bom.component=stockmaster.stockid
AND bom.parent='" . $OrderLine->StockID . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Could not retrieve assembly components from the database for'). ' '. $OrderLine->StockID . _('because').' ';
$DbgMsg = _('The SQL that failed was');
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/Credit_Invoice.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -748,8 +748,8 @@
stockmaster
WHERE bom.component=stockmaster.stockid
AND bom.parent='" . $CreditLine->StockID . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve assembly components from the database for') . ' ' . $CreditLine->StockID . ' ' . _('because');
$DbgMsg = _('The SQL that failed was');
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/MRP.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -897,8 +897,8 @@
LEFT JOIN levels
ON bom.component = levels.part
WHERE bom.parent = '".$TopPart."'
- AND effectiveafter <= '" . date('Y-m-d') . "'
- AND effectiveto >= '" . date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ResultBOM = DB_query($sql);
while ($myrow=DB_fetch_array($ResultBOM)) {
// Calculate required date by subtracting leadtime from top part's required date
Modified: trunk/PrintCustOrder_generic.php
===================================================================
--- trunk/PrintCustOrder_generic.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/PrintCustOrder_generic.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -215,7 +215,9 @@
stockmaster.decimalplaces
FROM bom INNER JOIN stockmaster
ON bom.component=stockmaster.stockid
- WHERE bom.parent='" . $myrow2['stkcode'] . "'";
+ WHERE bom.parent='" . $myrow2['stkcode'] . "'
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve the components of the ordered assembly item');
$AssemblyResult = DB_query($sql,$ErrMsg);
$LeftOvers = $pdf->addTextWrap($XPos,$YPos,150,$FontSize, _('Assembly Components:-'));
Modified: trunk/PrintWOItemSlip.php
===================================================================
--- trunk/PrintWOItemSlip.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/PrintWOItemSlip.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -72,9 +72,8 @@
AND bom.component = locstock.stockid
AND locstock.loccode = '". $Location ."'
AND bom.parent = '" . $StockId . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'
- AND (bom.effectiveto > '" . Date('Y-m-d') . "'
- OR bom.effectiveto='0000-00-00')";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('The bill of material could not be retrieved because');
$BOMResult = DB_query ($sqlBOM,$ErrMsg);
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/SelectCreditItems.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -1440,8 +1440,8 @@
FROM bom INNER JOIN stockmaster
ON bom.component=stockmaster.stockid
WHERE bom.parent='" . $CreditLine->StockID . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve assembly components from the database for') . ' ' . $CreditLine->StockID . ' ' . _('because');
$DbgMsg = _('The SQL that failed was');
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/SelectOrderItems.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -881,8 +881,8 @@
bom.quantity
FROM bom
WHERE bom.parent='" . $NewItem . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve kitset components from the database because') . ' ';
$KitResult = DB_query($sql,$ErrMsg,$DbgMsg);
@@ -1166,8 +1166,8 @@
bom.quantity
FROM bom
WHERE bom.parent='" . $NewItem . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve kitset components from the database because');
$KitResult = DB_query($sql,$ErrMsg);
@@ -1215,8 +1215,8 @@
bom.quantity
FROM bom
WHERE bom.parent='" . $NewItem . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('Could not retrieve kitset components from the database because');
$KitResult = DB_query($sql,$ErrMsg);
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/SelectProduct.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -153,8 +153,8 @@
FROM bom INNER JOIN stockmaster
ON bom.component=stockmaster.stockid
WHERE bom.parent='" . $StockID . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'");
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$CostRow = DB_fetch_row($CostResult);
$Cost = $CostRow[0];
} else {
@@ -184,9 +184,8 @@
stockmaster
ON bom.component=stockmaster.stockid
WHERE bom.parent = '" . $StockID . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'
- AND (bom.effectiveto > '" . Date('Y-m-d') . "'
- OR bom.effectiveto='0000-00-00')");
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$CostRow = DB_fetch_row($CostResult);
$Cost = $CostRow[0];
} else {
Modified: trunk/WOCanBeProducedNow.php
===================================================================
--- trunk/WOCanBeProducedNow.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/WOCanBeProducedNow.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -105,9 +105,8 @@
AND bom.component = locstock.stockid
AND locstock.loccode = '". $Location ."'
AND bom.parent = '" . $myItem['stockid'] . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'
- AND (bom.effectiveto > '" . Date('Y-m-d') . "'
- OR bom.effectiveto='0000-00-00')";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$ErrMsg = _('The bill of material could not be retrieved because');
$BOMResult = DB_query ($sqlBOM,$ErrMsg);
Modified: trunk/WhereUsedInquiry.php
===================================================================
--- trunk/WhereUsedInquiry.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/WhereUsedInquiry.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -56,8 +56,8 @@
ON bom.parent = stockmaster.stockid
INNER JOIN locationusers ON locationusers.loccode=bom.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
WHERE component='" . $StockID . "'
- AND bom.effectiveafter<='" . Date('Y-m-d') . "'
- AND bom.effectiveto >='" . Date('Y-m-d') . "'
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'
ORDER BY stockmaster.discontinued, bom.parent";
$ErrMsg = _('The parents for the selected part could not be retrieved because');;
Modified: trunk/api/api_debtortransactions.php
===================================================================
--- trunk/api/api_debtortransactions.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/api/api_debtortransactions.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -703,8 +703,8 @@
FROM bom INNER JOIN stockmaster
ON bom.component=stockmaster.stockid
WHERE bom.parent='" . $CN_Line['stockid'] . "'
- AND bom.effectiveto >= '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$AssResult = api_DB_query($SQL);
Modified: trunk/api/api_salesorders.php
===================================================================
--- trunk/api/api_salesorders.php 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/api/api_salesorders.php 2015-01-22 20:15:40 UTC (rev 7093)
@@ -870,8 +870,8 @@
FROM bom INNER JOIN stockmaster
ON bom.component=stockmaster.stockid
WHERE bom.parent='" . $OrderLineRow['stkcode'] . "'
- AND bom.effectiveto >= '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$AssResult = api_DB_query($SQL);
Modified: trunk/includes/SQL_CommonFunctions.inc
===================================================================
--- trunk/includes/SQL_CommonFunctions.inc 2015-01-22 14:17:10 UTC (rev 7092)
+++ trunk/includes/SQL_CommonFunctions.inc 2015-01-22 20:15:40 UTC (rev 7093)
@@ -221,8 +221,8 @@
FROM bom LEFT JOIN stockmaster
ON bom.component = stockmaster.stockid
WHERE bom.parent='". $Parent . "'
- AND bom.effectiveafter<='" . Date('Y-m-d') . "'
- AND bom.effectiveto>='" . Date('Y-m-d') . "'";
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'";
$result = DB_query($SQL);
$MyRow = DB_fetch_row($result);
$MaterialCost = $MyRow[0];
@@ -276,8 +276,8 @@
ON bom.component=stockmaster.stockid
WHERE bom.parent='" . $StockID . "'
AND bom.loccode ='" . $LocCode . "'
- AND bom.effectiveafter<='" . Date('Y-m-d') . "'
- AND bom.effectiveto>='" . Date('Y-m-d') . "'
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'
AND stockmaster.mbflag<>'G'
AND bom.component NOT IN (
SELECT stockid
@@ -304,8 +304,8 @@
ON bom.component=stockmaster.stockid
WHERE bom.parent='" . $StockID . "'
AND bom.loccode ='" . $LocCode . "'
- AND bom.effectiveafter<='" . Date('Y-m-d') . "'
- AND bom.effectiveto>='" . Date('Y-m-d') . "'
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'
AND stockmaster.mbflag<>'G'
AND bom.component IN (
SELECT stockid
@@ -328,8 +328,8 @@
ON bom.component=stockmaster.stockid
WHERE parent='" . $StockID . "'
AND loccode ='" . $LocCode . "'
- AND bom.effectiveafter<='" . Date('Y-m-d') . "'
- AND bom.effectiveto>='" . Date('Y-m-d') . "'
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'
+ AND bom.effectiveto > '" . date('Y-m-d') . "'
AND stockmaster.mbflag='G'";
$result = DB_query($sql);
while ($MyRow=DB_fetch_array($result)) {
|
|
From: <rc...@us...> - 2015-01-23 19:41:16
|
Revision: 7094
http://sourceforge.net/p/web-erp/reponame/7094
Author: rchacon
Date: 2015-01-23 19:41:10 +0000 (Fri, 23 Jan 2015)
Log Message:
-----------
Generalise indian number format for country=India (languages: English, Hindi, Marathi, etc.). Minor improvements in Spanish translation.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/doc/Manual/ManualMultilanguage.html
trunk/includes/MiscFunctions.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-01-22 20:15:40 UTC (rev 7093)
+++ trunk/doc/Change.log 2015-01-23 19:41:10 UTC (rev 7094)
@@ -1,5 +1,7 @@
webERP Change Log
+23/01/15 RChacon: Generalise indian number format for country=India (languages: English, Hindi, Marathi, etc.).
+Add translation for transaction type, script ID, manual references, class="number" to columns.
20/01/15 RChacon: Add translation for transaction type, script ID, manual references, class="number" to columns.
20/1/15 Exson: Remove die() function from Suppliers.php which will make adding or updating suppliers' data failed when google map is activated. Reported by Terry.
17/01/15 RChacon: Fix Czech language code, add info for Croatian language, add the script name and revision number and sort by language code.
Modified: trunk/doc/Manual/ManualMultilanguage.html
===================================================================
--- trunk/doc/Manual/ManualMultilanguage.html 2015-01-22 20:15:40 UTC (rev 7093)
+++ trunk/doc/Manual/ManualMultilanguage.html 2015-01-23 19:41:10 UTC (rev 7094)
@@ -74,7 +74,7 @@
<h4>The .po file starts with some initial comments which should also be completed</h4>
-<p>"SOME DESCRIPTIVE TITLE", - should be replaced with webERP - LANGUAGE Translation File - where LANGUAGE is the language being translated into<br>
+<p>"SOME DESCRIPTIVE TITLE", - should be replaced with <b><i>webERP - LANGUAGE Translation File</i></b> - where LANGUAGE is the language being translated into<br>
# FIRST AUTHOR , YEAR. - should be your name and email address - with the year of the work being done</p>
<h4>Project-Id-Version</h4>
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2015-01-22 20:15:40 UTC (rev 7093)
+++ trunk/includes/MiscFunctions.php 2015-01-23 19:41:10 UTC (rev 7094)
@@ -333,7 +333,8 @@
function locale_number_format($Number, $DecimalPlaces=0) {
global $DecimalPoint;
global $ThousandsSeparator;
- if ($_SESSION['Language']=='hi_IN.utf8' OR $_SESSION['Language']=='en_IN.utf8'){
+/* if ($_SESSION['Language']=='hi_IN.utf8' OR $_SESSION['Language']=='en_IN.utf8'){*/
+ if(substr($_SESSION['Language'], 3, 2)=='IN') {// If country is India (??_IN.utf8).
return indian_number_format(floatval($Number),$DecimalPlaces);
} else {
if (!is_numeric($DecimalPlaces) AND $DecimalPlaces == 'Variable'){
@@ -400,6 +401,7 @@
return $IntegerNumber. $DecimalValue;
}
}
+
function SendMailBySmtp(&$mail,$To) {
if(IsEmailAddress($_SESSION['SMTPSettings']['username'])){//user has set the fully mail address as user name
$SendFrom = $_SESSION['SMTPSettings']['username'];
@@ -450,4 +452,4 @@
echo ' ... ' . _('completed');
}
-?>
\ No newline at end of file
+?>
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-01-22 20:15:40 UTC (rev 7093)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-23 19:41:10 UTC (rev 7094)
@@ -1,4 +1,4 @@
-# webERP - Spanish Translation File.
+# webERP - SPANISH Translation File.
# Copyright (C) 2009 WebERP Team
# This file is distributed under the same license as the WebERP package.
# Javier De Lorenzo-Cáceres <in...@ci...>, 2009.
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-17 17:09-0600\n"
-"PO-Revision-Date: 2015-01-19 16:08-0600\n"
+"POT-Creation-Date: 2015-01-23 08:08-0600\n"
+"PO-Revision-Date: 2015-01-23 08:29-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -172,7 +172,7 @@
"dicho subgrupo"
#: AccountGroups.php:213 AccountGroups.php:248 AccountSections.php:130
-#: Areas.php:115 Areas.php:124 BankAccounts.php:163 CreditStatus.php:125
+#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:244 Currencies.php:252 Currencies.php:260
#: CustomerBranches.php:301 CustomerBranches.php:311 CustomerBranches.php:321
#: CustomerBranches.php:331 CustomerBranches.php:341 CustomerTypes.php:146
@@ -246,36 +246,36 @@
#: AccountGroups.php:282 AccountSections.php:169 AddCustomerContacts.php:25
#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
#: AddCustomerTypeNotes.php:94 AgedDebtors.php:454 AgedSuppliers.php:276
-#: Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256 BOMIndented.php:248
-#: BOMIndentedReverse.php:236 BOMInquiry.php:187 BOMListing.php:110
-#: BOMs.php:239 BOMs.php:890 BankReconciliation.php:17 COGSGLPostings.php:19
-#: CompanyPreferences.php:102 CounterReturns.php:1629 CounterSales.php:2097
-#: CounterSales.php:2193 CreditStatus.php:21 Credit_Invoice.php:276
-#: Currencies.php:30 CustEDISetup.php:17 CustItem.php:120 CustItem.php:210
-#: CustItem.php:238 DailyBankTransactions.php:11 DebtorsAtPeriodEnd.php:129
-#: DiscountCategories.php:12 DiscountCategories.php:149 DiscountMatrix.php:16
-#: EDIMessageFormat.php:105 FixedAssetLocations.php:13
-#: FixedAssetRegister.php:16 FixedAssetRegister.php:256
-#: FixedAssetTransfer.php:14 FormDesigner.php:185 GLBalanceSheet.php:387
-#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11
-#: HistoricalTestResults.php:38 InternalStockRequest.php:311
-#: InventoryPlanning.php:354 InventoryPlanningPrefSupplier.php:386
-#: MRPReport.php:516 MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16
-#: NoSalesItems.php:91 PDFPickingList.php:29 PDFStockLocTransfer.php:16
-#: POReport.php:60 POReport.php:64 POReport.php:68
-#: PO_AuthorisationLevels.php:10 PO_SelectOSPurchOrder.php:148
-#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
-#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PriceMatrix.php:16
-#: Prices.php:11 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
-#: ProductSpecs.php:38 PurchData.php:241 PurchData.php:373 PurchData.php:401
+#: Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256 BOMIndented.php:249
+#: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110
+#: BOMs.php:239 BOMs.php:890 COGSGLPostings.php:19 CompanyPreferences.php:102
+#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
+#: CreditStatus.php:21 Credit_Invoice.php:276 Currencies.php:30
+#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238
+#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
+#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
+#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
+#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
+#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournal.php:250
+#: GLJournalInquiry.php:11 HistoricalTestResults.php:38
+#: InternalStockRequest.php:311 InventoryPlanning.php:354
+#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:516
+#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91
+#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10
+#: PO_SelectOSPurchOrder.php:148 PcAssignCashToTab.php:59
+#: PcAssignCashToTab.php:133 PcAssignCashToTab.php:149
+#: PcAssignCashToTab.php:193 PriceMatrix.php:16 Prices.php:11
+#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401
#: PurchaseByPrefSupplier.php:305 QATests.php:20 RecurringSalesOrders.php:320
#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:65
-#: SelectOrderItems.php:559 SelectOrderItems.php:1442
-#: SelectOrderItems.php:1542 SelectProduct.php:511 SelectQASamples.php:43
+#: SelectOrderItems.php:559 SelectOrderItems.php:1463
+#: SelectOrderItems.php:1563 SelectProduct.php:510 SelectQASamples.php:43
#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:220
#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
@@ -320,7 +320,7 @@
#: ContractCosting.php:202 Currencies.php:330 Currencies.php:508
#: Currencies.php:510 CustomerBranches.php:451 Customers.php:659
#: Customers.php:1049 Customers.php:1055 Customers.php:1058
-#: DailyBankTransactions.php:145 DeliveryDetails.php:1155
+#: DailyBankTransactions.php:147 DeliveryDetails.php:1155
#: DeliveryDetails.php:1198 DeliveryDetails.php:1201 FormDesigner.php:101
#: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628
#: Locations.php:646 Locations.php:648 Locations.php:661 Locations.php:663
@@ -347,8 +347,8 @@
#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:264
#: SalesCategories.php:351 SalesCategories.php:355 SalesPeople.php:227
-#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:238
-#: SelectProduct.php:363 SelectQASamples.php:417 SelectQASamples.php:511
+#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:237
+#: SelectProduct.php:362 SelectQASamples.php:417 SelectQASamples.php:511
#: SelectQASamples.php:513 SelectQASamples.php:568 SelectQASamples.php:570
#: SelectQASamples.php:582 SelectQASamples.php:584 ShipmentCosting.php:667
#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
@@ -376,15 +376,15 @@
msgstr "Sí"
#: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452
-#: BOMs.php:130 BOMs.php:801 BOMs.php:805 BankAccounts.php:216
-#: BankAccounts.php:410 BankAccounts.php:412 BankAccounts.php:416
-#: BankAccounts.php:424 CompanyPreferences.php:424 CompanyPreferences.php:428
+#: BOMs.php:130 BOMs.php:801 BOMs.php:805 BankAccounts.php:218
+#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
+#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428
#: CompanyPreferences.php:439 CompanyPreferences.php:443
#: CompanyPreferences.php:454 CompanyPreferences.php:458
#: ContractCosting.php:200 Currencies.php:332 Currencies.php:513
#: Currencies.php:515 CustomerBranches.php:451 Customers.php:658
#: Customers.php:1047 Customers.php:1054 Customers.php:1057
-#: DailyBankTransactions.php:147 DeliveryDetails.php:1156
+#: DailyBankTransactions.php:149 DeliveryDetails.php:1156
#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:99
#: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629
#: Locations.php:651 Locations.php:653 Locations.php:666 Locations.php:668
@@ -411,8 +411,8 @@
#: SalesAnalRepts.php:422 SalesAnalRepts.php:447 SalesAnalRepts.php:450
#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:266
#: SalesCategories.php:352 SalesCategories.php:354 SalesPeople.php:229
-#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:240
-#: SelectProduct.php:365 SelectQASamples.php:419 SelectQASamples.php:516
+#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:239
+#: SelectProduct.php:364 SelectQASamples.php:419 SelectQASamples.php:516
#: SelectQASamples.php:518 SelectQASamples.php:573 SelectQASamples.php:575
#: SelectQASamples.php:587 SelectQASamples.php:589 ShipmentCosting.php:668
#: ShopParameters.php:290 ShopParameters.php:292 ShopParameters.php:338
@@ -442,7 +442,7 @@
#: AccountGroups.php:322 AccountSections.php:191 AddCustomerContacts.php:148
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BOMs.php:157 BankAccounts.php:241 COGSGLPostings.php:112
+#: BOMs.php:157 BankAccounts.php:243 COGSGLPostings.php:112
#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:362
#: Currencies.php:379 CustItem.php:166 CustomerBranches.php:455
#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
@@ -480,7 +480,7 @@
#: AccountGroups.php:323 AccountSections.php:195 AddCustomerContacts.php:149
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BOMs.php:159 BankAccounts.php:242 COGSGLPostings.php:113
+#: BOMs.php:159 BankAccounts.php:244 COGSGLPostings.php:113
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
#: Credit_Invoice.php:410 Currencies.php:365 CustItem.php:167
@@ -504,7 +504,7 @@
#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:778
#: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664
#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723
-#: SelectOrderItems.php:1357 SelectQASamples.php:411
+#: SelectOrderItems.php:1375 SelectQASamples.php:411
#: SellThroughSupport.php:299 Shipments.php:440 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
@@ -588,7 +588,7 @@
#: AccountGroups.php:462 AccountSections.php:262 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BOMs.php:818 BankAccounts.php:431 COGSGLPostings.php:368
+#: BOMs.php:818 BankAccounts.php:433 COGSGLPostings.php:368
#: CreditStatus.php:259 Currencies.php:522 CustLoginSetup.php:273
#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
@@ -724,8 +724,8 @@
#: AddCustomerContacts.php:126 CompanyPreferences.php:173
#: CustomerBranches.php:408 Customers.php:1118 Customers.php:1126
-#: ImportBankTransAnalysis.php:207 PrintWOItemSlip.php:185
-#: PrintWOItemSlip.php:196 PrintWOItemSlip.php:207 ProductSpecs.php:162
+#: ImportBankTransAnalysis.php:207 PrintWOItemSlip.php:184
+#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:162
#: ProductSpecs.php:383 QATests.php:389 SalesPeople.php:208
#: SelectCustomer.php:609 StockDispatch.php:275 StockDispatch.php:286
#: StockDispatch.php:297 SuppTransGLAnalysis.php:108 SupplierContacts.php:152
@@ -845,8 +845,8 @@
#: GLAccountReport.php:343 GLTransInquiry.php:47 MRPCalendar.php:219
#: PDFRemittanceAdvice.php:308 PDFWOPrint.php:448 PaymentAllocations.php:66
#: PcAssignCashToTab.php:238 PcAuthorizeExpenses.php:93 PrintCustTrans.php:856
-#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:187
-#: PrintWOItemSlip.php:198 PrintWOItemSlip.php:209 ReverseGRN.php:398
+#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:186
+#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:398
#: SelectCustomer.php:659 SelectCustomer.php:701 ShipmentCosting.php:538
#: ShipmentCosting.php:615 Shipments.php:491 StockDispatch.php:277
#: StockDispatch.php:288 StockDispatch.php:299 StockLocMovements.php:92
@@ -985,11 +985,11 @@
msgstr "Existencia"
#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
-#: BOMIndented.php:314 BOMIndentedReverse.php:293 BOMInquiry.php:109
-#: BOMInquiry.php:199 BOMs.php:567 BOMs.php:914 ContractBOM.php:242
+#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
+#: BOMInquiry.php:198 BOMs.php:567 BOMs.php:914 ContractBOM.php:242
#: ContractBOM.php:354 ContractOtherReqts.php:98 CounterReturns.php:1692
#: CounterSales.php:2102 CounterSales.php:2256 CreditStatus.php:152
-#: CreditStatus.php:243 CustomerPurchases.php:76 EmailConfirmation.php:219
+#: CreditStatus.php:243 CustomerPurchases.php:81 EmailConfirmation.php:219
#: EmailConfirmation.php:349 FixedAssetCategories.php:167
#: FixedAssetDepreciation.php:91 FixedAssetRegister.php:87
#: FixedAssetRegister.php:388 FixedAssetTransfer.php:60
@@ -1010,8 +1010,8 @@
#: ReorderLevel.php:298 ReorderLevelLocation.php:73 ReverseGRN.php:397
#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103
#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505
-#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1452
-#: SelectOrderItems.php:1614 SelectProduct.php:531 SelectProduct.php:757
+#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1473
+#: SelectOrderItems.php:1635 SelectProduct.php:530 SelectProduct.php:756
#: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680
#: StockCounts.php:142 StockDispatch.php:504 StockLocStatus.php:173
@@ -1073,7 +1073,7 @@
#: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430
#: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500
#: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:692
-#: SelectCreditItems.php:696 SelectOrderItems.php:1299
+#: SelectCreditItems.php:696 SelectOrderItems.php:1313
#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97
#: SuppTransGLAnalysis.php:139 SupplierAllocations.php:458
#: SupplierAllocations.php:570 SupplierAllocations.php:645
@@ -1103,7 +1103,7 @@
msgstr "Análisis de saldos de cuentas por cobrar por vencimiento"
#: AgedDebtors.php:267 AgedDebtors.php:369 AgedDebtors.php:434
-#: AgedSuppliers.php:108 BOMExtendedQty.php:154 BOMIndented.php:152
+#: AgedSuppliers.php:108 BOMExtendedQty.php:154 BOMIndented.php:153
#: BOMIndentedReverse.php:140 BOMListing.php:42 BOMListing.php:53
#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:108
#: GLBalanceSheet.php:147 GLProfit_Loss.php:185 GLTagProfit_Loss.php:194
@@ -1132,13 +1132,13 @@
msgstr "Informe de problemas"
#: AgedDebtors.php:269 CustomerInquiry.php:116 CustomerInquiry.php:141
-#: CustomerPurchases.php:25 Dashboard.php:145 DebtorsAtPeriodEnd.php:59
+#: CustomerPurchases.php:29 Dashboard.php:145 DebtorsAtPeriodEnd.php:59
msgid "The customer details could not be retrieved by the SQL because"
msgstr "No se pudo obtener mediante SQL el detalle del cliente porque"
#: AgedDebtors.php:270 AgedDebtors.php:372 AgedDebtors.php:437
#: AgedSuppliers.php:111 AgedSuppliers.php:198 BOMExtendedQty.php:157
-#: BOMExtendedQty.php:244 BOMIndented.php:155 BOMIndented.php:236
+#: BOMExtendedQty.php:244 BOMIndented.php:156 BOMIndented.php:237
#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45
#: Credit_Invoice.php:201 Dashboard.php:146 Dashboard.php:257
#: Dashboard.php:437 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72
@@ -1168,7 +1168,7 @@
#: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63
#: PDFStockCheckComparison.php:271 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31
#: PO_PDFPurchOrder.php:156 PrintCustOrder.php:238
-#: PrintCustOrder_generic.php:254 PrintWOItemSlip.php:123
+#: PrintCustOrder_generic.php:256 PrintWOItemSlip.php:122
#: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450
#: PurchaseByPrefSupplier.php:474 PurchaseByPrefSupplier.php:503
#: PurchaseByPrefSupplier.php:534 ReorderLevel.php:63 ReorderLevel.php:182
@@ -1316,7 +1316,7 @@
msgstr "Informe detallado"
#: AgedDebtors.php:527 AgedSuppliers.php:327 BOMExtendedQty.php:289
-#: BOMIndented.php:277 BOMIndentedReverse.php:255 BOMListing.php:131
+#: BOMIndented.php:278 BOMIndentedReverse.php:255 BOMListing.php:131
#: DebtorsAtPeriodEnd.php:168 InventoryPlanning.php:416
#: InventoryPlanningPrefSupplier.php:437 InventoryQuantities.php:210
#: InventoryValuation.php:272 MRPPlannedPurchaseOrders.php:294
@@ -1505,12 +1505,12 @@
msgid "Incorrect date format used, please re-enter"
msgstr "Formato de fecha incorrecto, por favor, inténtelo de nuevo"
-#: AuditTrail.php:43 BOMIndented.php:318 BOMIndentedReverse.php:297
+#: AuditTrail.php:43 BOMIndented.php:319 BOMIndentedReverse.php:297
#: MRPCalendar.php:264
msgid "From Date"
msgstr "Desde la fecha"
-#: AuditTrail.php:47 BOMIndented.php:319 BOMIndentedReverse.php:298
+#: AuditTrail.php:47 BOMIndented.php:320 BOMIndentedReverse.php:298
#: MRPCalendar.php:266
msgid "To Date"
msgstr "Hasta la fecha"
@@ -1526,7 +1526,7 @@
#: CounterSales.php:2204 CustomerBalancesMovement.php:32
#: CustomerBalancesMovement.php:42 CustomerBalancesMovement.php:52
#: CustomerInquiry.php:193 CustomerInquiry.php:198 CustomerInquiry.php:202
-#: CustomerTransInquiry.php:32 DailyBankTransactions.php:70
+#: CustomerTransInquiry.php:32 DailyBankTransactions.php:72
#: DailySalesInquiry.php:52 DailySalesInquiry.php:54 FixedAssetRegister.php:59
#: FixedAssetRegister.php:68 InventoryQuantities.php:168
#: InventoryQuantities.php:194 InventoryQuantities.php:196 MRP.php:619
@@ -1538,8 +1538,8 @@
#: ReorderLevel.php:246 SalesGraph.php:103 SalesGraph.php:105
#: SalesGraph.php:125 SalesGraph.php:127 SalesGraph.php:149 SalesGraph.php:151
#: SalesGraph.php:187 SalesInquiry.php:1095 SalesInquiry.php:1158
-#: SelectCreditItems.php:985 SelectOrderItems.php:1550
-#: SelectOrderItems.php:1553 SelectProduct.php:519 SelectProduct.php:521
+#: SelectCreditItems.php:985 SelectOrderItems.php:1571
+#: SelectOrderItems.php:1574 SelectProduct.php:518 SelectProduct.php:520
#: StockDispatch.php:82 StockDispatch.php:394 StockDispatch.php:396
#: StockLocStatus.php:72 StockLocStatus.php:74 StockLocStatus.php:92
#: StockLocStatus.php:97 StockLocStatus.php:102 StockLocStatus.php:107
@@ -1566,7 +1566,7 @@
#: AuditTrail.php:90 InternalStockRequest.php:593 LocationUsers.php:176
#: MRPReport.php:779 PO_SelectPurchOrder.php:432 SelectContract.php:187
-#: SelectProduct.php:792 UserLocations.php:177
+#: SelectProduct.php:791 UserLocations.php:177
msgid "View"
msgstr "Ver"
@@ -1574,7 +1574,7 @@
msgid "Date/Time"
msgstr "Fecha/Hora"
-#: AuditTrail.php:176 BankAccountUsers.php:71 BankAccountUsers.php:84
+#: AuditTrail.php:176 BankAccountUsers.php:77 BankAccountUsers.php:90
#: LocationUsers.php:77 LocationUsers.php:90 LocationUsers.php:100
#: PcReportTab.php:266 UserLocations.php:77 UserLocations.php:90
#: UserLocations.php:100 includes/header.inc:59
@@ -1583,9 +1583,9 @@
#: AuditTrail.php:177 BankReconciliation.php:218 BankReconciliation.php:295
#: CustWhereAlloc.php:21 CustWhereAlloc.php:111 CustomerAllocations.php:376
-#: CustomerInquiry.php:249 CustomerPurchases.php:77
+#: CustomerInquiry.php:249 CustomerPurchases.php:82
#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:98
-#: DailyBankTransactions.php:127 GLAccountInquiry.php:171
+#: DailyBankTransactions.php:129 GLAccountInquiry.php:171
#: GLAccountReport.php:341 GLJournal.php:266 MRPReschedules.php:194
#: ProductSpecs.php:386 QATests.php:255 QATests.php:393
#: SalesByTypePeriodInquiry.php:356 SelectCustomer.php:424
@@ -1640,8 +1640,8 @@
#: RelatedItemsUpdate.php:153 ReorderLevelLocation.php:72
#: RevisionTranslations.php:59 SalesPeople.php:207
#: SelectCompletedOrder.php:504 SelectCreditItems.php:1020
-#: SelectCustomer.php:420 SelectGLAccount.php:112 SelectOrderItems.php:1451
-#: SelectOrderItems.php:1613 SelectProduct.php:756 SelectQASamples.php:291
+#: SelectCustomer.php:420 SelectGLAccount.php:112 SelectOrderItems.php:1472
+#: SelectOrderItems.php:1634 SelectProduct.php:755 SelectQASamples.php:291
#: SelectSalesOrder.php:559 SelectSupplier.php:280 SelectWorkOrder.php:218
#: SellThroughSupport.php:159 Shipt_Select.php:190 SpecialOrder.php:148
#: StockCategories.php:263 SuppPriceList.php:308 SupplierPriceList.php:270
@@ -1696,15 +1696,15 @@
"El SQL no pudo obtener el Listado de Lista de Materiales con Cantidades "
"Extendida porque"
-#: BOMExtendedQty.php:241 BOMIndented.php:233
+#: BOMExtendedQty.php:241 BOMIndented.php:234
msgid "Print Indented BOM Listing Error"
msgstr "Error al Imprimir Lista de Materiales Indentada"
-#: BOMExtendedQty.php:243 BOMIndented.php:235
+#: BOMExtendedQty.php:243 BOMIndented.php:236
msgid "There were no items for the selected assembly"
msgstr "No hubo componentes para el ensamblaje seleccionado"
-#: BOMExtendedQty.php:263 BOMIndented.php:255 BOMIndentedReverse.php:242
+#: BOMExtendedQty.php:263 BOMIndented.php:256 BOMIndentedReverse.php:242
msgid "Part"
msgstr "Componente"
@@ -1715,14 +1715,14 @@
msgstr ""
#: BOMExtendedQty.php:267 BOMExtendedQty.php:334 BOMExtendedQty.php:335
-#: BOMExtendedQty.php:336 BOMExtendedQty.php:337 BOMIndented.php:317
-#: BOMIndentedReverse.php:296 BOMInquiry.php:200 BOMs.php:570 BOMs.php:764
+#: BOMExtendedQty.php:336 BOMExtendedQty.php:337 BOMIndented.php:318
+#: BOMIndentedReverse.php:296 BOMInquiry.php:199 BOMs.php:570 BOMs.php:764
#: ContractBOM.php:243 ContractBOM.php:357 ContractCosting.php:81
#: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:99
#: Contracts.php:994 Contracts.php:1030 CounterReturns.php:669
#: CounterReturns.php:1698 CounterReturns.php:1797 CounterSales.php:749
#: CounterSales.php:2108 CounterSales.php:2262 CounterSales.php:2365
-#: Credit_Invoice.php:296 CustomerPurchases.php:82 DeliveryDetails.php:877
+#: Credit_Invoice.php:296 CustomerPurchases.php:87 DeliveryDetails.php:877
#: DeliveryDetails.php:947 GoodsReceived.php:102 GoodsReceived.php:106
#: GoodsReceived.php:109 InternalStockRequest.php:635
#: InternalStockRequestFulfill.php:323 InternalStockRequestFulfill.php:324
@@ -1734,14 +1734,14 @@
#: PDFOrdersInvoiced.php:377 POReport.php:762 POReport.php:1449
#: PrintCustTrans.php:896 PrintCustTrans.php:985 PrintCustTrans.php:1034
#: PrintCustTransPortrait.php:949 PrintCustTransPortrait.php:1047
-#: PrintCustTransPortrait.php:1103 PrintWOItemSlip.php:156
+#: PrintCustTransPortrait.php:1103 PrintWOItemSlip.php:155
#: RecurringSalesOrders.php:331 ReorderLevel.php:300 ReverseGRN.php:399
#: ReverseGRN.php:400 SalesAnalReptCols.php:16 SalesAnalReptCols.php:18
#: SalesGraph.php:197 SalesGraph.php:280 SalesInquiry.php:997
#: SalesTopCustomersInquiry.php:218 SalesTopItemsInquiry.php:225
#: SelectCreditItems.php:687 SelectCreditItems.php:1067
-#: SelectOrderItems.php:1290 SelectOrderItems.php:1458
-#: SelectOrderItems.php:1621 SelectOrderItems.php:1725 ShipmentCosting.php:149
+#: SelectOrderItems.php:1303 SelectOrderItems.php:1479
+#: SelectOrderItems.php:1642 SelectOrderItems.php:1746 ShipmentCosting.php:149
#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:628
#: StockCounts.php:143 StockCounts.php:168 StockLocMovements.php:94
@@ -1787,19 +1787,19 @@
msgid "Only Show Shortages"
msgstr "Mostrar Sólo Escasez"
-#: BOMExtendedQty.php:278 BOMIndented.php:267 BOMIndentedReverse.php:246
+#: BOMExtendedQty.php:278 BOMIndented.php:268 BOMIndentedReverse.php:246
#: MRPPlannedPurchaseOrders.php:280 MRPPlannedWorkOrders.php:336
#: MRPReschedules.php:136 MRPShortages.php:293
msgid "Print Option"
msgstr "Estilo de impresión"
-#: BOMExtendedQty.php:280 BOMIndented.php:269 BOMIndentedReverse.php:248
+#: BOMExtendedQty.php:280 BOMIndented.php:270 BOMIndentedReverse.php:248
#: MRPPlannedPurchaseOrders.php:282 MRPPlannedWorkOrders.php:338
#: MRPReschedules.php:138 MRPShortages.php:295
msgid "Print With Alternating Highlighted Lines"
msgstr "Imprimir alternando líneas destacadas"
-#: BOMExtendedQty.php:281 BOMIndented.php:270 BOMIndentedReverse.php:249
+#: BOMExtendedQty.php:281 BOMIndented.php:271 BOMIndentedReverse.php:249
#: MRPPlannedPurchaseOrders.php:283 MRPPlannedWorkOrders.php:339
#: MRPReschedules.php:139 MRPShortages.php:296
msgid "Plain Print"
@@ -1809,13 +1809,13 @@
msgid "Extended Quantity BOM Listing For\t "
msgstr "Lista de Materiales de Cantidad Extendida para \t"
-#: BOMExtendedQty.php:316 BOMIndented.php:304 BOMIndentedReverse.php:283
+#: BOMExtendedQty.php:316 BOMIndented.php:305 BOMIndentedReverse.php:283
#: GLAccountReport.php:327 InventoryPlanningPrefSupplier.php:58
#: InventoryQuantities.php:234 MRPPlannedPurchaseOrders.php:320
#: MRPPlannedWorkOrders.php:374 MRPReport.php:817 MRPReschedules.php:180
#: MRPShortages.php:334 PDFOrderStatus.php:323 PDFPriceList.php:395
#: PDFReceipt.php:34 PO_Header.php:848 PO_PDFPurchOrder.php:64
-#: PO_SelectOSPurchOrder.php:545 PrintWOItemSlip.php:143 ReorderLevel.php:283
+#: PO_SelectOSPurchOrder.php:545 PrintWOItemSlip.php:142 ReorderLevel.php:283
#: StockDispatch.php:477 SuppPriceList.php:292
#: includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
@@ -1848,7 +1848,7 @@
msgid "Printed"
msgstr "Impreso"
-#: BOMExtendedQty.php:317 BOMIndented.php:305 BOMIndentedReverse.php:284
+#: BOMExtendedQty.php:317 BOMIndented.php:306 BOMIndentedReverse.php:284
#: FixedAssetRegister.php:367 GLAccountReport.php:327
#: InventoryPlanningPrefSupplier.php:58 InventoryQuantities.php:235
#: MRPPlannedPurchaseOrders.php:321 MRPPlannedWorkOrders.php:375
@@ -1857,7 +1857,7 @@
#: PrintCustOrder.php:175 PrintCustTrans.php:771 PrintCustTrans.php:980
#: PrintCustTrans.php:1029 PrintCustTransPortrait.php:818
#: PrintCustTransPortrait.php:1040 PrintCustTransPortrait.php:1096
-#: PrintWOItemSlip.php:144 ReorderLevel.php:284 StockDispatch.php:478
+#: PrintWOItemSlip.php:143 ReorderLevel.php:284 StockDispatch.php:478
#: SuppPriceList.php:293 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBOMListingPageHeader.inc:26
@@ -1918,8 +1918,8 @@
#: InternalStockRequest.php:631 PO_SelectOSPurchOrder.php:264
#: PO_SelectPurchO...
[truncated message content] |
|
From: <rc...@us...> - 2015-01-24 17:32:04
|
Revision: 7097
http://sourceforge.net/p/web-erp/reponame/7097
Author: rchacon
Date: 2015-01-24 17:32:11 +0000 (Sat, 24 Jan 2015)
Log Message:
-----------
Add info to Manual about Indian Numbering System. Add comments to code. Improvements to Cascading Style Sheet (CSS) for Manual.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/doc/Manual/ManualMultilanguage.html
trunk/doc/Manual/ManualNewScripts.html
trunk/doc/Manual/style/manual.css
trunk/includes/LanguageSetup.php
trunk/includes/LanguagesArray.php
trunk/includes/MiscFunctions.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-01-24 03:08:00 UTC (rev 7096)
+++ trunk/doc/Change.log 2015-01-24 17:32:11 UTC (rev 7097)
@@ -1,7 +1,7 @@
webERP Change Log
+24/01/15 RChacon: Add info to Manual about Indian Numbering System. Add comments to code. Improvements to Cascading Style Sheet (CSS) for Manual.
23/01/15 RChacon: Generalise indian number format for country=India (languages: English, Hindi, Marathi, etc.).
-Add translation for transaction type, script ID, manual references, class="number" to columns.
20/01/15 RChacon: Add translation for transaction type, script ID, manual references, class="number" to columns.
20/1/15 Exson: Remove die() function from Suppliers.php which will make adding or updating suppliers' data failed when google map is activated. Reported by Terry.
17/01/15 RChacon: Fix Czech language code, add info for Croatian language, add the script name and revision number and sort by language code.
Modified: trunk/doc/Manual/ManualMultilanguage.html
===================================================================
--- trunk/doc/Manual/ManualMultilanguage.html 2015-01-24 03:08:00 UTC (rev 7096)
+++ trunk/doc/Manual/ManualMultilanguage.html 2015-01-24 17:32:11 UTC (rev 7097)
@@ -8,8 +8,7 @@
<li><a href="http://lists.sourceforge.net/lists/listinfo/web-erp-translation">Join the mailing list here</a><br>
Let the list know you're wanting to help with a translation - someone may already be working on it.</li>
- <li>Obtain the latest messages.po file and enter the translations using your favourite editor (or poedit). The latest messages.po file is included with the latest archive:<br>
- www_root/webERP/locale/en_GB/LC_MESSAGES/message.po< br /> Edit the file provided entering the translations for the strings labelled msgid in the string labelled msgstr. Watch for html strings embedded inside the strings the html will also be required in the translated string. Also be sure to ensure that each translated string is enclosed in speech marks ("). Please also complete the translation file header information - with your details so that you are accorded proper recognition for your contribution.</li>
+ <li>Obtain the latest messages.po file and enter the translations using your favourite editor (or poedit). The latest messages.po file is included with the latest archive:<br />www_root/webERP/locale/en_GB/LC_MESSAGES/message.po<br />Edit the file provided entering the translations for the strings labelled msgid in the string labelled msgstr. Watch for html strings embedded inside the strings the html will also be required in the translated string. Also be sure to ensure that each translated string is enclosed in speech marks ("). Please also complete the translation file header information - with your details so that you are accorded proper recognition for your contribution.</li>
</ol>
<p>It is especially important to ensure that the string "ISO-8859-1" (at the time of writing around line 19400 in the messages.po file) is translated to be the character set that you wish your translation to use. webERP uses the translated string here to send appropriate html headers so your browser knows how to interpret the characters sent.</p>
@@ -24,6 +23,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
+<!-- Help BEGIN: TechnicalOverview -->
<h2>Technical Overview</h2>
<h3>How is it Done</h3>
@@ -34,29 +34,24 @@
<p>New directories will need to be made up if a translator wishes to have a local version for their language. Under the locale directory the five character locale abbreviation code directory there is a further sub-directory called LC_MESSAGES - this is where the translation files exist. There are two files in each of these directories:</p>
-<p></p>
-
<ol>
- <li>messages.po this file contains all the strings to be translated. This is the only file of concern for translators</li>
-
- <li>messages.mo this is a binary machine searchable translation file used by gettext. The .mo file is automatically produced by a gettext utility (msgfmt.exe or msgfmt in *nix) using the messages.po file (the syntax from a command window is msgfmt.exe messages.po). The main effort is required to get the .po file translated - the .mo file is easily and happily created by the webERP project admin if required.</li>
+ <li><b>messages.po</b>. This file contains all the strings to be translated. This is the only file of concern for translators</li>
+ <li><b>messages.mo</b>. This is a binary machine searchable translation file used by gettext. The .mo file is automatically produced by a gettext utility (msgfmt.exe or msgfmt in *nix) using the messages.po file (the syntax from a command window is msgfmt.exe messages.po). The main effort is required to get the .po file translated - the .mo file is easily and happily created by the webERP project admin if required.</li>
</ol>
-<p>Any text editor can be used to edit the .po file (GNU Emacs contains specific functionality for editing .po files there is a special PO-Mode) - there is also a utility called poedit which is often recommended by translators.</p>
+<p>Any text editor can be used to edit the .po file (GNU Emacs contains specific functionality for editing .po files there is a special PO-Mode) - there is also a utility called <a href="http://poedit.net/" target="_blank">Poedit - Gettext Translations Editor</a> which is often recommended by translators.</p>
-<p></p>
-
<h3>Understanding the messages.po File</h3>
-<p>The translation is performed by tranlating the strings in the messages.po file into the other language. It is important to work on the most recent messages.po file from the locale/en_GB/LC_MESSAGES/ deirectory in the CVS. This can be downloaded from http://web-erp.cvs.sourceforge.net/viewvc/*checkout*/web-erp/webERP/locale/en_GB/LC_MESSAGES/messages.po</p>
+<p>The translation is performed by translating the strings in the messages.po file into the other language. It is important to work on the most recent messages.po file from the locale/en_GB/LC_MESSAGES/ directory in the CVS. This can be downloaded from http://web-erp.cvs.sourceforge.net/viewvc/*checkout*/web-erp/webERP/locale/en_GB/LC_MESSAGES/messages.po</p>
<p>The messages.po is made up of sections</p>
-<p>eg. for a French translation file</p>
+<p>E.g. for a French translation file</p>
<p>#: AccountGroups.php:8 index.php:890<br>
msgid "An example string in English that needs to be translated"<br>
-msgstr="Une corde d'exemple dans le ce anglais doit être traduite "</p>
+msgstr="Une chaîne d'exemple en anglais qui doit être traduite"</p>
<p>the line #: AccountGroups.php:8 index.php:890<br>
means that the string following is used in the AccountGroups.php script on line 8 and the index.php script on line 890. It could be useful to understand the context of where the script is used. Strings that are used several times throughout the application only need to be translated once. In some cases the #: line showing where the string is used can be quite an extensive list of scripts.<br></p>
@@ -66,13 +61,26 @@
<p>The effort of the translation is to edit the messages.po file and enter the language translation within the inverted commas of the msgstr.</p>
+<h3><a id="IndianNumberingSystem">Indian Numbering System</a></h3>
+
+<p>Many people in India speak English but want to see numbers formatted in Indian Numbering System. The Indian Numbering System uses separators differently from the Arabic Numbering System; besides the three least significant digits of the integer part, a comma divides every two rather than every three digits, thus:</p>
+
+<ul>
+ <li>Arabic Numbering System: 1,234,567,890</li>
+ <li>Indian Numbering System: 1,23,45,67,890</li>
+</ul>
+
+<p>Having a record in the LanguagesArray.php and an empty folder under ~/locale/en_IN.utf8 allows us to have English (British) language --no strings translated as there is no matching strings in a messages.mo-- but the number format in Indian Numbering System. See <a href="ManualContents.php?ViewTopic=NewScripts#MiscFunctions">MiscFunctions.php</a> in Manual, New Scripts, Directory Structure.</p>
+
<div class="floatright">
<a class="minitext" href="#top">⬆ Top</a>
</div>
+<!-- Help END: TechnicalOverview -->
+
<h2>The .po File Header</h2>
-<h4>The .po file starts with some initial comments which should also be completed</h4>
+<p>The .po file starts with some initial comments which should also be completed</p>
<p>"SOME DESCRIPTIVE TITLE", - should be replaced with <b><i>webERP - LANGUAGE Translation File</i></b> - where LANGUAGE is the language being translated into<br>
# FIRST AUTHOR , YEAR. - should be your name and email address - with the year of the work being done</p>
@@ -104,7 +112,7 @@
<li>ISO-8859-5 for Macedonian, Serbian,</li>
- <li>ISO-8859-6 for Arabic,<</li></li>
+ <li>ISO-8859-6 for Arabic,</li>
<li>ISO-8859-7 for Greek,</li>
Modified: trunk/doc/Manual/ManualNewScripts.html
===================================================================
--- trunk/doc/Manual/ManualNewScripts.html 2015-01-24 03:08:00 UTC (rev 7096)
+++ trunk/doc/Manual/ManualNewScripts.html 2015-01-24 17:32:11 UTC (rev 7097)
@@ -156,17 +156,13 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
-<h3>MiscFunctions.php</h3>
+<h3><a id="MiscFunctions">MiscFunctions.php</a></h3>
<p>This script holds miscellaneous functions:</p>
-<ul>
- <li><i>TableRows</i> - Outputs the table row html tag ("<i><tr></i>") with the class to format the table row ("<i>OddTableRows</i>" or "<i>EvenTableRows</i>") and returns the row counter to determine background colour updated. It requires that the Row counter to determine background colour is initialised before using this function.<br />
- Example:<br />
- <code>
- $k = False;// Row counter to determine background colour.<br />
- ...<br />
- $k = TableRows($k);// Outputs html table row with class (Odd|Even).
- </code>
- </li>
-</ul>
+<dl>
+
+ <dt>locale_number_format($Number, $DecimalPlaces=0)</dt>
+ <dd>Displays numbers in locale of the user. See <a href="ManualContents.php?ViewTopic=Multilanguage#IndianNumberingSystem">Indian Numbering System</a> in Manual, Multilanguage, Technical Overview.</dd>
+
+</dl>
\ No newline at end of file
Modified: trunk/doc/Manual/style/manual.css
===================================================================
--- trunk/doc/Manual/style/manual.css 2015-01-24 03:08:00 UTC (rev 7096)
+++ trunk/doc/Manual/style/manual.css 2015-01-24 17:32:11 UTC (rev 7097)
@@ -4,89 +4,115 @@
*
*/
body {
-font-family:"Ubuntu", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-font-size:.85em;
-color:#0000;
-font-weight:lighter;
+ color:#000;
+ font-family:"Ubuntu", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
+ font-size:.85em;
+ font-weight:lighter;
}
img {
-border:none;
-width:50%;
+ border:none;
+ width:50%;
}
#pagetitle {
-font-weight:400;
-font-size:330%;
-text-align:center;
-color:#066307;
-background:#6BA81E;
-text-shadow:1px 1px #A9BD55;
-border-radius: 5px;
+ background:#6BA81E;
+ border-radius:5px;
+ color:#066307;
+ font-size:330%;
+ font-weight:400;
+ text-align:center;
+ text-shadow:1px 1px #A9BD55;
}
h1,h2,h3,h4,h1 a,h2 a,h3 a,h4 a {
-font-weight:400;
+ font-weight:400;
}
h1 {
-color:#0D1F54;
-background:#BED4EB;
-text-shadow:1px 1px #293EF5;
-padding:10px;
-margin:1%;
-border-radius: 5px;
+ background:#BED4EB;
+ border-radius:5px;
+ color:#0D1F54;
+ margin:1%;
+ padding:10px;
+ text-shadow:1px 1px #293EF5;
}
h2 {
-color:#0D1F54;
-background:#C8D5E3;
-padding:8px 8px 8px 20px;
-margin-left:1%;
-margin-right:1%;
-border-radius: 5px;
+ background:#C8D5E3;
+ border-radius:5px;
+ color:#0D1F54;
+ margin-left:1%;
+ margin-right:1%;
+ padding:8px 8px 8px 20px;
}
h3 {
-color:#0D1F54;
-background:#E1E6EC;
-padding:8px 8px 8px 30px;
-margin-left:1%;
-margin-right:1%;
-border-radius: 5px;
+ background:#E1E6EC;
+ border-radius:5px;
+ color:#0D1F54;
+ margin-left:1%;
+ margin-right:1%;
+ padding:6px 6px 6px 30px;
}
+h4 {
+ background:#F2EFEC;
+ border-radius:5px;
+ color:#0D1F54;
+ margin-left:1%;
+ margin-right:1%;
+ padding:4px 4px 4px 40px;
+ /* Heading level 4 format. */
+}
+
a {
-text-decoration:none;
+ text-decoration:none;
}
a:hover {
-color:#03c;
+ color:#03c;
}
-.right {
-text-align:right;
-}
-
.floatright {
-float:right;
+ float:right;
}
.left {
-text-align:left;
+ text-align:left;
}
.minitext {
-margin-right:1%;
-font-size:80%;
+ margin-right:1%;
+ font-size:80%;
}
+.right {
+ text-align:right;
+}
+
+dl {
+ margin-left:2%;
+ /* Description list format. */
+}
+
+dt {
+ font-weight:bold;
+ /* Description list terms format. */
+}
+
+dd {
+ /* Description list descriptions format. */
+}
+
li.toc {
-color:#03c;
+ color:#03c;
}
+
input[type=checkbox] {
- visibility: hidden;
+ visibility:hidden;
}
+
p {
-margin-left: 2%;
+ margin-left:2%;
}
Modified: trunk/includes/LanguageSetup.php
===================================================================
--- trunk/includes/LanguageSetup.php 2015-01-24 03:08:00 UTC (rev 7096)
+++ trunk/includes/LanguageSetup.php 2015-01-24 17:32:11 UTC (rev 7097)
@@ -1,16 +1,15 @@
<?php
-
/* $Id$ */
/* Set internal character encoding to UTF-8 */
mb_internal_encoding('UTF-8');
/* This file is included in session.inc or PDFStarter.php or a report script that does not use PDFStarter.php
-to check for the existance of gettext function and setup the necessary enviroment to allow for automatic translation
+to check for the existence of gettext function and setup the necessary environment to allow for automatic translation
Set language - defined in config.php or user variable when logging in (session.inc)
NB this language must also exist in the locale on the web-server
-normally the lower case two character country code underscore uppercase
+normally the lower case two character language code underscore uppercase
2 character country code does the trick except for en !!*/
@@ -26,18 +25,18 @@
//Check users' locale format via their language
//Then pass this information to the js for number validation purpose
-$Collect = array('US'=> array('en_US.utf8','en_GB.utf8','ja_JP.utf8','hi_IN.utf8','mr_IN.utf8','sw_KE.utf8','tr_TR.utf8','vi_VN.utf8','zh_CN.utf8','zh_HK.utf8','zh_TW.utf8'),
- 'IN'=>array('en_IN.utf8'),
+$Collect = array(
+ 'US'=>array('en_US.utf8','en_GB.utf8','ja_JP.utf8','hi_IN.utf8','mr_IN.utf8','sw_KE.utf8','tr_TR.utf8','vi_VN.utf8','zh_CN.utf8','zh_HK.utf8','zh_TW.utf8'),
+ 'IN'=>array('en_IN.utf8','hi_IN.utf8','mr_IN.utf8'),
'EE'=>array('ar_EG.utf8','cz_CZ.utf8','fr_CA.utf8','fr_FR.utf8','hr_HR.utf8','pl_PL.utf8','ru_RU.utf8','sq_AL.utf8','sv_SE.utf8'),
'FR'=>array('ar_EG.utf8','cz_CZ.utf8','fr_CA.utf8','fr_FR.utf8','hr_HR.utf8','pl_PL.utf8','ru_RU.utf8','sq_AL.utf8','sv_SE.utf8'),
'GM'=>array('de_DE.utf8','el_GR.utf8','es_ES.utf8','fa_IR.utf8','id_ID.utf8','it_IT.utf8','ro_RO.utf8','lv_LV.utf8','nl_NL.utf8','pt_BR.utf8','pt_PT.utf8'));
-foreach ($Collect as $Key=>$Value){
- if (in_array($Language,$Value)){
+foreach($Collect as $Key=>$Value) {
+ if(in_array($Language,$Value)) {
$Lang = $Key;
$_SESSION['Lang'] = $Lang;
}
-
}
/*Since LanguagesArray requires the function _() to translate the language names - we must provide a substitute if it doesn't exist aready before we include includes/LanguagesArray.php
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2015-01-24 03:08:00 UTC (rev 7096)
+++ trunk/includes/LanguagesArray.php 2015-01-24 17:32:11 UTC (rev 7097)
@@ -29,7 +29,7 @@
$LanguagesArray['en_GB.utf8']['DecimalPoint'] = '.';
$LanguagesArray['en_GB.utf8']['ThousandsSeparator'] = ',';
-$LanguagesArray['en_IN.utf8']['LanguageName'] = 'English India';
+$LanguagesArray['en_IN.utf8']['LanguageName'] = 'English India';// See Indian Numbering System in Manual, Multilanguage, Technical Overview.
$LanguagesArray['en_IN.utf8']['WindowsLocale'] = 'english-in';
$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.';
$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ',';
@@ -175,4 +175,4 @@
$LanguagesArray['zh_TW.utf8']['ThousandsSeparator'] = ',';
asort($LanguagesArray);
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2015-01-24 03:08:00 UTC (rev 7096)
+++ trunk/includes/MiscFunctions.php 2015-01-24 17:32:11 UTC (rev 7097)
@@ -333,8 +333,7 @@
function locale_number_format($Number, $DecimalPlaces=0) {
global $DecimalPoint;
global $ThousandsSeparator;
-/* if ($_SESSION['Language']=='hi_IN.utf8' OR $_SESSION['Language']=='en_IN.utf8'){*/
- if(substr($_SESSION['Language'], 3, 2)=='IN') {// If country is India (??_IN.utf8).
+ if(substr($_SESSION['Language'], 3, 2)=='IN') {// If country is India (??_IN.utf8). See Indian Numbering System in Manual, Multilanguage, Technical Overview.
return indian_number_format(floatval($Number),$DecimalPlaces);
} else {
if (!is_numeric($DecimalPlaces) AND $DecimalPlaces == 'Variable'){
@@ -452,4 +451,4 @@
echo ' ... ' . _('completed');
}
-?>
+?>
\ No newline at end of file
|
|
From: <rc...@us...> - 2015-01-25 04:58:10
|
Revision: 7099
http://sourceforge.net/p/web-erp/reponame/7099
Author: rchacon
Date: 2015-01-25 04:58:03 +0000 (Sun, 25 Jan 2015)
Log Message:
-----------
Add $ViewTopic and $BookMark, comments and page_title_text to ImportBankTrans.php. Add info to Manual.
Modified Paths:
--------------
trunk/ImportBankTrans.php
trunk/doc/Change.log
trunk/doc/Manual/ManualGeneralLedger.html
Modified: trunk/ImportBankTrans.php
===================================================================
--- trunk/ImportBankTrans.php 2015-01-25 03:24:24 UTC (rev 7098)
+++ trunk/ImportBankTrans.php 2015-01-25 04:58:03 UTC (rev 7099)
@@ -1,12 +1,19 @@
<?php
+/* $Id: ImportBankTrans.php 4213 2010-12-22 14:33:20Z tim_schofield $*/
+/* This script imports bank transactions. */
-/* $Id: ImportBankTrans.php 4213 2010-12-22 14:33:20Z tim_schofield $*/
include('includes/DefineImportBankTransClass.php');
+
include ('includes/session.inc');
+$Title = _('Import Bank Transactions');// Screen identificator.
+$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+$BookMark = 'ImportBankTrans';// Anchor's id in the manual's html document.
+include('includes/header.inc');
+echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+ '/images/bank.png" title="' .// Icon image.
+ _('Import Bank Transactions') . '" /> ' .// Icon title.
+ _('Import Bank Transactions') . '</p>';// Page title.
-$Title = _('Import Bank Transactions');
-
-include ('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
include('includes/CurrenciesArray.php');
@@ -552,4 +559,4 @@
}
include ('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-01-25 03:24:24 UTC (rev 7098)
+++ trunk/doc/Change.log 2015-01-25 04:58:03 UTC (rev 7099)
@@ -1,5 +1,6 @@
webERP Change Log
+25/01/15 RChacon: Add $ViewTopic and $BookMark, comments and page_title_text to ImportBankTrans.php. Add info to Manual.
24/01/15 RChacon: Add info to Manual about Indian Numbering System. Add comments to code. Improvements to Cascading Style Sheet (CSS) for Manual.
23/01/15 RChacon: Generalise indian number format for country=India (languages: English, Hindi, Marathi, etc.).
20/01/15 RChacon: Add translation for transaction type, script ID, manual references, class="number" to columns.
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2015-01-25 03:24:24 UTC (rev 7098)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2015-01-25 04:58:03 UTC (rev 7099)
@@ -120,8 +120,27 @@
<li>Narrative - applicable to the whole payment. Narrative applicable to individual general ledger entries can be entered separately.</li>
</ul>
-<p>Payments can take two forms - either it is a general ledger payment or it is a payment to a supplier. General ledger payments require an analysis of how the payment should be posted to the general ledger. General ledger accounts can be specified either as the account code directly (if the account code is known) or by selecting from the select box. Any narrative applicable to the general ledger amount can be entered too - and the amount to be posted to the selected/entered account. The total payment is taken as being the sum of all the entries made. If the total of all entries made is negative then this is entered as a negative payment - these are accepted to allow for correction of data entry errors. Payments are always entered in the curreny of the payment - the conversions are handled by the system for general ledger postings etc.</p><!-- Help End: Payments -->
+<p>Payments can take two forms - either it is a general ledger payment or it is a payment to a supplier. General ledger payments require an analysis of how the payment should be posted to the general ledger. General ledger accounts can be specified either as the account code directly (if the account code is known) or by selecting from the select box. Any narrative applicable to the general ledger amount can be entered too - and the amount to be posted to the selected/entered account. The total payment is taken as being the sum of all the entries made. If the total of all entries made is negative then this is entered as a negative payment - these are accepted to allow for correction of data entry errors. Payments are always entered in the curreny of the payment - the conversions are handled by the system for general ledger postings etc.</p>
+<div class="floatright">
+ <a class="minitext" href="#top">⬆ Top</a>
+</div>
+<!-- Help End: Payments -->
+
+
+<!-- Help BEGIN: Import Bank Transactions -->
+<h2><a id="ImportBankTrans">Import Bank Transactions</a></h2>
+
+<p>This script imports bank transactions. It works with bank accounts that have an import format already defined.</p>
+
+<p>The file format used by your bank for statement exports is defined by system administrators in <i><u>Main Menu</u></i> > <i><u>General Ledger</u></i> > <i>Maintenance</i> > <i><u> Bank Accounts</u></i>.</p>
+
+<div class="floatright">
+ <a class="minitext" href="#top">⬆ Top</a>
+</div>
+<!-- Help END: Import Bank Transactions -->
+
+
<h2><a id="GLReceipts">General Ledger Receipts</a></h2>
<p>The system allows for the receipt of money into any of the bank accounts that have been set up and for the income to be credited to any GL account. Receipts can be entered in any currency, and webERP will track the exchange rates correctly</p>
@@ -255,7 +274,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
-<h2>General Ledger Reports</h2>
+<h2>General Ledger Inquiries and Reports</h2>
<p>The webERP General Ledger module has the following reports:</p>
<ul>
<li><h3><a id="TrialBalance">Trial Balance</a></h3>
@@ -291,6 +310,13 @@
<p>This will produce a table of all journals, with their individual journal lines for the criteria specified. To print this table, just click on the printer icon in the top right hand corner.</p>
<p>You can produce a pdf of individual journals, by clicking on the "print" link at the end of the first line of the required journal.</p>
</li>
+
+<!-- BEGIN: To review. -->
+<h3><a id="BankReconciliation">Bank Account Reconciliation Statement</a></h3>
+
+<p>This script displays the bank reconciliation for a selected bank account.</p>
+<!-- END: To review. -->
+
<li>
<h3><a id="ChequePaymentListing">Cheque Payment Listing</a></h3>
<p>The cheque payments listing function allows you to create a PDF summary of all payments made from the bank account you specify, within a date range that you specify.</p>
@@ -329,4 +355,4 @@
<p>You can run a summary report to get just the relevant totals, or a detailed report to list all the transactions within that total.</p>
<p>The report will be run as a pdf file for printing, emailing, archiving etc.</P>
</li>
-</ul>
\ No newline at end of file
+</ul>
|
|
From: <dai...@us...> - 2015-01-27 09:04:41
|
Revision: 7103
http://sourceforge.net/p/web-erp/reponame/7103
Author: daintree
Date: 2015-01-27 09:04:25 +0000 (Tue, 27 Jan 2015)
Log Message:
-----------
Pre release 4.12
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/includes/ConnectDB.inc
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Added Paths:
-----------
trunk/sql/mysql/upgrade4.11.4-4.12.sql
Removed Paths:
-------------
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2015-01-26 22:19:36 UTC (rev 7102)
+++ trunk/UpgradeDatabase.php 2015-01-27 09:04:25 UTC (rev 7103)
@@ -184,6 +184,8 @@
case '4.11.3':
case '4.11.4':
$SQLScripts[] = './sql/mysql/upgrade4.11.3-4.11.4.sql';
+ case '4.11.5':
+ $SQLScripts[] = './sql/mysql/upgrade4.11.4-4.12.sql';
break;
} //end switch
}
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2015-01-26 22:19:36 UTC (rev 7102)
+++ trunk/includes/ConnectDB.inc 2015-01-27 09:04:25 UTC (rev 7103)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.11.5'; //must update manually every time there is a DB change
+$Version='4.12'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
if (!isset($_SESSION['DatabaseName'])){
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-01-26 22:19:36 UTC (rev 7102)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-01-27 09:04:25 UTC (rev 7103)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-26 15:51-0600\n"
+"POT-Creation-Date: 2015-01-27 21:55+1300\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -159,23 +159,23 @@
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:244 Currencies.php:252 Currencies.php:260
#: CustomerBranches.php:301 CustomerBranches.php:311 CustomerBranches.php:321
-#: CustomerBranches.php:331 CustomerBranches.php:341 CustomerTypes.php:146
-#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
-#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:79 GLAccounts.php:95
-#: Locations.php:265 Locations.php:273 Locations.php:284 Locations.php:293
-#: Locations.php:302 Locations.php:311 Locations.php:320 Locations.php:329
-#: Locations.php:337 MRPDemandTypes.php:87 Manufacturers.php:154
-#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153
-#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135
-#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
-#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
-#: StockCategories.php:216 Stocks.php:762 Stocks.php:771 Stocks.php:779
-#: Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811 Stocks.php:819
-#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: TaxCategories.php:132 TaxGroups.php:134 TaxGroups.php:142
-#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
-#: WorkCentres.php:89 WorkCentres.php:95
+#: CustomerBranches.php:331 CustomerBranches.php:341 Customers.php:296
+#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
+#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
+#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79
+#: GLAccounts.php:95 Locations.php:265 Locations.php:273 Locations.php:284
+#: Locations.php:293 Locations.php:302 Locations.php:311 Locations.php:320
+#: Locations.php:329 Locations.php:337 Manufacturers.php:154
+#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146
+#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128
+#: SalesCategories.php:135 SalesPeople.php:159 SalesPeople.php:166
+#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
+#: Shippers.php:93 StockCategories.php:216 Stocks.php:762 Stocks.php:771
+#: Stocks.php:779 Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811
+#: Stocks.php:819 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:134
+#: TaxGroups.php:142 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:88
msgid "There are"
msgstr "يوجد"
@@ -232,47 +232,46 @@
#: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110
#: BOMs.php:239 BOMs.php:890 COGSGLPostings.php:19 CompanyPreferences.php:102
#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
-#: CreditStatus.php:21 Credit_Invoice.php:276 Currencies.php:30
+#: Credit_Invoice.php:276 CreditStatus.php:21 Currencies.php:30
#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
-#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournal.php:250
-#: GLJournalInquiry.php:11 HistoricalTestResults.php:38
-#: InternalStockRequest.php:311 InventoryPlanning.php:354
-#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:516
-#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91
-#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60
-#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10
-#: PO_SelectOSPurchOrder.php:148 PcAssignCashToTab.php:59
-#: PcAssignCashToTab.php:133 PcAssignCashToTab.php:149
-#: PcAssignCashToTab.php:193 PriceMatrix.php:16 Prices.php:11
-#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38
-#: PurchData.php:241 PurchData.php:373 PurchData.php:401
-#: PurchaseByPrefSupplier.php:305 QATests.php:20 RecurringSalesOrders.php:320
-#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
-#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
-#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
-#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
-#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:65
-#: SelectOrderItems.php:559 SelectOrderItems.php:1463
-#: SelectOrderItems.php:1563 SelectProduct.php:510 SelectQASamples.php:43
-#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:220
-#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
-#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
-#: Shipt_Select.php:8 StockLocMovements.php:14 StockLocStatus.php:29
+#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournalInquiry.php:11
+#: GLJournal.php:250 HistoricalTestResults.php:38 InternalStockRequest.php:311
+#: InventoryPlanning.php:354 InventoryPlanningPrefSupplier.php:386
+#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:516
+#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
+#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:29
+#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:148
+#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
+#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:20
+#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24
+#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
+#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
+#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
+#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291
+#: SelectCustomer.php:265 SelectGLAccount.php:65 SelectOrderItems.php:559
+#: SelectOrderItems.php:1463 SelectOrderItems.php:1563 SelectProduct.php:510
+#: SelectQASamples.php:43 SelectSalesOrder.php:512 SelectSupplier.php:14
+#: SelectSupplier.php:220 SelectWorkOrder.php:9 SelectWorkOrder.php:174
+#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
+#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: StockLocMovements.php:14 StockLocStatus.php:29
#: StockSerialItemResearch.php:30 SupplierPriceList.php:14
#: SupplierPriceList.php:224 SupplierPriceList.php:394
#: SupplierPriceList.php:398 SupplierPriceList.php:449
-#: SupplierPriceList.php:499 SupplierTenderCreate.php:556
+#: SupplierPriceList.php:499 Suppliers.php:304 SupplierTenderCreate.php:556
#: SupplierTenderCreate.php:664 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 Suppliers.php:304
-#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
-#: WWW_Users.php:34 WhereUsedInquiry.php:18 WorkCentres.php:111
-#: WorkCentres.php:163 WorkOrderCosting.php:22 WorkOrderEntry.php:11
-#: WorkOrderIssue.php:22 WorkOrderReceive.php:31 WorkOrderStatus.php:58
-#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
+#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TestPlanResults.php:27
+#: TopItems.php:118 UnitsOfMeasure.php:10 WhereUsedInquiry.php:18
+#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22
+#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:31
+#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
+#: ../webSHOP/includes/header.php:216
msgid "Search"
msgstr "إبحث"
@@ -306,44 +305,44 @@
#: DeliveryDetails.php:1198 DeliveryDetails.php:1201 FormDesigner.php:101
#: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628
#: Locations.php:646 Locations.php:648 Locations.php:661 Locations.php:663
-#: MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566 MRP.php:570
-#: MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80
-#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:600 PDFWOPrint.php:604
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
-#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
-#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282
-#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248
-#: ProductSpecs.php:186 ProductSpecs.php:407 ProductSpecs.php:412
-#: ProductSpecs.php:418 ProductSpecs.php:423 ProductSpecs.php:428
-#: ProductSpecs.php:560 ProductSpecs.php:606 ProductSpecs.php:608
-#: ProductSpecs.php:619 ProductSpecs.php:621 ProductSpecs.php:632
-#: ProductSpecs.php:634 ProductSpecs.php:645 ProductSpecs.php:647
-#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:291
-#: QATests.php:293 QATests.php:304 QATests.php:306 QATests.php:317
-#: QATests.php:319 QATests.php:330 QATests.php:332 QATests.php:343
-#: QATests.php:345 QATests.php:412 QATests.php:417 QATests.php:422
-#: QATests.php:427 QATests.php:432 RecurringSalesOrders.php:493
-#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
-#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
-#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
-#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:264
-#: SalesCategories.php:351 SalesCategories.php:355 SalesPeople.php:227
-#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:237
-#: SelectProduct.php:362 SelectQASamples.php:417 SelectQASamples.php:511
-#: SelectQASamples.php:513 SelectQASamples.php:568 SelectQASamples.php:570
-#: SelectQASamples.php:582 SelectQASamples.php:584 ShipmentCosting.php:667
-#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
-#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
-#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
-#: ShopParameters.php:499 StockClone.php:922 StockClone.php:924
-#: StockClone.php:947 StockClone.php:949 Stocks.php:1256 Stocks.php:1258
-#: Stocks.php:1281 Stocks.php:1283 SuppContractChgs.php:90
-#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
-#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
-#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
-#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
-#: SystemParameters.php:945 SystemParameters.php:1088
+#: MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566
+#: MRP.php:570 PaymentMethods.php:206 PaymentMethods.php:207
+#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275
+#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296
+#: PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
+#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:600
+#: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134
+#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
+#: PO_PDFPurchOrder.php:416 ProductSpecs.php:186 ProductSpecs.php:407
+#: ProductSpecs.php:412 ProductSpecs.php:418 ProductSpecs.php:423
+#: ProductSpecs.php:428 ProductSpecs.php:560 ProductSpecs.php:606
+#: ProductSpecs.php:608 ProductSpecs.php:619 ProductSpecs.php:621
+#: ProductSpecs.php:632 ProductSpecs.php:634 ProductSpecs.php:645
+#: ProductSpecs.php:647 PurchData.php:296 PurchData.php:667 PurchData.php:670
+#: QATests.php:291 QATests.php:293 QATests.php:304 QATests.php:306
+#: QATests.php:317 QATests.php:319 QATests.php:330 QATests.php:332
+#: QATests.php:343 QATests.php:345 QATests.php:412 QATests.php:417
+#: QATests.php:422 QATests.php:427 QATests.php:432
+#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
+#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
+#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423
+#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
+#: SalesAnalRepts.php:479 SalesCategories.php:264 SalesCategories.php:351
+#: SalesCategories.php:355 SalesPeople.php:227 SalesPeople.php:367
+#: SalesPeople.php:369 SelectProduct.php:237 SelectProduct.php:362
+#: SelectQASamples.php:417 SelectQASamples.php:511 SelectQASamples.php:513
+#: SelectQASamples.php:568 SelectQASamples.php:570 SelectQASamples.php:582
+#: SelectQASamples.php:584 ShipmentCosting.php:667 ShopParameters.php:289
+#: ShopParameters.php:293 ShopParameters.php:337 ShopParameters.php:341
+#: ShopParameters.php:391 ShopParameters.php:395 ShopParameters.php:413
+#: ShopParameters.php:417 ShopParameters.php:495 ShopParameters.php:499
+#: StockClone.php:922 StockClone.php:924 StockClone.php:947 StockClone.php:949
+#: Stocks.php:1256 Stocks.php:1258 Stocks.php:1281 Stocks.php:1283
+#: SuppContractChgs.php:90 SystemParameters.php:479 SystemParameters.php:502
+#: SystemParameters.php:543 SystemParameters.php:624 SystemParameters.php:632
+#: SystemParameters.php:672 SystemParameters.php:763 SystemParameters.php:772
+#: SystemParameters.php:780 SystemParameters.php:798 SystemParameters.php:805
+#: SystemParameters.php:849 SystemParameters.php:945 SystemParameters.php:1088
#: SystemParameters.php:1090 SystemParameters.php:1100
#: SystemParameters.php:1102 SystemParameters.php:1156
#: SystemParameters.php:1168 SystemParameters.php:1170
@@ -353,14 +352,14 @@
#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
#: TestPlanResults.php:924 TestPlanResults.php:928 WWW_Users.php:516
#: WWW_Users.php:518 WWW_Users.php:689 WWW_Users.php:691 WWW_Users.php:704
-#: WWW_Users.php:706 reportwriter/languages/en_US/reports.php:114
+#: WWW_Users.php:706
msgid "Yes"
msgstr "موافق"
#: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452
-#: BOMs.php:130 BOMs.php:801 BOMs.php:805 BankAccounts.php:218
-#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
-#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428
+#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
+#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:130 BOMs.php:801
+#: BOMs.php:805 CompanyPreferences.php:424 CompanyPreferences.php:428
#: CompanyPreferences.php:439 CompanyPreferences.php:443
#: CompanyPreferences.php:454 CompanyPreferences.php:458
#: ContractCosting.php:200 Currencies.php:332 Currencies.php:513
@@ -370,15 +369,15 @@
#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:99
#: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629
#: Locations.php:651 Locations.php:653 Locations.php:666 Locations.php:668
-#: MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564 MRP.php:568
-#: MRPCalendar.php:226 NoSalesItems.php:191 PDFChequeListing.php:64
-#: PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 PDFWOPrint.php:601
+#: MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564
+#: MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209
+#: PaymentMethods.php:276 PaymentMethods.php:283 PaymentMethods.php:290
+#: PaymentMethods.php:297 PcAuthorizeExpenses.php:246 PDFChequeListing.php:64
+#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:601
#: PDFWOPrint.php:605 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276
-#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297
-#: PcAuthorizeExpenses.php:246 ProductSpecs.php:189 ProductSpecs.php:409
+#: PO_PDFPurchOrder.php:417 ProductSpecs.php:189 ProductSpecs.php:409
#: ProductSpecs.php:415 ProductSpecs.php:420 ProductSpecs.php:425
#: ProductSpecs.php:430 ProductSpecs.php:611 ProductSpecs.php:613
#: ProductSpecs.php:624 ProductSpecs.php:626 ProductSpecs.php:637
@@ -418,40 +417,37 @@
#: TestPlanResults.php:925 TestPlanResults.php:927 WWW_Users.php:515
#: WWW_Users.php:519 WWW_Users.php:688 WWW_Users.php:692 WWW_Users.php:703
#: WWW_Users.php:707 includes/PDFLowGPPageHeader.inc:44
-#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "ﻻ"
#: AccountGroups.php:322 AccountSections.php:191 AddCustomerContacts.php:148
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BOMs.php:157 BankAccounts.php:243 COGSGLPostings.php:112
+#: BankAccounts.php:243 BOMs.php:157 COGSGLPostings.php:112
#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:362
#: Currencies.php:379 CustItem.php:166 CustomerBranches.php:455
-#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
+#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:253 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173
+#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
-#: Labels.php:358 Locations.php:420 MRPDemandTypes.php:120 MRPDemands.php:309
-#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
-#: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
-#: PaymentTerms.php:205 PcAssignCashToTab.php:277
-#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:236
-#: PcTypeTabs.php:180 PriceMatrix.php:287 Prices.php:253
-#: Prices_Customer.php:286 ProductSpecs.php:463 PurchData.php:312
-#: QATests.php:465 SalesCategories.php:272 SalesGLPostings.php:137
-#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206
-#: SecurityTokens.php:130 SelectCustomer.php:614 SelectCustomer.php:633
-#: SelectCustomer.php:663 SelectCustomer.php:681 SelectCustomer.php:705
-#: SelectCustomer.php:722 SelectGLAccount.php:117 SelectGLAccount.php:132
-#: SelectQASamples.php:410 SellThroughSupport.php:298 Shippers.php:144
-#: StockCategories.php:296 SuppTransGLAnalysis.php:125
+#: Labels.php:358 Locations.php:420 MailingGroupMaintenance.php:178
+#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309
+#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205
+#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
+#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
+#: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253
+#: ProductSpecs.php:463 PurchData.php:312 QATests.php:465
+#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:255
+#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130
+#: SelectCustomer.php:614 SelectCustomer.php:633 SelectCustomer.php:663
+#: SelectCustomer.php:681 SelectCustomer.php:705 SelectCustomer.php:722
+#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:410
+#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
-#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:190
-#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:132
-#: WWW_Users.php:350 WorkCentres.php:142 includes/InputSerialItems.php:110
-#: includes/OutputSerialItems.php:20
-#: reportwriter/languages/en_US/reports.php:143
+#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184
+#: TaxGroups.php:190 TaxProvinces.php:179 UnitsOfMeasure.php:185
+#: WorkCentres.php:142 WWW_Access.php:132 WWW_Users.php:350
+#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
#, php-format
msgid "Edit"
msgstr "تحرير"
@@ -462,24 +458,24 @@
#: AccountGroups.php:323 AccountSections.php:195 AddCustomerContacts.php:149
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BOMs.php:159 BankAccounts.php:244 COGSGLPostings.php:113
+#: BankAccounts.php:244 BOMs.php:159 COGSGLPostings.php:113
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
-#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
-#: Credit_Invoice.php:410 Currencies.php:365 CustItem.php:167
-#: CustomerReceipt.php:989 CustomerTypes.php:206 Customers.php:1166
+#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:410
+#: CreditStatus.php:176 Currencies.php:365 CustItem.php:167
+#: CustomerReceipt.php:989 Customers.php:1166 CustomerTypes.php:206
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 GeocodeSetup.php:174
+#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:430 GLTags.php:97
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:607
-#: Locations.php:421 MRPDemandTypes.php:121 MRPDemands.php:310
-#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
-#: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768
-#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1103
+#: Locations.php:421 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
+#: PaymentMethods.php:211 Payments.php:1103 PaymentTerms.php:206
#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
-#: PriceMatrix.php:286 Prices.php:254 Prices_Customer.php:287
-#: ProductSpecs.php:464 PurchData.php:314 PurchData.php:721 QATests.php:466
+#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:286
+#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:464
+#: PurchData.php:314 PurchData.php:721 QATests.php:466
#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
@@ -490,15 +486,14 @@
#: SellThroughSupport.php:299 Shipments.php:440 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
-#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SuppShiptChgs.php:90
-#: SuppTransGLAnalysis.php:126 SupplierContacts.php:166
+#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SupplierContacts.php:166
#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
-#: SupplierTypes.php:172 TaxAuthorities.php:173 TaxCategories.php:186
-#: TaxGroups.php:191 TaxProvinces.php:180 TestPlanResults.php:920
-#: UnitsOfMeasure.php:186 WOSerialNos.php:335 WWW_Access.php:133
-#: WWW_Users.php:351 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60
+#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126
+#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:191
+#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186
+#: WorkCentres.php:143 WOSerialNos.php:335 WWW_Access.php:133
+#: WWW_Users.php:351 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
-#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "حذف"
@@ -563,21 +558,21 @@
#: AccountGroups.php:462 AccountSections.php:262 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BOMs.php:818 BankAccounts.php:433 COGSGLPostings.php:368
+#: BankAccounts.php:433 BOMs.php:818 COGSGLPostings.php:368
#: CreditStatus.php:259 Currencies.php:522 CustLoginSetup.php:273
#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
-#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:641
-#: Locations.php:680 MRPDemandTypes.php:188 MRPDemands.php:424
-#: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146
-#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310
+#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:641
+#: Locations.php:680 Manufacturers.php:312 MRPDemands.php:424
+#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146
+#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264
#: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:65...
[truncated message content] |
|
From: <rc...@us...> - 2015-01-27 19:51:49
|
Revision: 7104
http://sourceforge.net/p/web-erp/reponame/7104
Author: rchacon
Date: 2015-01-27 19:51:35 +0000 (Tue, 27 Jan 2015)
Log Message:
-----------
Spanish translation improvements. Note: The "Delete" key (keyboard) is translated to "Suprimir"; for usability, we standardise "borrar", "eliminar", etc. to "suprimir".
Modified Paths:
--------------
trunk/doc/Change.log
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-01-27 09:04:25 UTC (rev 7103)
+++ trunk/doc/Change.log 2015-01-27 19:51:35 UTC (rev 7104)
@@ -1,6 +1,9 @@
webERP Change Log
+27/01/15 RChacon: Spanish translation improvements. Note: The "Delete" key (keyboard) is translated to "Suprimir"; for usability, we standardise "borrar", "eliminar", etc. to "suprimir".
+27/01/15 Version 4.12 release
+
25/01/15 RChacon: Add $ViewTopic and $BookMark, comments and page_title_text to ImportBankTrans.php. Add info to Manual.
24/01/15 RChacon: Add info to Manual about Indian Numbering System. Add comments to code. Improvements to Cascading Style Sheet (CSS) for Manual.
23/01/15 RChacon: Generalise indian number format for country=India (languages: English, Hindi, Marathi, etc.).
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-01-27 09:04:25 UTC (rev 7103)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-27 19:51:35 UTC (rev 7104)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-27 21:55+1300\n"
-"PO-Revision-Date: 2015-01-23 08:29-0600\n"
+"POT-Creation-Date: 2015-01-27 09:44-0600\n"
+"PO-Revision-Date: 2015-01-27 11:02-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -168,30 +168,30 @@
"Cannot delete this account group because general ledger accounts have been "
"created using this group"
msgstr ""
-"No se puede eliminar el subgrupo de cuentas porque contiene cuentas que usan "
+"No se puede suprimir el subgrupo de cuentas porque contiene cuentas que usan "
"dicho subgrupo"
#: AccountGroups.php:213 AccountGroups.php:248 AccountSections.php:130
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:244 Currencies.php:252 Currencies.php:260
#: CustomerBranches.php:301 CustomerBranches.php:311 CustomerBranches.php:321
-#: CustomerBranches.php:331 CustomerBranches.php:341 Customers.php:296
-#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
-#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
-#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79
-#: GLAccounts.php:95 Locations.php:265 Locations.php:273 Locations.php:284
-#: Locations.php:293 Locations.php:302 Locations.php:311 Locations.php:320
-#: Locations.php:329 Locations.php:337 Manufacturers.php:154
-#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146
-#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128
-#: SalesCategories.php:135 SalesPeople.php:159 SalesPeople.php:166
-#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
-#: Shippers.php:93 StockCategories.php:216 Stocks.php:762 Stocks.php:771
-#: Stocks.php:779 Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811
-#: Stocks.php:819 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:134
-#: TaxGroups.php:142 TaxProvinces.php:129 UnitsOfMeasure.php:135
-#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:88
+#: CustomerBranches.php:331 CustomerBranches.php:341 CustomerTypes.php:146
+#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
+#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
+#: FixedAssetCategories.php:137 GLAccounts.php:79 GLAccounts.php:95
+#: Locations.php:265 Locations.php:273 Locations.php:284 Locations.php:293
+#: Locations.php:302 Locations.php:311 Locations.php:320 Locations.php:329
+#: Locations.php:337 MRPDemandTypes.php:87 Manufacturers.php:154
+#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153
+#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135
+#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
+#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
+#: StockCategories.php:216 Stocks.php:762 Stocks.php:771 Stocks.php:779
+#: Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811 Stocks.php:819
+#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: TaxCategories.php:132 TaxGroups.php:134 TaxGroups.php:142
+#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
+#: WorkCentres.php:89 WorkCentres.php:95
msgid "There are"
msgstr "Existen"
@@ -216,7 +216,7 @@
"Cannot delete this account group because it is a parent account group of "
"other account group(s)"
msgstr ""
-"No se puede eliminar este subgrupo de cuentas porque contiene otro(s) "
+"No se puede suprimir este subgrupo de cuentas porque contiene otro(s) "
"subgrupo(s)"
#: AccountGroups.php:248
@@ -225,11 +225,11 @@
#: AccountGroups.php:252
msgid "An error occurred in deleting the account group"
-msgstr "Hubo un error al eliminar el grupo contable"
+msgstr "Hubo un error al suprimir el grupo contable"
#: AccountGroups.php:253
msgid "The SQL that was used to delete the account group was"
-msgstr "El SQL usado para eliminar el grupo contables fue"
+msgstr "El SQL usado para suprimir el grupo contables fue"
#: AccountGroups.php:255
msgid "group has been deleted"
@@ -250,46 +250,47 @@
#: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110
#: BOMs.php:239 BOMs.php:890 COGSGLPostings.php:19 CompanyPreferences.php:102
#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
-#: Credit_Invoice.php:276 CreditStatus.php:21 Currencies.php:30
+#: CreditStatus.php:21 Credit_Invoice.php:276 Currencies.php:30
#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
-#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournalInquiry.php:11
-#: GLJournal.php:250 HistoricalTestResults.php:38 InternalStockRequest.php:311
-#: InventoryPlanning.php:354 InventoryPlanningPrefSupplier.php:386
-#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:516
-#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
-#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:29
-#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
-#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:148
-#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
-#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305
-#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:20
-#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24
-#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
-#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
-#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
-#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291
-#: SelectCustomer.php:265 SelectGLAccount.php:65 SelectOrderItems.php:559
-#: SelectOrderItems.php:1463 SelectOrderItems.php:1563 SelectProduct.php:510
-#: SelectQASamples.php:43 SelectSalesOrder.php:512 SelectSupplier.php:14
-#: SelectSupplier.php:220 SelectWorkOrder.php:9 SelectWorkOrder.php:174
-#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
-#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
-#: StockLocMovements.php:14 StockLocStatus.php:29
+#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournal.php:250
+#: GLJournalInquiry.php:11 HistoricalTestResults.php:38
+#: InternalStockRequest.php:311 InventoryPlanning.php:354
+#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:516
+#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91
+#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10
+#: PO_SelectOSPurchOrder.php:148 PcAssignCashToTab.php:59
+#: PcAssignCashToTab.php:133 PcAssignCashToTab.php:149
+#: PcAssignCashToTab.php:193 PriceMatrix.php:16 Prices.php:11
+#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401
+#: PurchaseByPrefSupplier.php:305 QATests.php:20 RecurringSalesOrders.php:320
+#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
+#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
+#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
+#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
+#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:65
+#: SelectOrderItems.php:559 SelectOrderItems.php:1463
+#: SelectOrderItems.php:1563 SelectProduct.php:510 SelectQASamples.php:43
+#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:220
+#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
+#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
+#: Shipt_Select.php:8 StockLocMovements.php:14 StockLocStatus.php:29
#: StockSerialItemResearch.php:30 SupplierPriceList.php:14
#: SupplierPriceList.php:224 SupplierPriceList.php:394
#: SupplierPriceList.php:398 SupplierPriceList.php:449
-#: SupplierPriceList.php:499 Suppliers.php:304 SupplierTenderCreate.php:556
+#: SupplierPriceList.php:499 SupplierTenderCreate.php:556
#: SupplierTenderCreate.php:664 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TestPlanResults.php:27
-#: TopItems.php:118 UnitsOfMeasure.php:10 WhereUsedInquiry.php:18
-#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22
-#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:31
-#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
-#: ../webSHOP/includes/header.php:216
+#: SupplierTenders.php:388 SupplierTransInquiry.php:10 Suppliers.php:304
+#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
+#: WWW_Users.php:34 WhereUsedInquiry.php:18 WorkCentres.php:111
+#: WorkCentres.php:163 WorkOrderCosting.php:22 WorkOrderEntry.php:11
+#: WorkOrderIssue.php:22 WorkOrderReceive.php:31 WorkOrderStatus.php:58
+#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
msgid "Search"
msgstr "Buscar"
@@ -323,44 +324,44 @@
#: DeliveryDetails.php:1198 DeliveryDetails.php:1201 FormDesigner.php:101
#: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628
#: Locations.php:646 Locations.php:648 Locations.php:661 Locations.php:663
-#: MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566
-#: MRP.php:570 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275
-#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296
-#: PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
-#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:600
-#: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134
-#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
-#: PO_PDFPurchOrder.php:416 ProductSpecs.php:186 ProductSpecs.php:407
-#: ProductSpecs.php:412 ProductSpecs.php:418 ProductSpecs.php:423
-#: ProductSpecs.php:428 ProductSpecs.php:560 ProductSpecs.php:606
-#: ProductSpecs.php:608 ProductSpecs.php:619 ProductSpecs.php:621
-#: ProductSpecs.php:632 ProductSpecs.php:634 ProductSpecs.php:645
-#: ProductSpecs.php:647 PurchData.php:296 PurchData.php:667 PurchData.php:670
-#: QATests.php:291 QATests.php:293 QATests.php:304 QATests.php:306
-#: QATests.php:317 QATests.php:319 QATests.php:330 QATests.php:332
-#: QATests.php:343 QATests.php:345 QATests.php:412 QATests.php:417
-#: QATests.php:422 QATests.php:427 QATests.php:432
-#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
-#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
-#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423
-#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
-#: SalesAnalRepts.php:479 SalesCategories.php:264 SalesCategories.php:351
-#: SalesCategories.php:355 SalesPeople.php:227 SalesPeople.php:367
-#: SalesPeople.php:369 SelectProduct.php:237 SelectProduct.php:362
-#: SelectQASamples.php:417 SelectQASamples.php:511 SelectQASamples.php:513
-#: SelectQASamples.php:568 SelectQASamples.php:570 SelectQASamples.php:582
-#: SelectQASamples.php:584 ShipmentCosting.php:667 ShopParameters.php:289
-#: ShopParameters.php:293 ShopParameters.php:337 ShopParameters.php:341
-#: ShopParameters.php:391 ShopParameters.php:395 ShopParameters.php:413
-#: ShopParameters.php:417 ShopParameters.php:495 ShopParameters.php:499
-#: StockClone.php:922 StockClone.php:924 StockClone.php:947 StockClone.php:949
-#: Stocks.php:1256 Stocks.php:1258 Stocks.php:1281 Stocks.php:1283
-#: SuppContractChgs.php:90 SystemParameters.php:479 SystemParameters.php:502
-#: SystemParameters.php:543 SystemParameters.php:624 SystemParameters.php:632
-#: SystemParameters.php:672 SystemParameters.php:763 SystemParameters.php:772
-#: SystemParameters.php:780 SystemParameters.php:798 SystemParameters.php:805
-#: SystemParameters.php:849 SystemParameters.php:945 SystemParameters.php:1088
+#: MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566 MRP.php:570
+#: MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80
+#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:600 PDFWOPrint.php:604
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
+#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
+#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282
+#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248
+#: ProductSpecs.php:186 ProductSpecs.php:407 ProductSpecs.php:412
+#: ProductSpecs.php:418 ProductSpecs.php:423 ProductSpecs.php:428
+#: ProductSpecs.php:560 ProductSpecs.php:606 ProductSpecs.php:608
+#: ProductSpecs.php:619 ProductSpecs.php:621 ProductSpecs.php:632
+#: ProductSpecs.php:634 ProductSpecs.php:645 ProductSpecs.php:647
+#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:291
+#: QATests.php:293 QATests.php:304 QATests.php:306 QATests.php:317
+#: QATests.php:319 QATests.php:330 QATests.php:332 QATests.php:343
+#: QATests.php:345 QATests.php:412 QATests.php:417 QATests.php:422
+#: QATests.php:427 QATests.php:432 RecurringSalesOrders.php:493
+#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
+#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
+#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
+#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:264
+#: SalesCategories.php:351 SalesCategories.php:355 SalesPeople.php:227
+#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:237
+#: SelectProduct.php:362 SelectQASamples.php:417 SelectQASamples.php:511
+#: SelectQASamples.php:513 SelectQASamples.php:568 SelectQASamples.php:570
+#: SelectQASamples.php:582 SelectQASamples.php:584 ShipmentCosting.php:667
+#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
+#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
+#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
+#: ShopParameters.php:499 StockClone.php:922 StockClone.php:924
+#: StockClone.php:947 StockClone.php:949 Stocks.php:1256 Stocks.php:1258
+#: Stocks.php:1281 Stocks.php:1283 SuppContractChgs.php:90
+#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
+#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
+#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
+#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
+#: SystemParameters.php:945 SystemParameters.php:1088
#: SystemParameters.php:1090 SystemParameters.php:1100
#: SystemParameters.php:1102 SystemParameters.php:1156
#: SystemParameters.php:1168 SystemParameters.php:1170
@@ -370,14 +371,14 @@
#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
#: TestPlanResults.php:924 TestPlanResults.php:928 WWW_Users.php:516
#: WWW_Users.php:518 WWW_Users.php:689 WWW_Users.php:691 WWW_Users.php:704
-#: WWW_Users.php:706
+#: WWW_Users.php:706 reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "Sí"
#: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452
-#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
-#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:130 BOMs.php:801
-#: BOMs.php:805 CompanyPreferences.php:424 CompanyPreferences.php:428
+#: BOMs.php:130 BOMs.php:801 BOMs.php:805 BankAccounts.php:218
+#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
+#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428
#: CompanyPreferences.php:439 CompanyPreferences.php:443
#: CompanyPreferences.php:454 CompanyPreferences.php:458
#: ContractCosting.php:200 Currencies.php:332 Currencies.php:513
@@ -387,15 +388,15 @@
#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:99
#: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629
#: Locations.php:651 Locations.php:653 Locations.php:666 Locations.php:668
-#: MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564
-#: MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:206
-#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209
-#: PaymentMethods.php:276 PaymentMethods.php:283 PaymentMethods.php:290
-#: PaymentMethods.php:297 PcAuthorizeExpenses.php:246 PDFChequeListing.php:64
-#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:601
+#: MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564 MRP.php:568
+#: MRPCalendar.php:226 NoSalesItems.php:191 PDFChequeListing.php:64
+#: PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 PDFWOPrint.php:601
#: PDFWOPrint.php:605 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 ProductSpecs.php:189 ProductSpecs.php:409
+#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207
+#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276
+#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297
+#: PcAuthorizeExpenses.php:246 ProductSpecs.php:189 ProductSpecs.php:409
#: ProductSpecs.php:415 ProductSpecs.php:420 ProductSpecs.php:425
#: ProductSpecs.php:430 ProductSpecs.php:611 ProductSpecs.php:613
#: ProductSpecs.php:624 ProductSpecs.php:626 ProductSpecs.php:637
@@ -435,65 +436,68 @@
#: TestPlanResults.php:925 TestPlanResults.php:927 WWW_Users.php:515
#: WWW_Users.php:519 WWW_Users.php:688 WWW_Users.php:692 WWW_Users.php:703
#: WWW_Users.php:707 includes/PDFLowGPPageHeader.inc:44
+#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "No"
#: AccountGroups.php:322 AccountSections.php:191 AddCustomerContacts.php:148
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BankAccounts.php:243 BOMs.php:157 COGSGLPostings.php:112
+#: BOMs.php:157 BankAccounts.php:243 COGSGLPostings.php:112
#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:362
#: Currencies.php:379 CustItem.php:166 CustomerBranches.php:455
-#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
+#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
+#: FreightCosts.php:253 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
-#: Labels.php:358 Locations.php:420 MailingGroupMaintenance.php:178
-#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309
-#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205
-#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
-#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
-#: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253
-#: ProductSpecs.php:463 PurchData.php:312 QATests.php:465
-#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:255
-#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130
-#: SelectCustomer.php:614 SelectCustomer.php:633 SelectCustomer.php:663
-#: SelectCustomer.php:681 SelectCustomer.php:705 SelectCustomer.php:722
-#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:410
-#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
+#: Labels.php:358 Locations.php:420 MRPDemandTypes.php:120 MRPDemands.php:309
+#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
+#: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
+#: PaymentTerms.php:205 PcAssignCashToTab.php:277
+#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:236
+#: PcTypeTabs.php:180 PriceMatrix.php:287 Prices.php:253
+#: Prices_Customer.php:286 ProductSpecs.php:463 PurchData.php:312
+#: QATests.php:465 SalesCategories.php:272 SalesGLPostings.php:137
+#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206
+#: SecurityTokens.php:130 SelectCustomer.php:614 SelectCustomer.php:633
+#: SelectCustomer.php:663 SelectCustomer.php:681 SelectCustomer.php:705
+#: SelectCustomer.php:722 SelectGLAccount.php:117 SelectGLAccount.php:132
+#: SelectQASamples.php:410 SellThroughSupport.php:298 Shippers.php:144
+#: StockCategories.php:296 SuppTransGLAnalysis.php:125
#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
-#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184
-#: TaxGroups.php:190 TaxProvinces.php:179 UnitsOfMeasure.php:185
-#: WorkCentres.php:142 WWW_Access.php:132 WWW_Users.php:350
-#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
+#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:190
+#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:132
+#: WWW_Users.php:350 WorkCentres.php:142 includes/InputSerialItems.php:110
+#: includes/OutputSerialItems.php:20
+#: reportwriter/languages/en_US/reports.php:143
#, php-format
msgid "Edit"
msgstr "Editar"
#: AccountGroups.php:323
msgid "Are you sure you wish to delete this account group?"
-msgstr "¿Confirma que desea eliminar este grupo de cuenta?"
+msgstr "¿Está seguro que desea suprimir este grupo de cuenta?"
#: AccountGroups.php:323 AccountSections.php:195 AddCustomerContacts.php:149
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BankAccounts.php:244 BOMs.php:159 COGSGLPostings.php:113
+#: BOMs.php:159 BankAccounts.php:244 COGSGLPostings.php:113
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
-#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:410
-#: CreditStatus.php:176 Currencies.php:365 CustItem.php:167
-#: CustomerReceipt.php:989 Customers.php:1166 CustomerTypes.php:206
+#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
+#: Credit_Invoice.php:410 Currencies.php:365 CustItem.php:167
+#: CustomerReceipt.php:989 CustomerTypes.php:206 Customers.php:1166
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:430 GLTags.php:97
+#: GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 GeocodeSetup.php:174
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:607
-#: Locations.php:421 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
-#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:211 Payments.php:1103 PaymentTerms.php:206
+#: Locations.php:421 MRPDemandTypes.php:121 MRPDemands.php:310
+#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768
+#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1103
#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
-#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:286
-#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:464
-#: PurchData.php:314 PurchData.php:721 QATests.php:466
+#: PriceMatrix.php:286 Prices.php:254 Prices_Customer.php:287
+#: ProductSpecs.php:464 PurchData.php:314 PurchData.php:721 QATests.php:466
#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
@@ -504,17 +508,18 @@
#: SellThroughSupport.php:299 Shipments.php:440 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
-#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SupplierContacts.php:166
+#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SuppShiptChgs.php:90
+#: SuppTransGLAnalysis.php:126 SupplierContacts.php:166
#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
-#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126
-#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:191
-#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186
-#: WorkCentres.php:143 WOSerialNos.php:335 WWW_Access.php:133
-#: WWW_Users.php:351 includes/InputSerialItemsKeyed.php:60
+#: SupplierTypes.php:172 TaxAuthorities.php:173 TaxCategories.php:186
+#: TaxGroups.php:191 TaxProvinces.php:180 TestPlanResults.php:920
+#: UnitsOfMeasure.php:186 WOSerialNos.php:335 WWW_Access.php:133
+#: WWW_Users.php:351 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
+#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
-msgstr "Eliminar"
+msgstr "Suprimir"
#: AccountGroups.php:351
msgid "An error occurred in retrieving the account group information"
@@ -583,21 +588,21 @@
#: AccountGroups.php:462 AccountSections.php:262 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BankAccounts.php:433 BOMs.php:818 COGSGLPostings.php:368
+#: BOMs.php:818 BankAccounts.php:433 COGSGLPostings.php:368
#: CreditStatus.php:259 Currencies.php:522 CustLoginSetup.php:273
#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
-#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:641
-#: Locations.php:680 Manufacturers.php:312 MRPDemands.php:424
-#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146
-#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264
+#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:641
+#: Locations.php:680 MRPDemandTypes.php:188 MRPDemands.php:424
+#: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146
+#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310
#: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:659
#: QATests.php:357 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:524
#: SelectQASamples.php:595 Shippers.php:203 StockCategories.php:653
-#: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327
+#: SuppLoginSetup.php:291 SupplierContacts.php:284 TaxAuthorities.php:327
#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
-#: UnitsOfMeasure.php:241 WorkCentres.php:283 WWW_Users.php:774
+#: UnitsOfMeasure.php:241 WWW_Users.php:774 WorkCentres.php:283
msgid "Enter Information"
msgstr "Guardar la información"
@@ -627,7 +632,7 @@
"Cannot delete this account section because general ledger accounts groups "
"have been created using this section"
msgstr ""
-"No se puede eliminar este Grupo Principal porque contiene subgrupos de "
+"No se puede suprimir este Grupo Principal porque contiene subgrupos de "
"cuentas"
#: AccountSections.php:130
@@ -700,12 +705,12 @@
#: AddCustomerContacts.php:59 AddCustomerNotes.php:51
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
#: DeliveryDetails.php:806 DeliveryDetails.php:823 Factors.php:105
-#: FixedAssetItems.php:250 MRPCalendar.php:176 PcAssignCashToTab.php:91
-#: PcClaimExpensesFromTab.php:82 PcExpenses.php:98 PcTabs.php:104
-#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:313 QATests.php:74
+#: FixedAssetItems.php:250 MRPCalendar.php:176 PO_Items.php:380
+#: PcAssignCashToTab.php:91 PcClaimExpensesFromTab.php:82 PcExpenses.php:98
+#: PcTabs.php:104 PcTypeTabs.php:63 ProductSpecs.php:313 QATests.php:74
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
-#: SelectQASamples.php:83 Stocks.php:589 Suppliers.php:531
-#: SupplierTypes.php:68
+#: SelectQASamples.php:83 Stocks.php:589 SupplierTypes.php:68
+#: Supplier...
[truncated message content] |
|
From: <dai...@us...> - 2015-01-29 07:07:26
|
Revision: 7105
http://sourceforge.net/p/web-erp/reponame/7105
Author: daintree
Date: 2015-01-29 07:07:12 +0000 (Thu, 29 Jan 2015)
Log Message:
-----------
Jiro new updated zh_TW.utf8 translation
Modified Paths:
--------------
trunk/doc/Change.log
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-01-27 19:51:35 UTC (rev 7104)
+++ trunk/doc/Change.log 2015-01-29 07:07:12 UTC (rev 7105)
@@ -1,7 +1,9 @@
webERP Change Log
+30/1/15 Jiro: Updated Traditional Chinese translation under zh_TW.utf8
27/01/15 RChacon: Spanish translation improvements. Note: The "Delete" key (keyboard) is translated to "Suprimir"; for usability, we standardise "borrar", "eliminar", etc. to "suprimir".
+
27/01/15 Version 4.12 release
25/01/15 RChacon: Add $ViewTopic and $BookMark, comments and page_title_text to ImportBankTrans.php. Add info to Manual.
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-01-27 19:51:35 UTC (rev 7104)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-29 07:07:12 UTC (rev 7105)
@@ -175,23 +175,23 @@
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:244 Currencies.php:252 Currencies.php:260
#: CustomerBranches.php:301 CustomerBranches.php:311 CustomerBranches.php:321
-#: CustomerBranches.php:331 CustomerBranches.php:341 CustomerTypes.php:146
-#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
-#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:79 GLAccounts.php:95
-#: Locations.php:265 Locations.php:273 Locations.php:284 Locations.php:293
-#: Locations.php:302 Locations.php:311 Locations.php:320 Locations.php:329
-#: Locations.php:337 MRPDemandTypes.php:87 Manufacturers.php:154
-#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153
-#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135
-#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
-#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
-#: StockCategories.php:216 Stocks.php:762 Stocks.php:771 Stocks.php:779
-#: Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811 Stocks.php:819
-#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: TaxCategories.php:132 TaxGroups.php:134 TaxGroups.php:142
-#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
-#: WorkCentres.php:89 WorkCentres.php:95
+#: CustomerBranches.php:331 CustomerBranches.php:341 Customers.php:296
+#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
+#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
+#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79
+#: GLAccounts.php:95 Locations.php:265 Locations.php:273 Locations.php:284
+#: Locations.php:293 Locations.php:302 Locations.php:311 Locations.php:320
+#: Locations.php:329 Locations.php:337 Manufacturers.php:154
+#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146
+#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128
+#: SalesCategories.php:135 SalesPeople.php:159 SalesPeople.php:166
+#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
+#: Shippers.php:93 StockCategories.php:216 Stocks.php:762 Stocks.php:771
+#: Stocks.php:779 Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811
+#: Stocks.php:819 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:134
+#: TaxGroups.php:142 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:88
msgid "There are"
msgstr "Existen"
@@ -250,47 +250,46 @@
#: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110
#: BOMs.php:239 BOMs.php:890 COGSGLPostings.php:19 CompanyPreferences.php:102
#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
-#: CreditStatus.php:21 Credit_Invoice.php:276 Currencies.php:30
+#: Credit_Invoice.php:276 CreditStatus.php:21 Currencies.php:30
#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
-#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournal.php:250
-#: GLJournalInquiry.php:11 HistoricalTestResults.php:38
-#: InternalStockRequest.php:311 InventoryPlanning.php:354
-#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:516
-#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91
-#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60
-#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10
-#: PO_SelectOSPurchOrder.php:148 PcAssignCashToTab.php:59
-#: PcAssignCashToTab.php:133 PcAssignCashToTab.php:149
-#: PcAssignCashToTab.php:193 PriceMatrix.php:16 Prices.php:11
-#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38
-#: PurchData.php:241 PurchData.php:373 PurchData.php:401
-#: PurchaseByPrefSupplier.php:305 QATests.php:20 RecurringSalesOrders.php:320
-#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
-#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
-#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
-#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
-#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:65
-#: SelectOrderItems.php:559 SelectOrderItems.php:1463
-#: SelectOrderItems.php:1563 SelectProduct.php:510 SelectQASamples.php:43
-#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:220
-#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
-#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
-#: Shipt_Select.php:8 StockLocMovements.php:14 StockLocStatus.php:29
+#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournalInquiry.php:11
+#: GLJournal.php:250 HistoricalTestResults.php:38 InternalStockRequest.php:311
+#: InventoryPlanning.php:354 InventoryPlanningPrefSupplier.php:386
+#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:516
+#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
+#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:29
+#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:148
+#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
+#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:20
+#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24
+#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
+#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
+#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
+#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291
+#: SelectCustomer.php:265 SelectGLAccount.php:65 SelectOrderItems.php:559
+#: SelectOrderItems.php:1463 SelectOrderItems.php:1563 SelectProduct.php:510
+#: SelectQASamples.php:43 SelectSalesOrder.php:512 SelectSupplier.php:14
+#: SelectSupplier.php:220 SelectWorkOrder.php:9 SelectWorkOrder.php:174
+#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
+#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: StockLocMovements.php:14 StockLocStatus.php:29
#: StockSerialItemResearch.php:30 SupplierPriceList.php:14
#: SupplierPriceList.php:224 SupplierPriceList.php:394
#: SupplierPriceList.php:398 SupplierPriceList.php:449
-#: SupplierPriceList.php:499 SupplierTenderCreate.php:556
+#: SupplierPriceList.php:499 Suppliers.php:304 SupplierTenderCreate.php:556
#: SupplierTenderCreate.php:664 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 Suppliers.php:304
-#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
-#: WWW_Users.php:34 WhereUsedInquiry.php:18 WorkCentres.php:111
-#: WorkCentres.php:163 WorkOrderCosting.php:22 WorkOrderEntry.php:11
-#: WorkOrderIssue.php:22 WorkOrderReceive.php:31 WorkOrderStatus.php:58
-#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
+#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TestPlanResults.php:27
+#: TopItems.php:118 UnitsOfMeasure.php:10 WhereUsedInquiry.php:18
+#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22
+#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:31
+#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
+#: ../webSHOP/includes/header.php:216
msgid "Search"
msgstr "Buscar"
@@ -324,44 +323,44 @@
#: DeliveryDetails.php:1198 DeliveryDetails.php:1201 FormDesigner.php:101
#: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628
#: Locations.php:646 Locations.php:648 Locations.php:661 Locations.php:663
-#: MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566 MRP.php:570
-#: MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80
-#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:600 PDFWOPrint.php:604
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
-#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
-#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282
-#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248
-#: ProductSpecs.php:186 ProductSpecs.php:407 ProductSpecs.php:412
-#: ProductSpecs.php:418 ProductSpecs.php:423 ProductSpecs.php:428
-#: ProductSpecs.php:560 ProductSpecs.php:606 ProductSpecs.php:608
-#: ProductSpecs.php:619 ProductSpecs.php:621 ProductSpecs.php:632
-#: ProductSpecs.php:634 ProductSpecs.php:645 ProductSpecs.php:647
-#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:291
-#: QATests.php:293 QATests.php:304 QATests.php:306 QATests.php:317
-#: QATests.php:319 QATests.php:330 QATests.php:332 QATests.php:343
-#: QATests.php:345 QATests.php:412 QATests.php:417 QATests.php:422
-#: QATests.php:427 QATests.php:432 RecurringSalesOrders.php:493
-#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
-#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
-#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
-#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:264
-#: SalesCategories.php:351 SalesCategories.php:355 SalesPeople.php:227
-#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:237
-#: SelectProduct.php:362 SelectQASamples.php:417 SelectQASamples.php:511
-#: SelectQASamples.php:513 SelectQASamples.php:568 SelectQASamples.php:570
-#: SelectQASamples.php:582 SelectQASamples.php:584 ShipmentCosting.php:667
-#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
-#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
-#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
-#: ShopParameters.php:499 StockClone.php:922 StockClone.php:924
-#: StockClone.php:947 StockClone.php:949 Stocks.php:1256 Stocks.php:1258
-#: Stocks.php:1281 Stocks.php:1283 SuppContractChgs.php:90
-#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
-#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
-#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
-#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
-#: SystemParameters.php:945 SystemParameters.php:1088
+#: MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566
+#: MRP.php:570 PaymentMethods.php:206 PaymentMethods.php:207
+#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275
+#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296
+#: PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
+#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:600
+#: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134
+#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
+#: PO_PDFPurchOrder.php:416 ProductSpecs.php:186 ProductSpecs.php:407
+#: ProductSpecs.php:412 ProductSpecs.php:418 ProductSpecs.php:423
+#: ProductSpecs.php:428 ProductSpecs.php:560 ProductSpecs.php:606
+#: ProductSpecs.php:608 ProductSpecs.php:619 ProductSpecs.php:621
+#: ProductSpecs.php:632 ProductSpecs.php:634 ProductSpecs.php:645
+#: ProductSpecs.php:647 PurchData.php:296 PurchData.php:667 PurchData.php:670
+#: QATests.php:291 QATests.php:293 QATests.php:304 QATests.php:306
+#: QATests.php:317 QATests.php:319 QATests.php:330 QATests.php:332
+#: QATests.php:343 QATests.php:345 QATests.php:412 QATests.php:417
+#: QATests.php:422 QATests.php:427 QATests.php:432
+#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
+#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
+#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423
+#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
+#: SalesAnalRepts.php:479 SalesCategories.php:264 SalesCategories.php:351
+#: SalesCategories.php:355 SalesPeople.php:227 SalesPeople.php:367
+#: SalesPeople.php:369 SelectProduct.php:237 SelectProduct.php:362
+#: SelectQASamples.php:417 SelectQASamples.php:511 SelectQASamples.php:513
+#: SelectQASamples.php:568 SelectQASamples.php:570 SelectQASamples.php:582
+#: SelectQASamples.php:584 ShipmentCosting.php:667 ShopParameters.php:289
+#: ShopParameters.php:293 ShopParameters.php:337 ShopParameters.php:341
+#: ShopParameters.php:391 ShopParameters.php:395 ShopParameters.php:413
+#: ShopParameters.php:417 ShopParameters.php:495 ShopParameters.php:499
+#: StockClone.php:922 StockClone.php:924 StockClone.php:947 StockClone.php:949
+#: Stocks.php:1256 Stocks.php:1258 Stocks.php:1281 Stocks.php:1283
+#: SuppContractChgs.php:90 SystemParameters.php:479 SystemParameters.php:502
+#: SystemParameters.php:543 SystemParameters.php:624 SystemParameters.php:632
+#: SystemParameters.php:672 SystemParameters.php:763 SystemParameters.php:772
+#: SystemParameters.php:780 SystemParameters.php:798 SystemParameters.php:805
+#: SystemParameters.php:849 SystemParameters.php:945 SystemParameters.php:1088
#: SystemParameters.php:1090 SystemParameters.php:1100
#: SystemParameters.php:1102 SystemParameters.php:1156
#: SystemParameters.php:1168 SystemParameters.php:1170
@@ -371,14 +370,14 @@
#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
#: TestPlanResults.php:924 TestPlanResults.php:928 WWW_Users.php:516
#: WWW_Users.php:518 WWW_Users.php:689 WWW_Users.php:691 WWW_Users.php:704
-#: WWW_Users.php:706 reportwriter/languages/en_US/reports.php:114
+#: WWW_Users.php:706
msgid "Yes"
msgstr "Sí"
#: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452
-#: BOMs.php:130 BOMs.php:801 BOMs.php:805 BankAccounts.php:218
-#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
-#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428
+#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
+#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:130 BOMs.php:801
+#: BOMs.php:805 CompanyPreferences.php:424 CompanyPreferences.php:428
#: CompanyPreferences.php:439 CompanyPreferences.php:443
#: CompanyPreferences.php:454 CompanyPreferences.php:458
#: ContractCosting.php:200 Currencies.php:332 Currencies.php:513
@@ -388,15 +387,15 @@
#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:99
#: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629
#: Locations.php:651 Locations.php:653 Locations.php:666 Locations.php:668
-#: MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564 MRP.php:568
-#: MRPCalendar.php:226 NoSalesItems.php:191 PDFChequeListing.php:64
-#: PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 PDFWOPrint.php:601
+#: MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564
+#: MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209
+#: PaymentMethods.php:276 PaymentMethods.php:283 PaymentMethods.php:290
+#: PaymentMethods.php:297 PcAuthorizeExpenses.php:246 PDFChequeListing.php:64
+#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:601
#: PDFWOPrint.php:605 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276
-#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297
-#: PcAuthorizeExpenses.php:246 ProductSpecs.php:189 ProductSpecs.php:409
+#: PO_PDFPurchOrder.php:417 ProductSpecs.php:189 ProductSpecs.php:409
#: ProductSpecs.php:415 ProductSpecs.php:420 ProductSpecs.php:425
#: ProductSpecs.php:430 ProductSpecs.php:611 ProductSpecs.php:613
#: ProductSpecs.php:624 ProductSpecs.php:626 ProductSpecs.php:637
@@ -436,40 +435,37 @@
#: TestPlanResults.php:925 TestPlanResults.php:927 WWW_Users.php:515
#: WWW_Users.php:519 WWW_Users.php:688 WWW_Users.php:692 WWW_Users.php:703
#: WWW_Users.php:707 includes/PDFLowGPPageHeader.inc:44
-#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "No"
#: AccountGroups.php:322 AccountSections.php:191 AddCustomerContacts.php:148
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BOMs.php:157 BankAccounts.php:243 COGSGLPostings.php:112
+#: BankAccounts.php:243 BOMs.php:157 COGSGLPostings.php:112
#: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:362
#: Currencies.php:379 CustItem.php:166 CustomerBranches.php:455
-#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
+#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:253 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173
+#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333
-#: Labels.php:358 Locations.php:420 MRPDemandTypes.php:120 MRPDemands.php:309
-#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
-#: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
-#: PaymentTerms.php:205 PcAssignCashToTab.php:277
-#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:236
-#: PcTypeTabs.php:180 PriceMatrix.php:287 Prices.php:253
-#: Prices_Customer.php:286 ProductSpecs.php:463 PurchData.php:312
-#: QATests.php:465 SalesCategories.php:272 SalesGLPostings.php:137
-#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206
-#: SecurityTokens.php:130 SelectCustomer.php:614 SelectCustomer.php:633
-#: SelectCustomer.php:663 SelectCustomer.php:681 SelectCustomer.php:705
-#: SelectCustomer.php:722 SelectGLAccount.php:117 SelectGLAccount.php:132
-#: SelectQASamples.php:410 SellThroughSupport.php:298 Shippers.php:144
-#: StockCategories.php:296 SuppTransGLAnalysis.php:125
+#: Labels.php:358 Locations.php:420 MailingGroupMaintenance.php:178
+#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309
+#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205
+#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
+#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
+#: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253
+#: ProductSpecs.php:463 PurchData.php:312 QATests.php:465
+#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:255
+#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130
+#: SelectCustomer.php:614 SelectCustomer.php:633 SelectCustomer.php:663
+#: SelectCustomer.php:681 SelectCustomer.php:705 SelectCustomer.php:722
+#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:410
+#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
-#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:190
-#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:132
-#: WWW_Users.php:350 WorkCentres.php:142 includes/InputSerialItems.php:110
-#: includes/OutputSerialItems.php:20
-#: reportwriter/languages/en_US/reports.php:143
+#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184
+#: TaxGroups.php:190 TaxProvinces.php:179 UnitsOfMeasure.php:185
+#: WorkCentres.php:142 WWW_Access.php:132 WWW_Users.php:350
+#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
#, php-format
msgid "Edit"
msgstr "Editar"
@@ -480,24 +476,24 @@
#: AccountGroups.php:323 AccountSections.php:195 AddCustomerContacts.php:149
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BOMs.php:159 BankAccounts.php:244 COGSGLPostings.php:113
+#: BankAccounts.php:244 BOMs.php:159 COGSGLPostings.php:113
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
-#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
-#: Credit_Invoice.php:410 Currencies.php:365 CustItem.php:167
-#: CustomerReceipt.php:989 CustomerTypes.php:206 Customers.php:1166
+#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:410
+#: CreditStatus.php:176 Currencies.php:365 CustItem.php:167
+#: CustomerReceipt.php:989 Customers.php:1166 CustomerTypes.php:206
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 GeocodeSetup.php:174
+#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:430 GLTags.php:97
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:607
-#: Locations.php:421 MRPDemandTypes.php:121 MRPDemands.php:310
-#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
-#: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768
-#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1103
+#: Locations.php:421 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
+#: PaymentMethods.php:211 Payments.php:1103 PaymentTerms.php:206
#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
-#: PriceMatrix.php:286 Prices.php:254 Prices_Customer.php:287
-#: ProductSpecs.php:464 PurchData.php:314 PurchData.php:721 QATests.php:466
+#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:286
+#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:464
+#: PurchData.php:314 PurchData.php:721 QATests.php:466
#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
@@ -508,15 +504,14 @@
#: SellThroughSupport.php:299 Shipments.php:440 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
-#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SuppShiptChgs.php:90
-#: SuppTransGLAnalysis.php:126 SupplierContacts.php:166
+#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SupplierContacts.php:166
#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
-#: SupplierTypes.php:172 TaxAuthorities.php:173 TaxCategories.php:186
-#: TaxGroups.php:191 TaxProvinces.php:180 TestPlanResults.php:920
-#: UnitsOfMeasure.php:186 WOSerialNos.php:335 WWW_Access.php:133
-#: WWW_Users.php:351 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60
+#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126
+#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:191
+#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186
+#: WorkCentres.php:143 WOSerialNos.php:335 WWW_Access.php:133
+#: WWW_Users.php:351 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
-#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "Suprimir"
@@ -588,21 +583,21 @@
#: AccountGroups.php:462 AccountSections.php:262 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BOMs.php:818 BankAccounts.php:433 COGSGLPostings.php:368
+#: BankAccounts.php:433 BOMs.php:818 COGSGLPostings.php:368
#: CreditStatus.php:259 Currencies.php:522 CustLoginSetup.php:273
#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
-#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:641
-#: Locations.php:680 MRPDemandTypes.php:188 MRPDemands.php:424
-#: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146
-#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310
+#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:641
+#: Locations.php:680 Manufacturers.php:312 MRPDemands.php:424
+#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146
+#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264
#: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:659
#: QATests.php:357 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:524
#: SelectQASamples.php:595 Shippers.php:203 StockCategories.php:653
-#: SuppLoginSetup.php:291 SupplierContacts.php:284 TaxAuthorities.php:327
+#: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327
#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
-#: UnitsOfMeasure.php:241 WWW_Users.php:774 WorkCentres.php:283
+#: UnitsOfMeasure.php:241 WorkCentres.php:283 WWW_Users.php:774
msgid "Enter Information"
msgstr "Guardar la información"
@@ -705,12 +700,12 @@
#: AddCustomerContacts.php:59 AddCustomerNotes.php:51
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
#: DeliveryDetails.php:806 DeliveryDetails.php:823 Factors.php:105
-#: FixedAssetItems.php:250 MRPCalendar.php:176 PO_Items.php:380
-#: PcAssignCashToTab.php:91 PcClaimExpensesFromTab.php:82 PcExpenses.php:98
-#: PcTabs.php:104 PcTypeTabs.php:63 ProductSpecs.php:313 QATests.php:74
+#: FixedAssetItems.php:250 MRPCalendar.php:176 PcAssignCashToTab.php:91
+#: PcClaimExpensesFromTab.php:82 PcExpenses.php:98 PcTabs.php:104
+#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:313 QATests.php:74
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
-#: SelectQASamples.php:83 Stocks.php:589 SupplierTypes.php:68
-#: Suppliers.php:531
+#: SelectQASamples.php:83 Stocks.php:589 Suppliers.php:531
+#: SupplierTypes.php:68
msgid "has been updated"
msgstr "ha sido actualizado"
@@ -728,7 +723,7 @@
#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:162
#: ProductSpecs.php:383 QATests.php:389 SalesPeople.php:208
#: SelectCustomer.php:609 StockDispatch.php:275 StockDispatch.php:286
-#: StockDispatch.php:297 SuppTransGLAnalysis.php:108 SupplierContacts.php:152
+#: StockDispatch.php:297 SupplierContacts.php:152 SuppTransGLAnalysis.php:108
#: Tax.php:411 TestPlanResults.php:508 UserLocations.php:176
#: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144
msgid "Name"
@@ -759,18 +754,17 @@
#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:67
#: includes/PDFTransPageHeader.inc:85
#: includes/PDFTransPageHeaderPortrait.inc:114 includes/PDFWOPageHeader.inc:19
-#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298
-#: ../webSHOP/Register.php:595
+#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:443
+#: ../webSHOP/Register.php:607
msgid "Email"
msgstr "Correo-e"
#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1122
-#: Customers.php:1130 PDFQuotation.php:252 PDFQuotationPortrait.php:249
-#: PcAssignCashToTab.php:242 PcAssignCashToTab.php:380
+#: Customers.php:1130 PcAssignCashToTab.php:242 PcAssignCashToTab.php:380
#: PcAuthorizeExpenses.php:97 PcClaimExpensesFromTab.php:238
-#: PcClaimExpensesFromTab.php:405 PcReportTab.php:333 SelectCustomer.php:613
-#: ShopParameters.php:198 SystemParameters.php:411 WOSerialNos.php:306
-#: WOSerialNos.php:312
+#: PcClaimExpensesFromTab.php:405 PcReportTab.php:333 PDFQuotation.php:252
+#: PDFQuotationPortrait.php:249 SelectCustomer.php:613 ShopParameters.php:198
+#: SystemParameters.php:411 WOSerialNos.php:306 WOSerialNos.php:312
msgid "Notes"
msgstr "Notas"
@@ -788,7 +782,7 @@
msgstr "Código del contacto"
#: AddCustomerContacts.php:214 Factors.php:234 SupplierContacts.php:239
-#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610
+#: ../webSHOP/Checkout.php:527 ../webSHOP/Register.php:622
msgid "Contact Name"
msgstr "Nombre del contacto"
@@ -797,8 +791,8 @@
#: SelectCustomer.php:425 SelectOrderItems.php:597
#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:63
#: includes/PDFTransPageHeader.inc:84
-#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:389
-#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723
+#: includes/PDFTrans...
[truncated message content] |
|
From: <aga...@us...> - 2015-01-29 14:01:55
|
Revision: 7107
http://sourceforge.net/p/web-erp/reponame/7107
Author: agaluski
Date: 2015-01-29 14:01:52 +0000 (Thu, 29 Jan 2015)
Log Message:
-----------
2 new emailed weekly reports, contain $AllowAnyone
Added Paths:
-----------
trunk/PDFSalesBySalesperson.php
trunk/PDFWeeklyOrders.php
Added: trunk/PDFSalesBySalesperson.php
===================================================================
--- trunk/PDFSalesBySalesperson.php (rev 0)
+++ trunk/PDFSalesBySalesperson.php 2015-01-29 14:01:52 UTC (rev 7107)
@@ -0,0 +1,173 @@
+<?php
+
+/* $Id: PDFSalesBySalesperson.php 1 2014-11-11 03:26:23Z agaluski $*/
+$DatabaseName='weberp';
+$AllowAnyone = true;
+
+include ('includes/session.inc');
+include('includes/SQL_CommonFunctions.inc');
+include ('includes/class.pdf.php');
+$_POST['FromDate']=date('Y-m-01');
+$_POST['ToDate']= FormatDateForSQL(Date($_SESSION['DefaultDateFormat']));
+$WeekStartDate = Date(($_SESSION['DefaultDateFormat']), strtotime($WeekStartDate . ' - 7 days'));
+$Recipients = GetMailList('salesbysalesperson');
+if (sizeOf($Recipients) == 0) {
+ $Title = _('Weekly Orders') . ' - ' . _('Problem Report');
+ include('includes/header.inc');
+ prnMsg( _('There are no members of the Weekly Orders Recipients email group'), 'warn');
+ include('includes/footer.inc');
+ exit;
+}
+
+$sql= "SELECT salesorders.orderno,
+ salesorders.orddate,
+ salesorderdetails.stkcode,
+ salesorderdetails.unitprice,
+ stockmaster.description,
+ stockmaster.units,
+ stockmaster.decimalplaces,
+ salesorderdetails.quantity,
+ salesorderdetails.qtyinvoiced,
+ salesorderdetails.completed,
+ salesorderdetails.discountpercent,
+ stockmaster.materialcost+stockmaster.labourcost+stockmaster.overheadcost AS standardcost,
+ debtorsmaster.name,
+ salesman.salesmanname
+ FROM salesorders
+ INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN stockmaster
+ ON salesorderdetails.stkcode = stockmaster.stockid
+ INNER JOIN debtorsmaster
+ ON salesorders.debtorno=debtorsmaster.debtorno
+ INNER JOIN custbranch ON custbranch.debtorno=salesorders.debtorno
+ AND custbranch.branchcode=salesorders.branchcode
+ INNER JOIN salesman ON salesman.salesmancode=custbranch.salesman
+ WHERE salesorders.orddate >='" . FormatDateForSQL($WeekStartDate) . "'
+ AND salesorders.orddate <='" . $_POST['ToDate'] . "'
+ AND salesorders.quotation=0
+ ORDER BY custbranch.salesman, salesorders.orderno";
+
+$Result=DB_query($sql,$db,'','',false,false); //dont trap errors here
+
+if (DB_error_no($db)!=0){
+ include('includes/header.inc');
+ echo '<br />' . _('An error occurred getting the orders details');
+ if ($debug==1){
+ echo '<br />' . _('The SQL used to get the orders that failed was') . '<br />' . $sql;
+ }
+ include ('includes/footer.inc');
+ exit;
+}
+$PaperSize="Letter_Landscape";
+include('includes/PDFStarter.php');
+$pdf->addInfo('Title',_('Weekly Orders Report'));
+$pdf->addInfo('Subject',_('Orders from') . ' ' . $_POST['FromDate'] . ' ' . _('to') . ' ' . $_POST['ToDate']);
+$line_height=12;
+$PageNumber = 1;
+$TotalDiffs = 0;
+include ('includes/PDFWeeklyOrdersPageHeader.inc');
+$Col1=2;
+$Col2=40;
+$Col3=160;
+$Col4=210;
+$Col5=260;
+$Col6=390;
+$Col7=450;
+$Col8=510;
+$Col9=570;
+$Col10=650;
+$Col11=660;
+
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col1,$YPos,$Col2-$Col1-5,$FontSize,_('Order'), 'left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col2,$YPos,$Col3-$Col2-5,$FontSize,_('Customer'), 'left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col3,$YPos,$Col4-$Col3-5,$FontSize,_('Order Date'), 'left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col4,$YPos,$Col5-$Col4-5,$FontSize,_('Item'), 'left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col5,$YPos,$Col6-$Col5-5,$FontSize,_('Description'), 'left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col6,$YPos,$Col7-$Col6-5,$FontSize,_('Quantity'), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col7,$YPos,$Col8-$Col7-5,$FontSize,_('Sales'), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col8,$YPos,$Col9-$Col8-5,$FontSize,_('Status'), 'Left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col9,$YPos,$Col10-$Col9-5,$FontSize,_('Salesperson'), 'Left');
+
+$YPos-=$line_height;
+$pdf->line($XPos, $YPos,$Page_Width-$Right_Margin, $YPos);
+$YPos-=$line_height;
+$Salesman='';
+while ($myrow=DB_fetch_array($Result)){
+
+ if ($myrow['completed']==1) {
+ $Status="Closed";
+ $Qty=$myrow['qtyinvoiced'];
+ } else {
+ $Qty=$myrow['quantity'];
+ if ($myrow['qtyinvoiced']==0) {
+ $Status= _('Ordered');
+ } else {
+ $Status= _('Partial');
+ }
+ }
+ $SalesValue=$Qty*$myrow['unitprice']*(1-$myrow['discountpercent']);
+ $SalesCost=$Qty*$myrow['standardcost'];
+ if ($SalesValue <> 0) {
+ $GP=($SalesValue-$SalesCost)/$SalesValue *100;
+ } else {
+ $GP=0;
+ }
+
+ if ($Salesman > '' and $Salesman <> $myrow['salesmanname']){
+ $PageNumber++;
+ include ('includes/PDFWeeklyOrdersPageHeader.inc');
+ } /*end of new page header */
+ $Salesman = $myrow['salesmanname'];
+
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col1,$YPos,$Col2-$Col1-5,$FontSize,$myrow['orderno'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col2,$YPos,$Col3-$Col2-5,$FontSize,html_entity_decode($myrow['name'],ENT_QUOTES,'UTF-8'), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col3,$YPos,$Col4-$Col3-5,$FontSize,ConvertSQLDate($myrow['orddate']), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col4,$YPos,$Col5-$Col4-5,$FontSize,$myrow['stkcode'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col5,$YPos,$Col6-$Col5-5,$FontSize,$myrow['description'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col6,$YPos,$Col7-$Col6-5,$FontSize,locale_number_format($myrow['quantity'],$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col7,$YPos,$Col8-$Col7-5,$FontSize,locale_number_format($SalesValue,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col8,$YPos,$Col9-$Col8-5,$FontSize,$Status, 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col9,$YPos,$Col10-$Col9-5,$FontSize,$myrow['salesmanname'], 'left');
+ if ($YPos - (2 *$line_height) < $Bottom_Margin){
+ $PageNumber++;
+ include ('includes/PDFWeeklyOrdersPageHeader.inc');
+ } /*end of new page header */
+ $YPos -= $line_height;
+
+} //while
+
+include('includes/htmlMimeMail.php');
+$filename=$_SESSION['reports_dir'] . '/SalesBySalesperson.pdf';
+$pdf->Output($filename, 'F');
+$pdf->__destruct();
+$mail = new htmlMimeMail();
+$attachment = $mail->getFile($filename);
+$mail->setText(_('Please find the Sales By Salesperson report'));
+$mail->setSubject(_('Sales By Salesperson Report'));
+$mail->addAttachment($attachment, $filename, 'application/pdf');
+//echo '<br /><div class="centre"><a href="' . $RootPath . '/' . $filename . '">' . _('click here') . '</a> ' . _('to view the file') . '</div>';
+if($_SESSION['SmtpSetting']==0){
+ $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
+ $result = $mail->send($Recipients);
+}else{
+ $result = SendmailBySmtp($mail,$Recipients);
+}
+if($result){
+ $Title = _('Print Weekly Orders');
+ include('includes/header.inc');
+ prnMsg(_('The Weekly Orders report has been mailed'),'success');
+ echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
+ include('includes/footer.inc');
+ exit;
+
+}else{
+ $Title = _('Print Weekly Orders Error');
+ include('includes/header.inc');
+ prnMsg(_('There are errors lead to mails not sent'),'error');
+ echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
+ include('includes/footer.inc');
+ exit;
+
+}
+?>
\ No newline at end of file
Added: trunk/PDFWeeklyOrders.php
===================================================================
--- trunk/PDFWeeklyOrders.php (rev 0)
+++ trunk/PDFWeeklyOrders.php 2015-01-29 14:01:52 UTC (rev 7107)
@@ -0,0 +1,222 @@
+<?php
+
+/* $Id: PDFWeeklyOrders.php 1 2014-11-11 03:26:23Z agaluski $*/
+$DatabaseName='weberp';
+$AllowAnyone = true;
+
+include ('includes/session.inc');
+include('includes/SQL_CommonFunctions.inc');
+include ('includes/class.pdf.php');
+$_POST['FromDate']=date('Y-m-01');
+$_POST['ToDate']= FormatDateForSQL(Date($_SESSION['DefaultDateFormat']));
+$WeekStartDate = Date(($_SESSION['DefaultDateFormat']), strtotime($WeekStartDate . ' - 7 days'));
+$Recipients = GetMailList('WeeklyOrders');
+if (sizeOf($Recipients) == 0) {
+ $Title = _('Weekly Orders') . ' - ' . _('Problem Report');
+ include('includes/header.inc');
+ prnMsg( _('There are no members of the Weekly Orders Recipients email group'), 'warn');
+ include('includes/footer.inc');
+ exit;
+}
+
+$sql= "SELECT salesorders.orderno,
+ salesorders.orddate,
+ salesorderdetails.stkcode,
+ salesorderdetails.unitprice,
+ stockmaster.description,
+ stockmaster.units,
+ stockmaster.decimalplaces,
+ salesorderdetails.quantity,
+ salesorderdetails.qtyinvoiced,
+ salesorderdetails.completed,
+ salesorderdetails.discountpercent,
+ stockmaster.materialcost+stockmaster.labourcost+stockmaster.overheadcost AS standardcost,
+ debtorsmaster.name
+ FROM salesorders
+ INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN stockmaster
+ ON salesorderdetails.stkcode = stockmaster.stockid
+ INNER JOIN debtorsmaster
+ ON salesorders.debtorno=debtorsmaster.debtorno
+ WHERE salesorders.orddate >='" . FormatDateForSQL($WeekStartDate) . "'
+ AND salesorders.orddate <='" . $_POST['ToDate'] . "'
+ AND salesorders.quotation=0
+ ORDER BY salesorders.orderno";
+
+$Result=DB_query($sql,$db,'','',false,false); //dont trap errors here
+
+if (DB_error_no($db)!=0){
+ include('includes/header.inc');
+ echo '<br />' . _('An error occurred getting the orders details');
+ if ($debug==1){
+ echo '<br />' . _('The SQL used to get the orders that failed was') . '<br />' . $sql;
+ }
+ include ('includes/footer.inc');
+ exit;
+}
+$PaperSize="Letter_Landscape";
+include('includes/PDFStarter.php');
+$pdf->addInfo('Title',_('Weekly Orders Report'));
+$pdf->addInfo('Subject',_('Orders from') . ' ' . $_POST['FromDate'] . ' ' . _('to') . ' ' . $_POST['ToDate']);
+$line_height=12;
+$PageNumber = 1;
+$TotalDiffs = 0;
+include ('includes/PDFWeeklyOrdersPageHeader.inc');
+$Col1=2;
+$Col2=40;
+$Col3=160;
+$Col4=210;
+$Col5=260;
+$Col6=390;
+$Col7=450;
+$Col8=510;
+$Col9=570;
+$Col10=610;
+$Col11=660;
+
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col1,$YPos,$Col2-$Col1-5,$FontSize,_('Order'), 'left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col2,$YPos,$Col3-$Col2-5,$FontSize,_('Customer'), 'left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col3,$YPos,$Col4-$Col3-5,$FontSize,_('Order Date'), 'left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col4,$YPos,$Col5-$Col4-5,$FontSize,_('Item'), 'left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col5,$YPos,$Col6-$Col5-5,$FontSize,_('Description'), 'left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col6,$YPos,$Col7-$Col6-5,$FontSize,_('Quantity'), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col7,$YPos,$Col8-$Col7-5,$FontSize,_('Sales'), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col8,$YPos,$Col9-$Col8-5,$FontSize,_('Cost'), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col9,$YPos,$Col10-$Col9-5,$FontSize,_('GP %'), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col10,$YPos,$Col11-$Col10-5,$FontSize,_('Status'), 'Left');
+
+$YPos-=$line_height;
+$pdf->line($XPos, $YPos,$Page_Width-$Right_Margin, $YPos);
+$YPos-=$line_height;
+
+while ($myrow=DB_fetch_array($Result)){
+
+ if ($myrow['completed']==1) {
+ $Status="Closed";
+ $Qty=$myrow['qtyinvoiced'];
+ } else {
+ $Qty=$myrow['quantity'];
+ if ($myrow['qtyinvoiced']==0) {
+ $Status= _('Ordered');
+ } else {
+ $Status= _('Partial');
+ }
+ }
+ $SalesValue=$Qty*$myrow['unitprice']*(1-$myrow['discountpercent']);
+ $SalesCost=$Qty*$myrow['standardcost'];
+ if ($SalesValue <> 0) {
+ $GP=($SalesValue-$SalesCost)/$SalesValue *100;
+ } else {
+ $GP=0;
+ }
+
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col1,$YPos,$Col2-$Col1-5,$FontSize,$myrow['orderno'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col2,$YPos,$Col3-$Col2-5,$FontSize,html_entity_decode($myrow['name'],ENT_QUOTES,'UTF-8'), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col3,$YPos,$Col4-$Col3-5,$FontSize,ConvertSQLDate($myrow['orddate']), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col4,$YPos,$Col5-$Col4-5,$FontSize,$myrow['stkcode'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col5,$YPos,$Col6-$Col5-5,$FontSize,$myrow['description'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col6,$YPos,$Col7-$Col6-5,$FontSize,locale_number_format($myrow['quantity'],$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col7,$YPos,$Col8-$Col7-5,$FontSize,locale_number_format($SalesValue,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col8,$YPos,$Col9-$Col8-5,$FontSize,locale_number_format($SalesCost,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col9,$YPos,$Col10-$Col9-5,$FontSize,locale_number_format($GP,2), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+$Col10,$YPos,$Col11-$Col10-5,$FontSize,$Status, 'left');
+ if ($YPos - (2 *$line_height) < $Bottom_Margin){
+ $PageNumber++;
+ include ('includes/PDFWeeklyOrdersPageHeader.inc');
+ } /*end of new page header */
+ $YPos -= $line_height;
+ $TotalSalesValue += $SalesValue;
+ $TotalSalesCost += $SalesCost;
+ $TotalSalesVolume += $myrow['quantity'];
+} //while
+if ($TotalSalesValue <> 0) {
+ $TotalGP=($TotalSalesValue-$TotalSalesCost)/$TotalSalesValue *100;
+} else {
+ $TotalGP=0;
+}
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col2,$YPos,$Col3-$Col2-5,$FontSize,_('Total Order Amounts'), 'left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col6,$YPos,$Col7-$Col6-5,$FontSize,locale_number_format($TotalSalesVolume,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col7,$YPos,$Col8-$Col7-5,$FontSize,locale_number_format($TotalSalesValue,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col8,$YPos,$Col9-$Col8-5,$FontSize,locale_number_format($TotalSalesCost,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col9,$YPos,$Col10-$Col9-5,$FontSize,locale_number_format($TotalGP,2), 'right');
+if ($YPos - (2 *$line_height) < $Bottom_Margin){
+ $PageNumber++;
+ include ('includes/PDFWeeklyOrdersPageHeader.inc');
+} /*end of new page header */
+
+$YPos -= $line_height;
+$YPos -= $line_height;
+$TotalSalesValue=0;
+$TotalSalesCost=0;
+$TotalSalesVolume=0;
+$TotalGP=0;
+$sql = "SELECT trandate,
+ (price*(1-discountpercent)* (-qty)) as salesvalue,
+ (CASE WHEN mbflag='A' THEN 0 ELSE (standardcost * -qty) END) as cost,
+ stockmoves.stockid,
+ description,
+ reference,
+ qty,
+ transno
+ FROM stockmoves
+ INNER JOIN stockmaster
+ ON stockmoves.stockid=stockmaster.stockid
+ INNER JOIN custbranch
+ ON stockmoves.debtorno=custbranch.debtorno
+ AND stockmoves.branchcode=custbranch.branchcode
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND trandate>='" . $_POST['FromDate'] . "'
+ AND trandate<='" . $_POST['ToDate'] . "'";
+
+$ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg($db);
+$SalesResult = DB_query($sql, $db,$ErrMsg);
+while ($DaySalesRow=DB_fetch_array($SalesResult)) {
+ $TotalSalesValue += $DaySalesRow['salesvalue'];
+ $TotalSalesCost += $DaySalesRow['cost'];
+ $TotalSalesVolume -= $DaySalesRow['qty'];
+}
+if ($TotalSalesValue <> 0) {
+ $TotalGP=($TotalSalesValue-$TotalSalesCost)/$TotalSalesValue *100;
+} else {
+ $TotalGP=0;
+}
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col2,$YPos,$Col3-$Col2-5,$FontSize,_('Monthly Invoiced Total'), 'left');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col6,$YPos,$Col7-$Col6-5,$FontSize,locale_number_format($TotalSalesVolume,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col7,$YPos,$Col8-$Col7-5,$FontSize,locale_number_format($TotalSalesValue,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col8,$YPos,$Col9-$Col8-5,$FontSize,locale_number_format($TotalSalesCost,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+$Col9,$YPos,$Col10-$Col9-5,$FontSize,locale_number_format($TotalGP,2), 'right');
+
+include('includes/htmlMimeMail.php');
+$filename=$_SESSION['reports_dir'] . '/WeeklyOrders.pdf';
+$pdf->Output($filename, 'F');
+$pdf->__destruct();
+$mail = new htmlMimeMail();
+$attachment = $mail->getFile($filename);
+$mail->setText(_('Please find the weekly order report'));
+$mail->setSubject(_('Weekly Orders Report'));
+$mail->addAttachment($attachment, $filename, 'application/pdf');
+if($_SESSION['SmtpSetting']==0){
+ $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
+ $result = $mail->send($Recipients);
+}else{
+ $result = SendmailBySmtp($mail,$Recipients);
+}
+if($result){
+ $Title = _('Print Weekly Orders');
+ include('includes/header.inc');
+ prnMsg(_('The Weekly Orders report has been mailed'),'success');
+ echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
+ include('includes/footer.inc');
+ exit;
+
+}else{
+ $Title = _('Print Weekly Orders Error');
+ include('includes/header.inc');
+ prnMsg(_('There are errors lead to mails not sent'),'error');
+ echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
+ include('includes/footer.inc');
+ exit;
+
+}
+?>
\ No newline at end of file
|
|
From: <rc...@us...> - 2015-01-31 18:11:02
|
Revision: 7112
http://sourceforge.net/p/web-erp/reponame/7112
Author: rchacon
Date: 2015-01-31 18:10:59 +0000 (Sat, 31 Jan 2015)
Log Message:
-----------
Add and modify help text. Spanish translation improvements. Standardise "Account:" to "Account".
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
trunk/Stocks.php
trunk/doc/Change.log
trunk/doc/Manual/ManualInventory.html
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2015-01-30 06:41:33 UTC (rev 7111)
+++ trunk/PrintCustTransPortrait.php 2015-01-31 18:10:59 UTC (rev 7112)
@@ -93,7 +93,7 @@
if (DB_error_no()!=1) {
if (DB_num_rows($result)==1){
$myrow = DB_fetch_array($result);
- $DefaultBankAccountNumber = _('Account:') .' ' .$myrow['bankaccountnumber'];
+ $DefaultBankAccountNumber = _('Account') .': ' .$myrow['bankaccountnumber'];
$DefaultBankAccountCode = _('Bank Code:') .' ' .$myrow['bankaccountcode'];
} else {
$DefaultBankAccountNumber = '';
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2015-01-30 06:41:33 UTC (rev 7111)
+++ trunk/Stocks.php 2015-01-31 18:10:59 UTC (rev 7112)
@@ -436,10 +436,10 @@
language_id,
descriptiontranslation,
longdescriptiontranslation)
- VALUES('" . $StockID . "','" .
- $LanguageId . "', '" .
- $_POST['Description_' . str_replace('.','_',$LanguageId)] . "', '" .
- $_POST['LongDescription_' . str_replace('.','_',$LanguageId)].
+ VALUES('" . $StockID . "','" .
+ $LanguageId . "', '" .
+ $_POST['Description_' . str_replace('.','_',$LanguageId)] . "', '" .
+ $_POST['LongDescription_' . str_replace('.','_',$LanguageId)].
"')",$ErrMsg,$DbgMsg,true);
}
}
@@ -466,7 +466,7 @@
$result = DB_query($sql,$ErrMsg,$DbgMsg,true);
}
-
+
//delete any properties for the item no longer relevant with the change of category
$result = DB_query("DELETE FROM stockitemproperties WHERE stockid ='" . $StockID . "'",$ErrMsg, $DbgMsg, true);
@@ -658,10 +658,10 @@
language_id,
descriptiontranslation,
longdescriptiontranslation)
- VALUES('" . $StockID . "','" .
- $LanguageId . "', '" .
- $_POST['Description_' . str_replace('.','_',$LanguageId)] . "', '" .
- $_POST['longDescription_' . str_replace('.','_',$LanguageId)].
+ VALUES('" . $StockID . "','" .
+ $LanguageId . "', '" .
+ $_POST['Description_' . str_replace('.','_',$LanguageId)] . "', '" .
+ $_POST['longDescription_' . str_replace('.','_',$LanguageId)].
"')",$ErrMsg,$DbgMsg,true);
}
}
@@ -1331,12 +1331,12 @@
</tr>';
echo '<tr>
- <td><label for="Pansize">' . _('Pan Size') . ':</label></td>
- <td><input class="number" id="Pansize" maxlength="6" name="Pansize" size="6" title="' . _('Order multiple. It is the minimum packing quantity.') . '" type="text" value="' . locale_number_format($_POST['Pansize'],0) . '" /></td>
+ <td><label for="PanSize">' . _('Pan Size') . ':</label></td>
+ <td><input class="number" id="PanSize" maxlength="6" name="Pansize" size="6" title="' . _('Order multiple. It is the minimum packing quantity.') . '" type="text" value="' . locale_number_format($_POST['Pansize'],0) . '" /></td>
</tr>
<tr>
- <td>' . _('Shrinkage Factor') . ':</td>
- <td><input type="text" class="number" name="ShrinkFactor" size="6" maxlength="6" value="' . locale_number_format($_POST['ShrinkFactor'],0) . '" /></td>
+ <td><label for="ShrinkageFactor">' . _('Shrinkage Factor') . ':</label></td>
+ <td><input class="number" id="ShrinkageFactor" maxlength="6" name="ShrinkFactor" size="6" title="' . _('Amount by which an output falls short of the estimated or planned output.') . '" type="text" value="' . locale_number_format($_POST['ShrinkFactor'],0) . '" /></td>
</tr>';
echo '</table>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-01-30 06:41:33 UTC (rev 7111)
+++ trunk/doc/Change.log 2015-01-31 18:10:59 UTC (rev 7112)
@@ -1,5 +1,6 @@
webERP Change Log
+31/01/15 RChacon: Add and modify help text. Spanish translation improvements. Standardise "Account:" to "Account".
30/1/15 Jiro: Updated Traditional Chinese translation under zh_TW.utf8
27/01/15 RChacon: Spanish translation improvements. Note: The "Delete" key (keyboard) is translated to "Suprimir"; for usability, we standardise "borrar", "eliminar", etc. to "suprimir".
Modified: trunk/doc/Manual/ManualInventory.html
===================================================================
--- trunk/doc/Manual/ManualInventory.html 2015-01-30 06:41:33 UTC (rev 7111)
+++ trunk/doc/Manual/ManualInventory.html 2015-01-31 18:10:59 UTC (rev 7112)
@@ -283,13 +283,13 @@
<h3>Pan Size</h3>
- <p>This modifier is sometimes called the order multiple. It is the minimum packing quantity. It allows you to create planned orders in even multiples. This is especially useful if you are required by your suppliers to place orders in specific lot sizes. It is also a useful modifier is you have established your own production run sizes. This modifier causes MRP to inflate the required order quantity to an even increment of the pansize value. As with all modifiers you do need to be careful with this modifier as its use could lead to excess inventories.</p>
+ <p>This modifier is sometimes called the order multiple. It is the minimum packing quantity. It allows you to create planned orders in multiples of that value. This is especially useful if you are required by your suppliers to place orders in specific lot sizes. It is also a useful modifier if you have established your own production run sizes. This modifier causes MRP to inflate the required order quantity to an even increment of the pansize value. As with all modifiers you do need to be careful with this modifier as its use could lead to excess inventories.</p>
<p>In other words if it is most efficient to manufacture an item in batches of 10 then the pan size would be 10, and MRP would calculate demand in batches of 10, so would inflate a demand of 17 to 20. For instance, we purchase some chemical materials which is 25 kg/pack. The pansize means you have to purchase at least one pack each time.</p>
<h3>Shrinkage Factor</h3>
- <p>Percentage by which an output falls short of the estimated or planned output.</p>
+ <p>Amount by which an output falls short of the estimated or planned output.</p>
<!--Suggested content: Where is it used? (e.g. scripts, formulas, etc.)-->
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-01-30 06:41:33 UTC (rev 7111)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2015-01-31 18:10:59 UTC (rev 7112)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-01-27 09:44-0600\n"
-"PO-Revision-Date: 2015-01-29 10:45-0600\n"
+"PO-Revision-Date: 2015-01-31 12:03-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -662,7 +662,7 @@
#: AccountSections.php:204
msgid "Review Account Sections"
-msgstr "Revisar se secciones contables"
+msgstr "Revisar secciones contables"
#: AccountSections.php:223
msgid "Could not retrieve the requested section please try again."
@@ -2499,7 +2499,7 @@
#: BOMs.php:452
msgid "Select a Different BOM"
-msgstr "Escojer una HCM diferente"
+msgstr "Seleccione una HCM diferente"
#: BOMs.php:468
msgid "Manufactured parent items"
@@ -3852,7 +3852,7 @@
#: ConfirmDispatchControlled_Invoice.php:27
msgid "Select a line item to invoice"
-msgstr "Seleccionar una fila de artículos a facturar"
+msgstr "Seleccione una fila de artículos a facturar"
#: ConfirmDispatchControlled_Invoice.php:30
msgid ""
@@ -4384,7 +4384,7 @@
#: ConfirmDispatch_Invoice.php:730
msgid "Select a sales order for confirming deliveries and invoicing"
-msgstr "Seleccionar una orden de venta para confirmar entregas y facturar"
+msgstr "Seleccione una orden de venta para confirmar entregas y facturar"
#: ConfirmDispatch_Invoice.php:760
msgid "Could not update the default shipping carrier for this branch because"
@@ -5311,7 +5311,7 @@
#: ContractBOM.php:284 ContractOtherReqts.php:138
msgid "Back To Contract Header"
-msgstr "Regresar a la cabecera de contrato"
+msgstr "Volver a la cabecera de contrato"
#: ContractBOM.php:295 PO_Items.php:1113
msgid "The supplier category details could not be retrieved because"
@@ -5738,7 +5738,7 @@
#: Contracts.php:111
msgid "Back to Contract Selection"
-msgstr "Regresar a la Selección del Contrato"
+msgstr "Volver a la Selección del Contrato"
#: Contracts.php:122 FixedAssetItems.php:38 Manufacturers.php:37
#: Manufacturers.php:109 SalesCategories.php:44 StockClone.php:65
@@ -6767,7 +6767,7 @@
#: CounterReturns.php:1634 CounterSales.php:2198 SelectOrderItems.php:1568
msgid "Select a Stock Category"
-msgstr "Seleccionar una categoría de inventario"
+msgstr "Seleccione una categoría de inventario"
#: CounterReturns.php:1659 CounterSales.php:2221 SelectOrderItems.php:1592
msgid "Enter partial Description"
@@ -6867,7 +6867,7 @@
#: CounterReturns.php:1827
msgid "Are you sure you wish to cancel this return?"
-msgstr "¿Seguro que desea cancelar de esta devolución?"
+msgstr "¿Está seguro que desea cancelar de esta devolución?"
#: CounterSales.php:11 CounterSales.php:230
msgid "Counter Sales"
@@ -7210,7 +7210,7 @@
#: CounterSales.php:2386
msgid "Are you sure you wish to cancel this sale?"
-msgstr "¿Seguro que desea cancelar de esta venta?"
+msgstr "¿Está seguro que desea cancelar de esta venta?"
#: CreditItemsControlled.php:9
msgid "Specify Credited Controlled Items"
@@ -7991,7 +7991,7 @@
#: StockClone.php:50 StockCostUpdate.php:18 StockReorderLevel.php:17
#: Stocks.php:60 WhereUsedInquiry.php:15
msgid "Back to Items"
-msgstr "Volver a Artículos"
+msgstr "Volver a artículos"
#: CustItem.php:50 PurchData.php:62
msgid ""
@@ -8256,7 +8256,7 @@
#: CustLoginSetup.php:15
msgid "Select A Customer"
-msgstr "Seleccionar un cliente"
+msgstr "Seleccione un cliente"
#: CustLoginSetup.php:32 SelectCustomer.php:210 SuppLoginSetup.php:33
msgid " has been selected"
@@ -9598,7 +9598,7 @@
#: CustomerReceipt.php:395
msgid "Act Transfer"
-msgstr "Acta de Transferencia"
+msgstr "Acta de transferencia"
#: CustomerReceipt.php:404 ImportBankTrans.php:459
msgid "The SQL that failed to insert the bank transaction was"
@@ -9830,7 +9830,7 @@
#: CustomerReceipt.php:1174
msgid "Select a Customer"
-msgstr "Seleccionar un cliente"
+msgstr "Seleccione un cliente"
#: CustomerReceipt.php:1177
msgid "Text in the Customer"
@@ -11297,7 +11297,7 @@
#: DiscountCategories.php:169
msgid "Select a part code"
-msgstr "Seleccionar un código de pieza"
+msgstr "Seleccione un código de pieza"
#: DiscountCategories.php:178
msgid "Assign discount category"
@@ -11464,7 +11464,7 @@
#: EDIMessageFormat.php:192
msgid "Review Message Lines"
-msgstr "Revisar Líneas del Mensaje"
+msgstr "Revisar líneas del mensaje"
#: EDIMessageFormat.php:213 EDIMessageFormat.php:215
msgid "Heading"
@@ -12780,7 +12780,7 @@
#: FixedAssetItems.php:14
msgid "Back to Select"
-msgstr "Regresar a la Selección"
+msgstr "Volver a seleccionar"
#: FixedAssetItems.php:17
msgid "Fixed Asset Items"
@@ -13516,7 +13516,7 @@
#: FreightCosts.php:46
msgid "Select the warehouse"
-msgstr "Seleccione Almacén"
+msgstr "Seleccione el almacén"
#: FreightCosts.php:46
msgid "ship from location"
@@ -14121,7 +14121,7 @@
#: GLBudgets.php:82
msgid "Select Account"
-msgstr "Seleccionar Cuenta"
+msgstr "Seleccionar cuenta"
#: GLBudgets.php:83
msgid "Next Account"
@@ -14278,7 +14278,7 @@
#: GLJournal.php:270 GLJournal.php:273
msgid "Reversing"
-msgstr "Inverso"
+msgstr "Reversando"
#: GLJournal.php:271 GLJournal.php:274
msgid "Normal"
@@ -14507,7 +14507,7 @@
#: GLTagProfit_Loss.php:97
msgid "Select tag"
-msgstr "Seleccione centro de costo"
+msgstr "Seleccionar centro de costo"
#: GLTagProfit_Loss.php:128
msgid "Show Statement of Income and Expenditure"
@@ -14979,7 +14979,7 @@
#: GoodsReceived.php:310 GoodsReceived.php:372 GoodsReceived.php:755
msgid "Select a different purchase order for receiving goods against"
msgstr ""
-"Seleccionar una orden de compra distinta para los bienes recibidos respecto a"
+"Seleccione una orden de compra distinta para los bienes recibidos respecto a"
#: GoodsReceived.php:330
msgid "To enter a delivery against this purchase order"
@@ -15211,7 +15211,7 @@
#: GoodsReceivedControlled.php:66
msgid "Back To Purchase Order"
-msgstr "Volver a la orden de compra"
+msgstr "Volver a orden de compra"
#: GoodsReceivedControlled.php:68
msgid "Receive controlled item"
@@ -15260,7 +15260,7 @@
#: HistoricalTestResults.php:130
msgid "Sample ID:"
-msgstr ""
+msgstr "Identificación de muestra:"
#: HistoricalTestResults.php:130 PDFGrn.php:142 PDFStockTransfer.php:135
msgid "Lot/Serial:"
@@ -15634,7 +15634,7 @@
#: InternalStockCategoriesByRole.php:72
msgid "already allowed as internal for this security role"
-msgstr ""
+msgstr "ya permitido como interno para este rol de seguridad"
#: InternalStockCategoriesByRole.php:80
msgid "Stock Category:"
@@ -15662,7 +15662,7 @@
#: InternalStockCategoriesByRole.php:113
msgid "Select User Role"
-msgstr ""
+msgstr "Seleccionar perfil de usuario"
#: InternalStockCategoriesByRole.php:147
msgid "Stock Categories available as internal for role"
@@ -15676,10 +15676,11 @@
#, php-format
msgid "Are you sure you wish to delete this internal stock category code?"
msgstr ""
+"¿Está seguro que desea suprimir este código de categoría inventario interno?"
#: InternalStockCategoriesByRole.php:201
msgid "Select Stock Category Code"
-msgstr "Seleccionar un código de categoría de inventario"
+msgstr "Seleccione un código de categoría de inventario"
#: InternalStockRequest.php:8
msgid "Create an Internal Materials Request"
@@ -15776,7 +15777,7 @@
#: InternalStockRequest.php:227
msgid "Select a Location"
-msgstr "Seleccionar una Ubicación"
+msgstr "Seleccione una ubicación"
#: InternalStockRequest.php:238
msgid "Date when required"
@@ -16814,11 +16815,11 @@
#: Locations.php:440 Manufacturers.php:239
msgid "Review Records"
-msgstr "Revisar Registros"
+msgstr "Revisar registros"
#: Locations.php:503
msgid "Amend Location details"
-msgstr "Modificar Detalles de ubicación"
+msgstr "Corregir detalles de ubicación"
#: Locations.php:515
msgid "New Location details"
@@ -17974,7 +17975,7 @@
#: MaintenanceTasks.php:93 MaintenanceTasks.php:133
#: MaintenanceUserSchedule.php:48
msgid "Task ID"
-msgstr ""
+msgstr "Identificación de tarea"
#: MaintenanceTasks.php:96 MaintenanceUserSchedule.php:51
msgid "Last Completed"
@@ -18131,7 +18132,7 @@
#: Manufacturers.php:272
msgid "Amend Brand Details"
-msgstr ""
+msgstr "Corregir detalles de marca"
#: Manufacturers.php:278
msgid "New Brand/Manufacturer Details"
@@ -19660,7 +19661,7 @@
#: PDFReceipt.php:9
msgid "Sales Receipt"
-msgstr "Recibo de Ventas"
+msgstr "Recibo de ventas"
#: PDFReceipt.php:33
msgid "Customer Receipt Number "
@@ -20010,7 +20011,7 @@
#: PDFWOPrint.php:89
msgid "Select a Work Order"
-msgstr ""
+msgstr "Seleccione una orden de trabajo"
#: PDFWOPrint.php:92
msgid "Select a Work Order Number to Print before calling this page"
@@ -20051,7 +20052,7 @@
#: PDFWOPrint.php:449
msgid "Signed for: "
-msgstr ""
+msgstr "Firmado por:"
#: PDFWOPrint.php:579 PDFWOPrint.php:662 PO_PDFPurchOrder.php:388
msgid "Print or Email the Order"
@@ -21068,7 +21069,7 @@
#: PO_Items.php:776
msgid " excluding Tax"
-msgstr " excluyendo Impuestos"
+msgstr " sin impuestos"
#: PO_Items.php:781
msgid "Update Order Lines"
@@ -21269,7 +21270,7 @@
#: PO_PDFPurchOrder.php:10
msgid "Select a Purchase Order"
-msgstr "Seleccionar una orden de compra"
+msgstr "Seleccione una orden de compra"
#: PO_PDFPurchOrder.php:13
msgid "Select a Purchase Order Number to Print before calling this page"
@@ -21440,7 +21441,7 @@
#: PO_SelectOSPurchOrder.php:216 PO_SelectPurchOrder.php:5
#: PO_SelectPurchOrder.php:165
msgid "Search Purchase Orders"
-msgstr "Buscar Órdenes de Compra"
+msgstr "Buscar órdenes de compra"
#: PO_SelectOSPurchOrder.php:225 PO_SelectPurchOrder.php:179
msgid ""
@@ -21456,7 +21457,7 @@
#: Shipt_Select.php:158 TestPlanResults.php:144 WorkOrderEntry.php:674
#: WorkOrderIssue.php:713
msgid "Select a stock category"
-msgstr "Seleccionar una clase de existencia"
+msgstr "Seleccione una clase de existencia"
#: PO_SelectOSPurchOrder.php:252 PO_SelectPurchOrder.php:201
#: SelectCompletedOrder.php:487 SelectQASamples.php:279
@@ -21556,7 +21557,7 @@
#: PaymentAllocations.php:34
msgid "Back to supplier inquiry"
-msgstr "Volver a Consulta de proveedor"
+msgstr "Volver a consulta de proveedor"
#: PaymentAllocations.php:56
msgid "There may be a problem retrieving the information. No data is returned"
@@ -21907,7 +21908,7 @@
#: Payments.php:433
msgid "Act Transfer From "
-msgstr "Acta de Transferencia de"
+msgstr "Acta de transferencia de"
#: Payments.php:441 Payments.php:588 PcAuthorizeExpenses.php:224
msgid "Cannot insert a bank transaction because"
@@ -22913,7 +22914,7 @@
#: Prices.php:217
msgid "Review Prices"
-msgstr "Revisar Precio"
+msgstr "Revisar precios"
#: Prices.php:223 PricesByCost.php:156 Prices_Customer.php:354
#: RecurringSalesOrders.php:428 SelectWorkOrder.php:337 WorkOrderEntry.php:583
@@ -22940,7 +22941,7 @@
#: Prices.php:344
msgid "Amend Price"
-msgstr "Corregir el precio"
+msgstr "Corregir precio"
#: PricesBasedOnMarkUp.php:5
msgid "Update Pricing"
@@ -23046,8 +23047,8 @@
"Are you sure you wish to update or add all the prices according to the "
"criteria selected?"
msgstr ""
-"¿Seguro que desea actualizar o agregar todos los precios de acuerdo a los "
-"criterios seleccionados?"
+"¿Está seguro que desea actualizar o agregar todos los precios de acuerdo a "
+"los criterios seleccionados?"
#: PricesBasedOnMarkUp.php:177
msgid "No price list is selected to update. No updates will take place"
@@ -23636,7 +23637,7 @@
#: PrintCustStatements.php:416
msgid "Amount received was"
-msgstr "el monto recibido fue"
+msgstr "Monto recibido fue"
#: PrintCustStatements.php:421
msgid "Please make payments to our account:"
@@ -24120,7 +24121,7 @@
#: ProductSpecs.php:546 TestPlanResults.php:803
msgid "Test Name"
-msgstr ""
+msgstr "Nombre de prueba"
#: ProductSpecs.php:603 QATests.php:301
msgid "Show On Cert?"
@@ -24645,7 +24646,7 @@
#: QATests.php:150
msgid "Show All QA Tests"
-msgstr ""
+msgstr "Mostrar todas las pruebas de aseguramiento de calidad"
#: QATests.php:198
msgid "QA Test ID"
@@ -24661,7 +24662,7 @@
#: QATests.php:243
msgid "ASTM, ISO, UL or other"
-msgstr ""
+msgstr "ASTM, ISO, UL u otro"
#: QATests.php:246 QATests.php:391
msgid "Group By"
@@ -24688,7 +24689,7 @@
#: QATests.php:388
msgid "Test ID"
-msgstr ""
+msgstr "Identificación de prueba"
#: QATests.php:395 StockCategories.php:577
msgid "Numeric Value"
@@ -25028,7 +25029,7 @@
#: RelatedItemsUpdate.php:170
msgid "Are you sure you wish to delete this relationship?"
-msgstr ""
+msgstr "¿Está seguro que desea suprimir esta relación?"
#: RelatedItemsUpdate.php:179
msgid "There are no items related set up for this part"
@@ -25040,7 +25041,7 @@
#: RelatedItemsUpdate.php:204
msgid "Amend Relation"
-msgstr ""
+msgstr "Corregir relación"
#: ReorderLevel.php:12 ReorderLevel.php:282
msgid "Reorder Level Report"
@@ -25447,7 +25448,7 @@
#: RevisionTranslations.php:63
msgid "Revised?"
-msgstr ""
+msgstr "¿Revisado?"
#: SMTPServer.php:5
msgid "SMTP Server details"
@@ -25937,7 +25938,7 @@
#: SalesAnalRepts.php:307
#, php-format
msgid "Are you sure you wish to remove this report design?"
-msgstr "¿Desea suprimir este diseño de informe?"
+msgstr "¿Está seguro que desea suprimir este diseño de informe?"
#: SalesAnalRepts.php:332
msgid "Show All Defined Reports"
@@ -26217,7 +26218,7 @@
#: SalesCategories.php:273
#, php-format
msgid "Are you sure you wish to delete this sales category?"
-msgstr "¡Está seguro que desea suprimir esta categoría de ventas?"
+msgstr "¿Está seguro que desea suprimir esta categoría de ventas?"
#: SalesCategories.php:325
msgid "Edit Sub Category"
@@ -26253,7 +26254,7 @@
#: SalesCategories.php:453
msgid "Select Brand"
-msgstr ""
+msgstr "Seleccionar marca"
#: SalesCategories.php:463
msgid "Add Item To Sales Category"
@@ -26840,7 +26841,7 @@
#: SalesTypes.php:156
msgid "Sales type"
-msgstr "Tipos de Venta"
+msgstr "Tipo de venta"
#: SalesTypes.php:156
msgid "price list"
@@ -26925,7 +26926,7 @@
#: SelectAsset.php:5 includes/MainMenuLinksArray.php:405
msgid "Select an Asset"
-msgstr "Seleccionar un activo"
+msgstr "Seleccione un activo"
#: SelectAsset.php:39
msgid ""
@@ -27230,7 +27231,7 @@
#: SelectCreditItems.php:957
msgid "Are you sure you wish to cancel the whole of this credit note?"
-msgstr "¿Seguro que desea cancelar la totalidad de esta nota de crédito?"
+msgstr "¿Está seguro que desea cancelar la totalidad de esta nota de crédito?"
#: SelectCreditItems.php:959
msgid "Process Credit Note"
@@ -27597,11 +27598,11 @@
#: SelectGLAccount.php:88
msgid "Select an Account Code"
-msgstr "Seleccionar un código de cuenta"
+msgstr "Seleccione un código de cuenta"
#: SelectGLAccount.php:115
msgid "Account Type"
-msgstr "Tipo de Cuenta"
+msgstr "Tipo de cuenta"
#: SelectOrderItems.php:12
msgid "Modifying Order"
@@ -27932,7 +27933,7 @@
#: SelectOrderItems.php:1796
msgid "Add Asset To Order"
-msgstr "Agregar un activo a una Orden"
+msgstr "Agregar un activo a una orden"
#: SelectOrderItems.php:1810
msgid "Cancel Whole Order"
@@ -27940,7 +27941,7 @@
#: SelectOrderItems.php:1810
msgid "Are you sure you wish to cancel this entire order?"
-msgstr "¿Seguro que desea cancelar todo el pedido?"
+msgstr "¿Está seguro que desea cancelar todo el pedido?"
#: SelectProduct.php:8
msgid "Search Inventory Items"
@@ -28190,7 +28191,7 @@
#: SelectQASamples.php:159 SelectQASamples.php:242 SelectQASamples.php:483
#: TestPlanResults.php:44 TestPlanResults.php:127 TestPlanResults.php:755
msgid "Sample ID"
-msgstr ""
+msgstr "Identificación de muestra"
#: SelectQASamples.php:242 TestPlanResults.php:127
msgid "Lot Number"
@@ -28198,7 +28199,7 @@
#: SelectQASamples.php:244 TestPlanResults.php:129
msgid "Search Samples"
-msgstr ""
+msgstr "Buscar muestras"
#: SelectQASamples.php:257 TestPlanResults.php:142
msgid ""
@@ -28217,7 +28218,7 @@
#: SelectQASamples.php:389 SelectQASamples.php:488 SelectQASamples.php:544
#: TestPlanResults.php:279 TestPlanResults.php:756
msgid "Specification"
-msgstr ""
+msgstr "Especificación"
#: SelectQASamples.php:391 TestPlanResults.php:281 TestPlanResults.php:757
msgid "Lot / Serial"
@@ -28235,7 +28236,7 @@
#: SelectQASamples.php:394 SelectQASamples.php:504 TestPlanResults.php:284
#: TestPlanResults.php:759
msgid "Sample Date"
-msgstr ""
+msgstr "Fecha de muestra"
#: SelectQASamples.php:396 TestPlanResults.php:286
msgid "Cert Allowed"
@@ -28243,11 +28244,11 @@
#: SelectQASamples.php:411
msgid "Are you sure you wish to delete this Sample ID ?"
-msgstr ""
+msgstr "¿Está seguro que desea suprimir esta identificación de muestra?"
#: SelectQASamples.php:449
msgid "Show All Samples"
-msgstr ""
+msgstr "Mostrar todas las muestras"
#: SelectQASamples.php:492 SelectQASamples.php:552
#: includes/PDFWOPageHeader.inc:45
@@ -30698,7 +30699,7 @@
#: StockClone.php:524
msgid "Review Item Purchase Data."
-msgstr ""
+msgstr "Revisar datos compra de artículos."
#: StockClone.php:525
msgid "Costing was updated for this cloned item."
@@ -31508,7 +31509,7 @@
#: StockLocTransferReceive.php:348
msgid "At"
-msgstr ""
+msgstr "En"
#: StockLocTransferReceive.php:364
msgid "Unable to COMMIT the Stock Transfer transaction"
@@ -31560,7 +31561,7 @@
#: StockLocTransferReceive.php:531
msgid "Select A Different Transfer"
-msgstr "Selecciones una transferencia diferente"
+msgstr "Seleccione una transferencia diferente"
#: StockLocTransferReceive.php:545
msgid "Select Location Receiving Into"
@@ -31898,7 +31899,7 @@
#: StockTransferControlled.php:60 StockTransferControlled.php:63
msgid "Back To Transfer Screen"
-msgstr "Regresar a la Pantalla de Transferencia"
+msgstr "Volver a la Pantalla de Transferencia"
#: StockTransferControlled.php:67
msgid "Transfer of controlled item"
@@ -32499,7 +32500,7 @@
#: SuppContractChgs.php:114 SuppFixedAssetChgs.php:103 SuppInvGRNs.php:163
#: SuppShiptChgs.php:21 SuppTransGLAnalysis.php:147 SupplierInvoice.php:1900
msgid "Back to Invoice Entry"
-msgstr "Regresar a introducción de facturas"
+msgstr "Volver a introducción de facturas"
#: SuppContractChgs.php:136
msgid "Contract Selection"
@@ -34034,7 +34035,7 @@
#: SupplierInquiry.php:18
msgid "Select a Supplier to Inquire On"
-msgstr "Seleccionar un proveedor para Informarse Sobre"
+msgstr "Seleccione un proveedor para Informarse Sobre"
#: SupplierInquiry.php:77 SupplierInquiry.php:99
msgid "The supplier details could not be retrieved by the SQL because"
@@ -34540,7 +34541,7 @@
#: SupplierTenderCreate.php:475
msgid "Save Tender"
-msgstr "Guardar la Licitación"
+msgstr "Guardar licitación"
#: SupplierTenderCreate.php:562 SupplierTenderCreate.php:564
#: SupplierTenderCreate.php:568 SupplierTenderCreate.php:570
@@ -34873,7 +34874,7 @@
#: Suppliers.php:307 Suppliers.php:597
msgid "Review Supplier Contact Details"
-msgstr ""
+msgstr "Revisar detalles del contacto del proveedor"
#: Suppliers.php:329
msgid "The supplier number already exists in the database"
@@ -37009,7 +37010,7 @@
#: TaxGroups.php:208
msgid "Review Existing Groups"
-msgstr "Revisar Grupos Existentes"
+msgstr "Revisar grupos existentes"
#: TaxGroups.php:221
msgid "The selected tax group is no longer available."
@@ -37274,7 +37275,7 @@
#: TestPlanResults.php:724
msgid "Back to Samples"
-msgstr ""
+msgstr "Volver a muestras"
#: TestPlanResults.php:761
msgid "Used for Cert"
@@ -37282,7 +37283,7 @@
#: TestPlanResults.php:807
msgid "Test Date"
-msgstr ""
+msgstr "Fecha de prueba"
#: TestPlanResults.php:808
msgid "Tested By"
@@ -37290,7 +37291,7 @@
#: TestPlanResults.php:809
msgid "Test Result"
-msgstr ""
+msgstr "Resultado de prueba"
#: TestPlanResults.php:810
msgid "On Cert"
@@ -37298,7 +37299,7 @@
#: TestPlanResults.php:920
msgid "Are you sure you wish to delete this Test from this Sample ?"
-msgstr ""
+msgstr "¿Está seguro que desea suprimir esta prueba de esta muestra?"
#: TestPlanResults.php:973
msgid "Copy These Results"
@@ -37433,7 +37434,7 @@
#: UnitsOfMeasure.php:196
msgid "Review Units of Measure"
-msgstr "Revisar Unidades de Medida"
+msgstr "Revisar unidades de medida"
#: UnitsOfMeasure.php:218
msgid "Could not retrieve the requested unit of measure, please try again."
@@ -38024,7 +38025,7 @@
#: WWW_Access.php:94
msgid "security role has been deleted"
-msgstr "Se eliminó el Perfil de Seguridad"
+msgstr "El Perfil de Seguridad fue suprimido"
#: WWW_Access.php:133
#, php-format
@@ -38033,7 +38034,7 @@
#: WWW_Access.php:148
msgid "Review Existing Roles"
-msgstr "Revisar Perfiles Existentes"
+msgstr "Revisar perfiles existentes"
#: WWW_Access.php:160
msgid "The selected role is no longer available."
@@ -38406,7 +38407,7 @@
#: WorkOrderCosting.php:32
msgid "Select a work order"
-msgstr "Seleccionar una orden de trabajo"
+msgstr "Seleccione una orden de trabajo"
#: WorkOrderCosting.php:33
msgid "This page can only be opened if a work order has been selected."
@@ -38601,7 +38602,7 @@
#: WorkOrderEntry.php:49 WorkOrderEntry.php:330 WorkOrderEntry.php:553
msgid "Select an existing work order"
-msgstr "Seleccionar una orden de trabajo existente"
+msgstr "Seleccione una orden de trabajo existente"
#: WorkOrderEntry.php:264
msgid ""
@@ -38683,7 +38684,7 @@
#: WorkOrderEntry.php:470
msgid "Select an existing outstanding work order"
-msgstr "Seleccionar una Orden de Trabajo Pendiente"
+msgstr "Seleccione una Orden de Trabajo Pendiente"
#: WorkOrderEntry.php:509
msgid "Could not get the work order items"
@@ -38976,7 +38977,7 @@
#: WorkOrderReceive.php:40
msgid "Select a work order to receive"
-msgstr "Seleccionar una Orden de Trabajo a recibir"
+msgstr "Seleccione una Orden de Trabajo a recibir"
#: WorkOrderReceive.php:42
msgid ""
@@ -39322,7 +39323,7 @@
#: Z_ChangeBranchCode.php:44
msgid "a unique branch code must be entered for the new code"
-msgstr "debe entrar un código de sucursal único para el nuevo código"
+msgstr "debe introducir un código de sucursal único para el nuevo código"
#: Z_ChangeBranchCode.php:52
msgid "Inserting the new customer branches master record"
@@ -39459,7 +39460,7 @@
#: Z_ChangeCustomerCode.php:34
msgid "a unique customer code must be entered for the new code"
-msgstr "debe introducir un código de cliente único"
+msgstr "debe introducir un código de cliente único para el nuevo código"
#: Z_ChangeCustomerCode.php:41
msgid "Inserting the new debtors master record"
@@ -39581,11 +39582,13 @@
#: Z_ChangeGLAccountCode.php:45
msgid "already exists as a GL account code in the system"
-msgstr ""
+...
[truncated message content] |
|
From: <dai...@us...> - 2015-02-03 08:57:05
|
Revision: 7118
http://sourceforge.net/p/web-erp/reponame/7118
Author: daintree
Date: 2015-02-03 08:56:58 +0000 (Tue, 03 Feb 2015)
Log Message:
-----------
fix bug preventing crediting an invoice that was originally over-delivered
Modified Paths:
--------------
trunk/Credit_Invoice.php
trunk/doc/Change.log
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2015-02-03 08:50:09 UTC (rev 7117)
+++ trunk/Credit_Invoice.php 2015-02-03 08:56:58 UTC (rev 7118)
@@ -494,8 +494,7 @@
foreach($_SESSION['CreditItems' . $identifier]->LineItems as $CreditLine) {
$SQL = "SELECT count(*) FROM salesorderdetails WHERE orderno = '" . $_SESSION['CreditItems'.$identifier]->OrderNo . "'
AND stkcode = '" . $CreditLine->StockID . "'
- AND quantity >=" . $CreditLine->QtyDispatched . "
- AND qtyinvoiced >=" . $CreditLine->QtyDispatched;
+ AND qtyinvoiced >='" . $CreditLine->QtyDispatched . "'";
$ErrMsg = _('Failed to retrieve salesoderdetails to compare if the order has been invoiced and that it is possible that the credit note may not already have been done');
$DuplicateCreditResult = DB_query($SQL,$ErrMsg);
$myrow1 = DB_fetch_array($DuplicateCreditResult);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-02-03 08:50:09 UTC (rev 7117)
+++ trunk/doc/Change.log 2015-02-03 08:56:58 UTC (rev 7118)
@@ -1,4 +1,7 @@
webERP Change Log
+
+3/2/15 Phil: Added more of Andrew Galuski's QA pdf manual to the webERP html manual.
+3/2/15 Andrew Galuski: Fix bug in Credit_Invoice.php that prevented the credit note where the origianal invoice was over delivered compared to the underlying order.
2/2/15 Exson: Remove unecessary suppliercontact sql statement which makes installation failed.
31/01/15 RChacon: Add and modify help text. Spanish translation improvements. Standardise "Account:" to "Account".
30/1/15 Jiro: Updated Traditional Chinese translation under zh_TW.utf8
|
|
From: <dai...@us...> - 2015-02-04 08:23:00
|
Revision: 7122
http://sourceforge.net/p/web-erp/reponame/7122
Author: daintree
Date: 2015-02-04 08:22:52 +0000 (Wed, 04 Feb 2015)
Log Message:
-----------
finish adding Andrews quality documentation
Modified Paths:
--------------
trunk/ProductSpecs.php
trunk/QATests.php
trunk/doc/Manual/ManualOutline.php
trunk/doc/Manual/ManualQualityAssurance.html
Modified: trunk/ProductSpecs.php
===================================================================
--- trunk/ProductSpecs.php 2015-02-04 08:12:21 UTC (rev 7121)
+++ trunk/ProductSpecs.php 2015-02-04 08:22:52 UTC (rev 7122)
@@ -4,7 +4,7 @@
include('includes/session.inc');
$Title = _('Product Specifications Maintenance');
$ViewTopic= 'QualityAssurance';// Filename in ManualContents.php's TOC.
-$BookMark = 'QA';// Anchor's id in the manual's html document.
+$BookMark = 'QA_ProdSpecs';// Anchor's id in the manual's html document.
include('includes/header.inc');
if (isset($_GET['SelectedQATest'])){
Modified: trunk/QATests.php
===================================================================
--- trunk/QATests.php 2015-02-04 08:12:21 UTC (rev 7121)
+++ trunk/QATests.php 2015-02-04 08:22:52 UTC (rev 7122)
@@ -3,6 +3,8 @@
include('includes/session.inc');
$Title = _('QA Tests Maintenance');
+$ViewTopic= 'QualityAssurance';// Filename in ManualContents.php's TOC.
+$BookMark = 'QA_Tests';// Anchor's id in the manual's html document.
include('includes/header.inc');
if (isset($_GET['SelectedQATest'])){
Modified: trunk/doc/Manual/ManualOutline.php
===================================================================
--- trunk/doc/Manual/ManualOutline.php 2015-02-04 08:12:21 UTC (rev 7121)
+++ trunk/doc/Manual/ManualOutline.php 2015-02-04 08:22:52 UTC (rev 7122)
@@ -237,7 +237,15 @@
'Work order issues',
'Closing work orders'),
'QualityAssurance' =>array('Quality Assurance',
- 'Overview'),
+ 'Overview',
+ 'Tests Maintenance',
+ 'Product Specifications',
+ 'Copying Specification',
+ 'Print Product Specification',
+ 'Logging Samples',
+ 'Entering Test Results',
+ 'Print Certificate of Analysis',
+ 'View Historical Results'),
'MRP' => array('Material requirements planning',
'MRP Overview',
'Base data required',
Modified: trunk/doc/Manual/ManualQualityAssurance.html
===================================================================
--- trunk/doc/Manual/ManualQualityAssurance.html 2015-02-04 08:12:21 UTC (rev 7121)
+++ trunk/doc/Manual/ManualQualityAssurance.html 2015-02-04 08:22:52 UTC (rev 7122)
@@ -10,7 +10,7 @@
<p>All menu options for Quality are found under Manufacturing. Your menus may look differnet based on your permissoins. The menus are shown below.</p>
<img src="images/QA_Menus.png" alt="QA Menu options screen" />
-<h2>QA Tests Maintenance</h2>
+<h2><a id="QA_Tests">QA Tests Maintenance</a></h2>
<p>This is where all tests that will be performed are defined. Other specification related information can be captured here that isn’t tested but describes in more detail the product specification. An example of this would be Processing Conditions for your product that you wish for your customers to understand. A specification is made up of any number of tests. The test defines outer tolerances but the specification allows the upper and lower bounds of the test to be specified.</p>
<img src="images/QA_Tests.png" alt="QA Tests screen" />
@@ -30,7 +30,7 @@
<li>Active: once a test has results entered against it delete is no longer allowed. This flag can be used to
inactivate it and not use it on future product specifications.</li>
</ul>
-<h2>Product Specification</h2>
+<h2><a id="QA_ProdSpecs">Product Specification</a></h2>
<p>Product Specifications are a collection of QA Tests that come together to define how a Product Data Sheet is built, what we test for and what we certify our results to. These are loosely tied to Items (Stocks). If a Product Specification is named the same as a stock ID then the Product Description will be used in printed paperwork and screens. If it is not a stock id then it is considered a generic product specification that can be used to hold any type of test results in your system. This also allows cascading templates to be created for faster product specification definition. In the future I foresee there may also be a loose connection to Fixed Assets. A Product Specification is added as soon as a test is added to it.
To start a new specification, go to the Product Specification Screen, Type in a specification Name or stock id and click Submit.</p>
<img src="images/QA_ProductSpecificationMaintenance.png" alt="QA Product specification maintenance screen" />
|
|
From: <dai...@us...> - 2015-02-04 09:15:52
|
Revision: 7123
http://sourceforge.net/p/web-erp/reponame/7123
Author: daintree
Date: 2015-02-04 09:15:50 +0000 (Wed, 04 Feb 2015)
Log Message:
-----------
fix up DB_query calls in QA stuff
Modified Paths:
--------------
trunk/HistoricalTestResults.php
trunk/PDFCOA.php
trunk/PDFProdSpec.php
trunk/ProductSpecs.php
trunk/QATests.php
trunk/SelectQASamples.php
trunk/doc/Manual/ManualQualityAssurance.html
Modified: trunk/HistoricalTestResults.php
===================================================================
--- trunk/HistoricalTestResults.php 2015-02-04 08:22:52 UTC (rev 7122)
+++ trunk/HistoricalTestResults.php 2015-02-04 09:15:50 UTC (rev 7123)
@@ -3,16 +3,20 @@
include('includes/session.inc');
$Title = _('Historical Test Results');
+$ViewTopic= 'QualityAssurance';// Filename in ManualContents.php's TOC.
+$BookMark = 'QA_HistoricalResults';// Anchor's id in the manual's html document.
include('includes/header.inc');
if (isset($_GET['KeyValue'])){
$KeyValue =mb_strtoupper($_GET['KeyValue']);
-} elseif(isset($_POST['KeyValue'])){
+} elseif (isset($_POST['KeyValue'])){
$KeyValue =mb_strtoupper($_POST['KeyValue']);
+} else {
+ $KeyValue='';
}
if (!isset($_POST['FromDate'])){
- $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), strtotime($UpcomingDate . ' - 180 days'));
+ $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), Mktime(0, 0, 0, Date('m'), Date('d')-180, Date('Y')));
}
if (!isset($_POST['ToDate'])){
$_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']);
@@ -20,13 +24,13 @@
if (!Is_Date($_POST['FromDate'])) {
$InputError = 1;
prnMsg(_('Invalid From Date'),'error');
- $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), strtotime($UpcomingDate . ' - 180 days'));
-}
+ $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), Mktime(0, 0, 0, Date('m'), Date('d')-180, Date('Y')));
+}
if (!Is_Date($_POST['ToDate'])) {
$InputError = 1;
prnMsg(_('Invalid To Date'),'error');
$_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']);
-}
+}
$FromDate = FormatDateForSQL($_POST['FromDate']);
$ToDate = FormatDateForSQL($_POST['ToDate']);
if (isset($Errors)) {
@@ -35,12 +39,11 @@
$Errors = array();
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
+echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
//prompt user for Key Value
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
@@ -50,30 +53,33 @@
description
FROM qasamples LEFT OUTER JOIN stockmaster
ON stockmaster.stockid=qasamples.prodspeckey";
-
-$ResultSelection=DB_query($SQLSpecSelect, $db);
+
+$ResultSelection=DB_query($SQLSpecSelect);
echo '<td><select name="KeyValue">';
while ($MyRowSelection=DB_fetch_array($ResultSelection)){
if ($MyRowSelection['prodspeckey']==$KeyValue) {
- $Selected=' selected="selected" ';
+ $Selected='selected="selected" ';
} else {
$Selected='';
}
- echo '<option' . $Selected . ' value="' . $MyRowSelection['prodspeckey'] . '">' . $MyRowSelection['prodspeckey'].' - ' .htmlspecialchars($MyRowSelection['description'], ENT_QUOTES,'UTF-8', false) . '</option>';
+ echo '<option ' . $Selected . ' value="' . $MyRowSelection['prodspeckey'] . '">' . $MyRowSelection['prodspeckey'].' - ' .htmlspecialchars($MyRowSelection['description'], ENT_QUOTES,'UTF-8', false) . '</option>';
}
-echo '</select></td>';
+echo '</select></td>';
echo '</tr>
<tr>
- <td>';
-echo _('From Sample Date') . ': </td><td><input name="FromDate" size="10" class="date" value="' . $_POST['FromDate'] . '"/></td></tr><tr><td> ' . _('To Sample Date') . ':</td><td> <input name="ToDate" size="10" class="date" value="' . $_POST['ToDate'] . '"/> ';
-echo '</td>
+ <td>' . _('From Sample Date') . ': </td>
+ <td><input name="FromDate" size="10" class="date" value="' . $_POST['FromDate'] . '"/></td>
</tr>
+ <tr>
+ <td> ' . _('To Sample Date') . ':</td>
+ <td> <input name="ToDate" size="10" class="date" value="' . $_POST['ToDate'] . '"/></td>
+ </tr>
</table>
</div>
<div>
- <input type="submit" name="pickspec" value="' . _('Submit') . '" />
+ <input type="submit" name="PickSpec" value="' . _('Submit') . '" />
</div>
</form>';
@@ -81,9 +87,9 @@
//show header
$SQLSpecSelect="SELECT description
FROM stockmaster
- WHERE stockmaster.stockid='" .$KeyValue. "'";
+ WHERE stockmaster.stockid='" . $KeyValue . "'";
-$ResultSelection=DB_query($SQLSpecSelect, $db);
+$ResultSelection=DB_query($SQLSpecSelect);
$MyRowSelection=DB_fetch_array($ResultSelection);
$SQLTests="SELECT sampleresults.testid,
sampledate,
@@ -92,30 +98,30 @@
identifier,
cert,
isinspec,
- testvalue,
+ testvalue,
name
FROM qasamples
INNER JOIN sampleresults on sampleresults.sampleid=qasamples.sampleid
INNER JOIN qatests
ON qatests.testid=sampleresults.testid
- WHERE qasamples.prodspeckey='".$KeyValue."'
+ WHERE qasamples.prodspeckey='" . $KeyValue . "'
AND sampleresults.showontestplan='1'
- AND sampledate>='".$FromDate."'
- AND sampledate <='".$ToDate."'";
-
+ AND sampledate>='" . $FromDate . "'
+ AND sampledate <='" . $ToDate . "'";
-$TestResult=DB_query($SQLTests, $db);
+
+$TestResult=DB_query($SQLTests);
$TestsArray=array();
$SamplesArray=array();
$AllResultsArray=array();
$TotResults=0;
while ($MyTestRow=DB_fetch_array($TestResult)) {
$FormattedSampleID=str_pad($MyTestRow['sampleid'],10,'0',STR_PAD_LEFT);
- $testkey=array_search ($MyTestRow['name'] , $TestsArray);
+ $testkey=array_search ($MyTestRow['name'] , $TestsArray);
if ($testkey===false) {
$TestsArray[$MyTestRow['name']]=$MyTestRow['name'];
}
-
+
$testkey=array_search ($MyTestRow['sampleid'] , $SamplesArray);
if ($testkey===false) {
$SamplesArray[$FormattedSampleID]=$MyTestRow;
Modified: trunk/PDFCOA.php
===================================================================
--- trunk/PDFCOA.php 2015-02-04 08:22:52 UTC (rev 7122)
+++ trunk/PDFCOA.php 2015-02-04 09:15:50 UTC (rev 7123)
@@ -40,7 +40,7 @@
</table>
</div>
<div>
- <input type="submit" name="pickspec" value="' . _('Submit') . '" />
+ <input type="submit" name="PickSpec" value="' . _('Submit') . '" />
</div>
</form>
<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
@@ -57,20 +57,20 @@
ON stockmaster.stockid=qasamples.prodspeckey
WHERE cert='1'
ORDER BY lotkey";
-
- $ResultSelection=DB_query($SQLSpecSelect, $db);
+
+ $ResultSelection=DB_query($SQLSpecSelect);
echo '<td><select name="QASampleID" style="font-family: monospace; white-space:pre;">';
echo '<option value="">' . str_pad(_('Lot/Serial'),15,'_'). str_pad(_('Item'),20, '_', STR_PAD_RIGHT). str_pad(_('Description'),20,'_') . '</option>';
while ($MyRowSelection=DB_fetch_array($ResultSelection)){
echo '<option value="' . $MyRowSelection['sampleid'] . '">' . str_pad($MyRowSelection['lotkey'],15, '_', STR_PAD_RIGHT). str_pad($MyRowSelection['prodspeckey'],20,'_') .htmlspecialchars($MyRowSelection['description'], ENT_QUOTES,'UTF-8', false) . '</option>';
}
- echo '</select></td>';
+ echo '</select></td>';
echo '</tr>
</table>
</div>
<div>
- <input type="submit" name="pickspec" value="' . _('Submit') . '" />
+ <input type="submit" name="PickSpec" value="' . _('Submit') . '" />
</div>
</form>';
include('includes/footer.inc');
@@ -89,7 +89,7 @@
testvalue,
sampledate,
groupby
- FROM qasamples INNER JOIN sampleresults
+ FROM qasamples INNER JOIN sampleresults
ON sampleresults.sampleid=qasamples.sampleid
INNER JOIN qatests
ON qatests.testid=sampleresults.testid
@@ -109,7 +109,7 @@
testvalue,
sampledate,
groupby
- FROM qasamples INNER JOIN sampleresults
+ FROM qasamples INNER JOIN sampleresults
ON sampleresults.sampleid=qasamples.sampleid
INNER JOIN qatests
ON qatests.testid=sampleresults.testid
@@ -119,7 +119,7 @@
AND sampleresults.showoncert='1'
ORDER by groupby, sampleresults.testid";
}
-$result=DB_query($sql,$db, $ErrMsg);
+$result=DB_query($sql,$ErrMsg);
//If there are no rows, there's a problem.
if (DB_num_rows($result)==0){
@@ -146,7 +146,7 @@
<br />';
include('includes/footer.inc');
exit;
-}
+}
$PaperSize = 'Letter';
if ($QASampleID>'') {
$myrow=DB_fetch_array($result);
@@ -176,7 +176,7 @@
}
$Spec=$myrow['description'];
$SampleDate=ConvertSQLDate($myrow['sampledate']);
-
+
foreach($SectionsArray as $row) {
if ($myrow['groupby']==$row[0]) {
$SectionColSizes=$row[4];
@@ -189,7 +189,7 @@
include('includes/PDFCOAHeader.inc');
$HeaderPrinted=1;
}
-
+
if ($CurSection!=$myrow['groupby']) {
$SectionHeading=0;
if ($CurSection!='' AND $PrintTrailer==1) {
@@ -204,7 +204,7 @@
}
}
}
-
+
if ($SectionHeading==0) {
$XPos=65;
if ($PrevTrailer>'' AND $PrintTrailer==1) {
@@ -254,16 +254,16 @@
$ColWidth=$SectionColSizes[$x];
$ColAlign=$SectionAlign[$x];
switch ($x) {
- case 0;
+ case 0;
$DispValue=$myrow['name'];
break;
- case 1;
+ case 1;
$DispValue=$Value;
break;
case 2;
$DispValue=$myrow['method'];
break;
- }
+ }
$LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,$ColWidth,$FontSize,$DispValue,$ColAlign,1);
$XPos+=$ColWidth;
$x++;
@@ -305,7 +305,7 @@
FROM config
WHERE confname='QualityCOAText'";
-$result=DB_query($sql,$db, $ErrMsg);
+$result=DB_query($sql, $ErrMsg);
$myrow=DB_fetch_array($result);
$Disclaimer=$myrow[0];
$LeftOvers = $pdf->addTextWrap($XPos+5,$YPos,500,$FontSize,$Disclaimer);
Modified: trunk/PDFProdSpec.php
===================================================================
--- trunk/PDFProdSpec.php 2015-02-04 08:22:52 UTC (rev 7122)
+++ trunk/PDFProdSpec.php 2015-02-04 09:15:50 UTC (rev 7123)
@@ -9,10 +9,11 @@
$SelectedProdSpec=$_GET['KeyValue'];
} elseif (isset($_POST['KeyValue'])) {
$SelectedProdSpec=$_POST['KeyValue'];
+} else {
+ $SelectedProdSpec='';
}
-
//Get Out if we have no product specification
-If (!isset($SelectedProdSpec) || $SelectedProdSpec==""){
+If (!isset($SelectedProdSpec) OR $SelectedProdSpec==''){
$Title = _('Select Product Specification To Print');
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . $Title . '</p>';
@@ -27,7 +28,7 @@
</table>
</div>
<div>
- <input type="submit" name="pickspec" value="' . _('Submit') . '" />
+ <input type="submit" name="PickSpec" value="' . _('Submit') . '" />
</div>
</form>
<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
@@ -40,20 +41,20 @@
description
FROM prodspecs LEFT OUTER JOIN stockmaster
ON stockmaster.stockid=prodspecs.keyval";
-
- $ResultSelection=DB_query($SQLSpecSelect, $db);
+
+ $ResultSelection=DB_query($SQLSpecSelect);
echo '<td><select name="KeyValue">';
while ($MyRowSelection=DB_fetch_array($ResultSelection)){
echo '<option value="' . $MyRowSelection['keyval'] . '">' . $MyRowSelection['keyval'].' - ' .htmlspecialchars($MyRowSelection['description'], ENT_QUOTES,'UTF-8', false) . '</option>';
}
- echo '</select></td>';
+ echo '</select></td>';
echo '</tr>
</table>
</div>
<div>
- <input type="submit" name="pickspec" value="' . _('Submit') . '" />
+ <input type="submit" name="PickSpec" value="' . _('Submit') . '" />
</div>
</form>';
include('includes/footer.inc');
@@ -83,7 +84,7 @@
AND prodspecs.showonspec='1'
ORDER by groupby, prodspecs.testid";
-$result=DB_query($sql,$db, $ErrMsg);
+$result=DB_query($sql,$ErrMsg);
//If there are no rows, there's a problem.
if (DB_num_rows($result)==0){
@@ -110,7 +111,7 @@
<br />';
include('includes/footer.inc');
exit;
-}
+}
$PaperSize = 'Letter';
include('includes/PDFStarter.php');
@@ -148,7 +149,7 @@
include('includes/PDFProdSpecHeader.inc');
$HeaderPrinted=1;
}
-
+
if ($CurSection!=$myrow['groupby']) {
$SectionHeading=0;
if ($CurSection!='' AND $PrintTrailer==1) {
@@ -163,7 +164,7 @@
}
}
}
-
+
if ($SectionHeading==0) {
$XPos=65;
if ($PrevTrailer>'' AND $PrintTrailer==1) {
@@ -220,16 +221,16 @@
$ColWidth=$SectionColSizes[$x];
$ColAlign=$SectionAlign[$x];
switch ($x) {
- case 0;
+ case 0;
$DispValue=$myrow['name'];
break;
- case 1;
+ case 1;
$DispValue=$Value;
break;
case 2;
$DispValue=$myrow['method'];
break;
- }
+ }
$LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,$ColWidth,$FontSize,$DispValue,$ColAlign,1);
$XPos+=$ColWidth;
$x++;
@@ -272,7 +273,7 @@
FROM config
WHERE confname='QualityProdSpecText'";
-$result=DB_query($sql,$db, $ErrMsg);
+$result=DB_query($sql,$ErrMsg);
$myrow=DB_fetch_array($result);
$Disclaimer=$myrow[0];
$LeftOvers = $pdf->addTextWrap($XPos+5,$YPos,500,$FontSize,$Disclaimer);
@@ -281,7 +282,7 @@
$LeftOvers = $pdf->addTextWrap($XPos+5,$YPos,445,$FontSize, $LeftOvers, 'left');
}
-$pdf->OutputI($_SESSION['DatabaseName'] . 'ProductSpecification' . date('Y-m-d') . '.pdf');
+$pdf->OutputI($_SESSION['DatabaseName'] . '_ProductSpecification_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
?>
\ No newline at end of file
Modified: trunk/ProductSpecs.php
===================================================================
--- trunk/ProductSpecs.php 2015-02-04 08:22:52 UTC (rev 7122)
+++ trunk/ProductSpecs.php 2015-02-04 09:15:50 UTC (rev 7123)
@@ -40,13 +40,14 @@
if (isset($_GET['CopySpec']) OR isset($_POST['CopySpec'])) {
if (!isset($_POST['CopyTo']) OR $_POST['CopyTo']=='' ) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo _('Enter The Item, Fixed Asset or Template to Copy this Specification to') . ':<input type="text" name="CopyTo" size="25" maxlength="25" />';
- echo '<div class="centre">
- <input type="hidden" name="KeyValue" value="' . $KeyValue . '" />
- <input type="submit" name="CopySpec" value="' . _('Copy') . '" />
- </div></form>';
+ echo '<div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo _('Enter The Item, Fixed Asset or Template to Copy this Specification to') . ':<input type="text" name="CopyTo" size="25" maxlength="25" />
+ <div class="centre">
+ <input type="hidden" name="KeyValue" value="' . $KeyValue . '" />
+ <input type="submit" name="CopySpec" value="' . _('Copy') . '" />
+ </div>
+ </form>';
include('includes/footer.inc');
exit;
} else {
@@ -105,6 +106,7 @@
<table class="selection">
<tr>
<td>' . _('Or Select Existing Specification') .':</td>';
+
$SQLSpecSelect="SELECT DISTINCT(keyval),
description
FROM prodspecs LEFT OUTER JOIN stockmaster
@@ -274,7 +276,7 @@
showontestplan,
active
FROM qatests WHERE testid='" .$_POST['AddTestID' .$i]. "'";
- echo $sql;
+ //echo $sql;
$msg = _('A Product Specification record has been added for Test ID') . ' ' . $_POST['AddTestID' .$i] . ' for ' . ' ' . $KeyValue ;
$ErrMsg = _('The insert of the Product Specification failed because');
$DbgMsg = _('The SQL that was used and failed was');
Modified: trunk/QATests.php
===================================================================
--- trunk/QATests.php 2015-02-04 08:22:52 UTC (rev 7122)
+++ trunk/QATests.php 2015-02-04 09:15:50 UTC (rev 7123)
@@ -47,7 +47,7 @@
}
$sql= "SELECT COUNT(*) FROM qatests WHERE qatests.name='".$_POST['QATestName']."'
AND qatests.testid <> '" .$SelectedQATest. "'";
- $result = DB_query($sql,$db);
+ $result = DB_query($sql);
$myrow = DB_fetch_row($result);
if ($myrow[0]>0) {
$InputError = 1;
@@ -108,7 +108,7 @@
//run the SQL from either of the above possibilites
$ErrMsg = _('The insert or update of the QA Test failed because');
$DbgMsg = _('The SQL that was used and failed was');
- $result = DB_query($sql,$db,$ErrMsg, $DbgMsg);
+ $result = DB_query($sql,$ErrMsg, $DbgMsg);
prnMsg($msg , 'success');
@@ -139,7 +139,7 @@
} else {
$sql="DELETE FROM qatests WHERE testid='". $SelectedQATest."'";
$ErrMsg = _('The QA Test could not be deleted because');
- $result = DB_query($sql,$db,$ErrMsg);
+ $result = DB_query($sql,$ErrMsg);
prnMsg(_('QA Test') . ' ' . $SelectedQATest . ' ' . _('has been deleted from the database'),'success');
unset ($SelectedQATest);
@@ -176,7 +176,7 @@
FROM qatests
WHERE testid='".$SelectedQATest."'";
- $result = DB_query($sql, $db);
+ $result = DB_query($sql);
$myrow = DB_fetch_array($result);
$_POST['SelectedQATest'] = $myrow['testid'];
@@ -383,7 +383,7 @@
active
FROM qatests
ORDER BY name";
- $result = DB_query($sql,$db);
+ $result = DB_query($sql);
echo '<table class="selection">';
echo '<tr>
Modified: trunk/SelectQASamples.php
===================================================================
--- trunk/SelectQASamples.php 2015-02-04 08:22:52 UTC (rev 7122)
+++ trunk/SelectQASamples.php 2015-02-04 09:15:50 UTC (rev 7123)
@@ -3,6 +3,8 @@
include('includes/session.inc');
$Title = _('Select QA Samples');
+$ViewTopic= 'QualityAssurance';// Filename in ManualContents.php's TOC.
+$BookMark = 'QA_Samples';// Anchor's id in the manual's html document.
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -28,7 +30,7 @@
$SampleID = $_POST['SampleID'];
}
if (!isset($_POST['FromDate'])){
- $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), strtotime($UpcomingDate . ' - 15 days'));
+ $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), Mktime(0, 0, 0, Date('m'), Date('d')-15, Date('Y')));
}
if (!isset($_POST['ToDate'])){
$_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']);
@@ -56,9 +58,9 @@
if (isset($SelectedSampleID) AND $InputError !=1) {
//check to see all values are in spec or at least entered
$result = DB_query("SELECT count(sampleid) FROM sampleresults
- WHERE sampleid = '".$SelectedSampleID."'
+ WHERE sampleid = '" . $SelectedSampleID . "'
AND showoncert='1'
- AND testvalue=''", $db);
+ AND testvalue=''");
$myrow = DB_fetch_row($result);;
if($myrow[0]>0 AND $_POST['Cert']=='1') {
$_POST['Cert']='0';
@@ -68,7 +70,7 @@
$result = DB_query("SELECT count(sampleid) FROM sampleresults
WHERE sampleid = '".$SelectedSampleID."'
AND showoncert='1'
- AND isinspec='0'", $db);
+ AND isinspec='0'");
$myrow = DB_fetch_row($result);;
if($myrow[0]>0 AND $_POST['Cert']=='1') {
$msg = _('Some Results are out of Spec');
@@ -78,26 +80,26 @@
comments='" . $_POST['Comments'] . "',
sampledate='" . FormatDateForSQL($_POST['SampleDate']) . "',
cert='" . $_POST['Cert'] . "'
- WHERE sampleid = '".$SelectedSampleID."'";
+ WHERE sampleid = '" . $SelectedSampleID . "'";
$msg = _('QA Sample record for') . ' ' . $SelectedSampleID . ' ' . _('has been updated');
$ErrMsg = _('The update of the QA Sample failed because');
$DbgMsg = _('The SQL that was used and failed was');
- $result = DB_query($sql,$db,$ErrMsg, $DbgMsg);
+ $result = DB_query($sql,$ErrMsg, $DbgMsg);
prnMsg($msg , 'success');
if ( $_POST['Cert']==1) {
$result = DB_query("SELECT prodspeckey, lotkey FROM qasamples
- WHERE sampleid = '".$SelectedSampleID."'", $db);
+ WHERE sampleid = '".$SelectedSampleID."'");
$myrow = DB_fetch_row($result);;
if($myrow[0]>'') {
$sql = "UPDATE qasamples SET cert='0'
- WHERE sampleid <> '".$SelectedSampleID."'
- AND prodspeckey='".$myrow[0]."'
- AND lotkey='".$myrow[1]."'";
+ WHERE sampleid <> '".$SelectedSampleID . "'
+ AND prodspeckey='" . $myrow[0] . "'
+ AND lotkey='" . $myrow[1] . "'";
$msg = _('All other samples for this Specification and Lot was marked as Cert=No');
$ErrMsg = _('The update of the QA Sample failed because');
$DbgMsg = _('The SQL that was used and failed was');
- $result = DB_query($sql,$db,$ErrMsg, $DbgMsg);
+ $result = DB_query($sql,$ErrMsg, $DbgMsg);
prnMsg($msg , 'success');
}
}
@@ -107,7 +109,7 @@
$SelectedSampleID=DB_Last_Insert_ID($db,'qasamples','sampleid');
if ($SelectedSampleID > '') {
$msg = _('Created New Sample');
- prnMsg($msg , 'success');
+ prnMsg($msg , 'success');
}
}
unset($SelectedSampleID);
@@ -115,25 +117,25 @@
unset($_POST['LotKey']);
unset($_POST['Identifier']);
unset($_POST['Comments']);
- unset($_POST['Cert']);
+ unset($_POST['Cert']);
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
// PREVENT DELETES IF DEPENDENT RECORDS
$sql= "SELECT COUNT(*) FROM sampleresults WHERE sampleresults.sampleid='".$SelectedSampleID."'
- AND sampleresults.testvalue>''";
- $result = DB_query($sql,$db);
+ AND sampleresults.testvalue > ''";
+ $result = DB_query($sql);
$myrow = DB_fetch_row($result);
if ($myrow[0]>0) {
prnMsg(_('Cannot delete this Sample ID because there are test results tied to it'),'error');
} else {
- $sql="DELETE FROM sampleresults WHERE sampleid='". $SelectedSampleID."'";
+ $sql="DELETE FROM sampleresults WHERE sampleid='" . $SelectedSampleID . "'";
$ErrMsg = _('The sample results could not be deleted because');
- $result = DB_query($sql,$db,$ErrMsg);
- $sql="DELETE FROM qasamples WHERE sampleid='". $SelectedSampleID."'";
+ $result = DB_query($sql,$ErrMsg);
+ $sql="DELETE FROM qasamples WHERE sampleid='" . $SelectedSampleID ."'";
$ErrMsg = _('The QA Sample could not be deleted because');
- $result = DB_query($sql,$db,$ErrMsg);
+ $result = DB_query($sql,$ErrMsg);
echo $sql;
prnMsg(_('QA Sample') . ' ' . $SelectedSampleID . _('has been deleted from the database'),'success');
unset ($SelectedSampleID);
@@ -150,7 +152,7 @@
if (isset($_POST['ResetPart'])) {
unset($SelectedStockItem);
}
-
+
if (isset($SampleID) AND $SampleID != '') {
if (!is_numeric($SampleID)) {
prnMsg(_('The Sample ID entered') . ' <U>' . _('MUST') . '</U> ' . _('be numeric'), 'error');
@@ -162,13 +164,13 @@
if (!Is_Date($_POST['FromDate'])) {
$InputError = 1;
prnMsg(_('Invalid From Date'),'error');
- $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), strtotime($UpcomingDate . ' - 15 days'));
- }
+ $_POST['FromDate']=Date(($_SESSION['DefaultDateFormat']), mktime(0, 0, 0, Date('m'), Date('d')-15, Date('Y')));
+ }
if (!Is_Date($_POST['ToDate'])) {
$InputError = 1;
prnMsg(_('Invalid To Date'),'error');
$_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']);
- }
+ }
if (isset($_POST['SearchParts'])) {
if ($_POST['Keywords'] AND $_POST['StockCode']) {
prnMsg(_('Stock description keywords have been used in preference to the Stock code extract entered'), 'info');
@@ -182,7 +184,7 @@
SUM(locstock.quantity) as qoh,
stockmaster.units,
FROM stockmaster INNER JOIN locstock
- ON stockmaster.stockid = locstock.stockid
+ ON stockmaster.stockid = locstock.stockid
INNER JOIN locationusers ON locationusers.loccode = locstock.loccode
AND locationusers.userid='" . $_SESSION['UserID'] . "'
AND locationusers.canview=1
@@ -228,14 +230,20 @@
stockmaster.units
ORDER BY stockmaster.stockid";
}
-
+
$ErrMsg = _('No stock items were returned by the SQL because');
$DbgMsg = _('The SQL used to retrieve the searched parts was');
- $StockItemsResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
+ $StockItemsResult = DB_query($SQL, $ErrMsg, $DbgMsg);
}
- if (true or !isset($LotNumber) or $LotNumber == "") { //revisit later, right now always show all inputs
+ if (true or !isset($LotNumber) or $LotNumber == '') { //revisit later, right now always show all inputs
echo '<table class="selection"><tr><td>';
+ if (!isset($LotNumber)){
+ $LotNumber ='';
+ }
+ if (!isset($SampleID)){
+ $SampleID='';
+ }
if (isset($SelectedStockItem)) {
echo _('For the part') . ':<b>' . $SelectedStockItem . '</b> ' . _('and') . ' <input type="hidden" name="SelectedStockItem" value="' . $SelectedStockItem . '" />';
}
@@ -249,14 +257,13 @@
categorydescription
FROM stockcategory
ORDER BY categorydescription";
- $result1 = DB_query($SQL, $db);
- echo '
- <table class="selection">
+ $result1 = DB_query($SQL);
+ echo '<table class="selection">
<tr>
- <td>';
- echo _('To search for Pick Lists for a specific part use the part selection facilities below') . '</td></tr>';
- echo '<tr>
- <td>' . _('Select a stock category') . ':<select name="StockCat">';
+ <td>' . _('To search for Pick Lists for a specific part use the part selection facilities below') . '</td>
+ </tr>
+ <tr>
+ <td>' . _('Select a stock category') . ':<select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
if (isset($_POST['StockCat']) and $myrow1['categoryid'] == $_POST['StockCat']) {
echo '<option selected="selected" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
@@ -380,7 +387,7 @@
} //no stock item selected
} //end no sample id selected
$ErrMsg = _('No QA samples were returned by the SQL because');
- $SampleResult = DB_query($SQL, $db, $ErrMsg);
+ $SampleResult = DB_query($SQL, $ErrMsg);
if (DB_num_rows($SampleResult) > 0) {
echo '<table cellpadding="2" width="90%" class="selection">';
@@ -410,7 +417,7 @@
$Edit = '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedSampleID=' . $myrow['sampleid'] .'">' . _('Edit') .'</a>';
$Delete = '<a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'?delete=yes&SelectedSampleID=' . $myrow['sampleid'].'" onclick="return confirm(\'' . _('Are you sure you wish to delete this Sample ID ?') . '\');">' . _('Delete').'</a>';
$FormatedSampleDate = ConvertSQLDate($myrow['sampledate']);
-
+
//echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?CopyTest=yes&SelectedSampleID=' .$SelectedSampleID .'">' . _('Copy These Results') . '</a></div>';
//echo '<div class="centre"><a target="_blank" href="'. $RootPath . '/PDFTestPlan.php?SelectedSampleID=' .$SelectedSampleID .'">' . _('Print Testing Worksheet') . '</a></div>';
if ($myrow['cert']==1) {
@@ -418,7 +425,7 @@
} else {
$CertAllowed=_('No');
}
-
+
echo '<td><a href="' . $ModifySampleID . '">' . str_pad($myrow['sampleid'],10,'0',STR_PAD_LEFT) . '</a></td>
<td>' . $myrow['prodspeckey'] . '</td>
<td>' . $myrow['description'] . '</td>
@@ -447,7 +454,7 @@
if (isset($SelectedSampleID)) {
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Show All Samples') . '</a></div>';
-
+
}
if (! isset($_GET['delete'])) {
@@ -464,10 +471,10 @@
comments,
cert,
sampledate
- FROM qasamples
+ FROM qasamples
WHERE sampleid='".$SelectedSampleID."'";
-
- $result = DB_query($sql, $db);
+
+ $result = DB_query($sql);
$myrow = DB_fetch_array($result);
$_POST['ProdSpecKey'] = $myrow['prodspeckey'];
@@ -476,7 +483,7 @@
$_POST['Comments'] = $myrow['comments'];
$_POST['SampleDate'] = ConvertSQLDate($myrow['sampledate']);
$_POST['Cert'] = $myrow['cert'];
-
+
echo '<input type="hidden" name="SelectedSampleID" value="' . $SelectedSampleID . '" />';
echo '<table class="selection">
<tr>
@@ -487,24 +494,24 @@
echo '<tr>
<td>' . _('Specification') . ':</td>
<td>' . $_POST['ProdSpecKey']. '</td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Lot') . ':</td>
<td>' . $_POST['LotKey']. '</td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Identifier') . ':</td>
<td><input type="text" name="Identifier" size="15" maxlength="15" value="' . $_POST['Identifier']. '" /></td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Comments') . ':</td>
<td><input type="text" name="Comments" size="30" maxlength="255" value="' . $_POST['Comments']. '" /></td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Sample Date') . ':</td>
<td><input class="date" type="text" name="SampleDate" size="10" maxlength="10" value="' . $_POST['SampleDate']. '" /></td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Use for Cert?') . ':</td>
<td><select name="Cert">';
if ($_POST['Cert']==1){
@@ -538,30 +545,29 @@
description
FROM prodspecs LEFT OUTER JOIN stockmaster
ON stockmaster.stockid=prodspecs.keyval";
-
- $ResultSelection=DB_query($SQLSpecSelect, $db);
+
+ $ResultSelection=DB_query($SQLSpecSelect);
echo '<tr>
<td>' . _('Specification') . ':</td>';
echo '<td><select name="ProdSpecKey">';
while ($MyRowSelection=DB_fetch_array($ResultSelection)){
echo '<option value="' . $MyRowSelection['keyval'] . '">' . $MyRowSelection['keyval'].' - ' .htmlspecialchars($MyRowSelection['description'], ENT_QUOTES,'UTF-8', false) . '</option>';
}
- echo '</select></td>
- </tr>';
- echo '<tr>
+ echo '</select></td>
+ </tr>
+ <tr>
<td>' . _('Lot') . ':</td>
- <td><input type="text" required="required" name="LotKey" size="15" maxlength="15" value="' . $_POST['LotKey']. '" /></td>
- </tr>';
- echo '<tr>
+ <td><input type="text" required="required" name="LotKey" size="15" maxlength="15" value="' . (isset($_POST['LotKey'])? $_POST['LotKey']:'')...
[truncated message content] |
|
From: <vv...@us...> - 2015-02-05 02:13:03
|
Revision: 7124
http://sourceforge.net/p/web-erp/reponame/7124
Author: vvs2012
Date: 2015-02-05 02:12:56 +0000 (Thu, 05 Feb 2015)
Log Message:
-----------
explode("\r\n", ...) must use double quotes
Modified Paths:
--------------
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2015-02-04 09:15:50 UTC (rev 7123)
+++ trunk/PrintCustTrans.php 2015-02-05 02:12:56 UTC (rev 7124)
@@ -323,7 +323,7 @@
$YPos -= ($line_height);
- $lines=explode('\r\n',htmlspecialchars_decode($myrow2['narrative']));
+ $lines=explode("\r\n",htmlspecialchars_decode($myrow2['narrative']));
for ($i=0;$i<sizeOf($lines);$i++) {
while (mb_strlen($lines[$i])>1) {
if ($YPos-$line_height <= $Bottom_Margin) {
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2015-02-04 09:15:50 UTC (rev 7123)
+++ trunk/PrintCustTransPortrait.php 2015-02-05 02:12:56 UTC (rev 7124)
@@ -388,7 +388,7 @@
}
$YPos -= ($FontSize*$lines);
- $lines=explode('\r\n',htmlspecialchars_decode($myrow2['narrative']));
+ $lines=explode("\r\n",htmlspecialchars_decode($myrow2['narrative']));
for ($i=0;$i<sizeOf($lines);$i++) {
while (mb_strlen($lines[$i])>1){
if ($YPos-$line_height <= $Bottom_Margin){
@@ -465,7 +465,7 @@
$pdf->addTextWrap($Left_Margin, $YPos+3, 280, $FontSize,_('Payment Terms') . ': ' . $myrow['terms']);
$FontSize =8;
- $LeftOvers=explode('\r\n',DB_escape_string($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]);
}
|
|
From: <dai...@us...> - 2015-02-05 23:00:43
|
Revision: 7125
http://sourceforge.net/p/web-erp/reponame/7125
Author: daintree
Date: 2015-02-05 23:00:41 +0000 (Thu, 05 Feb 2015)
Log Message:
-----------
rewrite of Z_ImportChartOfAccounts.php using webERP KISS principles
Modified Paths:
--------------
trunk/Z_ImportChartOfAccounts.php
trunk/doc/Change.log
Modified: trunk/Z_ImportChartOfAccounts.php
===================================================================
--- trunk/Z_ImportChartOfAccounts.php 2015-02-05 02:12:56 UTC (rev 7124)
+++ trunk/Z_ImportChartOfAccounts.php 2015-02-05 23:00:41 UTC (rev 7125)
@@ -1,86 +1,137 @@
<?php
/* $Id$*/
-//$PageSecurity = 11;
-
include('includes/session.inc');
-$Title = _('Import Chart of Accounts');
+$Title = _('Import Chart Of Accounts');
include('includes/header.inc');
-include('xmlrpc/lib/xmlrpc.inc');
-include('api/api_errorcodes.php');
+echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme .
+ '/images/maintenance.png" title="' .
+ _('Import Chart of Accounts from CSV file') . '" />' . ' ' .
+ _('Import Chart of Accounts from CSV file') . '</p>';
-$weberpuser = $_SESSION['UserID'];
-$sql='SELECT password FROM www_users WHERE userid="'.$weberpuser.'"';
-$result=DB_query($sql);
-$myrow=DB_fetch_array($result);
-$weberppassword = $myrow[0];
+$FieldHeadings = array(
+ 'Account Code', // 0 'Account Code
+ 'Description', // 1 'Account Description',
+ 'Account Group' // 2 'Account Group',
+);
-$ServerURL = "http://". $_SERVER['HTTP_HOST'].$RootPath."/api/api_xml-rpc.php";
-$DebugLevel = 0; //Set to 0,1, or 2 with 2 being the highest level of debug info
+if (isset($_FILES['ChartFile']) and $_FILES['ChartFile']['name']) { //start file processing
+ //check file info
+ $FileName = $_FILES['ChartFile']['name'];
+ $TempName = $_FILES['ChartFile']['tmp_name'];
+ $FileSize = $_FILES['ChartFile']['size'];
+ $InputError = 0;
-if (isset($_POST['update'])) {
- $fp = fopen($_FILES['ImportFile']['tmp_name'], "r");
- $buffer = fgets($fp, 4096);
- $FieldNames = explode(',', $buffer);
- $SuccessStyle='style="color:green; font-weight:bold"';
- $FailureStyle='style="color:red; font-weight:bold"';
- echo '<table><tr><th>' . _('Account Code') . '</th><th>' . _('Result') . '</th><th>' . _('Comments') . '</th></tr>';
- $successes=0;
- $failures=0;
- while (!feof ($fp)) {
- $buffer = fgets($fp, 4096);
- $FieldValues = explode(',', $buffer);
- if ($FieldValues[0]!='') {
- for ($i=0; $i<sizeof($FieldValues); $i++) {
- if (mb_substr($FieldNames[$i],0,6)=='group_' or $FieldNames[$i]=='group_') {
- $FieldNames[$i] = mb_substr($FieldNames[$i],0,6);
- $FieldValues[$i] = mb_substr($FieldValues[$i], 0, mb_strlen($FieldValues[$i])-1);
- $FieldValues[$i] = mb_substr($FieldValues[$i], 0, 30);
- }
- $AccountDetails[$FieldNames[$i]]=$FieldValues[$i];
- }
- $account = php_xmlrpc_encode($AccountDetails);
- $user = new xmlrpcval($weberpuser);
- $password = new xmlrpcval($weberppassword);
+ //get file handle
+ $FileHandle = fopen($TempName, 'r');
- $msg = new xmlrpcmsg("weberp.xmlrpc_InsertGLAccount", array($account, $user, $password));
+ //get the header row
+ $HeadRow = fgetcsv($FileHandle, 10000, ',');
- $client = new xmlrpc_client($ServerURL);
- $client->setDebug($DebugLevel);
+ //check for correct number of fields
+ if ( count($HeadRow) != count($FieldHeadings) ) {
+ prnMsg (_('File contains') . ' '. count($HeadRow). ' ' . _('columns, expected') . ' '. count($FieldHeadings) . '<br/>' . _('There should be three column headings:') . ' Account Code, Description, Account Group','error');
+ fclose($FileHandle);
+ include('includes/footer.inc');
+ exit;
+ }
- $response = $client->send($msg);
- $answer = php_xmlrpc_decode($response->value());
- if ($answer[0]==0) {
- echo '<tr '.$SuccessStyle.'><td>' . $AccountDetails['accountcode'] . '</td><td>' . 'Success' . '</td></tr>';
- $successes++;
- } else {
- echo '<tr '.$FailureStyle.'><td>' . $AccountDetails['accountcode'] . '</td><td>' . 'Failure' . '</td><td>';
- for ($i=0; $i<sizeof($answer); $i++) {
- echo 'Error no '.$answer[$i].' - '.$ErrorDescription[$answer[$i]] . '<br />';
- }
- echo '</td></tr>';
- $failures++;
- }
- }
- unset($AccountDetails);
+ //test header row field name and sequence
+ $HeadingColumnNumber = 0;
+ foreach ($HeadRow as $HeadField) {
+ if ( trim(mb_strtoupper($HeadField)) != trim(mb_strtoupper($FieldHeadings[$HeadingColumnNumber]))) {
+ prnMsg (_('The file to import the chart of accounts from contains incorrect column headings') . ' '. mb_strtoupper($HeadField). ' != '. mb_strtoupper($FieldHeadings[$HeadingColumnNumber]). '<br />' . _('There should be three column headings:') . ' Account Code, Description, Account Group','error');
+ fclose($FileHandle);
+ include('includes/footer.inc');
+ exit;
+ }
+ $HeadingColumnNumber++;
}
- echo '<tr><td>' . $successes._(' records successfully imported') . '</td></tr>';
- echo '<tr><td>' . $failures._(' records failed to import') . '</td></tr>';
- echo '</table>';
- fclose ($fp);
-} else {
- prnMsg( _('Select a csv file containing the details of the account codes that you wish to import into webERP. '). '<br />' .
- _('The first line must contain the field names that you wish to import. ').
- '<a href ="Z_DescribeTable.php?table=chartmaster">' . _('The field names can be found here'). '</a>', 'info');
- echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">';
- echo '<div>';
+
+ //start database transaction
+ DB_Txn_Begin();
+
+ //loop through file rows
+ $LineNumber = 1;
+ while ( ($myrow = fgetcsv($FileHandle, 10000, ',')) !== FALSE ) {
+
+ //check for correct number of fields
+ $FieldCount = count($myrow);
+ if ($FieldCount != count($FieldHeadings)){
+ prnMsg (count($FieldHeadings) . ' ' . _('fields required') . ', '. $FieldCount. ' ' . _('fields received'),'error');
+ fclose($FileHandle);
+ include('includes/footer.inc');
+ exit;
+ }
+
+ // cleanup the data (csv files often import with empty strings and such)
+ $AccountCode = mb_strtoupper($myrow[0]);
+ foreach ($myrow as &$value) {
+ $value = trim($value);
+ $value = str_replace('"', '', $value);
+ }
+
+ //Then check that the account group actually exists
+ $sql = "SELECT COUNT(group_) FROM chartmaster WHERE group_='" . $myrow[2] . "'";
+ $result = DB_query($sql);
+ $testrow = DB_fetch_row($result);
+ if ($testrow[0] == 0) {
+ $InputError = 1;
+ prnMsg (_('Account Group') . ' "' . $myrow[2]. '" ' . _('does not exist. First enter the account groups you require in webERP before attempting to import the accounts.'),'error');
+ }
+
+ if ($InputError !=1){
+
+ //Insert the chart record
+ $sql = "INSERT INTO chartmaster (accountcode,
+ accountname,
+ group_
+ ) VALUES (
+ '" . $myrow[0] . "',
+ '" . $myrow[1] . "',
+ '" . $myrow[2] . "')";
+
+ $ErrMsg = _('The general ledger account could not be added because');
+ $DbgMsg = _('The SQL that was used to add the general ledger account that failed was');
+ $result = DB_query($sql, $ErrMsg, $DbgMsg);
+ }
+
+ if ($InputError == 1) { //this row failed so exit loop
+ break;
+ }
+ $LineNumber++;
+ }
+
+ if ($InputError == 1) { //exited loop with errors so rollback
+ prnMsg(_('Failed on row') . ' '. $LineNumber. '. ' . _('Batch import of the chart of accounts has been rolled back.'),'error');
+ DB_Txn_Rollback();
+ } else { //all good so commit data transaction
+ DB_Txn_Commit();
+ prnMsg( _('Batch Import of') .' ' . $FileName . ' '. _('has been completed') . '. ' . _('All general ledger accounts have been added to the chart of accounts'),'success');
+ }
+
+ fclose($FileHandle);
+ //Now create the chartdetails records as necessary for the new chartsmaster records
+ include('includes/GLPostings.inc');
+
+} else { //show file upload form
+
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" class="noPrint" enctype="multipart/form-data">';
+ echo '<div class="centre">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table><tr><td>' . _('File to import') . '</td>' .
- '<td><input type="file" id="ImportFile" name="ImportFile" /></td></tr></table>';
- echo '<div class="centre"><input type="submit" name="update" value="Process" /></div>';
- echo '</div>
- </form>';
+ echo '<div class="page_help_text">' .
+ _('This function loads a chart of accounts from a comma separated variable (csv) file.') . '<br />' .
+ _('The file must contain three columns, and the first row should be the following headers:') . '<br />Account Code, Description, Account Group<br />' .
+ _('followed by rows containing these three fields for each general ledger account to be uploaded.') . '<br />' .
+ _('The Account Group field must have a corresponding entry in the account groups table. So these need to be set up first.') . '</div>';
+
+ echo '<br /><input type="hidden" name="MAX_FILE_SIZE" value="1000000" />' .
+ _('Upload file') . ': <input name="ChartFile" type="file" />
+ <input type="submit" name="submit" value="' . _('Send File') . '" />
+ </div>
+ </form>';
+
}
include('includes/footer.inc');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-02-05 02:12:56 UTC (rev 7124)
+++ trunk/doc/Change.log 2015-02-05 23:00:41 UTC (rev 7125)
@@ -1,5 +1,7 @@
webERP Change Log
-03/02/15 Exson: Fixed date compatible problem for strict sql mode in CopyBOM.php.
+
+5/2/15 Phil: Rewrite of Z_ImportChartOfAccounts.php old script used the api and hard coded based on the database in api_php.php
+3/02/15 Exson: Fixed date compatible problem for strict sql mode in CopyBOM.php.
3/2/15 Phil: Added more of Andrew Galuski's QA pdf manual to the webERP html manual.
3/2/15 Andrew Galuski: Fix bug in Credit_Invoice.php that prevented the credit note where the origianal invoice was over delivered compared to the underlying order.
2/2/15 Exson: Remove unecessary suppliercontact sql statement which makes installation failed.
|
|
From: <dai...@us...> - 2015-02-05 23:43:49
|
Revision: 7126
http://sourceforge.net/p/web-erp/reponame/7126
Author: daintree
Date: 2015-02-05 23:43:45 +0000 (Thu, 05 Feb 2015)
Log Message:
-----------
Pre Version 4.12.1
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/build/make_release.sh
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2015-02-05 23:00:41 UTC (rev 7125)
+++ trunk/UpgradeDatabase.php 2015-02-05 23:43:45 UTC (rev 7126)
@@ -186,6 +186,8 @@
$SQLScripts[] = './sql/mysql/upgrade4.11.3-4.11.4.sql';
case '4.11.5':
$SQLScripts[] = './sql/mysql/upgrade4.11.4-4.12.sql';
+ case '4.12':
+ $SQLScripts[] = './sql/mysql/upgrade4.12-4.12.1.sql';
break;
} //end switch
}
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2015-02-05 23:00:41 UTC (rev 7125)
+++ trunk/build/make_release.sh 2015-02-05 23:43:45 UTC (rev 7126)
@@ -1,6 +1,6 @@
#! /bin/bash
-BASE_DIR=/var/www/webERP;
+BASE_DIR=/usr/share/nginx/html/webERP;
OUTPUT_DIR=/home/phil/Documents/webERP;
MYSQL_USER=root;
MYSQL_PWD=a;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-02-05 23:00:41 UTC (rev 7125)
+++ trunk/doc/Change.log 2015-02-05 23:43:45 UTC (rev 7126)
@@ -1,5 +1,7 @@
webERP Change Log
+6/2/15 Version 4.12.1
+
5/2/15 Phil: Rewrite of Z_ImportChartOfAccounts.php old script used the api and hard coded based on the database in api_php.php
3/02/15 Exson: Fixed date compatible problem for strict sql mode in CopyBOM.php.
3/2/15 Phil: Added more of Andrew Galuski's QA pdf manual to the webERP html manual.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2015-02-05 23:00:41 UTC (rev 7125)
+++ trunk/includes/ConnectDB.inc 2015-02-05 23:43:45 UTC (rev 7126)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.12'; //must update manually every time there is a DB change
+$Version='4.12.1'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
if (!isset($_SESSION['DatabaseName'])){
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-02-05 23:00:41 UTC (rev 7125)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-02-05 23:43:45 UTC (rev 7126)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-27 21:55+1300\n"
+"POT-Creation-Date: 2015-02-06 12:41+1300\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -239,7 +239,7 @@
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
#: GLBalanceSheet.php:387 GLBudgets.php:32 GLJournalInquiry.php:11
-#: GLJournal.php:250 HistoricalTestResults.php:38 InternalStockRequest.php:311
+#: GLJournal.php:250 HistoricalTestResults.php:42 InternalStockRequest.php:311
#: InventoryPlanning.php:354 InventoryPlanningPrefSupplier.php:386
#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:516
#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
@@ -248,7 +248,7 @@
#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:148
#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305
-#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:20
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:22
#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24
#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28
@@ -256,7 +256,7 @@
#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291
#: SelectCustomer.php:265 SelectGLAccount.php:65 SelectOrderItems.php:559
#: SelectOrderItems.php:1463 SelectOrderItems.php:1563 SelectProduct.php:510
-#: SelectQASamples.php:43 SelectSalesOrder.php:512 SelectSupplier.php:14
+#: SelectQASamples.php:45 SelectSalesOrder.php:512 SelectSupplier.php:14
#: SelectSupplier.php:220 SelectWorkOrder.php:9 SelectWorkOrder.php:174
#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
@@ -271,7 +271,7 @@
#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22
#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:31
#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57
-#: ../webSHOP/includes/header.php:216
+#: ../webSHOP/includes/header.php:217
msgid "Search"
msgstr "إبحث"
@@ -313,16 +313,16 @@
#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:600
#: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134
#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
-#: PO_PDFPurchOrder.php:416 ProductSpecs.php:186 ProductSpecs.php:407
-#: ProductSpecs.php:412 ProductSpecs.php:418 ProductSpecs.php:423
-#: ProductSpecs.php:428 ProductSpecs.php:560 ProductSpecs.php:606
-#: ProductSpecs.php:608 ProductSpecs.php:619 ProductSpecs.php:621
-#: ProductSpecs.php:632 ProductSpecs.php:634 ProductSpecs.php:645
-#: ProductSpecs.php:647 PurchData.php:296 PurchData.php:667 PurchData.php:670
-#: QATests.php:291 QATests.php:293 QATests.php:304 QATests.php:306
-#: QATests.php:317 QATests.php:319 QATests.php:330 QATests.php:332
-#: QATests.php:343 QATests.php:345 QATests.php:412 QATests.php:417
-#: QATests.php:422 QATests.php:427 QATests.php:432
+#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409
+#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425
+#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608
+#: ProductSpecs.php:610 ProductSpecs.php:621 ProductSpecs.php:623
+#: ProductSpecs.php:634 ProductSpecs.php:636 ProductSpecs.php:647
+#: ProductSpecs.php:649 PurchData.php:296 PurchData.php:667 PurchData.php:670
+#: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308
+#: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334
+#: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419
+#: QATests.php:424 QATests.php:429 QATests.php:434
#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423
@@ -330,9 +330,9 @@
#: SalesAnalRepts.php:479 SalesCategories.php:264 SalesCategories.php:351
#: SalesCategories.php:355 SalesPeople.php:227 SalesPeople.php:367
#: SalesPeople.php:369 SelectProduct.php:237 SelectProduct.php:362
-#: SelectQASamples.php:417 SelectQASamples.php:511 SelectQASamples.php:513
-#: SelectQASamples.php:568 SelectQASamples.php:570 SelectQASamples.php:582
-#: SelectQASamples.php:584 ShipmentCosting.php:667 ShopParameters.php:289
+#: SelectQASamples.php:424 SelectQASamples.php:518 SelectQASamples.php:520
+#: SelectQASamples.php:574 SelectQASamples.php:576 SelectQASamples.php:588
+#: SelectQASamples.php:590 ShipmentCosting.php:667 ShopParameters.php:289
#: ShopParameters.php:293 ShopParameters.php:337 ShopParameters.php:341
#: ShopParameters.php:391 ShopParameters.php:395 ShopParameters.php:413
#: ShopParameters.php:417 ShopParameters.php:495 ShopParameters.php:499
@@ -377,25 +377,25 @@
#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:601
#: PDFWOPrint.php:605 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 ProductSpecs.php:189 ProductSpecs.php:409
-#: ProductSpecs.php:415 ProductSpecs.php:420 ProductSpecs.php:425
-#: ProductSpecs.php:430 ProductSpecs.php:611 ProductSpecs.php:613
-#: ProductSpecs.php:624 ProductSpecs.php:626 ProductSpecs.php:637
-#: ProductSpecs.php:639 ProductSpecs.php:650 ProductSpecs.php:652
-#: PurchData.php:299 PurchData.php:668 PurchData.php:671 QATests.php:296
-#: QATests.php:298 QATests.php:309 QATests.php:311 QATests.php:322
-#: QATests.php:324 QATests.php:335 QATests.php:337 QATests.php:348
-#: QATests.php:350 QATests.php:414 QATests.php:419 QATests.php:424
-#: QATests.php:429 QATests.php:434 RecurringSalesOrders.php:492
+#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411
+#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
+#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615
+#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639
+#: ProductSpecs.php:641 ProductSpecs.php:652 ProductSpecs.php:654
+#: PurchData.php:299 PurchData.php:668 PurchData.php:671 QATests.php:298
+#: QATests.php:300 QATests.php:311 QATests.php:313 QATests.php:324
+#: QATests.php:326 QATests.php:337 QATests.php:339 QATests.php:350
+#: QATests.php:352 QATests.php:416 QATests.php:421 QATests.php:426
+#: QATests.php:431 QATests.php:436 RecurringSalesOrders.php:492
#: RecurringSalesOrders.php:495 SalesAnalReptCols.php:282
#: SalesAnalReptCols.php:420 SalesAnalReptCols.php:423 SalesAnalRepts.php:419
#: SalesAnalRepts.php:422 SalesAnalRepts.php:447 SalesAnalRepts.php:450
#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:266
#: SalesCategories.php:352 SalesCategories.php:354 SalesPeople.php:229
#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:239
-#: SelectProduct.php:364 SelectQASamples.php:419 SelectQASamples.php:516
-#: SelectQASamples.php:518 SelectQASamples.php:573 SelectQASamples.php:575
-#: SelectQASamples.php:587 SelectQASamples.php:589 ShipmentCosting.php:668
+#: SelectProduct.php:364 SelectQASamples.php:426 SelectQASamples.php:523
+#: SelectQASamples.php:525 SelectQASamples.php:579 SelectQASamples.php:581
+#: SelectQASamples.php:593 SelectQASamples.php:595 ShipmentCosting.php:668
#: ShopParameters.php:290 ShopParameters.php:292 ShopParameters.php:338
#: ShopParameters.php:340 ShopParameters.php:392 ShopParameters.php:394
#: ShopParameters.php:414 ShopParameters.php:416 ShopParameters.php:496
@@ -436,12 +436,12 @@
#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
#: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253
-#: ProductSpecs.php:463 PurchData.php:312 QATests.php:465
+#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:255
#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130
#: SelectCustomer.php:614 SelectCustomer.php:633 SelectCustomer.php:663
#: SelectCustomer.php:681 SelectCustomer.php:705 SelectCustomer.php:722
-#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:410
+#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:417
#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184
@@ -474,15 +474,15 @@
#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:286
-#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:464
-#: PurchData.php:314 PurchData.php:721 QATests.php:466
+#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
+#: PurchData.php:314 PurchData.php:721 QATests.php:468
#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:778
#: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664
#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723
-#: SelectOrderItems.php:1375 SelectQASamples.php:411
+#: SelectOrderItems.php:1375 SelectQASamples.php:418
#: SellThroughSupport.php:299 Shipments.php:440 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
@@ -566,10 +566,10 @@
#: Locations.php:680 Manufacturers.php:312 MRPDemands.php:424
#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146
#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264
-#: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:659
-#: QATests.php:357 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
-#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:524
-#: SelectQASamples.php:595 Shippers.php:203 StockCategories.php:653
+#: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:661
+#: QATests.php:359 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
+#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:531
+#: SelectQASamples.php:601 Shippers.php:203 StockCategories.php:653
#: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327
#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
#: UnitsOfMeasure.php:241 WorkCentres.php:283 WWW_Users.php:774
@@ -673,9 +673,9 @@
#: DeliveryDetails.php:806 DeliveryDetails.php:823 Factors.php:105
#: FixedAssetItems.php:250 MRPCalendar.php:176 PcAssignCashToTab.php:91
#: PcClaimExpensesFromTab.php:82 PcExpenses.php:98 PcTabs.php:104
-#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:313 QATests.php:74
+#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
-#: SelectQASamples.php:83 Stocks.php:589 Suppliers.php:531
+#: SelectQASamples.php:85 Stocks.php:589 Suppliers.php:531
#: SupplierTypes.php:68
msgid "has been updated"
msgstr ""
@@ -691,8 +691,8 @@
#: AddCustomerContacts.php:126 CompanyPreferences.php:173
#: CustomerBranches.php:408 Customers.php:1118 Customers.php:1126
#: ImportBankTransAnalysis.php:207 PrintWOItemSlip.php:184
-#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:162
-#: ProductSpecs.php:383 QATests.php:389 SalesPeople.php:208
+#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:164
+#: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208
#: SelectCustomer.php:609 StockDispatch.php:275 StockDispatch.php:286
#: StockDispatch.php:297 SupplierContacts.php:152 SuppTransGLAnalysis.php:108
#: Tax.php:411 TestPlanResults.php:508 UserLocations.php:176
@@ -828,10 +828,10 @@
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180
#: SelectCustomer.php:660 SelectCustomer.php:702 StockClone.php:926
-#: Stocks.php:1260 UpgradeDatabase.php:238 UpgradeDatabase.php:241
-#: UpgradeDatabase.php:244 UpgradeDatabase.php:247 UpgradeDatabase.php:250
-#: UpgradeDatabase.php:253 UpgradeDatabase.php:256 UpgradeDatabase.php:259
-#: UpgradeDatabase.php:262 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1260 UpgradeDatabase.php:240 UpgradeDatabase.php:243
+#: UpgradeDatabase.php:246 UpgradeDatabase.php:249 UpgradeDatabase.php:252
+#: UpgradeDatabase.php:255 UpgradeDatabase.php:258 UpgradeDatabase.php:261
+#: UpgradeDatabase.php:264 Z_Upgrade_3.10-3.11.php:62
#: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70
#: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78
#: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66
@@ -967,15 +967,15 @@
#: NoSalesItems.php:194 PaymentTerms.php:182 PcExpenses.php:190
#: PcExpenses.php:296 PcExpensesTypeTab.php:171 PcReportTab.php:178
#: PcTypeTabs.php:164 PDFCOA.php:64 PDFOrdersInvoiced.php:335
-#: PDFOrderStatus.php:337 PO_Items.php:716 PO_Items.php:1187
-#: PO_SelectOSPurchOrder.php:263 PO_SelectPurchOrder.php:214
-#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevelLocation.php:73
-#: ReorderLevel.php:298 ReverseGRN.php:397 SalesCategories.php:509
-#: SecurityTokens.php:94 SecurityTokens.php:103 SecurityTokens.php:120
-#: SelectAsset.php:264 SelectCompletedOrder.php:505 SelectContract.php:147
-#: SelectCreditItems.php:1021 SelectOrderItems.php:1473
+#: PDFOrderStatus.php:337 PDFSalesBySalesperson.php:86 PDFWeeklyOrders.php:82
+#: PO_Items.php:716 PO_Items.php:1187 PO_SelectOSPurchOrder.php:263
+#: PO_SelectPurchOrder.php:214 PricesByCost.php:153 RelatedItemsUpdate.php:154
+#: ReorderLevelLocation.php:73 ReorderLevel.php:298 ReverseGRN.php:397
+#: SalesCategories.php:509 SecurityTokens.php:94 SecurityTokens.php:103
+#: SecurityTokens.php:120 SelectAsset.php:264 SelectCompletedOrder.php:505
+#: SelectContract.php:147 SelectCreditItems.php:1021 SelectOrderItems.php:1473
#: SelectOrderItems.php:1635 SelectProduct.php:530 SelectProduct.php:756
-#: SelectQASamples.php:292 SelectQASamples.php:390 SelectSalesOrder.php:560
+#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:560
#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680
#: StockCounts.php:142 StockDispatch.php:504 StockLocStatus.php:173
#: StockQuantityByDate.php:109 Stocks.php:1013 SuppCreditGRNs.php:92
@@ -1080,8 +1080,9 @@
#: MRPReschedules.php:57 MRPShortages.php:155 MRPShortages.php:167
#: OutstandingGRNs.php:46 OutstandingGRNs.php:59 PDFCustomerList.php:20
#: PDFCustomerList.php:232 PDFCustomerList.php:244 PDFLowGP.php:20
-#: PDFSellThroughSupportClaim.php:17 PDFStockCheckComparison.php:33
-#: PDFStockCheckComparison.php:59 PDFStockCheckComparison.php:267
+#: PDFSalesBySalesperson.php:15 PDFSellThroughSupportClaim.php:17
+#: PDFStockCheckComparison.php:33 PDFStockCheckComparison.php:59
+#: PDFStockCheckComparison.php:267 PDFWeeklyOrders.php:15
#: PurchaseByPrefSupplier.php:399 PurchaseByPrefSupplier.php:447
#: PurchaseByPrefSupplier.php:471 PurchaseByPrefSupplier.php:500
#: PurchaseByPrefSupplier.php:531 ReorderLevel.php:60 SelectAsset.php:39
@@ -1124,9 +1125,11 @@
#: PDFGrn.php:176 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147
#: PDFPrintLabel.php:45 PDFQALabel.php:116 PDFQuotation.php:276
#: PDFQuotationPortrait.php:268 PDFRemittanceAdvice.php:83
+#: PDFSalesBySalesperson.php:160 PDFSalesBySalesperson.php:168
#: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86
#: PDFStockCheckComparison.php:37 PDFStockCheckComparison.php:63
-#: PDFStockCheckComparison.php:271 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31
+#: PDFStockCheckComparison.php:271 PDFWeeklyOrders.php:209
+#: PDFWeeklyOrders.php:217 PDFWOPrint.php:109 PO_PDFPurchOrder.php:31
#: PO_PDFPurchOrder.php:156 PrintCustOrder_generic.php:256
#: PrintCustOrder.php:238 PrintWOItemSlip.php:122
#: PurchaseByPrefSupplier.php:402 PurchaseByPrefSupplier.php:450
@@ -1171,7 +1174,7 @@
#: ConfirmDispatch_Invoice.php:172 ConfirmDispatch_Invoice.php:1001
#: ConfirmDispatch_Invoice.php:1015 Contracts.php:592 CounterReturns.php:1024
#: CounterReturns.php:1038 CounterSales.php:1425 CounterSales.php:1439
-#: Credit_Invoice.php:755 Credit_Invoice.php:776 CustItem.php:73
+#: Credit_Invoice.php:754 Credit_Invoice.php:775 CustItem.php:73
#: CustItem.php:86 CustItem.php:197 CustomerReceipt.php:574
#: CustomerReceipt.php:726 CustomerReceipt.php:754 CustomerTransInquiry.php:91
#: Dashboard.php:259 Dashboard.php:439 DeliveryDetails.php:409
@@ -1532,7 +1535,7 @@
#: CustomerTransInquiry.php:98 CustWhereAlloc.php:21 CustWhereAlloc.php:111
#: DailyBankTransactions.php:129 GLAccountInquiry.php:171
#: GLAccountReport.php:341 GLJournal.php:266 MRPReschedules.php:194
-#: ProductSpecs.php:386 QATests.php:255 QATests.php:393
+#: ProductSpecs.php:388 QATests.php:257 QATests.php:395
#: SalesByTypePeriodInquiry.php:356 SelectCustomer.php:424
#: ShipmentCosting.php:536 ShipmentCosting.php:613 StockLocMovements.php:90
#: StockMovements.php:98 SupplierAllocations.php:454 SupplierInquiry.php:210
@@ -1553,7 +1556,7 @@
msgstr ""
#: AuditTrail.php:180 MaterialsNotUsed.php:38 PDFCOA.php:169 PDFCOA.php:170
-#: PDFCOA.php:171 PDFProdSpec.php:129 PDFProdSpec.php:130 PDFProdSpec.php:131
+#: PDFCOA.php:171 PDFProdSpec.php:130 PDFProdSpec.php:131 PDFProdSpec.php:132
#: PurchData.php:700 SellThroughSupport.php:263 ShopParameters.php:197
#: SystemParameters.php:410 includes/PDFOstdgGRNsPageHeader.inc:43
msgid "Value"
@@ -1585,7 +1588,7 @@
#: ReorderLevelLocation.php:72 RevisionTranslations.php:59 SalesPeople.php:207
#: SelectCompletedOrder.php:504 SelectCreditItems.php:1020
#: SelectCustomer.php:420 SelectGLAccount.php:112 SelectOrderItems.php:1472
-#: SelectOrderItems.php:1634 SelectProduct.php:755 SelectQASamples.php:291
+#: SelectOrderItems.php:1634 SelectProduct.php:755 SelectQASamples.php:298
#: SelectSalesOrder.php:559 SelectSupplier.php:280 SelectWorkOrder.php:218
#: SellThroughSupport.php:159 Shipt_Select.php:190 SpecialOrder.php:148
#: StockCategories.php:263 SupplierPriceList.php:270 SupplierPriceList.php:455
@@ -2055,7 +2058,8 @@
#: PDFDeliveryDifferences.php:320 PDFDIFOT.php:201 PDFDIFOT.php:214
#: PDFDIFOT.php:313 PDFFGLabel.php:208 PDFOrdersInvoiced.php:87
#: PDFOrdersInvoiced.php:261 PDFOrderStatus.php:92 PDFOrderStatus.php:274
-#: PDFRemittanceAdvice.php:48 PDFWOPrint.php:503 PO_PDFPurchOrder.php:358
+#: PDFRemittanceAdvice.php:48 PDFSalesBySalesperson.php:65
+#: PDFWeeklyOrders.php:61 PDFWOPrint.php:503 PO_PDFPurchOrder.php:358
#: PricesBasedOnMarkUp.php:219 PricesBasedOnMarkUp.php:358
#: PrintCustStatements.php:46 PrintCustTrans.php:63 PrintCustTrans.php:66
#: PrintCustTransPortrait.php:62 PrintCustTransPortrait.php:65
@@ -2458,7 +2462,8 @@
#: MRPPlannedWorkOrders.php:261 MRPPlannedWorkOrders.php:395 MRPReport.php:413
#: MRPReport.php:419 MRPReschedules.php:195 OffersReceived.php:108
#: OffersReceived.php:218 OffersReceived.php:278 OrderDetails.php:173
-#: PDFOrdersInvoiced.php:377 POReport.php:762 POReport.php:1449
+#: PDFOrdersInvoiced.php:377 PDFSalesBySalesperson.php:87
+#: PDFWeeklyOrders.php:83 POReport.php:762 POReport.php:1449
#: PrintCustTrans.php:896 PrintCustTrans.php:985 PrintCustTrans.php:1034
#: PrintCustTransPortrait.php:949 PrintCustTransPortrait.php:1047
#: PrintCustTransPortrait.php:1103 PrintWOItemSlip.php:155
@@ -2646,7 +2651,7 @@
#: PO_SelectPurchOrder.php:215 PurchaseByPrefSupplier.php:415
#: ReorderLevelLocation.php:75 ReorderLevelLocation.php:76
#: SelectCompletedOrder.php:506 SelectOrderItems.php:1475
-#: SelectOrderItems.php:1638 SelectQASamples.php:293 SelectSalesOrder.php:561
+#: SelectOrderItems.php:1638 SelectQASamples.php:300 SelectSalesOrder.php:561
#: SelectWorkOrder.php:220 Shipt_Select.php:192 TestPlanResults.php:178
#: TopItems.php:174 includes/PDFTopItemsHeader.inc:54
msgid "On Hand"
@@ -2781,14 +2786,14 @@
#: BOMInquiry.php:26 BOMs.php:896 MRPDemands.php:336
#: PO_SelectOSPurchOrder.php:241 PO_SelectPurchOrder.php:190
-#: SelectQASamples.php:268 Shipt_Select.php:169 TestPlanResults.php:153
+#: SelectQASamples.php:275 Shipt_Select.php:169 TestPlanResults.php:153
#: WorkOrderEntry.php:701 WorkOrderIssue.php:732
msgid "Enter text extracts in the"
msgstr ""
#: BOMInquiry.php:26 BOMs.php:896 MRPDemands.php:336
#: PO_SelectOSPurchOrder.php:241 PO_SelectPurchOrder.php:190
-#: SelectQASamples.php:268 Shipt_Select.php:169 TestPlanResults.php:153
+#: SelectQASamples.php:275 Shipt_Select.php:169 TestPlanResults.php:153
#: WorkOrderEntry.php:701 WorkOrderIssue.php:732
msgid "description"
msgstr ""
@@ -2806,7 +2811,7 @@
#: SelectCreditItems.php:1004 SelectCustomer.php:274 SelectCustomer.php:284
#: SelectCustomer.php:293 SelectCustomer.php:303 SelectCustomer.php:350
#: SelectGLAccount.php:79 SelectOrderItems.php:569 SelectOrderItems.php:572
-#: SelectOrderItems.php:1599 SelectProduct.php:537 SelectQASamples.php:273
+#: SelectOrderItems.php:1599 SelectProduct.php:537 SelectQASamples.php:280
#: SelectSalesOrder.php:544 SelectSupplier.php:231 SelectWorkOrder.php:206
#: SellThroughSupport.php:202 Shipt_Select.php:174 SuppFixedAssetChgs.php:126
#: SupplierPriceList.php:49 SupplierPriceList.php:406
@@ -2818,7 +2823,7 @@
#: BOMInquiry.php:29 BOMs.php:899 MRPDemands.php:339
#: PO_SelectOSPurchOrder.php:245 PO_SelectPurchOrder.php:195
-#: SelectQASamples.php:273 Shipt_Select.php:174 TestPlanResults.php:158
+#: SelectQASamples.php:280 Shipt_Select.php:174 TestPlanResults.php:158
#: WorkOrderEntry.php:706 WorkOrderIssue.php:737
msgid "Enter extract of the"
msgstr ""
@@ -2830,7 +2835,7 @@
#: SalesInquiry.php:769 SalesInquiry.php:780 SalesInquiry.php:800
#: SalesInquiry.php:826 SalesInquiry.php:845 SalesInquiry.php:955
#: SalesInquiry.php:1113 SalesInquiry.php:1210 SalesInquiry.php:1228
-#: SelectProduct.php:537 SelectQASamples.php:273 Shipt_Select.php:174
+#: SelectProduct.php:537 SelectQASamples.php:280 Shipt_Select.php:174
#: StockAdjustments.php:141 StockAdjustments.php:430 StockCounts.php:141
#: StockCounts.php:167 StockCounts.php:213 StockMovements.php:36
#: StockReorderLevel.php:51 StockStatus.php:62 StockTransfers.php:48
@@ -2857,7 +2862,7 @@
#: BOMInquiry.php:47 BOMs.php:833 ContractBOM.php:52 MRPDemands.php:56
#: MRPReport.php:578 PO_Items.php:852 PO_SelectOSPurchOrder.php:65
#: PO_SelectPurchOrder.php:48 SelectCompletedOrder.php:97
-#: SelectCreditItems.php:301 SelectProduct.php:558 SelectQASamples.php:174
+#: SelectCreditItems.php:301 SelectProduct.php:558 SelectQASamples.php:176
#: SelectSalesOrder.php:876 SelectWorkOrder.php:51 Shipt_Select.php:61
#: SupplierPriceList.php:76 SupplierTenderCreate.php:731
#: SupplierTenders.php:576 TestPlanResults.php:59 WorkOrderEntry.php:100
@@ -2886,10 +2891,10 @@
#: InternalStockRequest.php:630 InventoryValuation.php:197 MRPReport.php:752
#: NoSalesItems.php:197 OffersReceived.php:109 PO_Items.php:1190
#: PO_SelectOSPurchOrder.php:266 PO_SelectPurchOrder.php:217
-#: ProductSpecs.php:164 ProductSpecs.php:385 QATests.php:251 QATests.php:392
+#: ProductSpecs.php:166 ProductSpecs.php:387 QATests.php:253 QATests.php:394
#: SelectCompletedOrder.php:509 SelectCreditItems.php:1022
#: SelectOrderItems.php:1474 SelectOrderItems.php:1637 SelectProduct.php:131
-#: SelectProduct.php:758 SelectQASamples.php:294 SelectSalesOrder.php:562
+#: SelectProduct.php:758 SelectQASamples.php:301 SelectSalesOrder.php:562
#: SelectWorkOrder.php:221 Shipments.php:402 Shipments.php:489
#: Shipt_Select.php:194 StockLocTransferReceive.php:463
#: SupplierPriceList.php:272 SupplierTenderCreate.php:854
@@ -316...
[truncated message content] |
|
From: <dai...@us...> - 2015-02-06 07:01:17
|
Revision: 7128
http://sourceforge.net/p/web-erp/reponame/7128
Author: daintree
Date: 2015-02-06 07:01:03 +0000 (Fri, 06 Feb 2015)
Log Message:
-----------
Pre 4.12.2
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
Added Paths:
-----------
trunk/sql/mysql/upgrade4.12.1-4.12.2.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2015-02-06 04:24:13 UTC (rev 7127)
+++ trunk/UpgradeDatabase.php 2015-02-06 07:01:03 UTC (rev 7128)
@@ -188,6 +188,8 @@
$SQLScripts[] = './sql/mysql/upgrade4.11.4-4.12.sql';
case '4.12':
$SQLScripts[] = './sql/mysql/upgrade4.12-4.12.1.sql';
+ case '4.12.1':
+ $SQLScripts[] = './sql/mysql/upgrade4.12.1-4.12.2.sql';
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-02-06 04:24:13 UTC (rev 7127)
+++ trunk/doc/Change.log 2015-02-06 07:01:03 UTC (rev 7128)
@@ -1,5 +1,9 @@
webERP Change Log
+6/2/15 Version 4.12.2
+
+6/2/15 Vitaly:Added SQL to add the script LocationUsers.php and the necessary table locationusers
+
6/2/15 Version 4.12.1
5/2/15 Phil: Rewrite of Z_ImportChartOfAccounts.php old script used the api and hard coded based on the database in api_php.php
@@ -11,7 +15,6 @@
30/1/15 Jiro: Updated Traditional Chinese translation under zh_TW.utf8
27/01/15 RChacon: Spanish translation improvements. Note: The "Delete" key (keyboard) is translated to "Suprimir"; for usability, we standardise "borrar", "eliminar", etc. to "suprimir".
-
27/01/15 Version 4.12 release
25/01/15 RChacon: Add $ViewTopic and $BookMark, comments and page_title_text to ImportBankTrans.php. Add info to Manual.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2015-02-06 04:24:13 UTC (rev 7127)
+++ trunk/includes/ConnectDB.inc 2015-02-06 07:01:03 UTC (rev 7128)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.12.1'; //must update manually every time there is a DB change
+$Version='4.12.2'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
if (!isset($_SESSION['DatabaseName'])){
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-02-06 04:24:13 UTC (rev 7127)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-02-06 07:01:03 UTC (rev 7128)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 12:41+1300\n"
+"POT-Creation-Date: 2015-02-06 19:17+1300\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -711,11 +711,12 @@
msgstr ""
#: AddCustomerContacts.php:129 AddCustomerContacts.php:241
-#: CustomerBranches.php:414 CustomerBranches.php:849 CustomerInquiry.php:432
-#: CustomerInquiry.php:474 Customers.php:1121 Customers.php:1129
-#: EmailCustTrans.php:15 EmailCustTrans.php:64 Factors.php:246 Factors.php:297
-#: Locations.php:616 OrderDetails.php:115 PDFRemittanceAdvice.php:251
-#: PDFWOPrint.php:591 PDFWOPrint.php:594 PDFWOPrint.php:674 PDFWOPrint.php:677
+#: CustomerAccount.php:429 CustomerAccount.php:471 CustomerBranches.php:414
+#: CustomerBranches.php:849 CustomerInquiry.php:432 CustomerInquiry.php:474
+#: Customers.php:1121 Customers.php:1129 EmailCustTrans.php:15
+#: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:616
+#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PDFWOPrint.php:591
+#: PDFWOPrint.php:594 PDFWOPrint.php:674 PDFWOPrint.php:677
#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustTrans.php:748
#: PrintCustTrans.php:979 PrintCustTrans.php:1028
#: PrintCustTransPortrait.php:793 PrintCustTransPortrait.php:1039
@@ -804,7 +805,7 @@
#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
#: AgedControlledInventory.php:47 BankMatching.php:281
#: BankReconciliation.php:217 BankReconciliation.php:294
-#: ContractCosting.php:177 CustomerAllocations.php:348
+#: ContractCosting.php:177 CustomerAccount.php:248 CustomerAllocations.php:348
#: CustomerAllocations.php:378 CustomerInquiry.php:251
#: CustomerTransInquiry.php:100 GLAccountInquiry.php:173
#: GLAccountReport.php:343 GLTransInquiry.php:47 MRPCalendar.php:219
@@ -828,10 +829,10 @@
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180
#: SelectCustomer.php:660 SelectCustomer.php:702 StockClone.php:926
-#: Stocks.php:1260 UpgradeDatabase.php:240 UpgradeDatabase.php:243
-#: UpgradeDatabase.php:246 UpgradeDatabase.php:249 UpgradeDatabase.php:252
-#: UpgradeDatabase.php:255 UpgradeDatabase.php:258 UpgradeDatabase.php:261
-#: UpgradeDatabase.php:264 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1260 UpgradeDatabase.php:242 UpgradeDatabase.php:245
+#: UpgradeDatabase.php:248 UpgradeDatabase.php:251 UpgradeDatabase.php:254
+#: UpgradeDatabase.php:257 UpgradeDatabase.php:260 UpgradeDatabase.php:263
+#: UpgradeDatabase.php:266 Z_Upgrade_3.10-3.11.php:62
#: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70
#: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78
#: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66
@@ -1020,16 +1021,16 @@
#: ConfirmDispatch_Invoice.php:309 CounterReturns.php:676
#: CounterReturns.php:756 CounterSales.php:759 CounterSales.php:853
#: CounterSales.php:855 Credit_Invoice.php:299 Credit_Invoice.php:303
-#: CustomerAllocations.php:349 CustomerAllocations.php:379
-#: CustomerInquiry.php:256 DeliveryDetails.php:881 DeliveryDetails.php:950
-#: GLBalanceSheet.php:191 GLBalanceSheet.php:203 GLBalanceSheet.php:293
-#: GLBalanceSheet.php:302 GLBudgets.php:213 GLJournal.php:435
-#: GLTransInquiry.php:195 GLTrialBalance.php:225 GLTrialBalance.php:245
-#: GLTrialBalance.php:266 GLTrialBalance.php:362 GLTrialBalance.php:492
-#: GLTrialBalance.php:512 GLTrialBalance.php:536 GLTrialBalance.php:648
-#: GLTrialBalance.php:668 GLTrialBalance.php:692 InventoryValuation.php:197
-#: MaterialsNotUsed.php:77 OffersReceived.php:111 OrderDetails.php:177
-#: OutstandingGRNs.php:243 PDFCustTransListing.php:137
+#: CustomerAccount.php:253 CustomerAllocations.php:349
+#: CustomerAllocations.php:379 CustomerInquiry.php:256 DeliveryDetails.php:881
+#: DeliveryDetails.php:950 GLBalanceSheet.php:191 GLBalanceSheet.php:203
+#: GLBalanceSheet.php:293 GLBalanceSheet.php:302 GLBudgets.php:213
+#: GLJournal.php:435 GLTransInquiry.php:195 GLTrialBalance.php:225
+#: GLTrialBalance.php:245 GLTrialBalance.php:266 GLTrialBalance.php:362
+#: GLTrialBalance.php:492 GLTrialBalance.php:512 GLTrialBalance.php:536
+#: GLTrialBalance.php:648 GLTrialBalance.php:668 GLTrialBalance.php:692
+#: InventoryValuation.php:197 MaterialsNotUsed.php:77 OffersReceived.php:111
+#: OrderDetails.php:177 OutstandingGRNs.php:243 PDFCustTransListing.php:137
#: PDFOrdersInvoiced.php:379 PDFRemittanceAdvice.php:310
#: PDFSuppTransListing.php:131 RecurringSalesOrders.php:335
#: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430
@@ -1092,8 +1093,9 @@
msgid "Problem Report"
msgstr ""
-#: AgedDebtors.php:269 CustomerInquiry.php:116 CustomerInquiry.php:141
-#: CustomerPurchases.php:29 Dashboard.php:145 DebtorsAtPeriodEnd.php:59
+#: AgedDebtors.php:269 CustomerAccount.php:138 CustomerInquiry.php:116
+#: CustomerInquiry.php:141 CustomerPurchases.php:29 Dashboard.php:145
+#: DebtorsAtPeriodEnd.php:59
msgid "The customer details could not be retrieved by the SQL because"
msgstr ""
@@ -1472,7 +1474,8 @@
#: AuditTrail.php:55 AuditTrail.php:69 ContractBOM.php:306
#: CounterReturns.php:1637 CounterReturns.php:1640 CounterSales.php:2201
-#: CounterSales.php:2204 CustomerBalancesMovement.php:32
+#: CounterSales.php:2204 CustomerAccount.php:190 CustomerAccount.php:195
+#: CustomerAccount.php:199 CustomerBalancesMovement.php:32
#: CustomerBalancesMovement.php:42 CustomerBalancesMovement.php:52
#: CustomerInquiry.php:193 CustomerInquiry.php:198 CustomerInquiry.php:202
#: CustomerTransInquiry.php:32 DailyBankTransactions.php:72
@@ -1530,7 +1533,7 @@
msgstr ""
#: AuditTrail.php:177 BankReconciliation.php:218 BankReconciliation.php:295
-#: CustomerAllocations.php:376 CustomerInquiry.php:249
+#: CustomerAccount.php:246 CustomerAllocations.php:376 CustomerInquiry.php:249
#: CustomerPurchases.php:82 CustomerTransInquiry.php:21
#: CustomerTransInquiry.php:98 CustWhereAlloc.php:21 CustWhereAlloc.php:111
#: DailyBankTransactions.php:129 GLAccountInquiry.php:171
@@ -2306,8 +2309,9 @@
msgstr ""
#: BankReconciliation.php:219 BankReconciliation.php:296
-#: CustomerAllocations.php:347 CustomerAllocations.php:377
-#: CustomerInquiry.php:250 CustomerTransInquiry.php:99 CustWhereAlloc.php:112
+#: CustomerAccount.php:247 CustomerAllocations.php:347
+#: CustomerAllocations.php:377 CustomerInquiry.php:250
+#: CustomerTransInquiry.php:99 CustWhereAlloc.php:112
#: DailyBankTransactions.php:128 EmailCustTrans.php:15
#: GLAccountInquiry.php:172 ImportBankTrans.php:490 PrintCustTrans.php:509
#: PrintCustTrans.php:733 PrintCustTrans.php:966 PrintCustTrans.php:1015
@@ -2326,8 +2330,9 @@
msgstr ""
#: BankReconciliation.php:220 BankReconciliation.php:297
-#: ContractCosting.php:176 CustomerInquiry.php:253 CustomerPurchases.php:89
-#: CustomerReceipt.php:930 CustomerTransInquiry.php:103 CustWhereAlloc.php:113
+#: ContractCosting.php:176 CustomerAccount.php:250 CustomerInquiry.php:253
+#: CustomerPurchases.php:89 CustomerReceipt.php:930
+#: CustomerTransInquiry.php:103 CustWhereAlloc.php:113
#: DailyBankTransactions.php:130 Dashboard.php:54 GLAccountReport.php:342
#: PaymentAllocations.php:64 PaymentAllocations.php:65 Payments.php:920
#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:144
@@ -3812,7 +3817,7 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:279 Contracts.php:778 CustItem.php:144
-#: CustLoginSetup.php:32 CustomerAllocations.php:345
+#: CustLoginSetup.php:32 CustomerAccount.php:159 CustomerAllocations.php:345
#: CustomerBalancesMovement.php:30 CustomerBalancesMovement.php:117
#: CustomerBalancesMovement.php:124 CustomerBranches.php:403
#: CustomerBranches.php:586 CustomerBranches.php:633 CustomerInquiry.php:162
@@ -4552,10 +4557,11 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:1050 CounterSales.php:1474
-#: CustomerInquiry.php:255 CustomerTransInquiry.php:105
-#: DeliveryDetails.php:621 DeliveryDetails.php:627 DeliveryDetails.php:634
-#: DeliveryDetails.php:811 DeliveryDetails.php:817 DeliveryDetails.php:840
-#: MRPReport.php:412 PDFOrdersInvoiced.php:291 PDFOrderStatus.php:292
+#: CustomerAccount.php:252 CustomerInquiry.php:255
+#: CustomerTransInquiry.php:105 DeliveryDetails.php:621
+#: DeliveryDetails.php:627 DeliveryDetails.php:634 DeliveryDetails.php:811
+#: DeliveryDetails.php:817 DeliveryDetails.php:840 MRPReport.php:412
+#: PDFOrdersInvoiced.php:291 PDFOrderStatus.php:292
#: PDFSalesBySalesperson.php:82 PDFWeeklyOrders.php:78
#: SelectCompletedOrder.php:555 SelectContract.php:143
#: SelectOrderItems.php:686 SelectProduct.php:367 Shipments.php:399
@@ -5775,12 +5781,13 @@
msgid "Reset"
msgstr ""
-#: Contracts.php:779 CustomerInquiry.php:252 CustomerTransInquiry.php:102
-#: Dashboard.php:658 FTP_RadioBeacon.php:52 PDFOrdersInvoiced.php:293
-#: PDFOrderStatus.php:294 PDFPriceList.php:427 PricesByCost.php:155
-#: Prices_Customer.php:263 Prices_Customer.php:337 PrintCustTrans.php:844
-#: PrintCustTransPortrait.php:892 SelectCompletedOrder.php:557
-#: SelectCreditItems.php:243 SelectCustomer.php:422 SelectOrderItems.php:595
+#: Contracts.php:779 CustomerAccount.php:249 CustomerInquiry.php:252
+#: CustomerTransInquiry.php:102 Dashboard.php:658 FTP_RadioBeacon.php:52
+#: PDFOrdersInvoiced.php:293 PDFOrderStatus.php:294 PDFPriceList.php:427
+#: PricesByCost.php:155 Prices_Customer.php:263 Prices_Customer.php:337
+#: PrintCustTrans.php:844 PrintCustTransPortrait.php:892
+#: SelectCompletedOrder.php:557 SelectCreditItems.php:243
+#: SelectCustomer.php:422 SelectOrderItems.php:595
#: SelectRecurringSalesOrder.php:92 SelectSalesOrder.php:702
#: SelectSalesOrder.php:719 StockMovements.php:103
#: StockSerialItemResearch.php:84
@@ -5809,10 +5816,10 @@
msgid "Fax"
msgstr ""
-#: Contracts.php:829 CustomerInquiry.php:162 CustomerReceipt.php:1024
-#: PDFRemittanceAdvice.php:275 PO_Header.php:609 PrintCustTrans.php:881
-#: PrintCustTransPortrait.php:933 SupplierInquiry.php:120
-#: includes/PDFQuotationPageHeader.inc:88
+#: Contracts.php:829 CustomerAccount.php:159 CustomerInquiry.php:162
+#: CustomerReceipt.php:1024 PDFRemittanceAdvice.php:275 PO_Header.php:609
+#: PrintCustTrans.php:881 PrintCustTransPortrait.php:933
+#: SupplierInquiry.php:120 includes/PDFQuotationPageHeader.inc:88
#: includes/PDFQuotationPortraitPageHeader.inc:88
#: includes/PDFStatementPageHeader.inc:116 includes/PDFTransPageHeader.inc:162
#: includes/PDFTransPageHeaderPortrait.inc:214
@@ -6569,9 +6576,9 @@
msgid "Picked Up By"
msgstr ""
-#: CounterSales.php:909 CustomerInquiry.php:254 CustomerTransInquiry.php:104
-#: DeliveryDetails.php:1105 OrderDetails.php:125 PO_Header.php:1155
-#: PO_OrderDetails.php:156 RecurringSalesOrders.php:419
+#: CounterSales.php:909 CustomerAccount.php:251 CustomerInquiry.php:254
+#: CustomerTransInquiry.php:104 DeliveryDetails.php:1105 OrderDetails.php:125
+#: PO_Header.php:1155 PO_OrderDetails.php:156 RecurringSalesOrders.php:419
#: SelectQASamples.php:402 SelectQASamples.php:507 SelectQASamples.php:567
#: SpecialOrder.php:613 SupplierCredit.php:602 SupplierInquiry.php:213
#: SupplierInvoice.php:952 SupplierTransInquiry.php:107
@@ -7895,6 +7902,250 @@
msgid "Language"
msgstr ""
+#: CustomerAccount.php:5
+msgid "Customer Account"
+msgstr ""
+
+#: CustomerAccount.php:14
+msgid ""
+"To display the account a customer must first be selected from the customer "
+"selection screen"
+msgstr ""
+
+#: CustomerAccount.php:15
+msgid "Select a Customer Account to Display"
+msgstr ""
+
+#: CustomerAccount.php:28 CustomerInquiry.php:28
+msgid "Failed to retrieve sales data"
+msgstr ""
+
+#: CustomerAccount.php:37
+msgid "There is no salesman data set for this customer"
+msgstr ""
+
+#: CustomerAccount.php:42
+msgid "You have no authority to review this customer account"
+msgstr ""
+
+#: CustomerAccount.php:57 CustomerInquiry.php:57
+msgid "The balance status should be all or zero balance or not zero balance"
+msgstr ""
+
+#: CustomerAccount.php:70 PrintCustStatements.php:116
+msgid "There was a problem retrieving the outstanding transactions for"
+msgstr ""
+
+#: CustomerAccount.php:70 CustomerAccount.php:93 EmailConfirmation.php:43
+#: FTP_RadioBeacon.php:178 PDFCOA.php:81 PDFPickingList.php:224
+#: PDFProdSpec.php:65 PDFQuotation.php:37 PDFQuotation.php:123
+#: PDFQuotationPortrait.php:39 PDFQuotationPortrait.php:125 PDFWOPrint.php:144
+#: PDFWOPrint.php:264 PO_PDFPurchOrder.php:78 PO_PDFPurchOrder.php:209
+#: PrintCustOrder_generic.php:38 PrintCustOrder_generic.php:163
+#: PrintCustOrder.php:39 PrintCustOrder.php:136 PrintCustStatements.php:116
+#: PrintCustStatements.php:139 PrintCustTrans.php:225 PrintCustTrans.php:280
+#: PrintCustTrans.php:702 PrintCustTrans.php:885
+#: PrintCustTransPortrait.php:248 PrintCustTransPortrait.php:305
+#: PrintCustTransPortrait.php:746 PrintCustTransPortrait.php:937
+msgid "from the database"
+msgstr ""
+
+#: CustomerAccount.php:93 PrintCustStatements.php:139
+msgid ""
+"There was a problem retrieving the transactions that were settled over the "
+"course of the last month for"
+msgstr ""
+
+#: CustomerAccount.php:155 CustomerInquiry.php:158
+msgid "Back to Customer Screen"
+msgstr ""
+
+#: CustomerAccount.php:159 CustomerInquiry.php:162 CustomerReceipt.php:1024
+#: SelectOrderItems.php:698 SupplierCredit.php:264 SupplierInquiry.php:122
+#: SupplierInvoice.php:608
+msgid "Terms"
+msgstr ""
+
+#: CustomerAccount.php:159 CustomerInquiry.php:162 CustomerReceipt.php:1024
+#: Customers.php:566 Customers.php:907 Customers.php:937
+msgid "Credit Limit"
+msgstr ""
+
+#: CustomerAccount.php:159 CustomerInquiry.php:162 CustomerReceipt.php:1024
+#: Customers.php:592 Customers.php:974 Customers.php:980
+#: includes/MainMenuLinksArray.php:495
+msgid "Credit Status"
+msgstr ""
+
+#: CustomerAccount.php:163 CustomerInquiry.php:166 CustomerReceipt.php:1028
+msgid "ACCOUNT ON HOLD"
+msgstr ""
+
+#: CustomerAccount.php:168 CustomerInquiry.php:171 CustomerReceipt.php:1034
+#: PrintCustStatements.php:398 SupplierInquiry.php:144
+msgid "Total Balance"
+msgstr ""
+
+#: CustomerAccount.php:169 CustomerInquiry.php:172 CustomerReceipt.php:1035
+#: Dashboard.php:58 PrintCustStatements.php:394 SalesPeople.php:214
+#: Shipments.php:406 StockClone.php:886 StockClone.php:888 Stocks.php:1220
+#: Stocks.php:1222 SupplierInquiry.php:145 WhereUsedInquiry.php:92
+#: includes/PDFAgedDebtorsPageHeader.inc:50
+#: includes/PDFAgedSuppliersPageHeader.inc:36
+msgid "Current"
+msgstr ""
+
+#: CustomerAccount.php:170 CustomerInquiry.php:173 CustomerReceipt.php:1036
+#: SupplierInquiry.php:146
+msgid "Now Due"
+msgstr ""
+
+#: CustomerAccount.php:171 CustomerAccount.php:172 CustomerInquiry.php:174
+#: CustomerInquiry.php:175 CustomerReceipt.php:1037 CustomerReceipt.php:1038
+#: SupplierInquiry.php:147 SupplierInquiry.php:148
+msgid "Days Overdue"
+msgstr ""
+
+#: CustomerAccount.php:172 CustomerInquiry.php:175 CustomerReceipt.php:1038
+#: PrintCustStatements.php:397 SupplierInquiry.php:148
+msgid "Over"
+msgstr ""
+
+#: CustomerAccount.php:186 CustomerInquiry.php:189 SupplierInquiry.php:165
+msgid "Show all transactions after"
+msgstr ""
+
+#: CustomerAccount.php:191 CustomerAccount.php:196 CustomerAccount.php:200
+#: CustomerInquiry.php:194 CustomerInquiry.php:199 CustomerInquiry.php:203
+msgid "Invoices not fully allocated"
+msgstr ""
+
+#: CustomerAccount.php:192 CustomerAccount.php:197 CustomerAccount.php:201
+#: CustomerInquiry.php:195 CustomerInquiry.php:200 CustomerInquiry.php:204
+msgid "Invoices fully allocated"
+msgstr ""
+
+#: CustomerAccount.php:206 CustomerInquiry.php:209 SupplierInquiry.php:166
+msgid "Refresh Inquiry"
+msgstr ""
+
+#: CustomerAccount.php:233 CustomerInquiry.php:236 SupplierInquiry.php:193
+msgid "No transactions were returned by the SQL because"
+msgstr ""
+
+#: CustomerAccount.php:237 CustomerInquiry.php:240 SupplierInquiry.php:199
+msgid "There are no transactions to display since"
+msgstr ""
+
+#: CustomerAccount.php:254 CustomerInquiry.php:257 SupplierInquiry.php:215
+#: Z_CheckAllocationsFrom.php:35 Z_CheckAllocationsFrom.php:60
+#: includes/PDFStatementPageHeader.inc:172
+msgid "Allocated"
+msgstr ""
+
+#: CustomerAccount.php:255 CustomerAllocations.php:382
+#: CustomerAllocations.php:570 CustomerAllocations.php:622
+#: CustomerBalancesMovement.php:121 CustomerBalancesMovement.php:124
+#: CustomerBalancesMovement.php:200 CustomerInquiry.php:258 Dashboard.php:57
+#: Dashboard.php:534 GLAccountInquiry.php:177 SupplierInquiry.php:216
+#: includes/PDFAgedDebtorsPageHeader.inc:49
+#: includes/PDFAgedSuppliersPageHeader.inc:35
+#: includes/PDFDebtorBalsPageHeader.inc:31
+#: includes/PDFOstdgGRNsPageHeader.inc:41
+#: includes/PDFSupplierBalsPageHeader.inc:34
+msgid "Balance"
+msgstr ""
+
+#: CustomerAccount.php:256 CustomerAccount.php:257 CustomerAccount.php:258
+#: CustomerAccount.php:259 CustomerAccount.php:260 CustomerInquiry.php:259
+#: CustomerInquiry.php:260 CustomerInquiry.php:261 CustomerInquiry.php:262
+#: CustomerInquiry.php:263 SupplierAllocations.php:647 SupplierInquiry.php:217
+#: SupplierInquiry.php:218
+msgid "More Info"
+msgstr ""
+
+#: CustomerAccount.php:301 CustomerAccount.php:343 CustomerInquiry.php:304
+#: CustomerInquiry.php:346
+msgid "Credit "
+msgstr ""
+
+#: CustomerAccount.php:302 CustomerAccount.php:344 CustomerInquiry.php:305
+#: CustomerInquiry.php:347
+msgid "Click to credit the invoice"
+msgstr ""
+
+#: CustomerAccount.php:306 CustomerAccount.php:348 CustomerAccount.php:385
+#: CustomerAccount.php:419 CustomerAccount.php:461 CustomerInquiry.php:309
+#: CustomerInquiry.php:351 CustomerInquiry.php:388 CustomerInquiry.php:422
+#: CustomerInquiry.php:464
+msgid "HTML "
+msgstr ""
+
+#: CustomerAccount.php:307 CustomerAccount.php:349 CustomerAccount.php:386
+#: CustomerInquiry.php:310 CustomerInquiry.php:352 CustomerInquiry.php:389
+#: CustomerTransInquiry.php:140
+#, php-format
+msgid "Click to preview the invoice"
+msgstr ""
+
+#: CustomerAccount.php:311 CustomerAccount.php:353 CustomerAccount.php:390
+#: CustomerAccount.php:424 CustomerAccount.php:466 CustomerInquiry.php:314
+#: CustomerInquiry.php:356 CustomerInquiry.php:393 CustomerInquiry.php:427
+#: CustomerInquiry.php:469
+msgid "PDF "
+msgstr ""
+
+#: CustomerAccount.php:312 CustomerAccount.php:354 CustomerAccount.php:391
+#: CustomerAccount.php:425 CustomerAccount.php:467 CustomerInquiry.php:315
+#: CustomerInquiry.php:357 CustomerInquiry.php:394 CustomerInquiry.php:428
+#: CustomerInquiry.php:470 SelectSalesOrder.php:772 SelectSalesOrder.php:799
+#, php-format
+msgid "Click for PDF"
+msgstr ""
+
+#: CustomerAccount.php:316 CustomerAccount.php:358 CustomerAccount.php:395
+#: CustomerInquiry.php:319 CustomerInquiry.php:361 CustomerInquiry.php:398
+msgid "Email "
+msgstr ""
+
+#: CustomerAccount.php:317 CustomerAccount.php:359 CustomerAccount.php:396
+#: CustomerInquiry.php:320 CustomerInquiry.php:362 CustomerInquiry.php:399
+msgid "Click to email the invoice"
+msgstr ""
+
+#: CustomerAccount.php:321 CustomerAccount.php:322 CustomerAccount.php:439
+#: CustomerAccount.php:440 CustomerAccount.php:509 CustomerAccount.php:510
+#: CustomerAccount.php:563 CustomerAccount.php:564 CustomerAccount.php:612
+#: CustomerAccount.php:613 CustomerInquiry.php:324 CustomerInquiry.php:325
+#: CustomerInquiry.php:442 CustomerInquiry.php:443 CustomerInquiry.php:512
+#: CustomerInquiry.php:513 CustomerInquiry.php:566 CustomerInquiry.php:567
+#: CustomerInquiry.php:615 CustomerInquiry.php:616
+msgid "View GL Entries"
+msgstr ""
+
+#: CustomerAccount.php:420 CustomerAccount.php:462 CustomerInquiry.php:423
+#: CustomerInquiry.php:465
+msgid "Click to preview the credit note"
+msgstr ""
+
+#: CustomerAccount.php:430 CustomerAccount.php:472 CustomerInquiry.php:433
+#: CustomerInquiry.php:475
+msgid "Click to email the credit note"
+msgstr ""
+
+#: CustomerAccount.php:434 CustomerAccount.php:476 CustomerAccount.php:501
+#: CustomerAccount.php:531 CustomerAllocations.php:381 CustomerInquiry.php:437
+#: CustomerInquiry.php:479 CustomerInquiry.php:504 CustomerInquiry.php:534
+#: SupplierAllocations.php:460 SupplierInquiry.php:263
+msgid "Allocation"
+msgstr ""
+
+#: CustomerAccount.php:435 CustomerAccount.php:477 CustomerAccount.php:502
+#: CustomerAccount.php:532 CustomerInquiry.php:438 CustomerInquiry.php:480
+#: CustomerInquiry.php:505 CustomerInquiry.php:535 SupplierInquiry.php:262
+msgid "Click to allocate funds"
+msgstr ""
+
#: CustomerAllocations.php:13
msgid "Customer Receipt"
msgstr ""
@@ -8035,29 +8286,10 @@
msgid "This"
msgstr ""
-#: CustomerAllocations.php:381 CustomerInquiry.php:437 CustomerInquiry.php:479
-#: CustomerInquiry.php:504 CustomerInquiry.php:534 SupplierAllocations.php:460
-#: SupplierInquiry.php:263
-msgid "Allocation"
-msgstr ""
-
#: CustomerAllocations.php:382
msgid "Running"
msgstr ""
-#: CustomerAllocations.php:382 CustomerAllocations.php:570
-#: CustomerAllocations.php:622 CustomerBalancesMovement.php:121
-#: CustomerBalancesMovement.php:124 CustomerBalancesMovement.php:200
-#: CustomerInquiry.php:258 Dashboard.php:57 Dashboard.php:534
-#: GLAccountInquiry.php:177 SupplierInquiry.php:216
-#: includes/PDFAgedDebtorsPageHeader.inc:49
-#: includes/PDFAgedSuppliersPageHeader.inc:35
-#: includes/PDFDebtorBalsPageHeader.inc:31
-#: includes/PDFOstdgGRNsPageHeader.inc:41
-#: includes/PDFSupplierBalsPageHeader.inc:34
-msgid "Balance"
-msgstr ""
-
#: CustomerAllocations.php:394
msgid "Being allocated"
msgstr ""
@@ -8623,10 +8855,6 @@
msgid "Select a Customer to Inquire On"
msgstr ""
-#: CustomerInquiry.php:28
-msgid "Failed to retrieve sales data"
-msgstr ""
-
#: CustomerInquiry.php:37
msgid "There is no salesman data set for this debtor"
msgstr ""
@@ -8635,156 +8863,6 @@
msgid "You have no authority to review this data"
msgstr ""
-#: CustomerInquiry.php:57
-msgid "The balance status should be all or zero balance or not zero balance"
-msgstr ""
-
-#: CustomerInquiry.php:158
-msgid "Back to Customer Screen"
-msgstr ""
-
-#: CustomerInquiry.php:162 CustomerReceipt.php:1024 SelectOrderItems.php:698
-#: SupplierCredit.php:264 SupplierInquiry.php:122 SupplierInvoice.php:608
-msgid "Terms"
-msgstr ""
-
-#: CustomerInquiry.php:162 CustomerReceipt.php:1024 Customers.php:566
-#: Customers.php:907 Customers.php:937
-msgid "Credit Limit"
-msgstr ""
-
-#: CustomerInquiry.php:162 CustomerReceipt.php:1024 Customers.php:592
-#: Customers.php:974 Customers.php:980 includes/MainMenuLinksArray.php:495
-msgid "Credit Status"
-msgstr ""
-
-#: CustomerInquiry.php:166 CustomerReceipt.php:1028
-msgid "ACCOUNT ON HOLD"
-msgstr ""
-
-#: CustomerInquiry.php:171 CustomerReceipt.php:1034
-#: PrintCustStatements.php:398 SupplierInquiry.php:144
-msgid "Total Balance"
-msgstr ""
-
-#: CustomerInquiry.php:172 CustomerReceipt.php:1035 Dashboard.php:58
-#: PrintCustStatements.php:394 SalesPeople.php:214 Shipments.php:406
-#: StockClone.php:886 StockClone.php:888 Stocks.php:1220 Stocks.php:1222
-#: SupplierInquiry.php:145 WhereUsedInquiry.php:92
-#: includes/PDFAgedDebtorsPageHeader.inc:50
-#: includes/PDFAgedSuppliersPageHeader.inc:36
-msgid "Current"
-msgstr ""
-
-#: CustomerInquiry.php:173 CustomerReceipt.php:1036 SupplierInquiry.php:146
-msgid "Now Due"
-msgstr ""
-
-#: CustomerInquiry.php:174 CustomerInquiry.php:175 CustomerReceipt.php:1037
-#: CustomerReceipt.php:1038 SupplierInquiry.php:147 SupplierInquiry.php:148
-msgid "Days Overdue"
-msgstr ""
-
-#: CustomerInquiry.php:175 CustomerReceipt.php:1038
-#: PrintCustStatements.php:397 SupplierInquiry.php:148
-msgid "Over"
-msgstr ""
-
-#: CustomerInquiry.php:189 SupplierInquiry.php:165
-msgid "Show all transactions after"
-msgstr ""
-
-#: CustomerInquiry.php:194 CustomerInquiry.php:199 CustomerInquiry.php:203
-msgid "Invoices not fully allocated"
-msgstr ""
-
-#: CustomerInquiry.php:195 CustomerInquiry.php:200 CustomerInquiry.php:204
-msgid "Invoices fully allocated"
-msgstr ""
-
-#: CustomerInquiry.php:209 SupplierInquiry.php:166
-msgid "Refresh Inquiry"
-msgstr ""
-
-#: CustomerInquiry.php:236 SupplierInquiry.php:193
-msgid "No transactions were returned by the SQL because"
...
[truncated message content] |
|
From: <dai...@us...> - 2015-02-06 07:07:25
|
Revision: 7129
http://sourceforge.net/p/web-erp/reponame/7129
Author: daintree
Date: 2015-02-06 07:07:22 +0000 (Fri, 06 Feb 2015)
Log Message:
-----------
pre 4.12.2
Modified Paths:
--------------
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2015-02-06 07:01:03 UTC (rev 7128)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2015-02-06 07:07:22 UTC (rev 7129)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-06 19:17+1300\n"
+"POT-Creation-Date: 2015-02-06 20:01+1300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
Modified: trunk/sql/mysql/country_sql/default.sql
===================================================================
--- trunk/sql/mysql/country_sql/default.sql 2015-02-06 07:01:03 UTC (rev 7128)
+++ trunk/sql/mysql/country_sql/default.sql 2015-02-06 07:07:22 UTC (rev 7129)
@@ -3341,7 +3341,7 @@
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2015-02-06 19:17:44
+-- Dump completed on 2015-02-06 20:01:47
-- MySQL dump 10.14 Distrib 5.5.40-MariaDB, for debian-linux-gnu (x86_64)
--
-- Host: localhost Database: weberpdemo
@@ -6405,7 +6405,7 @@
-- Dumping data for table `www_users`
--
-INSERT INTO `www_users` VALUES ('admin','$2y$10$Q8HLC/2rQaB5NcCcK6V6ZOQG3chIsx16mKtZRoSaUsU9okMBDbUwG','Demonstration user','','','','','ad...@we...','MEL',8,1,'2015-02-06 19:03:06','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,0,50,'xenos','en_GB.utf8',0,0);
+INSERT INTO `www_users` VALUES ('admin','$2y$10$Q8HLC/2rQaB5NcCcK6V6ZOQG3chIsx16mKtZRoSaUsU9okMBDbUwG','Demonstration user','','','','','ad...@we...','MEL',8,1,'2015-02-06 20:00:59','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,0,50,'xenos','en_GB.utf8',0,0);
--
-- Dumping data for table `edi_orders_segs`
@@ -6679,7 +6679,7 @@
INSERT INTO `config` VALUES ('StandardCostDecimalPlaces','2');
INSERT INTO `config` VALUES ('TaxAuthorityReferenceName','');
INSERT INTO `config` VALUES ('UpdateCurrencyRatesDaily','2015-02-06');
-INSERT INTO `config` VALUES ('VersionNumber','4.12.1');
+INSERT INTO `config` VALUES ('VersionNumber','4.12.2');
INSERT INTO `config` VALUES ('WeightedAverageCosting','0');
INSERT INTO `config` VALUES ('WikiApp','0');
INSERT INTO `config` VALUES ('WikiPath','wiki');
@@ -7219,7 +7219,7 @@
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2015-02-06 19:17:44
+-- Dump completed on 2015-02-06 20:01:47
SET FOREIGN_KEY_CHECKS = 1;
UPDATE systypes SET typeno=0;
INSERT INTO shippers VALUES (1,'Default Shipper',0);
Modified: trunk/sql/mysql/country_sql/demo.sql
===================================================================
--- trunk/sql/mysql/country_sql/demo.sql 2015-02-06 07:01:03 UTC (rev 7128)
+++ trunk/sql/mysql/country_sql/demo.sql 2015-02-06 07:07:22 UTC (rev 7129)
@@ -3343,7 +3343,7 @@
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2015-02-06 19:17:44
+-- Dump completed on 2015-02-06 20:01:47
-- MySQL dump 10.14 Distrib 5.5.40-MariaDB, for debian-linux-gnu (x86_64)
--
-- Host: localhost Database: weberpdemo
@@ -7163,7 +7163,7 @@
INSERT INTO `config` VALUES ('StandardCostDecimalPlaces','2');
INSERT INTO `config` VALUES ('TaxAuthorityReferenceName','');
INSERT INTO `config` VALUES ('UpdateCurrencyRatesDaily','2015-02-06');
-INSERT INTO `config` VALUES ('VersionNumber','4.12.1');
+INSERT INTO `config` VALUES ('VersionNumber','4.12.2');
INSERT INTO `config` VALUES ('WeightedAverageCosting','0');
INSERT INTO `config` VALUES ('WikiApp','0');
INSERT INTO `config` VALUES ('WikiPath','wiki');
@@ -11999,12 +11999,12 @@
-- Dumping data for table `www_users`
--
-INSERT INTO `www_users` VALUES ('admin','$2y$10$Q8HLC/2rQaB5NcCcK6V6ZOQG3chIsx16mKtZRoSaUsU9okMBDbUwG','Demonstration user','','','','','ad...@we...','MEL',8,1,'2015-02-06 19:03:06','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,0,50,'xenos','en_GB.utf8',0,0);
+INSERT INTO `www_users` VALUES ('admin','$2y$10$Q8HLC/2rQaB5NcCcK6V6ZOQG3chIsx16mKtZRoSaUsU9okMBDbUwG','Demonstration user','','','','','ad...@we...','MEL',8,1,'2015-02-06 20:00:59','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,0,50,'xenos','en_GB.utf8',0,0);
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2015-02-06 19:17:44
+-- Dump completed on 2015-02-06 20:01:47
SET FOREIGN_KEY_CHECKS = 1;
|
|
From: <dai...@us...> - 2015-02-07 03:24:01
|
Revision: 7133
http://sourceforge.net/p/web-erp/reponame/7133
Author: daintree
Date: 2015-02-07 03:23:51 +0000 (Sat, 07 Feb 2015)
Log Message:
-----------
email.gif in css/images not email.png
Modified Paths:
--------------
trunk/CustomerInquiry.php
trunk/SelectCustomer.php
trunk/SelectOrderItems.php
trunk/build/make_release.sh
trunk/includes/header.inc
trunk/sql/mysql/upgrade4.12-4.13.sql
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2015-02-06 18:47:10 UTC (rev 7132)
+++ trunk/CustomerInquiry.php 2015-02-07 03:23:51 UTC (rev 7133)
@@ -317,7 +317,7 @@
</td>
<td>
<a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email '), '
- <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" />
+ <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the invoice'), '" alt="" />
</a>
</td>
<td>
@@ -359,7 +359,7 @@
</td>
<td>
<a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . '
- <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" />
+ <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the invoice'), '" alt="" />
</a>
</td>
<td></td>
@@ -396,7 +396,7 @@
</td>
<td>
<a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice">', _('Email ') . '
- <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the invoice'), '" alt="" />
+ <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the invoice'), '" alt="" />
</a>
</td>
<td></td>
@@ -430,7 +430,7 @@
</td>
<td>
<a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), '
- <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" />
+ <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the credit note'), '" alt="" />
</a>
</td>
<td>
@@ -472,7 +472,7 @@
</td>
<td>
<a href="', $RootPath, '/EmailCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit">', _('Email'), '
- <img src="', $RootPath, '/css/', $Theme, '/images/email.png" title="', _('Click to email the credit note'), '" alt="" />
+ <img src="', $RootPath, '/css/', $Theme, '/images/email.gif" title="', _('Click to email the credit note'), '" alt="" />
</a>
</td>
<td>
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2015-02-06 18:47:10 UTC (rev 7132)
+++ trunk/SelectCustomer.php 2015-02-07 03:23:51 UTC (rev 7133)
@@ -219,6 +219,7 @@
echo '<tr><td valign="top" class="select">';
/* Customer Inquiry Options */
echo '<a href="' . $RootPath . '/CustomerInquiry.php?CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Customer Transaction Inquiries') . '</a><br />';
+ echo '<a href="' . $RootPath . '/CustomerAccount.php?CustomerID=' . $_SESSION['CustomerID'] . '">' . _('Customer Account statement on screen') . '</a><br />';
echo '<a href="' . $RootPath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '&Modify=No">' . _('View Customer Details') . '</a><br />';
echo '<a href="' . $RootPath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes">' . _('Print Customer Statement') . '</a><br />';
echo '<a href="' . $RootPath . '/SelectCompletedOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Inquiries') . '</a><br />';
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2015-02-06 18:47:10 UTC (rev 7132)
+++ trunk/SelectOrderItems.php 2015-02-07 03:23:51 UTC (rev 7133)
@@ -1729,7 +1729,6 @@
</tr>
</table>
</div>';
- echo $jsCall;
}#end if SearchResults to show
} /*end of PartSearch options to be displayed */
@@ -1845,4 +1844,4 @@
$result = DB_query($sql,$ErrMsg,$DbgMsg);
return $result;
}
-?>
+?>
\ No newline at end of file
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2015-02-06 18:47:10 UTC (rev 7132)
+++ trunk/build/make_release.sh 2015-02-07 03:23:51 UTC (rev 7133)
@@ -26,6 +26,7 @@
msgmerge -U -N --backup=off locale/it_IT.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U -N --backup=off locale/ja_JP.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U -N --backup=off locale/lv_LV.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U -N --backup=off locale/mr_IN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U -N --backup=off locale/nl_NL.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U -N --backup=off locale/pl_PL.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U -N --backup=off locale/pt_BR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
@@ -50,6 +51,7 @@
msgfmt -o locale/es_ES.utf8/LC_MESSAGES/messages.mo locale/es_ES.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/et_EE.utf8/LC_MESSAGES/messages.mo locale/et_EE.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/fa_IR.utf8/LC_MESSAGES/messages.mo locale/fa_IR.utf8/LC_MESSAGES/messages.po
+msgfmt -o locale/fr_CA.utf8/LC_MESSAGES/messages.mo locale/fr_CA.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/fr_FR.utf8/LC_MESSAGES/messages.mo locale/fr_FR.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/hr_HR.utf8/LC_MESSAGES/messages.mo locale/hr_HR.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/hi_IN.utf8/LC_MESSAGES/messages.mo locale/hi_IN.utf8/LC_MESSAGES/messages.po
@@ -58,6 +60,7 @@
msgfmt -o locale/it_IT.utf8/LC_MESSAGES/messages.mo locale/it_IT.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/ja_JP.utf8/LC_MESSAGES/messages.mo locale/ja_JP.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/lv_LV.utf8/LC_MESSAGES/messages.mo locale/lv_LV.utf8/LC_MESSAGES/messages.po
+msgfmt -o locale/mr_IN.utf8/LC_MESSAGES/messages.mo locale/mr_IN.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/nl_NL.utf8/LC_MESSAGES/messages.mo locale/nl_NL.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/pl_PL.utf8/LC_MESSAGES/messages.mo locale/pl_PL.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/pt_BR.utf8/LC_MESSAGES/messages.mo locale/pt_BR.utf8/LC_MESSAGES/messages.po
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2015-02-06 18:47:10 UTC (rev 7132)
+++ trunk/includes/header.inc 2015-02-07 03:23:51 UTC (rev 7133)
@@ -96,4 +96,4 @@
echo '<div id="BodyDiv">';
echo '<div id="BodyWrapDiv">';
-?>
+?>
\ No newline at end of file
Modified: trunk/sql/mysql/upgrade4.12-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12-4.13.sql 2015-02-06 18:47:10 UTC (rev 7132)
+++ trunk/sql/mysql/upgrade4.12-4.13.sql 2015-02-07 03:23:51 UTC (rev 7133)
@@ -1,6 +1,3 @@
-INSERT INTO `securitygroups` VALUES (8,16);
--- Add a description for the script:
-UPDATE `scripts` SET `description` = 'Allows you to view all bank transactions for a selected date range, and the inquiry can be filtered by matched or unmatched transactions, or all transactions can be chosen' WHERE `scripts`.`script` = 'DailyBankTransactions.php';
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('CustomerAccount.php', '1', 'Shows customer account/statement on screen rather than PDF');
-
-----UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
\ No newline at end of file
|
|
From: <dai...@us...> - 2015-02-07 21:32:33
|
Revision: 7135
http://sourceforge.net/p/web-erp/reponame/7135
Author: daintree
Date: 2015-02-07 21:32:31 +0000 (Sat, 07 Feb 2015)
Log Message:
-----------
missing upgrade file added to repository
Modified Paths:
--------------
trunk/doc/Change.log
Added Paths:
-----------
trunk/sql/mysql/upgrade4.11.3-4.11.4.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-02-07 03:24:43 UTC (rev 7134)
+++ trunk/doc/Change.log 2015-02-07 21:32:31 UTC (rev 7135)
@@ -1,5 +1,7 @@
webERP Change Log
+7/2/15 New script CustomerAccount.php - on screen statement similar to CustomerInquiry.php
+
6/2/15 Version 4.12.2
6/2/15 Vitaly:Added SQL to add the script LocationUsers.php and the necessary table locationusers
Added: trunk/sql/mysql/upgrade4.11.3-4.11.4.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11.3-4.11.4.sql (rev 0)
+++ trunk/sql/mysql/upgrade4.11.3-4.11.4.sql 2015-02-07 21:32:31 UTC (rev 7135)
@@ -0,0 +1,94 @@
+INSERT INTO `systypes` (`typeid` ,`typename` ,`typeno`) VALUES ('600', 'Auto Supplier Number', '0');
+INSERT INTO config (confname, confvalue) VALUES ('AutoSupplierNo', '0');
+DELETE FROM config WHERE confname='DefaultTheme';
+INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('PDFWOPrint.php', '11', 'Produces W/O Paperwork');
+INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('PDFFGLabel.php', '11', 'Produces FG Labels');
+INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('PDFQALabel.php', '2', 'Produces a QA label on receipt of stock');
+INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('CustItem.php', '11', 'Customer Items');
+ALTER TABLE `woitems` ADD `comments` LONGBLOB NULL DEFAULT NULL ;
+ALTER TABLE `www_users` CHANGE `modulesallowed` `modulesallowed` VARCHAR( 25 ) NOT NULL;
+INSERT INTO scripts VALUES ('CostUpdate','10','NB Not a script but allows users to maintain item costs from withing StockCostUpdate.php');
+CREATE TABLE `custitem` (
+ `debtorno` char(10) NOT NULL DEFAULT '',
+ `stockid` varchar(20) NOT NULL DEFAULT '',
+ `cust_part` varchar(20) NOT NULL DEFAULT '',
+ `cust_description` varchar(30) NOT NULL DEFAULT '',
+ `customersuom` char(50) NOT NULL DEFAULT '',
+ `conversionfactor` double NOT NULL DEFAULT '1',
+ PRIMARY KEY (`debtorno`,`stockid`),
+ KEY `StockID` (`stockid`),
+ KEY `Debtorno` (`debtorno`),
+ CONSTRAINT ` custitem _ibfk_1` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`),
+ CONSTRAINT ` custitem _ibfk_2` FOREIGN KEY (`debtorno`) REFERENCES `debtorsmaster` (`debtorno`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ALTER table pricematrix ADD column currabrev char(3) NOT NULL DEFAULT '';
+ALTER table pricematrix ADD column startdate date NOT NULL DEFAULT '0000-00-00';
+ALTER table pricematrix ADD column enddate date NOT NULL DEFAULT '9999-12-31';
+ALTER table pricematrix DROP PRIMARY KEY;
+ALTER table pricematrix ADD PRIMARY KEY (`salestype`,`stockid`,`currabrev`,`quantitybreak`,`startdate`,`enddate`);
+ALTER table pricematrix DROP KEY `DiscountCategory`;
+ALTER table pricematrix ADD KEY currabrev(`currabrev`);
+ALTER table pricematrix ADD KEY stockid(`stockid`);
+ALTER TABLE `debtortrans` CHANGE `consignment` `consignment` VARCHAR( 20 ) NOT NULL DEFAULT '';
+ALTER TABLE `workorders` ADD `closecomments` LONGBLOB NULL DEFAULT NULL ;
+
+CREATE TABLE IF NOT EXISTS `relateditems` (
+ `stockid` varchar(20) CHARACTER SET utf8 NOT NULL,
+ `related` varchar(20) CHARACTER SET utf8 NOT NULL,
+ PRIMARY KEY (`stockid`,`related`),
+ UNIQUE KEY `Related` (`related`,`stockid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('RelatedItemsUpdate.php', '2', 'Maintains Related Items');
+INSERT INTO scripts VALUES('Z_ImportDebtors.php',15,'Import debtors by csv file');
+ALTER table purchorders MODIFY tel varchar(30) NOT NULL DEFAULT '';
+
+ALTER TABLE banktrans DROP KEY ref_10, DROP KEY ref_9, DROP KEY ref_8, DROP KEY ref_7;
+ALTER TABLE banktrans DROP KEY ref_6, DROP KEY ref_5, DROP KEY ref_4, DROP KEY ref_3, DROP KEY ref_2;
+ALTER TABLE gltrans DROP KEY tag_2, DROP KEY tag_3, DROP KEY tag_4;
+ALTER TABLE mrpdemandtypes DROP KEY mrpdemandtype;
+ALTER TABLE salescatprod DROP KEY manufacturers_id_2;
+ALTER TABLE salescatprod DROP KEY manufacturers_id;
+ALTER TABLE stockrequest DROP KEY departmentid_2;
+ALTER TABLE stockrequest DROP KEY loccode_2;
+ALTER TABLE stockrequestitems DROP KEY stockid_2, DROP KEY dispatchid_2;
+INSERT INTO scripts VALUES('Dashboard.php',1,'Display outstanding debtors, creditors etc');
+
+INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('Z_MakeLocUsers.php', '15', 'Create User Location records');
+INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('LocationUsers.php', '15', 'User Location Maintenance');
+INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('AgedControlledInventory.php', '11', 'Report of Controlled Items and their age');
+
+CREATE TABLE IF NOT EXISTS `locationusers` (
+ `loccode` varchar(5) NOT NULL,
+ `userid` varchar(20) NOT NULL,
+ `canview` tinyint(4) NOT NULL DEFAULT '0',
+ `canupd` tinyint(4) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`loccode`,`userid`),
+ KEY `UserId` (`userid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO locationusers (userid, loccode, canview, canupd)
+ SELECT www_users.userid, locations.loccode,1,1
+ FROM www_users CROSS JOIN locations
+ LEFT JOIN locationusers
+ ON www_users.userid = locationusers.userid
+ AND locations.loccode = locationusers.loccode
+ WHERE locationusers.userid IS NULL;
+
+ALTER TABLE `mrpparameters` ADD `userldemands` VARCHAR( 5 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'use RL requirements or not' AFTER `usemrpdemands`;
+
+INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('WOCanBeProducedNow.php', '4', 'List of WO items that can be produced with available stock in location');
+INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('PrintWOItemSlip.php', '4', 'PDF WO Item production Slip ');
+
+ALTER TABLE `locations` ADD `usedforwo` TINYINT( 4 ) NOT NULL DEFAULT '1' AFTER `internalrequest`;
+ALTER TABLE `bankaccounts` ADD `importformat` VARCHAR( 10 ) NOT NULL DEFAULT '';
+ALTER TABLE `audittrail` ADD INDEX ( `transactiondate` );
+ALTER TABLE stockmoves MODIFY price DECIMAL(21,5) NOT NULL DEFAULT '0.00000';
+
+INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('SalesTopCustomersInquiry.php', 2, 'Shows the sales to the top customers');
+ALTER TABLE `stockmoves` ADD `userid` VARCHAR( 20 ) NOT NULL , ADD INDEX ( `userid` ) ;
+
+UPDATE config SET confvalue='4.11.5' WHERE confname='VersionNumber';
+
+
+
Property changes on: trunk/sql/mysql/upgrade4.11.3-4.11.4.sql
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
|
Thanks for helping keep SourceForge clean.
X