Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2012-06-16 21:56:49
|
Revision: 5438
http://web-erp.svn.sourceforge.net/web-erp/?rev=5438&view=rev
Author: daintree
Date: 2012-06-16 21:56:35 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
pre 4.08
Modified Paths:
--------------
trunk/api/api_xml-rpc.php
trunk/build/make_release.sh
trunk/doc/Change.log
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/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/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-06-14 08:05:15 UTC (rev 5437)
+++ trunk/api/api_xml-rpc.php 2012-06-16 21:56:35 UTC (rev 5438)
@@ -115,8 +115,7 @@
function xmlrpc_InsertBranch($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(InsertBranch(php_xmlrpc_decode($xmlrpcmsg->getParam( 0 )),
/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
@@ -152,13 +151,12 @@
function xmlrpc_ModifyCustomer($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(ModifyCustomer(php_xmlrpc_decode($xmlrpcmsg->getParam( 0 )),
-/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(ModifyCustomer(php_xmlrpc_decode($xmlrpcmsg->getParam( 0 )),
+/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(ModifyCustomer(php_xmlrpc_decode($xmlrpcmsg->getParam( 0 )), '', '')));
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(ModifyCustomer(php_xmlrpc_decode($xmlrpcmsg->getParam( 0 )), '', '')));
/*x*/ }
ob_end_flush();
return $rtn;
@@ -183,19 +181,18 @@
._('If the first element is zero then the function was successful. ')
._('Otherwise an array of error codes is returned and no insertion takes place. ');
-/*E*/ $ModifyBranch_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
+/*E*/$ModifyBranch_sig = array(array($xmlrpcStruct,$xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcStruct,$xmlrpcString,$xmlrpcString));
$ModifyBranch_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
function xmlrpc_ModifyBranch($xmlrpcmsg){
ob_start('ob_file_callback');
-/*x*/ if ($xmlrpcmsg->getNumParams() == 3)
-/*x*/ {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(ModifyBranch(php_xmlrpc_decode($xmlrpcmsg->getParam( 0 )),
+/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(ModifyBranch(php_xmlrpc_decode($xmlrpcmsg->getParam( 0 )),
/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(ModifyBranch(php_xmlrpc_decode($xmlrpcmsg->getParam( 0 )), '', '')));
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(ModifyBranch(php_xmlrpc_decode($xmlrpcmsg->getParam( 0 )), '', '')));
/*x*/ }
ob_end_flush();
return $rtn;
@@ -367,7 +364,7 @@
/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList( '', '')));
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetCurrencyList('','')));
/*x*/ }
ob_end_flush();
return $rtn;
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2012-06-14 08:05:15 UTC (rev 5437)
+++ trunk/build/make_release.sh 2012-06-16 21:56:35 UTC (rev 5438)
@@ -37,6 +37,7 @@
msgmerge -U --backup=off locale/tr_TR.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/zh_CN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/zh_HK.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
+msgmerge -U --backup=off locale/zh_TW.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/vi_VN.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgfmt -o locale/ar_EG.utf8/LC_MESSAGES/messages.mo locale/ar_EG.utf8/LC_MESSAGES/messages.po
@@ -67,6 +68,7 @@
msgfmt -o locale/tr_TR.utf8/LC_MESSAGES/messages.mo locale/tr_TR.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/zh_CN.utf8/LC_MESSAGES/messages.mo locale/zh_CN.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/zh_HK.utf8/LC_MESSAGES/messages.mo locale/zh_HK.utf8/LC_MESSAGES/messages.po
+msgfmt -o locale/zh_TW.utf8/LC_MESSAGES/messages.mo locale/zh_TW.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/vi_VN.utf8/LC_MESSAGES/messages.mo locale/vi_VN.utf8/LC_MESSAGES/messages.po
mysql -u$MYSQL_USER -p$MYSQL_PWD < $BASE_DIR/build/TruncateAuditTrail.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-14 08:05:15 UTC (rev 5437)
+++ trunk/doc/Change.log 2012-06-16 21:56:35 UTC (rev 5438)
@@ -1,4 +1,7 @@
webERP Change Log
+
+15/6/12 Release 4.08
+
02/06/2012 Exson: Fixed the order cancel function failure in SelectOrderItems.php. Reported by Pak Richard.
2/6/12 Phil: Settle counter sales and receipts should be set - now fixed.
28/5/2012 Phil: Configure xmlrpc api to work correctly with utf-8 character encoding.
@@ -105,7 +108,6 @@
7/2/12 Phil: Reworked ReorderLevelLocation.php
7/2/12 Phil: StockTransfers.php if SESSION['Transfer'][0] not set then now initiate a new transfer
7/2/12 Exson: Sent NewTransfer with call from SelectProduct.php to ensure new transfer initiated
-6/2/12 Tim: Removed FUD as new API functions seem consistent with the rest of the API</p>
6/2/12 Phil: Added new API function InsertDebtorReceipt in api_debtortransactions.php
4/2/12 Vitaly: Fixed addTextWrap() in class.pdf.php. The length of the string was not calculated properly, causing long strings to print beyond the cell boundaries.
4/2/12 Phil: Added new API function CreateCreditNote in api_debtortransactions.php
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 2012-06-14 08:05:15 UTC (rev 5437)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2012-06-16 21:56:35 UTC (rev 5438)
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: web-erp\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-04 22:15+1200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-16 16:39+1200\n"
"PO-Revision-Date: 2012-01-26 10:26+0000\n"
"Last-Translator: JC_Chuck <Unknown>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -17,11 +17,11 @@
"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
"X-Generator: Launchpad (build 14907)\n"
-#: AccountGroups.php:9 index.php:1273
+#: AccountGroups.php:7 includes/MainMenuLinksArray.php:375
msgid "Account Groups"
msgstr "مجموعات العضوية"
-#: AccountGroups.php:19
+#: AccountGroups.php:17
msgid ""
"An error occurred in retrieving the account groups of the parent account "
"group during the check for recursion"
@@ -29,616 +29,689 @@
"لقد حدث خطأ فى استرجاع بيانات مجموعات العضو الخاصة باعضوية الأب اثناء "
"االتحقق من وجود استدعاء ذاتي"
-#: AccountGroups.php:20
+#: AccountGroups.php:18
msgid ""
"The SQL that was used to retrieve the account groups of the parent account "
"group and that failed in the process was"
msgstr ""
-#: AccountGroups.php:57 AccountGroups.php:94 AccountGroups.php:177
-#: AccountGroups.php:187
+#: AccountGroups.php:58 AccountGroups.php:95 AccountGroups.php:176
+#: AccountGroups.php:186
msgid "The SQL that was used to retrieve the information was"
msgstr "الطلب المستخدم لإسترجاع المعلومات كان"
-#: AccountGroups.php:58
+#: AccountGroups.php:59
msgid "Could not check whether the group exists because"
msgstr "لم يتم التحقق من وجود المجموعة بسبب"
-#: AccountGroups.php:65
+#: AccountGroups.php:66
msgid "The account group name already exists in the database"
msgstr "اسم المجموعة موجود مسبقاً"
-#: AccountGroups.php:71
+#: AccountGroups.php:72
msgid "The account group name cannot contain the character"
msgstr "لا يمكن وضع هذا الحرف في اسم المجموعة"
-#: AccountGroups.php:71 AccountSections.php:75 PaymentMethods.php:41
-#: TaxCategories.php:33 TaxProvinces.php:32 UnitsOfMeasure.php:32
+#: AccountGroups.php:72 Departments.php:30 TaxCategories.php:31
msgid "or the character"
msgstr "او الحرف"
-#: AccountGroups.php:77
+#: AccountGroups.php:78
msgid "The account group name must be at least one character long"
msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
-#: AccountGroups.php:84
+#: AccountGroups.php:85
msgid ""
"The parent account group selected appears to result in a recursive account "
"structure - select an alternative parent account group or make this group a "
"top level account group"
msgstr ""
-#: AccountGroups.php:95
+#: AccountGroups.php:96
msgid "Could not check whether the group is recursive because"
msgstr "لم أستطيع التخقق اذا كانت المجموعة ذاتيى الأسترجاع لأن"
-#: AccountGroups.php:107
+#: AccountGroups.php:104
+msgid ""
+"Since this account group is a child group, the sequence in the trial "
+"balance, the section in the accounts and whether or not the account group "
+"appears in the balance sheet or profit and loss account are all properties "
+"inherited from the parent account group. Any changes made to these fields "
+"will have no effect."
+msgstr ""
+
+#: AccountGroups.php:109
msgid "The section in accounts must be an integer"
msgstr "يجب ان يكون القسم فى الحساب عدد صحيح"
-#: AccountGroups.php:113
+#: AccountGroups.php:115
msgid "The sequence in the trial balance must be an integer"
msgstr "التسلسل فى الحساب التجريبى يجب ان يكون عدد صحيح"
-#: AccountGroups.php:119
+#: AccountGroups.php:121
msgid "The sequence in the TB must be numeric and less than"
msgstr ""
-#: AccountGroups.php:136
+#: AccountGroups.php:137
msgid "An error occurred in updating the account group"
msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
-#: AccountGroups.php:137
+#: AccountGroups.php:138
msgid "The SQL that was used to update the account group was"
msgstr ""
-#: AccountGroups.php:139 AccountSections.php:106 PaymentMethods.php:91
+#: AccountGroups.php:140 AccountSections.php:98 PaymentMethods.php:83
msgid "Record Updated"
msgstr "تم التحديث"
-#: AccountGroups.php:157
+#: AccountGroups.php:156
msgid "An error occurred in inserting the account group"
msgstr "حدث خطأ ما اثناء اضافة المجموعة"
-#: AccountGroups.php:158
+#: AccountGroups.php:157
msgid "The SQL that was used to insert the account group was"
msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
-#: AccountGroups.php:159 AccountSections.php:118 PaymentMethods.php:113
+#: AccountGroups.php:158 AccountSections.php:108
msgid "Record inserted"
msgstr "تمت الإضافة بنجاح"
-#: AccountGroups.php:176
-msgid ""
-"An error occurred in retrieving the group information from chartmaster"
+#: AccountGroups.php:175
+msgid "An error occurred in retrieving the group information from chartmaster"
msgstr ""
-#: AccountGroups.php:181
+#: AccountGroups.php:180
msgid ""
"Cannot delete this account group because general ledger accounts have been "
"created using this group"
msgstr ""
-#: AccountGroups.php:182 AccountGroups.php:192 AccountSections.php:139
-#: Areas.php:117 Areas.php:126 BankAccounts.php:163 CreditStatus.php:126
-#: Currencies.php:144 Currencies.php:152 Currencies.php:159
-#: CustomerBranches.php:296 CustomerBranches.php:306 CustomerBranches.php:316
-#: CustomerBranches.php:326 Customers.php:317 Customers.php:326
-#: Customers.php:334 Customers.php:342 CustomerTypes.php:149
-#: CustomerTypes.php:159 Factors.php:136 FixedAssetCategories.php:132
-#: GLAccounts.php:95 GLAccounts.php:109 Locations.php:247 Locations.php:255
-#: Locations.php:264 Locations.php:272 Locations.php:280 Locations.php:288
-#: Locations.php:296 Locations.php:304 MRPDemandTypes.php:89
-#: PaymentMethods.php:146 PaymentTerms.php:147 PaymentTerms.php:154
-#: PcExpenses.php:119 SalesCategories.php:127 SalesCategories.php:135
-#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:147
-#: SalesTypes.php:157 Shippers.php:82 Shippers.php:94 StockCategories.php:182
-#: Stocks.php:471 Stocks.php:480 Stocks.php:488 Stocks.php:496 Stocks.php:504
-#: Stocks.php:512 Suppliers.php:613 Suppliers.php:622 Suppliers.php:630
-#: SupplierTypes.php:147 TaxCategories.php:133 TaxGroups.php:128
-#: TaxGroups.php:135 TaxProvinces.php:127 UnitsOfMeasure.php:142
-#: UnitsOfMeasure.php:149 WorkCentres.php:90 WorkCentres.php:96
-#: WWW_Access.php:87
+#: AccountGroups.php:181 AccountGroups.php:191 AccountSections.php:130
+#: Areas.php:114 Areas.php:123 BankAccounts.php:158 CreditStatus.php:125
+#: Currencies.php:166 Currencies.php:174 Currencies.php:182
+#: CustomerBranches.php:286 CustomerBranches.php:296 CustomerBranches.php:306
+#: CustomerBranches.php:316 Customers.php:289 Customers.php:298
+#: Customers.php:306 Customers.php:314 CustomerTypes.php:147
+#: CustomerTypes.php:157 Departments.php:141 Factors.php:134
+#: FixedAssetCategories.php:134 GLAccounts.php:80 GLAccounts.php:96
+#: Locations.php:237 Locations.php:245 Locations.php:256 Locations.php:265
+#: Locations.php:274 Locations.php:283 Locations.php:292 Locations.php:301
+#: Locations.php:309 MRPDemandTypes.php:87 PaymentMethods.php:142
+#: PaymentTerms.php:146 PaymentTerms.php:153 PcExpenses.php:158
+#: SalesCategories.php:125 SalesCategories.php:132 SalesPeople.php:150
+#: SalesPeople.php:157 SalesPeople.php:163 SalesTypes.php:140
+#: SalesTypes.php:150 Shippers.php:81 Shippers.php:93 StockCategories.php:187
+#: Stocks.php:653 Stocks.php:662 Stocks.php:670 Stocks.php:678 Stocks.php:686
+#: Stocks.php:694 Suppliers.php:612 Suppliers.php:621 Suppliers.php:629
+#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:132
+#: TaxGroups.php:140 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:83
msgid "There are"
msgstr "يوجد"
-#: AccountGroups.php:182
+#: AccountGroups.php:181
msgid "general ledger accounts that refer to this account group"
msgstr ""
-#: AccountGroups.php:186
+#: AccountGroups.php:185
msgid "An error occurred in retrieving the parent group information"
msgstr ""
-#: AccountGroups.php:191
+#: AccountGroups.php:190
msgid ""
"Cannot delete this account group because it is a parent account group of "
"other account group(s)"
msgstr ""
-#: AccountGroups.php:192
+#: AccountGroups.php:191
msgid "account groups that have this group as its/there parent account group"
msgstr ""
-#: AccountGroups.php:195
+#: AccountGroups.php:194
msgid "An error occurred in deleting the account group"
msgstr "حدث خطأ ما اثناء حذف مجموعة الحسابات"
-#: AccountGroups.php:196
+#: AccountGroups.php:195
msgid "The SQL that was used to delete the account group was"
msgstr ""
-#: AccountGroups.php:198
+#: AccountGroups.php:197
msgid "group has been deleted"
msgstr "تم حذف المجموعة"
-#: AccountGroups.php:223
+#: AccountGroups.php:222
msgid "The sql that was used to retrieve the account group information was "
msgstr ""
-#: AccountGroups.php:224
+#: AccountGroups.php:223
msgid "Could not get account groups because"
msgstr "لم يتمكن الحصول على مجموات العضو لان"
-#: AccountGroups.php:226 AccountSections.php:177 AddCustomerContacts.php:25
-#: AddCustomerContacts.php:28 AddCustomerNotes.php:97
-#: AddCustomerTypeNotes.php:94 AgedDebtors.php:468 AgedSuppliers.php:277
-#: Areas.php:145 AuditTrail.php:13 BOMExtendedQty.php:286 BOMIndented.php:262
-#: BOMIndentedReverse.php:257 BOMInquiry.php:165 BOMListing.php:128
-#: BOMs.php:214 BOMs.php:793 COGSGLPostings.php:20 CompanyPreferences.php:158
-#: CounterSales.php:1940 CounterSales.php:2062 Credit_Invoice.php:257
-#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:19
-#: DailyBankTransactions.php:9 DebtorsAtPeriodEnd.php:138
-#: DiscountCategories.php:12 DiscountCategories.php:122 DiscountMatrix.php:18
-#: EDIMessageFormat.php:106 FixedAssetList.php:8 FixedAssetLocations.php:9
-#: FixedAssetRegister.php:13 FixedAssetRegister.php:232
-#: FixedAssetTransfer.php:31 FormDesigner.php:132 GLBalanceSheet.php:351
-#: GLBudgets.php:30 GLJournal.php:243 InventoryPlanning.php:369
-#: InventoryPlanningPrefSupplier.php:474 Labels.php:117 Labels.php:273
-#: MRPReport.php:536 OutstandingGRNs.php:174 PcAssignCashToTab.php:39
-#: PcAssignCashToTab.php:113 PcAssignCashToTab.php:129
-#: PcAssignCashToTab.php:165 PDFPickingList.php:30 PDFPrintLabel.php:132
-#: PDFStockLocTransfer.php:21 PO_AuthorisationLevels.php:12 POReport.php:61
-#: POReport.php:65 POReport.php:69 PO_SelectOSPurchOrder.php:136
-#: PricesBasedOnMarkUp.php:11 Prices_Customer.php:45 Prices.php:32
-#: PurchData.php:141 PurchData.php:231 PurchData.php:250
-#: RecurringSalesOrders.php:307 SalesAnalReptCols.php:51 SalesAnalRepts.php:13
-#: SalesCategories.php:13 SalesGLPostings.php:18 SalesGraph.php:34
-#: SalesPeople.php:22 SalesTypes.php:22 SelectAsset.php:44
-#: SelectCompletedOrder.php:13 SelectContract.php:81 SelectCreditItems.php:204
-#: SelectCreditItems.php:272 SelectCustomer.php:315 SelectGLAccount.php:19
-#: SelectGLAccount.php:79 SelectOrderItems.php:605 SelectOrderItems.php:1436
-#: SelectOrderItems.php:1556 SelectProduct.php:456 SelectSalesOrder.php:155
-#: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:11
-#: SelectWorkOrder.php:147 ShipmentCosting.php:13 Shipments.php:18
-#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:10
-#: StockLocMovements.php:15 StockLocStatus.php:27 Suppliers.php:306
-#: SupplierTenders.php:261 SupplierTenders.php:318 SupplierTransInquiry.php:11
-#: TaxGroups.php:16 TaxProvinces.php:12 TopItems.php:60
-#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:158
-#: WorkOrderCosting.php:14 WorkOrderEntry.php:12 WorkOrderIssue.php:22
-#: WorkOrderReceive.php:15 WorkOrderStatus.php:43 WWW_Access.php:13
-#: WWW_Users.php:38 Z_BottomUpCosts.php:51
+#: AccountGroups.php:225 AccountSections.php:169 AddCustomerContacts.php:25
+#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
+#: AddCustomerTypeNotes.php:94 AgedDebtors.php:444 AgedSuppliers.php:276
+#: Areas.php:143 AuditTrail.php:11 BankReconciliation.php:14
+#: BOMExtendedQty.php:250 BOMIndented.php:246 BOMIndentedReverse.php:235
+#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:858
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2037
+#: CounterSales.php:2163 Credit_Invoice.php:255 CreditStatus.php:21
+#: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:11
+#: DebtorsAtPeriodEnd.php:125 DiscountCategories.php:10
+#: DiscountCategories.php:134 DiscountMatrix.php:16 EDIMessageFormat.php:105
+#: FixedAssetLocations.php:9 FixedAssetRegister.php:13
+#: FixedAssetRegister.php:249 FixedAssetTransfer.php:32 FormDesigner.php:129
+#: GLBalanceSheet.php:378 GLBudgets.php:29 GLJournal.php:247
+#: InternalStockRequest.php:281 InventoryPlanning.php:374
+#: InventoryPlanningPrefSupplier.php:467 MRPReport.php:516 NoSalesItems.php:93
+#: OutstandingGRNs.php:163 PcAssignCashToTab.php:56 PcAssignCashToTab.php:130
+#: PcAssignCashToTab.php:146 PcAssignCashToTab.php:190 PDFPickingList.php:28
+#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:140
+#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:30
+#: PurchData.php:152 PurchData.php:286 PurchData.php:312
+#: RecurringSalesOrders.php:309 SalesAnalReptCols.php:51 SalesAnalRepts.php:11
+#: SalesCategories.php:11 SalesGLPostings.php:17 SalesGraph.php:35
+#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:46
+#: SelectCompletedOrder.php:11 SelectContract.php:65 SelectCreditItems.php:216
+#: SelectCreditItems.php:287 SelectCustomer.php:263 SelectGLAccount.php:17
+#: SelectGLAccount.php:87 SelectOrderItems.php:586 SelectOrderItems.php:1498
+#: SelectOrderItems.php:1620 SelectProduct.php:505 SelectSalesOrder.php:534
+#: SelectSupplier.php:9 SelectSupplier.php:199 SelectWorkOrder.php:9
+#: SelectWorkOrder.php:152 ShipmentCosting.php:11 Shipments.php:17
+#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: StockLocMovements.php:14 StockLocStatus.php:28
+#: StockSerialItemResearch.php:30 SupplierPriceList.php:15
+#: SupplierPriceList.php:214 SupplierPriceList.php:384
+#: SupplierPriceList.php:388 SupplierPriceList.php:439
+#: SupplierPriceList.php:489 Suppliers.php:302 SupplierTenderCreate.php:522
+#: SupplierTenderCreate.php:628 SupplierTenders.php:322
+#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TaxGroups.php:15
+#: TaxProvinces.php:11 TopItems.php:114 WhereUsedInquiry.php:18
+#: WorkCentres.php:111 WorkCentres.php:162 WorkOrderCosting.php:13
+#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:17
+#: WorkOrderStatus.php:42 WWW_Access.php:11 WWW_Users.php:33
+#: Z_BottomUpCosts.php:57
msgid "Search"
msgstr "إبحث"
-#: AccountGroups.php:230
+#: AccountGroups.php:229
msgid "Group Name"
msgstr "إسم المجموعة"
-#: AccountGroups.php:231 EDIMessageFormat.php:131
+#: AccountGroups.php:230 EDIMessageFormat.php:129 EDIMessageFormat.php:208
msgid "Section"
msgstr "قسم"
-#: AccountGroups.php:232 AccountGroups.php:396
+#: AccountGroups.php:231 AccountGroups.php:410
msgid "Sequence In TB"
msgstr ""
-#: AccountGroups.php:233 AccountGroups.php:380 GLProfit_Loss.php:8
-#: GLProfit_Loss.php:105 GLProfit_Loss.php:106 GLProfit_Loss.php:157
-#: SelectGLAccount.php:45 SelectGLAccount.php:59
+#: AccountGroups.php:232 AccountGroups.php:393 GLProfit_Loss.php:6
+#: GLProfit_Loss.php:126 GLProfit_Loss.php:127 GLProfit_Loss.php:178
+#: SelectGLAccount.php:40 SelectGLAccount.php:54 SelectGLAccount.php:68
msgid "Profit and Loss"
msgstr ""
-#: AccountGroups.php:234 AccountGroups.php:341
+#: AccountGroups.php:233 AccountGroups.php:354
msgid "Parent Group"
msgstr ""
-#: AccountGroups.php:250 AccountGroups.php:253 AccountGroups.php:384
-#: AccountGroups.php:386 BankAccounts.php:217 BankAccounts.php:361
-#: BankAccounts.php:363 BankAccounts.php:367 BOMs.php:128 BOMs.php:713
-#: BOMs.php:715 CompanyPreferences.php:439 CompanyPreferences.php:441
-#: CompanyPreferences.php:451 CompanyPreferences.php:453
-#: CompanyPreferences.php:463 CompanyPreferences.php:465
-#: ContractCosting.php:174 CustLoginSetup.php:590 CustLoginSetup.php:592
-#: CustomerBranches.php:420 Customers.php:600 Customers.php:857
-#: Customers.php:864 Customers.php:867 DeliveryDetails.php:1034
-#: DeliveryDetails.php:1074 DeliveryDetails.php:1077 GLTransInquiry.php:73
-#: Locations.php:373 MRPCalendar.php:222 MRP.php:530 MRP.php:534 MRP.php:538
-#: MRP.php:542 PaymentMethods.php:203 PaymentMethods.php:204
-#: PaymentMethods.php:264 PaymentMethods.php:270 PDFChequeListing.php:63
-#: PDFDeliveryDifferences.php:64 PDFDIFOT.php:67
-#: PO_AuthorisationLevels.php:132 PO_AuthorisationLevels.php:137
-#: PO_Header.php:758 PO_PDFPurchOrder.php:367 PO_PDFPurchOrder.php:370
-#: PurchData.php:189 PurchData.php:469 PurchData.php:472
-#: RecurringSalesOrders.php:479 RecurringSalesOrders.php:482
-#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
-#: SalesAnalReptCols.php:404 SalesAnalRepts.php:406 SalesAnalRepts.php:409
-#: SalesAnalRepts.php:432 SalesAnalRepts.php:435 SalesAnalRepts.php:458
-#: SalesAnalRepts.php:461 SelectProduct.php:351 ShipmentCosting.php:622
-#: Stocks.php:867 Stocks.php:869 Stocks.php:887 Stocks.php:889
-#: SuppContractChgs.php:83 SuppLoginSetup.php:511 SuppLoginSetup.php:513
-#: SystemParameters.php:373 SystemParameters.php:405 SystemParameters.php:450
-#: SystemParameters.php:468 SystemParameters.php:476 SystemParameters.php:516
-#: SystemParameters.php:589 SystemParameters.php:597 SystemParameters.php:615
-#: SystemParameters.php:622 SystemParameters.php:746 SystemParameters.php:877
-#: SystemParameters.php:879 SystemParameters.php:889 SystemParameters.php:891
-#: SystemParameters.php:945 SystemParameters.php:957 SystemParameters.php:959
-#: TaxGroups.php:292 TaxGroups.php:295 TaxGroups.php:344 WWW_Users.php:610
-#: WWW_Users.php:612
+#: AccountGroups.php:249 AccountGroups.php:252 AccountGroups.php:397
+#: AccountGroups.php:399 BOMs.php:124 BOMs.php:772 BOMs.php:774
+#: CompanyPreferences.php:477 CompanyPreferences.php:479
+#: CompanyPreferences.php:492 CompanyPreferences.php:494
+#: CompanyPreferences.php:507 CompanyPreferences.php:509
+#: ContractCosting.php:198 CustomerBranches.php:411 Customers.php:594
+#: Customers.php:947 Customers.php:956 Customers.php:959
+#: DeliveryDetails.php:1082 DeliveryDetails.php:1125 DeliveryDetails.php:1128
+#: GLTransInquiry.php:69 Labels.php:491 Labels.php:493 Labels.php:518
+#: MRPCalendar.php:224 MRP.php:529 MRP.php:533 MRP.php:537 MRP.php:541
+#: PaymentMethods.php:204 PaymentMethods.php:205 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:273 PaymentMethods.php:280
+#: PaymentMethods.php:287 PaymentMethods.php:294 PcAuthorizeExpenses.php:243
+#: PDFChequeListing.php:63 PDFDeliveryDifferences.php:76 PDFDIFOT.php:76
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:792 PO_PDFPurchOrder.php:392 PO_PDFPurchOrder.php:395
+#: PurchData.php:212 PurchData.php:554 PurchData.php:557
+#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
+#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
+#: SalesAnalReptCols.php:422 SalesAnalRepts.php:417 SalesAnalRepts.php:420
+#: SalesAnalRepts.php:445 SalesAnalRepts.php:448 SalesAnalRepts.php:473
+#: SalesAnalRepts.php:476 SalesPeople.php:219 SalesPeople.php:356
+#: SalesPeople.php:358 SelectProduct.php:385 ShipmentCosting.php:667
+#: Stocks.php:1051 Stocks.php:1053 Stocks.php:1076 Stocks.php:1078
+#: SuppContractChgs.php:90 SystemParameters.php:401 SystemParameters.php:424
+#: SystemParameters.php:440 SystemParameters.php:503 SystemParameters.php:511
+#: SystemParameters.php:551 SystemParameters.php:631 SystemParameters.php:640
+#: SystemParameters.php:648 SystemParameters.php:666 SystemParameters.php:673
+#: SystemParameters.php:717 SystemParameters.php:813 SystemParameters.php:948
+#: SystemParameters.php:950 SystemParameters.php:960 SystemParameters.php:962
+#: SystemParameters.php:1016 SystemParameters.php:1028
+#: SystemParameters.php:1030 TaxGroups.php:311 TaxGroups.php:314
+#: TaxGroups.php:371 WWW_Users.php:484 WWW_Users.php:486 WWW_Users.php:657
+#: WWW_Users.php:659
msgid "Yes"
msgstr "موافق"
-#: AccountGroups.php:256 AccountGroups.php:389 AccountGroups.php:391
-#: BankAccounts.php:215 BankAccounts.php:361 BankAccounts.php:363
-#: BankAccounts.php:367 BOMs.php:130 BOMs.php:712 BOMs.php:716
-#: CompanyPreferences.php:438 CompanyPreferences.php:442
-#: CompanyPreferences.php:450 CompanyPreferences.php:454
-#: CompanyPreferences...
[truncated message content] |
|
From: <te...@us...> - 2012-06-17 01:29:04
|
Revision: 5439
http://web-erp.svn.sourceforge.net/web-erp/?rev=5439&view=rev
Author: tehonu
Date: 2012-06-17 01:28:58 +0000 (Sun, 17 Jun 2012)
Log Message:
-----------
Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
Modified Paths:
--------------
trunk/StockDispatch.php
trunk/doc/Change.log
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2012-06-16 21:56:35 UTC (rev 5438)
+++ trunk/StockDispatch.php 2012-06-17 01:28:58 UTC (rev 5439)
@@ -26,8 +26,8 @@
$template='simple';
}elseif($_POST['template']=='standard'){
$template='standard';
- }
- else{$template='full';
+ }else{
+ $template='full';
}
// Create Transfer Number
if(!isset($Trf_ID) && $_POST['ReportType'] == 'Batch'){
@@ -60,6 +60,11 @@
$WhereCategory = " ";
}
+ if ($_POST['Strategy'] == 'RLZero') {
+ $WhereCategory = $WhereCategory . " AND fromlocstock.reorderlevel = 0 ";
+ }else{
+ $WhereCategory = $WhereCategory . " AND locstock.reorderlevel > locstock.quantity ";
+ }
$sql = "SELECT locstock.stockid,
stockmaster.description,
@@ -84,7 +89,6 @@
AND fromlocstock.loccode = '" . $_POST['FromLocation'] . "'
WHERE locstock.stockid=stockmaster.stockid
AND locstock.loccode ='" . $_POST['ToLocation'] . "'
- AND locstock.reorderlevel > locstock.quantity
AND (fromlocstock.quantity - fromlocstock.reorderlevel) > 0
AND stockcategory.stocktype<>'A'
AND (stockmaster.mbflag='B' OR stockmaster.mbflag='M') " .
@@ -150,15 +154,21 @@
// The real needed stock is reorder level - qty - in transit).
$NeededQtyAtTo = $myrow['neededqty'] - $InTransitQuantityAtTo;
- // Decide how many are sent
- $ShipQty = 0;
- if ($AvailableShipQtyAtFrom > 0) {
- if ($AvailableShipQtyAtFrom >= $NeededQtyAtTo) {
- // We can ship all the needed qty at TO location
- $ShipQty = $NeededQtyAtTo;
- }else{
- // We can't ship all the needed qty at TO location, but at least can ship some
- $ShipQty = $AvailableShipQtyAtFrom;
+ // Decide how many are sent (depends on the strategy)
+ if ($_POST['Strategy'] == 'RLZero') {
+ // send items with overstock (and RL = 0) at FROM, no matter qty needed at TO.
+ $ShipQty = $AvailableShipQtyAtFrom;
+ }else{
+ // Send all items with overstock at FROM needed at TO
+ $ShipQty = 0;
+ if ($AvailableShipQtyAtFrom > 0) {
+ if ($AvailableShipQtyAtFrom >= $NeededQtyAtTo) {
+ // We can ship all the needed qty at TO location
+ $ShipQty = $NeededQtyAtTo;
+ }else{
+ // We can't ship all the needed qty at TO location, but at least can ship some
+ $ShipQty = $AvailableShipQtyAtFrom;
+ }
}
}
@@ -285,7 +295,7 @@
$title=_('Stock Dispatch Report');
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . _('Inventory Stock Dispatch Report') . '</p>';
- echo '<div class="page_help_text">' . _('Create batch of overstock from one location to transfer to another location that is below reorder level.<br/>
+ echo '<div class="page_help_text">' . _('Create a transfer batch of overstock from one location to another location that is below reorder level.<br/>
Quantity to ship is based on reorder level minus the quantity on hand at the To Location; if there is a<br/>
dispatch percentage entered, that needed quantity is inflated by the percentage entered.<br/>
Use Bulk Inventory Transfer - Receive to process the batch') . '</div>';
@@ -351,9 +361,6 @@
exit;
}
- // Define StockCat with 'name="StockCat[ ]" multiple' so can select more than one
- // Also have to change way define $WhereCategory for WHERE clause
-
echo '<tr>
<td>' . _('In Stock Category') . ':</td>
<td><select name="StockCat">';
@@ -374,6 +381,12 @@
}
echo '</select></td></tr>';
+ echo '<tr><td>' . _('Dispatch Strategy:') . ':</td>';
+ echo '<td><select name="Strategy">';
+ echo '<option selected="selected" value="All">' . _('Items needed at TO location with overstock at FROM location') . '</option>';
+ echo '<option value="RLZero">' . _('Items with overstock at FROM location (and RL=0)') . '</option>';
+ echo '</select></td><td> </td></tr>';
+
echo '<tr><td>' . _('Report Type') . ':</td>';
echo '<td><select name="ReportType">';
echo '<option selected="selected" value="Batch">' . _('Create Batch') . '</option>';
@@ -418,8 +431,8 @@
$YPos -=$line_height;
$pdf->addTextWrap($Left_Margin,$YPos,150,$FontSize,_('Stock Dispatch ') . $_POST['ReportType']);
- $pdf->addTextWrap(200,$YPos,50,$FontSize,_('From :'));
- $pdf->addTextWrap(250,$YPos,200,$FontSize,$FromLocation);
+ $pdf->addTextWrap(200,$YPos,30,$FontSize,_('From :'));
+ $pdf->addTextWrap(230,$YPos,200,$FontSize,$FromLocation);
$pdf->addTextWrap($Page_Width-$Right_Margin-150,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
@@ -427,16 +440,21 @@
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Transfer No.'));
$pdf->addTextWrap(95,$YPos,50,$FontSize,$Trf_ID);
$pdf->setFont('','B');
- $pdf->addTextWrap(200,$YPos,20,$FontSize,_('To :'));
- $pdf->addTextWrap(250,$YPos,200,$FontSize,$ToLocation);
+ $pdf->addTextWrap(200,$YPos,30,$FontSize,_('To :'));
+ $pdf->addTextWrap(230,$YPos,200,$FontSize,$ToLocation);
$pdf->setFont('','');
$YPos -= $line_height;
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Category'));
$pdf->addTextWrap(95,$YPos,50,$FontSize,$_POST['StockCat']);
$pdf->addTextWrap(160,$YPos,150,$FontSize,$CategoryDescription,'left');
$YPos -= $line_height;
- $pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Percent'));
- $pdf->addTextWrap(95,$YPos,50,$FontSize,$_POST['Percent']);
+ $pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Over transfer'));
+ $pdf->addTextWrap(95,$YPos,50,$FontSize,$_POST['Percent'] . "%");
+ if ($_POST['Strategy'] == 'RLZero') {
+ $pdf->addTextWrap(200,$YPos,200,$FontSize,_('Overstock items at '). $FromLocation);
+ }else{
+ $pdf->addTextWrap(200,$YPos,200,$FontSize,_('Items needed at '). $ToLocation);
+ }
$YPos -=(2*$line_height);
/*set up the headings */
$Xpos = $Left_Margin+1;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-16 21:56:35 UTC (rev 5438)
+++ trunk/doc/Change.log 2012-06-17 01:28:58 UTC (rev 5439)
@@ -1,4 +1,5 @@
webERP Change Log
+17/06/2012 Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
15/6/12 Release 4.08
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-06-17 01:29:04
|
Revision: 5439
http://web-erp.svn.sourceforge.net/web-erp/?rev=5439&view=rev
Author: tehonu
Date: 2012-06-17 01:28:58 +0000 (Sun, 17 Jun 2012)
Log Message:
-----------
Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
Modified Paths:
--------------
trunk/StockDispatch.php
trunk/doc/Change.log
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2012-06-16 21:56:35 UTC (rev 5438)
+++ trunk/StockDispatch.php 2012-06-17 01:28:58 UTC (rev 5439)
@@ -26,8 +26,8 @@
$template='simple';
}elseif($_POST['template']=='standard'){
$template='standard';
- }
- else{$template='full';
+ }else{
+ $template='full';
}
// Create Transfer Number
if(!isset($Trf_ID) && $_POST['ReportType'] == 'Batch'){
@@ -60,6 +60,11 @@
$WhereCategory = " ";
}
+ if ($_POST['Strategy'] == 'RLZero') {
+ $WhereCategory = $WhereCategory . " AND fromlocstock.reorderlevel = 0 ";
+ }else{
+ $WhereCategory = $WhereCategory . " AND locstock.reorderlevel > locstock.quantity ";
+ }
$sql = "SELECT locstock.stockid,
stockmaster.description,
@@ -84,7 +89,6 @@
AND fromlocstock.loccode = '" . $_POST['FromLocation'] . "'
WHERE locstock.stockid=stockmaster.stockid
AND locstock.loccode ='" . $_POST['ToLocation'] . "'
- AND locstock.reorderlevel > locstock.quantity
AND (fromlocstock.quantity - fromlocstock.reorderlevel) > 0
AND stockcategory.stocktype<>'A'
AND (stockmaster.mbflag='B' OR stockmaster.mbflag='M') " .
@@ -150,15 +154,21 @@
// The real needed stock is reorder level - qty - in transit).
$NeededQtyAtTo = $myrow['neededqty'] - $InTransitQuantityAtTo;
- // Decide how many are sent
- $ShipQty = 0;
- if ($AvailableShipQtyAtFrom > 0) {
- if ($AvailableShipQtyAtFrom >= $NeededQtyAtTo) {
- // We can ship all the needed qty at TO location
- $ShipQty = $NeededQtyAtTo;
- }else{
- // We can't ship all the needed qty at TO location, but at least can ship some
- $ShipQty = $AvailableShipQtyAtFrom;
+ // Decide how many are sent (depends on the strategy)
+ if ($_POST['Strategy'] == 'RLZero') {
+ // send items with overstock (and RL = 0) at FROM, no matter qty needed at TO.
+ $ShipQty = $AvailableShipQtyAtFrom;
+ }else{
+ // Send all items with overstock at FROM needed at TO
+ $ShipQty = 0;
+ if ($AvailableShipQtyAtFrom > 0) {
+ if ($AvailableShipQtyAtFrom >= $NeededQtyAtTo) {
+ // We can ship all the needed qty at TO location
+ $ShipQty = $NeededQtyAtTo;
+ }else{
+ // We can't ship all the needed qty at TO location, but at least can ship some
+ $ShipQty = $AvailableShipQtyAtFrom;
+ }
}
}
@@ -285,7 +295,7 @@
$title=_('Stock Dispatch Report');
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . _('Inventory Stock Dispatch Report') . '</p>';
- echo '<div class="page_help_text">' . _('Create batch of overstock from one location to transfer to another location that is below reorder level.<br/>
+ echo '<div class="page_help_text">' . _('Create a transfer batch of overstock from one location to another location that is below reorder level.<br/>
Quantity to ship is based on reorder level minus the quantity on hand at the To Location; if there is a<br/>
dispatch percentage entered, that needed quantity is inflated by the percentage entered.<br/>
Use Bulk Inventory Transfer - Receive to process the batch') . '</div>';
@@ -351,9 +361,6 @@
exit;
}
- // Define StockCat with 'name="StockCat[ ]" multiple' so can select more than one
- // Also have to change way define $WhereCategory for WHERE clause
-
echo '<tr>
<td>' . _('In Stock Category') . ':</td>
<td><select name="StockCat">';
@@ -374,6 +381,12 @@
}
echo '</select></td></tr>';
+ echo '<tr><td>' . _('Dispatch Strategy:') . ':</td>';
+ echo '<td><select name="Strategy">';
+ echo '<option selected="selected" value="All">' . _('Items needed at TO location with overstock at FROM location') . '</option>';
+ echo '<option value="RLZero">' . _('Items with overstock at FROM location (and RL=0)') . '</option>';
+ echo '</select></td><td> </td></tr>';
+
echo '<tr><td>' . _('Report Type') . ':</td>';
echo '<td><select name="ReportType">';
echo '<option selected="selected" value="Batch">' . _('Create Batch') . '</option>';
@@ -418,8 +431,8 @@
$YPos -=$line_height;
$pdf->addTextWrap($Left_Margin,$YPos,150,$FontSize,_('Stock Dispatch ') . $_POST['ReportType']);
- $pdf->addTextWrap(200,$YPos,50,$FontSize,_('From :'));
- $pdf->addTextWrap(250,$YPos,200,$FontSize,$FromLocation);
+ $pdf->addTextWrap(200,$YPos,30,$FontSize,_('From :'));
+ $pdf->addTextWrap(230,$YPos,200,$FontSize,$FromLocation);
$pdf->addTextWrap($Page_Width-$Right_Margin-150,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
@@ -427,16 +440,21 @@
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Transfer No.'));
$pdf->addTextWrap(95,$YPos,50,$FontSize,$Trf_ID);
$pdf->setFont('','B');
- $pdf->addTextWrap(200,$YPos,20,$FontSize,_('To :'));
- $pdf->addTextWrap(250,$YPos,200,$FontSize,$ToLocation);
+ $pdf->addTextWrap(200,$YPos,30,$FontSize,_('To :'));
+ $pdf->addTextWrap(230,$YPos,200,$FontSize,$ToLocation);
$pdf->setFont('','');
$YPos -= $line_height;
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Category'));
$pdf->addTextWrap(95,$YPos,50,$FontSize,$_POST['StockCat']);
$pdf->addTextWrap(160,$YPos,150,$FontSize,$CategoryDescription,'left');
$YPos -= $line_height;
- $pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Percent'));
- $pdf->addTextWrap(95,$YPos,50,$FontSize,$_POST['Percent']);
+ $pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Over transfer'));
+ $pdf->addTextWrap(95,$YPos,50,$FontSize,$_POST['Percent'] . "%");
+ if ($_POST['Strategy'] == 'RLZero') {
+ $pdf->addTextWrap(200,$YPos,200,$FontSize,_('Overstock items at '). $FromLocation);
+ }else{
+ $pdf->addTextWrap(200,$YPos,200,$FontSize,_('Items needed at '). $ToLocation);
+ }
$YPos -=(2*$line_height);
/*set up the headings */
$Xpos = $Left_Margin+1;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-16 21:56:35 UTC (rev 5438)
+++ trunk/doc/Change.log 2012-06-17 01:28:58 UTC (rev 5439)
@@ -1,4 +1,5 @@
webERP Change Log
+17/06/2012 Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
15/6/12 Release 4.08
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-06-19 03:49:16
|
Revision: 5442
http://web-erp.svn.sourceforge.net/web-erp/?rev=5442&view=rev
Author: tehonu
Date: 2012-06-19 03:49:10 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Ricard: Added new script Z_ChangeLocationCode.php
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/MainMenuLinksArray.php
Added Paths:
-----------
trunk/Z_ChangeLocationCode.php
Added: trunk/Z_ChangeLocationCode.php
===================================================================
--- trunk/Z_ChangeLocationCode.php (rev 0)
+++ trunk/Z_ChangeLocationCode.php 2012-06-19 03:49:10 UTC (rev 5442)
@@ -0,0 +1,266 @@
+<?php
+
+/* $Id: Z_ChangeLocationCode.php 5296 2012-04-29 15:28:19Z vvs2012 $*/
+
+include ('includes/session.inc');
+$title = _('UTILITY PAGE Change A Location Code');
+include('includes/header.inc');
+include('includes/SQL_CommonFunctions.inc');
+
+if (isset($_POST['ProcessLocationChange'])){
+
+ $InputError =0;
+
+ $_POST['NewLocationID'] = mb_strtoupper($_POST['NewLocationID']);
+
+/*First check the location code exists */
+ $result=DB_query("SELECT loccode FROM locations WHERE loccode='" . $_POST['OldLocationID'] . "'",$db);
+ if (DB_num_rows($result)==0){
+ prnMsg(_('The location code') . ': ' . $_POST['OldLocationID'] . ' ' . _('does not currently exist as a location code in the system'),'error');
+ $InputError =1;
+ }
+
+ if (ContainsIllegalCharacters($_POST['NewLocationID'])){
+ prnMsg(_('The new location code to change the old code to contains illegal characters - no changes will be made'),'error');
+ $InputError =1;
+ }
+
+ if ($_POST['NewLocationID']==''){
+ prnMsg(_('The new location code to change the old code to must be entered as well'),'error');
+ $InputError =1;
+ }
+
+ if (ContainsIllegalCharacters($_POST['NewLocationName'])){
+ prnMsg(_('The new location name to change the old name to contains illegal characters - no changes will be made'),'error');
+ $InputError =1;
+ }
+
+ if ($_POST['NewLocationName']==''){
+ prnMsg(_('The new location name to change the old name to must be entered as well'),'error');
+ $InputError =1;
+ }
+/*Now check that the new code doesn't already exist */
+ $result=DB_query("SELECT loccode FROM locations WHERE loccode='" . $_POST['NewLocationID'] . "'",$db);
+ if (DB_num_rows($result)!=0){
+ echo '<br /><br />';
+ prnMsg(_('The replacement location code') . ': ' . $_POST['NewLocationID'] . ' ' . _('already exists as a location code in the system') . ' - ' . _('a unique location code must be entered for the new code'),'error');
+ $InputError =1;
+ }
+
+ if ($InputError ==0){ // no input errors
+ $result = DB_Txn_Begin($db);
+ DB_IgnoreForeignKeys($db);
+
+ echo '<br />' . _('Adding the new location record');
+ $sql = "INSERT INTO locations (loccode,
+ locationname,
+ deladd1,
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ fax,
+ email,
+ contact,
+ taxprovinceid,
+ managed,
+ cashsalecustomer,
+ cashsalebranch)
+ SELECT '" . $_POST['NewLocationID'] . "',
+ '" . $_POST['NewLocationName'] . "',
+ deladd1,
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ fax,
+ email,
+ contact,
+ taxprovinceid,
+ managed,
+ cashsalecustomer,
+ cashsalebranch
+ FROM locations
+ WHERE loccode='" . $_POST['OldLocationID'] . "'";
+
+ $DbgMsg = _('The SQL statement that failed was');
+ $ErrMsg =_('The SQL to insert the new location record failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing the BOM table records');
+ $sql = "UPDATE bom SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the BOM records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing the config table records');
+ $sql = "UPDATE config SET confvalue='" . $_POST['NewLocationID'] . "' WHERE confvalue='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the BOM records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing the contracts table records');
+ $sql = "UPDATE contracts SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the contracts records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing the custbranch table records');
+ $sql = "UPDATE custbranch SET defaultlocation='" . $_POST['NewLocationID'] . "' WHERE defaultlocation='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the custbranch records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing the freightcosts table records');
+ $sql = "UPDATE freightcosts SET locationfrom='" . $_POST['NewLocationID'] . "' WHERE locationfrom='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the freightcosts records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing stock location records');
+ $sql = "UPDATE locstock SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update stock location records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing location transfer information (Shipping location)');
+ $sql = "UPDATE loctransfers SET shiploc='" . $_POST['NewLocationID'] . "' WHERE shiploc='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the loctransfers records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing location transfer information (Receiving location)');
+ $sql = "UPDATE loctransfers SET recloc='" . $_POST['NewLocationID'] . "' WHERE recloc='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the loctransfers records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ //check if MRP tables exist before assuming
+
+ $result = DB_query("SELECT COUNT(*) FROM mrpparameters",$db,'','',false,false);
+ if (DB_error_no($db)==0) {
+ echo '<br />' . _('Changing MRP parameters information');
+ $sql = "UPDATE mrpparameters SET location='" . $_POST['NewLocationID'] . "' WHERE location='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the mrpparameters records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+ }
+
+ echo '<br />' . _('Changing purchase orders information');
+ $sql = "UPDATE purchorders SET intostocklocation='" . $_POST['NewLocationID'] . "' WHERE intostocklocation='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the purchase orders records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing recurring sales orders information');
+ $sql = "UPDATE recurringsalesorders SET fromstkloc='" . $_POST['NewLocationID'] . "' WHERE fromstkloc='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the recurring sales orders records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing sales orders information');
+ $sql = "UPDATE salesorders SET fromstkloc='" . $_POST['NewLocationID'] . "' WHERE fromstkloc='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the sales orders records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing stock check freeze records');
+ $sql = "UPDATE stockcheckfreeze SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update stock check freeze records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing stockcounts records');
+ $sql = "UPDATE stockcounts SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update stockcounts records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing stockmoves records');
+ $sql = "UPDATE stockmoves SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update stockmoves records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing stockrequest records');
+ $sql = "UPDATE stockrequest SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update stockrequest records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing stockserialitems records');
+ $sql = "UPDATE stockserialitems SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update stockserialitems records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing tenders records');
+ $sql = "UPDATE tenders SET location='" . $_POST['NewLocationID'] . "' WHERE location='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update tenders records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing workcentres records');
+ $sql = "UPDATE workcentres SET location='" . $_POST['NewLocationID'] . "' WHERE location='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update workcentres records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing workorders records');
+ $sql = "UPDATE workorders SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update workorders records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing users records');
+ $sql = "UPDATE www_users SET defaultlocation='" . $_POST['NewLocationID'] . "' WHERE defaultlocation='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update users records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ DB_ReinstateForeignKeys($db);
+
+ $result = DB_Txn_Commit($db);
+
+ echo '<br />' . _('Deleting the old location record');
+ $sql = "DELETE FROM locations WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to delete the old location record failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+
+ echo '<p>' . _('Location code') . ': ' . $_POST['OldLocationID'] . ' ' . _('was successfully changed to') . ' : ' . $_POST['NewLocationID'];
+ } //only do the stuff above if $InputError==0
+}
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div class="centre">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+echo '<br />
+ <table>
+ <tr>
+ <td>' . _('Existing Location Code') . ':</td>
+ <td><input type="text" name="OldLocationID" size="5" maxlength="5" /></td>
+ </tr>
+ <tr>
+ <td>' . _('New Location Code') . ':</td>
+ <td><input type="text" name="NewLocationID" size="5" maxlength="5" /></td>
+ </tr>
+ <tr>
+ <td>' . _('New Location Name') . ':</td>
+ <td><input type="text" name="NewLocationName" size="50" maxlength="50" /></td>
+ </tr>
+ </table>
+
+ <input type="submit" name="ProcessLocationChange" value="' . _('Process') . '" />
+ </div>
+ </form>';
+
+include('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-18 01:21:18 UTC (rev 5441)
+++ trunk/doc/Change.log 2012-06-19 03:49:10 UTC (rev 5442)
@@ -1,4 +1,5 @@
webERP Change Log
+19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
17/06/2012 Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
15/6/12 Release 4.08
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2012-06-18 01:21:18 UTC (rev 5441)
+++ trunk/includes/MainMenuLinksArray.php 2012-06-19 03:49:10 UTC (rev 5442)
@@ -534,6 +534,7 @@
_('Change A Customer Branch Code'),
_('Change An Inventory Item Code'),
_('Change A Supplier Code'),
+ _('Change A Location Code'),
_('Update costs for all BOM items, from the bottom up'),
_('Re-apply costs to Sales Analysis'),
_('Delete sales transactions'),
@@ -543,6 +544,7 @@
'/Z_ChangeBranchCode.php',
'/Z_ChangeStockCode.php',
'/Z_ChangeSupplierCode.php',
+ '/Z_ChangeLocationCode.php',
'/Z_BottomUpCosts.php',
'/Z_ReApplyCostToSA.php',
'/Z_DeleteSalesTransActions.php',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-06-19 03:49:16
|
Revision: 5442
http://web-erp.svn.sourceforge.net/web-erp/?rev=5442&view=rev
Author: tehonu
Date: 2012-06-19 03:49:10 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Ricard: Added new script Z_ChangeLocationCode.php
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/MainMenuLinksArray.php
Added Paths:
-----------
trunk/Z_ChangeLocationCode.php
Added: trunk/Z_ChangeLocationCode.php
===================================================================
--- trunk/Z_ChangeLocationCode.php (rev 0)
+++ trunk/Z_ChangeLocationCode.php 2012-06-19 03:49:10 UTC (rev 5442)
@@ -0,0 +1,266 @@
+<?php
+
+/* $Id: Z_ChangeLocationCode.php 5296 2012-04-29 15:28:19Z vvs2012 $*/
+
+include ('includes/session.inc');
+$title = _('UTILITY PAGE Change A Location Code');
+include('includes/header.inc');
+include('includes/SQL_CommonFunctions.inc');
+
+if (isset($_POST['ProcessLocationChange'])){
+
+ $InputError =0;
+
+ $_POST['NewLocationID'] = mb_strtoupper($_POST['NewLocationID']);
+
+/*First check the location code exists */
+ $result=DB_query("SELECT loccode FROM locations WHERE loccode='" . $_POST['OldLocationID'] . "'",$db);
+ if (DB_num_rows($result)==0){
+ prnMsg(_('The location code') . ': ' . $_POST['OldLocationID'] . ' ' . _('does not currently exist as a location code in the system'),'error');
+ $InputError =1;
+ }
+
+ if (ContainsIllegalCharacters($_POST['NewLocationID'])){
+ prnMsg(_('The new location code to change the old code to contains illegal characters - no changes will be made'),'error');
+ $InputError =1;
+ }
+
+ if ($_POST['NewLocationID']==''){
+ prnMsg(_('The new location code to change the old code to must be entered as well'),'error');
+ $InputError =1;
+ }
+
+ if (ContainsIllegalCharacters($_POST['NewLocationName'])){
+ prnMsg(_('The new location name to change the old name to contains illegal characters - no changes will be made'),'error');
+ $InputError =1;
+ }
+
+ if ($_POST['NewLocationName']==''){
+ prnMsg(_('The new location name to change the old name to must be entered as well'),'error');
+ $InputError =1;
+ }
+/*Now check that the new code doesn't already exist */
+ $result=DB_query("SELECT loccode FROM locations WHERE loccode='" . $_POST['NewLocationID'] . "'",$db);
+ if (DB_num_rows($result)!=0){
+ echo '<br /><br />';
+ prnMsg(_('The replacement location code') . ': ' . $_POST['NewLocationID'] . ' ' . _('already exists as a location code in the system') . ' - ' . _('a unique location code must be entered for the new code'),'error');
+ $InputError =1;
+ }
+
+ if ($InputError ==0){ // no input errors
+ $result = DB_Txn_Begin($db);
+ DB_IgnoreForeignKeys($db);
+
+ echo '<br />' . _('Adding the new location record');
+ $sql = "INSERT INTO locations (loccode,
+ locationname,
+ deladd1,
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ fax,
+ email,
+ contact,
+ taxprovinceid,
+ managed,
+ cashsalecustomer,
+ cashsalebranch)
+ SELECT '" . $_POST['NewLocationID'] . "',
+ '" . $_POST['NewLocationName'] . "',
+ deladd1,
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ fax,
+ email,
+ contact,
+ taxprovinceid,
+ managed,
+ cashsalecustomer,
+ cashsalebranch
+ FROM locations
+ WHERE loccode='" . $_POST['OldLocationID'] . "'";
+
+ $DbgMsg = _('The SQL statement that failed was');
+ $ErrMsg =_('The SQL to insert the new location record failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing the BOM table records');
+ $sql = "UPDATE bom SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the BOM records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing the config table records');
+ $sql = "UPDATE config SET confvalue='" . $_POST['NewLocationID'] . "' WHERE confvalue='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the BOM records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing the contracts table records');
+ $sql = "UPDATE contracts SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the contracts records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing the custbranch table records');
+ $sql = "UPDATE custbranch SET defaultlocation='" . $_POST['NewLocationID'] . "' WHERE defaultlocation='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the custbranch records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing the freightcosts table records');
+ $sql = "UPDATE freightcosts SET locationfrom='" . $_POST['NewLocationID'] . "' WHERE locationfrom='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the freightcosts records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing stock location records');
+ $sql = "UPDATE locstock SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update stock location records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing location transfer information (Shipping location)');
+ $sql = "UPDATE loctransfers SET shiploc='" . $_POST['NewLocationID'] . "' WHERE shiploc='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the loctransfers records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing location transfer information (Receiving location)');
+ $sql = "UPDATE loctransfers SET recloc='" . $_POST['NewLocationID'] . "' WHERE recloc='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the loctransfers records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ //check if MRP tables exist before assuming
+
+ $result = DB_query("SELECT COUNT(*) FROM mrpparameters",$db,'','',false,false);
+ if (DB_error_no($db)==0) {
+ echo '<br />' . _('Changing MRP parameters information');
+ $sql = "UPDATE mrpparameters SET location='" . $_POST['NewLocationID'] . "' WHERE location='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the mrpparameters records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+ }
+
+ echo '<br />' . _('Changing purchase orders information');
+ $sql = "UPDATE purchorders SET intostocklocation='" . $_POST['NewLocationID'] . "' WHERE intostocklocation='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the purchase orders records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing recurring sales orders information');
+ $sql = "UPDATE recurringsalesorders SET fromstkloc='" . $_POST['NewLocationID'] . "' WHERE fromstkloc='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the recurring sales orders records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing sales orders information');
+ $sql = "UPDATE salesorders SET fromstkloc='" . $_POST['NewLocationID'] . "' WHERE fromstkloc='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update the sales orders records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing stock check freeze records');
+ $sql = "UPDATE stockcheckfreeze SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update stock check freeze records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing stockcounts records');
+ $sql = "UPDATE stockcounts SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update stockcounts records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing stockmoves records');
+ $sql = "UPDATE stockmoves SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update stockmoves records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing stockrequest records');
+ $sql = "UPDATE stockrequest SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update stockrequest records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing stockserialitems records');
+ $sql = "UPDATE stockserialitems SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update stockserialitems records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing tenders records');
+ $sql = "UPDATE tenders SET location='" . $_POST['NewLocationID'] . "' WHERE location='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update tenders records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing workcentres records');
+ $sql = "UPDATE workcentres SET location='" . $_POST['NewLocationID'] . "' WHERE location='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update workcentres records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing workorders records');
+ $sql = "UPDATE workorders SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update workorders records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Changing users records');
+ $sql = "UPDATE www_users SET defaultlocation='" . $_POST['NewLocationID'] . "' WHERE defaultlocation='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update users records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ DB_ReinstateForeignKeys($db);
+
+ $result = DB_Txn_Commit($db);
+
+ echo '<br />' . _('Deleting the old location record');
+ $sql = "DELETE FROM locations WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to delete the old location record failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+
+ echo '<p>' . _('Location code') . ': ' . $_POST['OldLocationID'] . ' ' . _('was successfully changed to') . ' : ' . $_POST['NewLocationID'];
+ } //only do the stuff above if $InputError==0
+}
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div class="centre">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+echo '<br />
+ <table>
+ <tr>
+ <td>' . _('Existing Location Code') . ':</td>
+ <td><input type="text" name="OldLocationID" size="5" maxlength="5" /></td>
+ </tr>
+ <tr>
+ <td>' . _('New Location Code') . ':</td>
+ <td><input type="text" name="NewLocationID" size="5" maxlength="5" /></td>
+ </tr>
+ <tr>
+ <td>' . _('New Location Name') . ':</td>
+ <td><input type="text" name="NewLocationName" size="50" maxlength="50" /></td>
+ </tr>
+ </table>
+
+ <input type="submit" name="ProcessLocationChange" value="' . _('Process') . '" />
+ </div>
+ </form>';
+
+include('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-18 01:21:18 UTC (rev 5441)
+++ trunk/doc/Change.log 2012-06-19 03:49:10 UTC (rev 5442)
@@ -1,4 +1,5 @@
webERP Change Log
+19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
17/06/2012 Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
15/6/12 Release 4.08
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2012-06-18 01:21:18 UTC (rev 5441)
+++ trunk/includes/MainMenuLinksArray.php 2012-06-19 03:49:10 UTC (rev 5442)
@@ -534,6 +534,7 @@
_('Change A Customer Branch Code'),
_('Change An Inventory Item Code'),
_('Change A Supplier Code'),
+ _('Change A Location Code'),
_('Update costs for all BOM items, from the bottom up'),
_('Re-apply costs to Sales Analysis'),
_('Delete sales transactions'),
@@ -543,6 +544,7 @@
'/Z_ChangeBranchCode.php',
'/Z_ChangeStockCode.php',
'/Z_ChangeSupplierCode.php',
+ '/Z_ChangeLocationCode.php',
'/Z_BottomUpCosts.php',
'/Z_ReApplyCostToSA.php',
'/Z_DeleteSalesTransActions.php',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-06-20 02:43:37
|
Revision: 5443
http://web-erp.svn.sourceforge.net/web-erp/?rev=5443&view=rev
Author: tehonu
Date: 2012-06-20 02:43:30 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Ricard: Added opposite currency pair graph to ExchangeRateTrend.php
Modified Paths:
--------------
trunk/ExchangeRateTrend.php
trunk/doc/Change.log
Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php 2012-06-19 03:49:10 UTC (rev 5442)
+++ trunk/ExchangeRateTrend.php 2012-06-20 02:43:30 UTC (rev 5443)
@@ -58,14 +58,22 @@
// **************
- $graph = $CurrencyToShow. '/' . $FunctionalCurrency . $graph;
- $image = 'http://www.x-rates.com/d/' . $graph;
+ $graphA = $CurrencyToShow. '/' . $FunctionalCurrency . $graph;
+ $image = 'http://www.x-rates.com/d/' . $graphA;
echo '<br /><table class="selection">';
echo '<tr><th><div class="centre"><b>' . $FunctionalCurrency . ' / ' . $CurrencyToShow . '</b></div></th></tr>';
echo '<tr><td><img src="' . $image . '" alt="' ._('Trend Currently Unavailable') . '" /></td></tr>';
echo '</table>';
+ $graphB = $FunctionalCurrency. '/' . $CurrencyToShow . $graph;
+ $image = 'http://www.x-rates.com/d/' . $graphB;
+ echo '<br /><table class="selection">';
+ echo '<tr><th><div class="centre"><b>' . $CurrencyToShow . ' / ' . $FunctionalCurrency . '</b></div></th></tr>';
+ echo '<tr><td><img src="' . $image . '" alt="' ._('Trend Currently Unavailable') . '" /></td></tr>';
+ echo '</table>';
+
+
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-19 03:49:10 UTC (rev 5442)
+++ trunk/doc/Change.log 2012-06-20 02:43:30 UTC (rev 5443)
@@ -1,4 +1,5 @@
webERP Change Log
+20/06/2012 Ricard: Added opposite currency pair graph to ExchangeRateTrend.php.
19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
17/06/2012 Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-06-20 02:43:37
|
Revision: 5443
http://web-erp.svn.sourceforge.net/web-erp/?rev=5443&view=rev
Author: tehonu
Date: 2012-06-20 02:43:30 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Ricard: Added opposite currency pair graph to ExchangeRateTrend.php
Modified Paths:
--------------
trunk/ExchangeRateTrend.php
trunk/doc/Change.log
Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php 2012-06-19 03:49:10 UTC (rev 5442)
+++ trunk/ExchangeRateTrend.php 2012-06-20 02:43:30 UTC (rev 5443)
@@ -58,14 +58,22 @@
// **************
- $graph = $CurrencyToShow. '/' . $FunctionalCurrency . $graph;
- $image = 'http://www.x-rates.com/d/' . $graph;
+ $graphA = $CurrencyToShow. '/' . $FunctionalCurrency . $graph;
+ $image = 'http://www.x-rates.com/d/' . $graphA;
echo '<br /><table class="selection">';
echo '<tr><th><div class="centre"><b>' . $FunctionalCurrency . ' / ' . $CurrencyToShow . '</b></div></th></tr>';
echo '<tr><td><img src="' . $image . '" alt="' ._('Trend Currently Unavailable') . '" /></td></tr>';
echo '</table>';
+ $graphB = $FunctionalCurrency. '/' . $CurrencyToShow . $graph;
+ $image = 'http://www.x-rates.com/d/' . $graphB;
+ echo '<br /><table class="selection">';
+ echo '<tr><th><div class="centre"><b>' . $CurrencyToShow . ' / ' . $FunctionalCurrency . '</b></div></th></tr>';
+ echo '<tr><td><img src="' . $image . '" alt="' ._('Trend Currently Unavailable') . '" /></td></tr>';
+ echo '</table>';
+
+
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-19 03:49:10 UTC (rev 5442)
+++ trunk/doc/Change.log 2012-06-20 02:43:30 UTC (rev 5443)
@@ -1,4 +1,5 @@
webERP Change Log
+20/06/2012 Ricard: Added opposite currency pair graph to ExchangeRateTrend.php.
19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
17/06/2012 Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-06-20 08:52:14
|
Revision: 5444
http://web-erp.svn.sourceforge.net/web-erp/?rev=5444&view=rev
Author: tehonu
Date: 2012-06-20 08:52:04 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Ricard: Added total QOH to NoSalesItems.php
Modified Paths:
--------------
trunk/NoSalesItems.php
trunk/doc/Change.log
Modified: trunk/NoSalesItems.php
===================================================================
--- trunk/NoSalesItems.php 2012-06-20 02:43:30 UTC (rev 5443)
+++ trunk/NoSalesItems.php 2012-06-20 08:52:04 UTC (rev 5444)
@@ -1,6 +1,6 @@
<?php
-/* $Id: NoSalesItems.php 2012-05-12 Kapal Laut $*/
+/* $Id: NoSalesItems.php 2012-05-12 $*/
/* Session started in session.inc for password checking and authorisation level check
config.php is in turn included in session.inc*/
@@ -146,7 +146,7 @@
$SQL = $SQL. "ORDER BY stockmaster.stockid";
$result = DB_query($SQL, $db);
echo '<p class="page_title_text" align="center"><strong>' . _('No Sales Items') . '</strong></p>';
- echo '<form action="PDFNoSalesItems2.php" method="GET">
+ echo '<form action="PDFNoSalesItems.php" method="GET">
<table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$TableHeader = '<tr>
@@ -154,7 +154,8 @@
<th>' . _('Location') . '</th>
<th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
- <th>' . _('On Hand') . '</th>
+ <th>' . _('Location QOH') . '</th>
+ <th>' . _('Total QOH') . '</th>
<th>' . _('Units') . '</th>
</tr>';
echo $TableHeader;
@@ -171,18 +172,28 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
+ $QOHResult = DB_query("SELECT sum(quantity)
+ FROM locstock
+ WHERE stockid = '" . $myrow['stockid'] . "'", $db);
+ $QOHRow = DB_fetch_row($QOHResult);
+ $QOH = $QOHRow[0];
+
+ $CodeLink = '<a href="' . $rootpath . '/SelectProduct.php?StockID=' . $myrow['stockid'] . '">' . $myrow['stockid'] . '</a>';
+
printf('<td class="number">%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
+ <td>%s</td>
</tr>',
$i,
$myrow['locationname'],
- $myrow['0'],
+ $CodeLink,
$myrow['description'],
- $myrow['quantity'], //onhand
+ $myrow['quantity'], //on hand on location selected only
+ $QOH, // total on hand
$myrow['units'] //unit
);
$i++;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-20 02:43:30 UTC (rev 5443)
+++ trunk/doc/Change.log 2012-06-20 08:52:04 UTC (rev 5444)
@@ -1,4 +1,5 @@
webERP Change Log
+20/06/2012 Ricard: Added total QOH to NoSalesItems.php.
20/06/2012 Ricard: Added opposite currency pair graph to ExchangeRateTrend.php.
19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
17/06/2012 Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <te...@us...> - 2012-06-20 08:52:15
|
Revision: 5444
http://web-erp.svn.sourceforge.net/web-erp/?rev=5444&view=rev
Author: tehonu
Date: 2012-06-20 08:52:04 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Ricard: Added total QOH to NoSalesItems.php
Modified Paths:
--------------
trunk/NoSalesItems.php
trunk/doc/Change.log
Modified: trunk/NoSalesItems.php
===================================================================
--- trunk/NoSalesItems.php 2012-06-20 02:43:30 UTC (rev 5443)
+++ trunk/NoSalesItems.php 2012-06-20 08:52:04 UTC (rev 5444)
@@ -1,6 +1,6 @@
<?php
-/* $Id: NoSalesItems.php 2012-05-12 Kapal Laut $*/
+/* $Id: NoSalesItems.php 2012-05-12 $*/
/* Session started in session.inc for password checking and authorisation level check
config.php is in turn included in session.inc*/
@@ -146,7 +146,7 @@
$SQL = $SQL. "ORDER BY stockmaster.stockid";
$result = DB_query($SQL, $db);
echo '<p class="page_title_text" align="center"><strong>' . _('No Sales Items') . '</strong></p>';
- echo '<form action="PDFNoSalesItems2.php" method="GET">
+ echo '<form action="PDFNoSalesItems.php" method="GET">
<table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$TableHeader = '<tr>
@@ -154,7 +154,8 @@
<th>' . _('Location') . '</th>
<th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
- <th>' . _('On Hand') . '</th>
+ <th>' . _('Location QOH') . '</th>
+ <th>' . _('Total QOH') . '</th>
<th>' . _('Units') . '</th>
</tr>';
echo $TableHeader;
@@ -171,18 +172,28 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
+ $QOHResult = DB_query("SELECT sum(quantity)
+ FROM locstock
+ WHERE stockid = '" . $myrow['stockid'] . "'", $db);
+ $QOHRow = DB_fetch_row($QOHResult);
+ $QOH = $QOHRow[0];
+
+ $CodeLink = '<a href="' . $rootpath . '/SelectProduct.php?StockID=' . $myrow['stockid'] . '">' . $myrow['stockid'] . '</a>';
+
printf('<td class="number">%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
+ <td>%s</td>
</tr>',
$i,
$myrow['locationname'],
- $myrow['0'],
+ $CodeLink,
$myrow['description'],
- $myrow['quantity'], //onhand
+ $myrow['quantity'], //on hand on location selected only
+ $QOH, // total on hand
$myrow['units'] //unit
);
$i++;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-20 02:43:30 UTC (rev 5443)
+++ trunk/doc/Change.log 2012-06-20 08:52:04 UTC (rev 5444)
@@ -1,4 +1,5 @@
webERP Change Log
+20/06/2012 Ricard: Added total QOH to NoSalesItems.php.
20/06/2012 Ricard: Added opposite currency pair graph to ExchangeRateTrend.php.
19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
17/06/2012 Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-06-21 19:36:26
|
Revision: 5445
http://web-erp.svn.sourceforge.net/web-erp/?rev=5445&view=rev
Author: daintree
Date: 2012-06-21 19:36:19 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
tooltip of long description
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/TaxCategories.php
trunk/api/api_stock.php
trunk/api/api_taxgroups.php
trunk/api/api_xml-rpc.php
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
trunk/includes/MiscFunctions.php
trunk/sql/mysql/weberp-demo.sql
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/SelectProduct.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -560,6 +560,7 @@
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
SUM(locstock.quantity) AS qoh,
stockmaster.units,
stockmaster.mbflag,
@@ -573,6 +574,7 @@
AND stockmaster.description " . LIKE . " '$SearchString'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -581,6 +583,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
SUM(locstock.quantity) AS qoh,
stockmaster.units,
stockmaster.mbflag,
@@ -593,6 +596,7 @@
AND categoryid='" . $_POST['StockCat'] . "'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -604,6 +608,7 @@
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockmaster.discontinued,
SUM(locstock.quantity) AS qoh,
@@ -617,6 +622,7 @@
AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -625,6 +631,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockmaster.discontinued,
sum(locstock.quantity) as qoh,
@@ -637,6 +644,7 @@
AND categoryid='" . $_POST['StockCat'] . "'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -647,6 +655,7 @@
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockmaster.discontinued,
SUM(locstock.quantity) AS qoh,
@@ -659,6 +668,7 @@
WHERE stockmaster.stockid=locstock.stockid
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -667,6 +677,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockmaster.discontinued,
SUM(locstock.quantity) AS qoh,
@@ -678,6 +689,7 @@
AND categoryid='" . $_POST['StockCat'] . "'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -773,7 +785,7 @@
}
echo '<td><input type="submit" name="Select" value="' . $myrow['stockid'] . '" /></td>
- <td>'.$myrow['description'].'</td>
+ <td title="'. $myrow['longdescription'] . '">' . $myrow['description'] . '</td>
<td class="number">' . $qoh . '</td>
<td>' . $myrow['units'] . '</td>
<td>' . $ItemStatus . '</td>
Modified: trunk/TaxCategories.php
===================================================================
--- trunk/TaxCategories.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/TaxCategories.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -121,9 +121,9 @@
// This is probably the safest way there is
prnMsg( _('Cannot delete this tax category because it no longer exists'),'warn');
} else {
- $myrow = DB_fetch_row($result);
- $OldTaxCategoryName = $myrow[0];
- $sql= "SELECT COUNT(*) FROM stockmaster WHERE taxcatid ".LIKE." '" . $OldTaxCategoryName . "'";
+ $myrow = DB_fetch_array($result);
+ $TaxCatName = $myrow['taxcatname'];
+ $sql= "SELECT COUNT(*) FROM stockmaster WHERE taxcatid = '" . $SelectedTaxCategory . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0]>0) {
@@ -134,7 +134,7 @@
$result = DB_query($sql,$db);
$sql = "DELETE FROM taxcategories WHERE taxcatid = '" . $SelectedTaxCategory . "'";
$result = DB_query($sql,$db);
- prnMsg( $OldTaxCategoryName . ' ' . _('tax category and any tax rates set for it have been deleted'),'success');
+ prnMsg( $TaxCatName . ' ' . _('tax category and any tax rates set for it have been deleted'),'success');
}
} //end if
unset ($SelectedTaxCategory);
Modified: trunk/api/api_stock.php
===================================================================
--- trunk/api/api_stock.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/api/api_stock.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -563,7 +563,7 @@
$sql="SELECT quantity,
loccode
FROM locstock WHERE stockid='" . $StockID."'";
- $result = DB_Query($sql, $db);
+ $result = DB_query($sql, $db);
if (sizeof($Errors)==0) {
$i=0;
while ($myrow=DB_fetch_array($result)) {
Modified: trunk/api/api_taxgroups.php
===================================================================
--- trunk/api/api_taxgroups.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/api/api_taxgroups.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -5,7 +5,7 @@
* currently setup on webERP
*/
- function GetTaxgroupList($user, $password) {
+ function GetTaxGroupList($user, $password) {
$Errors = array();
$db = db($user, $password);
if (gettype($db)=='integer') {
@@ -27,7 +27,7 @@
* tax group.
*/
- function GetTaxgroupDetails($taxgroup, $user, $password) {
+ function GetTaxGroupDetails($taxgroup, $user, $password) {
$Errors = array();
$db = db($user, $password);
if (gettype($db)=='integer') {
@@ -51,9 +51,20 @@
$Errors[0]=NoAuthorisation;
return $Errors;
}
- $sql = "SELECT * FROM taxgrouptaxes WHERE taxgroupid='".$TaxGroup."'";
+ $sql = "SELECT taxgroupid, taxauthid, calculationorder, taxontax FROM taxgrouptaxes WHERE taxgroupid='".$TaxGroup."'";
$result = DB_query($sql, $db);
- return DB_fetch_array($result);
+ $i=0;
+ $Answer = array();
+ while ($myrow=DB_fetch_array($result)){
+ $Answer[$i]['taxgroupid'] = $myrow['taxgroupid'];
+ $Answer[$i]['taxauthid'] = $myrow['taxauthid'];
+ $Answer[$i]['calculationorder'] = $myrow['calculationorder'];
+ $Answer[$i]['taxontax'] = $myrow['taxontax'];
+ $i++;
+ }
+ $Errors[0]=0;
+ $Errors[1]=$Answer;
+ return $Errors;
}
/* This function returns a list of the tax authority ids
@@ -90,20 +101,9 @@
}
$sql = "SELECT * FROM taxauthorities WHERE taxid='".$TaxAuthority."'";
$result = DB_query($sql, $db);
- $i=0;
- while ($myrow=DB_fetch_array($result)){
- $Answer[$i]['taxcatid'] = $myrow['taxcatid'];
- $Answer[$i]['dispatchtaxprovince'] = $myrow['dispatchtaxprovince'];
- $Answer[$i]['taxrate'] = $myrow['taxrate'];
- }
- $Errors[0]=0;
- $Errors[1]=$Answer;
- return $Errors;
+ return DB_fetch_array($result);
}
-
-/
-
/* This function takes as a parameter a tax authority id and a tax category id
* and returns an array containing the rate of tax for the selected
* tax authority and tax category
@@ -116,11 +116,19 @@
$Errors[0]=NoAuthorisation;
return $Errors;
}
- $sql = "SELECT taxcatid, dispatchtaxprovince, taxrate FROM taxauthrates WHERE taxauthority='".$TaxAuthority."' AND taxcatid='" . $TaxCatID . "'";
+ $sql = "SELECT taxcatid, dispatchtaxprovince, taxrate FROM taxauthrates WHERE taxauthority='".$TaxAuthority."'";
$result = DB_query($sql, $db);
- $TaxRateRow = DB_fetch_row($result);
- return $TaxRateRow[0];
+ $i=0;
+ $Answer = array();
+ while ($myrow=DB_fetch_array($result)){
+ $Answer[$i]['taxcatid'] = $myrow['taxcatid'];
+ $Answer[$i]['dispatchtaxprovince'] = $myrow['dispatchtaxprovince'];
+ $Answer[$i]['taxrate'] = $myrow['taxrate'];
+ $i++;
+ }
+ $Errors[0]=0;
+ $Errors[1]=$Answer;
+ return $Errors;
}
-
?>
\ No newline at end of file
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/api/api_xml-rpc.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -1844,16 +1844,16 @@
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group IDs.');
-/*E*/$GetTaxgroupList_sig = array(array($xmlrpcStruct),
+/*E*/$GetTaxGroupList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
- $GetTaxgroupList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+ $GetTaxGroupList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
- function xmlrpc_GetTaxgroupList($xmlrpcmsg){
+ function xmlrpc_GetTaxGroupList($xmlrpcmsg){
ob_start('ob_file_callback');
/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList( '', '')));
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupList( '', '')));
/*x*/ }
ob_end_flush();
return $rtn;
@@ -1873,18 +1873,18 @@
$Parameter[2]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group details.');
-/*E*/$GetTaxgroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*E*/$GetTaxGroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
- $GetTaxgroupDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+ $GetTaxGroupDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
- function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
+ function xmlrpc_GetTaxGroupDetails($xmlrpcmsg){
ob_start('ob_file_callback');
/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
/*x*/ }
ob_end_flush();
return $rtn;
@@ -1932,7 +1932,7 @@
function xmlrpc_GetTaxAuthorityDetails($xmlrpcmsg){
ob_start('ob_file_callback');
/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
/*x*/ }
@@ -3240,18 +3240,14 @@
"function" => "xmlrpc_InsertSalesman",
"signature" => $InsertSalesman_sig,
"docstring" => $InsertSalesman_doc),
- "weberp.xmlrpc_GetTaxgroupList" => array(
- "function" => "xmlrpc_GetTaxgroupList",
- "signature" => $GetTaxgroupList_sig,
- "docstring" => $GetTaxgroupList_doc),
- "weberp.xmlrpc_GetTaxCategoryList" => array(
- "function" => "xmlrpc_GetTaxCategoryList",
- "signature" => $GetTaxCategoryList_sig,
- "docstring" => $GetTaxCategoryList_doc),
- "weberp.xmlrpc_GetTaxgroupDetails" => array(
- "function" => "xmlrpc_GetTaxgroupDetails",
- "signature" => $GetTaxgroupDetails_sig,
- "docstring" => $GetTaxgroupDetails_doc),
+ "weberp.xmlrpc_GetTaxGroupList" => array(
+ "function" => "xmlrpc_GetTaxGroupList",
+ "signature" => $GetTaxGroupList_sig,
+ "docstring" => $GetTaxGroupList_doc),
+ "weberp.xmlrpc_GetTaxGroupDetails" => array(
+ "function" => "xmlrpc_GetTaxGroupDetails",
+ "signature" => $GetTaxGroupDetails_sig,
+ "docstring" => $GetTaxGroupDetails_doc),
"weberp.xmlrpc_GetTaxGroupTaxes" => array(
"function" => "xmlrpc_GetTaxGroupTaxes",
"signature" => $GetTaxGroupTaxes_sig,
@@ -3264,10 +3260,10 @@
"function" => "xmlrpc_GetTaxAuthorityDetails",
"signature" => $GetTaxAuthorityDetails_sig,
"docstring" => $GetTaxAuthorityDetails_doc),
- "weberp.xmlrpc_GetTaxAuthorityRate" => array(
- "function" => "xmlrpc_GetTaxAuthorityRate",
- "signature" => $GetTaxAuthorityRate_sig,
- "docstring" => $GetTaxAuthorityRate_doc),
+ "weberp.xmlrpc_GetTaxAuthorityRates" => array(
+ "function" => "xmlrpc_GetTaxAuthorityRates",
+ "signature" => $GetTaxAuthorityRates_sig,
+ "docstring" => $GetTaxAuthorityRates_doc),
"weberp.xmlrpc_GetCustomerTypeList" => array(
"function" => "xmlrpc_GetCustomerTypeList",
"signature" => $GetCustomerTypeList_sig,
@@ -3409,4 +3405,4 @@
return $doc;
}
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/doc/Change.log 2012-06-21 19:36:19 UTC (rev 5445)
@@ -1,4 +1,6 @@
webERP Change Log
+
+21/06/2012 Phil: Added tooltip of long description to SelectProduct.php
20/06/2012 Ricard: Added total QOH to NoSalesItems.php.
20/06/2012 Ricard: Added opposite currency pair graph to ExchangeRateTrend.php.
19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/doc/Manual/ManualContributors.html 2012-06-21 19:36:19 UTC (rev 5445)
@@ -13,6 +13,8 @@
<br /><br />
Shane Barnaby
<br /><br />
+Klaus Beucher
+<br /><br />
Chris Bice
<br /><br />
Danie Brink
@@ -33,10 +35,14 @@
<br /><br />
Edd Dumbill (phpxmlrpc)
<br /><br />
+Ahmed Fawzy
+<br /><br />
Tom Fox
<br /><br />
Braian Gomez
<br /><br />
+Paul Harness
+<br /><br />
Lindsay Harris
<br /><br />
David Hawke
@@ -45,6 +51,8 @@
<br /><br />
High-Tech Bridge SA Security Research Lab
<br /><br />
+Tomáš Horáček (barcodepack)
+<br /><br />
Hindra Joshua
<br /><br />
Alan Jones
@@ -53,6 +61,8 @@
<br /><br />
Nico Kaiser (php-gettext)
<br /><br />
+CQZ,KE
+<br /><br />
Mo Kelly - due dates and customer po by sales order line
<br /><br />
Meraj Khattak - database diagram
@@ -83,6 +93,8 @@
<br /><br />
Afan Ottenheimer (phplot)
<br /><br />
+Kunshan-Ouhai
+<br /><br />
Ricardo Pedroso
<br /><br />
Jesse Peterson
@@ -136,12 +148,16 @@
<td valign="top">
<b>Translation </b>
<br /><br />
+Billy Chang,劉世琪 - Taiwanese
+<br /><br />
Csillag Péter Hungarian
<br /><br />
Danu Satrio Pratomo Djojosoemarto and his cousin - Indonesian
<br /><br />
Janusz Dobrowolski - Polish
<br /><br />
+James Dupin - French
+<br /><br />
Matt Elbrecht - Estonian
<br /><br />
Igor Felix - Portuguese Brazilian
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/includes/MiscFunctions.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -160,8 +160,12 @@
if ($tag['type'] == 'complete' OR $tag['type'] == 'open') {
$elements[$index] = new XmlElement;
$elements[$index]->name = $tag['tag'];
- $elements[$index]->attributes = $tag['attributes'];
- $elements[$index]->content = $tag['value'];
+ if (isset($tag['attributes'])){
+ $elements[$index]->attributes = $tag['attributes'];
+ }
+ if (isset($tag['value'])){
+ $elements[$index]->content = $tag['value'];
+ }
if ($tag['type'] == 'open') { // push
$elements[$index]->children = array();
$stack[count($stack)] = &$elements;
Modified: trunk/sql/mysql/weberp-demo.sql
===================================================================
--- trunk/sql/mysql/weberp-demo.sql 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/sql/mysql/weberp-demo.sql 2012-06-21 19:36:19 UTC (rev 5445)
@@ -17,8 +17,6 @@
-- Table structure for table `accountgroups`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `accountgroups` (
`groupname` char(30) NOT NULL DEFAULT '',
`sectioninaccounts` int(11) NOT NULL DEFAULT '0',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-06-21 19:36:27
|
Revision: 5445
http://web-erp.svn.sourceforge.net/web-erp/?rev=5445&view=rev
Author: daintree
Date: 2012-06-21 19:36:19 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
tooltip of long description
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/TaxCategories.php
trunk/api/api_stock.php
trunk/api/api_taxgroups.php
trunk/api/api_xml-rpc.php
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
trunk/includes/MiscFunctions.php
trunk/sql/mysql/weberp-demo.sql
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/SelectProduct.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -560,6 +560,7 @@
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
SUM(locstock.quantity) AS qoh,
stockmaster.units,
stockmaster.mbflag,
@@ -573,6 +574,7 @@
AND stockmaster.description " . LIKE . " '$SearchString'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -581,6 +583,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
SUM(locstock.quantity) AS qoh,
stockmaster.units,
stockmaster.mbflag,
@@ -593,6 +596,7 @@
AND categoryid='" . $_POST['StockCat'] . "'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -604,6 +608,7 @@
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockmaster.discontinued,
SUM(locstock.quantity) AS qoh,
@@ -617,6 +622,7 @@
AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -625,6 +631,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockmaster.discontinued,
sum(locstock.quantity) as qoh,
@@ -637,6 +644,7 @@
AND categoryid='" . $_POST['StockCat'] . "'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -647,6 +655,7 @@
if ($_POST['StockCat'] == 'All') {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockmaster.discontinued,
SUM(locstock.quantity) AS qoh,
@@ -659,6 +668,7 @@
WHERE stockmaster.stockid=locstock.stockid
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -667,6 +677,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockmaster.discontinued,
SUM(locstock.quantity) AS qoh,
@@ -678,6 +689,7 @@
AND categoryid='" . $_POST['StockCat'] . "'
GROUP BY stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units,
stockmaster.mbflag,
stockmaster.discontinued,
@@ -773,7 +785,7 @@
}
echo '<td><input type="submit" name="Select" value="' . $myrow['stockid'] . '" /></td>
- <td>'.$myrow['description'].'</td>
+ <td title="'. $myrow['longdescription'] . '">' . $myrow['description'] . '</td>
<td class="number">' . $qoh . '</td>
<td>' . $myrow['units'] . '</td>
<td>' . $ItemStatus . '</td>
Modified: trunk/TaxCategories.php
===================================================================
--- trunk/TaxCategories.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/TaxCategories.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -121,9 +121,9 @@
// This is probably the safest way there is
prnMsg( _('Cannot delete this tax category because it no longer exists'),'warn');
} else {
- $myrow = DB_fetch_row($result);
- $OldTaxCategoryName = $myrow[0];
- $sql= "SELECT COUNT(*) FROM stockmaster WHERE taxcatid ".LIKE." '" . $OldTaxCategoryName . "'";
+ $myrow = DB_fetch_array($result);
+ $TaxCatName = $myrow['taxcatname'];
+ $sql= "SELECT COUNT(*) FROM stockmaster WHERE taxcatid = '" . $SelectedTaxCategory . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0]>0) {
@@ -134,7 +134,7 @@
$result = DB_query($sql,$db);
$sql = "DELETE FROM taxcategories WHERE taxcatid = '" . $SelectedTaxCategory . "'";
$result = DB_query($sql,$db);
- prnMsg( $OldTaxCategoryName . ' ' . _('tax category and any tax rates set for it have been deleted'),'success');
+ prnMsg( $TaxCatName . ' ' . _('tax category and any tax rates set for it have been deleted'),'success');
}
} //end if
unset ($SelectedTaxCategory);
Modified: trunk/api/api_stock.php
===================================================================
--- trunk/api/api_stock.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/api/api_stock.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -563,7 +563,7 @@
$sql="SELECT quantity,
loccode
FROM locstock WHERE stockid='" . $StockID."'";
- $result = DB_Query($sql, $db);
+ $result = DB_query($sql, $db);
if (sizeof($Errors)==0) {
$i=0;
while ($myrow=DB_fetch_array($result)) {
Modified: trunk/api/api_taxgroups.php
===================================================================
--- trunk/api/api_taxgroups.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/api/api_taxgroups.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -5,7 +5,7 @@
* currently setup on webERP
*/
- function GetTaxgroupList($user, $password) {
+ function GetTaxGroupList($user, $password) {
$Errors = array();
$db = db($user, $password);
if (gettype($db)=='integer') {
@@ -27,7 +27,7 @@
* tax group.
*/
- function GetTaxgroupDetails($taxgroup, $user, $password) {
+ function GetTaxGroupDetails($taxgroup, $user, $password) {
$Errors = array();
$db = db($user, $password);
if (gettype($db)=='integer') {
@@ -51,9 +51,20 @@
$Errors[0]=NoAuthorisation;
return $Errors;
}
- $sql = "SELECT * FROM taxgrouptaxes WHERE taxgroupid='".$TaxGroup."'";
+ $sql = "SELECT taxgroupid, taxauthid, calculationorder, taxontax FROM taxgrouptaxes WHERE taxgroupid='".$TaxGroup."'";
$result = DB_query($sql, $db);
- return DB_fetch_array($result);
+ $i=0;
+ $Answer = array();
+ while ($myrow=DB_fetch_array($result)){
+ $Answer[$i]['taxgroupid'] = $myrow['taxgroupid'];
+ $Answer[$i]['taxauthid'] = $myrow['taxauthid'];
+ $Answer[$i]['calculationorder'] = $myrow['calculationorder'];
+ $Answer[$i]['taxontax'] = $myrow['taxontax'];
+ $i++;
+ }
+ $Errors[0]=0;
+ $Errors[1]=$Answer;
+ return $Errors;
}
/* This function returns a list of the tax authority ids
@@ -90,20 +101,9 @@
}
$sql = "SELECT * FROM taxauthorities WHERE taxid='".$TaxAuthority."'";
$result = DB_query($sql, $db);
- $i=0;
- while ($myrow=DB_fetch_array($result)){
- $Answer[$i]['taxcatid'] = $myrow['taxcatid'];
- $Answer[$i]['dispatchtaxprovince'] = $myrow['dispatchtaxprovince'];
- $Answer[$i]['taxrate'] = $myrow['taxrate'];
- }
- $Errors[0]=0;
- $Errors[1]=$Answer;
- return $Errors;
+ return DB_fetch_array($result);
}
-
-/
-
/* This function takes as a parameter a tax authority id and a tax category id
* and returns an array containing the rate of tax for the selected
* tax authority and tax category
@@ -116,11 +116,19 @@
$Errors[0]=NoAuthorisation;
return $Errors;
}
- $sql = "SELECT taxcatid, dispatchtaxprovince, taxrate FROM taxauthrates WHERE taxauthority='".$TaxAuthority."' AND taxcatid='" . $TaxCatID . "'";
+ $sql = "SELECT taxcatid, dispatchtaxprovince, taxrate FROM taxauthrates WHERE taxauthority='".$TaxAuthority."'";
$result = DB_query($sql, $db);
- $TaxRateRow = DB_fetch_row($result);
- return $TaxRateRow[0];
+ $i=0;
+ $Answer = array();
+ while ($myrow=DB_fetch_array($result)){
+ $Answer[$i]['taxcatid'] = $myrow['taxcatid'];
+ $Answer[$i]['dispatchtaxprovince'] = $myrow['dispatchtaxprovince'];
+ $Answer[$i]['taxrate'] = $myrow['taxrate'];
+ $i++;
+ }
+ $Errors[0]=0;
+ $Errors[1]=$Answer;
+ return $Errors;
}
-
?>
\ No newline at end of file
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/api/api_xml-rpc.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -1844,16 +1844,16 @@
$Parameter[1]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group IDs.');
-/*E*/$GetTaxgroupList_sig = array(array($xmlrpcStruct),
+/*E*/$GetTaxGroupList_sig = array(array($xmlrpcStruct),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString));
- $GetTaxgroupList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+ $GetTaxGroupList_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
- function xmlrpc_GetTaxgroupList($xmlrpcmsg){
+ function xmlrpc_GetTaxGroupList($xmlrpcmsg){
ob_start('ob_file_callback');
/*x*/ if ($xmlrpcmsg->getNumParams() == 2) {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupList($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ))) );
/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupList( '', '')));
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupList( '', '')));
/*x*/ }
ob_end_flush();
return $rtn;
@@ -1873,18 +1873,18 @@
$Parameter[2]['description'] = _('The weberp password associated with this user name. ');
$ReturnValue[0] = _('This function returns an array of tax group details.');
-/*E*/$GetTaxgroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
+/*E*/$GetTaxGroupDetails_sig = array(array($xmlrpcStruct,$xmlrpcString),
/*x*/ array($xmlrpcStruct,$xmlrpcString,$xmlrpcString,$xmlrpcString));
- $GetTaxgroupDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
+ $GetTaxGroupDetails_doc = apiBuildDocHTML( $Description,$Parameter,$ReturnValue );
- function xmlrpc_GetTaxgroupDetails($xmlrpcmsg){
+ function xmlrpc_GetTaxGroupDetails($xmlrpcmsg){
ob_start('ob_file_callback');
/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ),
/*x*/ $xmlrpcmsg->getParam( 1 )->scalarval( ),
/*x*/ $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
/*x*/ } else {
-/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxgroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
+/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxGroupDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
/*x*/ }
ob_end_flush();
return $rtn;
@@ -1932,7 +1932,7 @@
function xmlrpc_GetTaxAuthorityDetails($xmlrpcmsg){
ob_start('ob_file_callback');
/*x*/ if ($xmlrpcmsg->getNumParams() == 3) {
-/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
+/*x*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), $xmlrpcmsg->getParam( 1 )->scalarval( ), $xmlrpcmsg->getParam( 2 )->scalarval( ))) );
/*x*/ } else {
/*e*/ $rtn = new xmlrpcresp( php_xmlrpc_encode(GetTaxAuthorityDetails($xmlrpcmsg->getParam( 0 )->scalarval( ), '', '')));
/*x*/ }
@@ -3240,18 +3240,14 @@
"function" => "xmlrpc_InsertSalesman",
"signature" => $InsertSalesman_sig,
"docstring" => $InsertSalesman_doc),
- "weberp.xmlrpc_GetTaxgroupList" => array(
- "function" => "xmlrpc_GetTaxgroupList",
- "signature" => $GetTaxgroupList_sig,
- "docstring" => $GetTaxgroupList_doc),
- "weberp.xmlrpc_GetTaxCategoryList" => array(
- "function" => "xmlrpc_GetTaxCategoryList",
- "signature" => $GetTaxCategoryList_sig,
- "docstring" => $GetTaxCategoryList_doc),
- "weberp.xmlrpc_GetTaxgroupDetails" => array(
- "function" => "xmlrpc_GetTaxgroupDetails",
- "signature" => $GetTaxgroupDetails_sig,
- "docstring" => $GetTaxgroupDetails_doc),
+ "weberp.xmlrpc_GetTaxGroupList" => array(
+ "function" => "xmlrpc_GetTaxGroupList",
+ "signature" => $GetTaxGroupList_sig,
+ "docstring" => $GetTaxGroupList_doc),
+ "weberp.xmlrpc_GetTaxGroupDetails" => array(
+ "function" => "xmlrpc_GetTaxGroupDetails",
+ "signature" => $GetTaxGroupDetails_sig,
+ "docstring" => $GetTaxGroupDetails_doc),
"weberp.xmlrpc_GetTaxGroupTaxes" => array(
"function" => "xmlrpc_GetTaxGroupTaxes",
"signature" => $GetTaxGroupTaxes_sig,
@@ -3264,10 +3260,10 @@
"function" => "xmlrpc_GetTaxAuthorityDetails",
"signature" => $GetTaxAuthorityDetails_sig,
"docstring" => $GetTaxAuthorityDetails_doc),
- "weberp.xmlrpc_GetTaxAuthorityRate" => array(
- "function" => "xmlrpc_GetTaxAuthorityRate",
- "signature" => $GetTaxAuthorityRate_sig,
- "docstring" => $GetTaxAuthorityRate_doc),
+ "weberp.xmlrpc_GetTaxAuthorityRates" => array(
+ "function" => "xmlrpc_GetTaxAuthorityRates",
+ "signature" => $GetTaxAuthorityRates_sig,
+ "docstring" => $GetTaxAuthorityRates_doc),
"weberp.xmlrpc_GetCustomerTypeList" => array(
"function" => "xmlrpc_GetCustomerTypeList",
"signature" => $GetCustomerTypeList_sig,
@@ -3409,4 +3405,4 @@
return $doc;
}
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/doc/Change.log 2012-06-21 19:36:19 UTC (rev 5445)
@@ -1,4 +1,6 @@
webERP Change Log
+
+21/06/2012 Phil: Added tooltip of long description to SelectProduct.php
20/06/2012 Ricard: Added total QOH to NoSalesItems.php.
20/06/2012 Ricard: Added opposite currency pair graph to ExchangeRateTrend.php.
19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/doc/Manual/ManualContributors.html 2012-06-21 19:36:19 UTC (rev 5445)
@@ -13,6 +13,8 @@
<br /><br />
Shane Barnaby
<br /><br />
+Klaus Beucher
+<br /><br />
Chris Bice
<br /><br />
Danie Brink
@@ -33,10 +35,14 @@
<br /><br />
Edd Dumbill (phpxmlrpc)
<br /><br />
+Ahmed Fawzy
+<br /><br />
Tom Fox
<br /><br />
Braian Gomez
<br /><br />
+Paul Harness
+<br /><br />
Lindsay Harris
<br /><br />
David Hawke
@@ -45,6 +51,8 @@
<br /><br />
High-Tech Bridge SA Security Research Lab
<br /><br />
+Tomáš Horáček (barcodepack)
+<br /><br />
Hindra Joshua
<br /><br />
Alan Jones
@@ -53,6 +61,8 @@
<br /><br />
Nico Kaiser (php-gettext)
<br /><br />
+CQZ,KE
+<br /><br />
Mo Kelly - due dates and customer po by sales order line
<br /><br />
Meraj Khattak - database diagram
@@ -83,6 +93,8 @@
<br /><br />
Afan Ottenheimer (phplot)
<br /><br />
+Kunshan-Ouhai
+<br /><br />
Ricardo Pedroso
<br /><br />
Jesse Peterson
@@ -136,12 +148,16 @@
<td valign="top">
<b>Translation </b>
<br /><br />
+Billy Chang,劉世琪 - Taiwanese
+<br /><br />
Csillag Péter Hungarian
<br /><br />
Danu Satrio Pratomo Djojosoemarto and his cousin - Indonesian
<br /><br />
Janusz Dobrowolski - Polish
<br /><br />
+James Dupin - French
+<br /><br />
Matt Elbrecht - Estonian
<br /><br />
Igor Felix - Portuguese Brazilian
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/includes/MiscFunctions.php 2012-06-21 19:36:19 UTC (rev 5445)
@@ -160,8 +160,12 @@
if ($tag['type'] == 'complete' OR $tag['type'] == 'open') {
$elements[$index] = new XmlElement;
$elements[$index]->name = $tag['tag'];
- $elements[$index]->attributes = $tag['attributes'];
- $elements[$index]->content = $tag['value'];
+ if (isset($tag['attributes'])){
+ $elements[$index]->attributes = $tag['attributes'];
+ }
+ if (isset($tag['value'])){
+ $elements[$index]->content = $tag['value'];
+ }
if ($tag['type'] == 'open') { // push
$elements[$index]->children = array();
$stack[count($stack)] = &$elements;
Modified: trunk/sql/mysql/weberp-demo.sql
===================================================================
--- trunk/sql/mysql/weberp-demo.sql 2012-06-20 08:52:04 UTC (rev 5444)
+++ trunk/sql/mysql/weberp-demo.sql 2012-06-21 19:36:19 UTC (rev 5445)
@@ -17,8 +17,6 @@
-- Table structure for table `accountgroups`
--
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `accountgroups` (
`groupname` char(30) NOT NULL DEFAULT '',
`sectioninaccounts` int(11) NOT NULL DEFAULT '0',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-06-23 08:48:57
|
Revision: 5446
http://web-erp.svn.sourceforge.net/web-erp/?rev=5446&view=rev
Author: daintree
Date: 2012-06-23 08:48:47 +0000 (Sat, 23 Jun 2012)
Log Message:
-----------
icedlava changes
Modified Paths:
--------------
trunk/AccountSections.php
trunk/doc/Change.log
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2012-06-21 19:36:19 UTC (rev 5445)
+++ trunk/AccountSections.php 2012-06-23 08:48:47 UTC (rev 5446)
@@ -14,7 +14,7 @@
if( DB_num_rows($result) == 0 ) {
$sql = "INSERT INTO accountsection (sectionid,
- sectionname)
+ sectionname)
VALUES (1,
'Income')";
$result = DB_query($sql,$db);
@@ -25,7 +25,7 @@
if( DB_num_rows($result) == 0 ) {
$sql = "INSERT INTO accountsection (sectionid,
- sectionname)
+ sectionname)
VALUES (2,
'Cost Of Sales')";
$result = DB_query($sql,$db);
@@ -93,7 +93,7 @@
/*SelectedSectionID could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
$sql = "UPDATE accountsection SET sectionname='" . $_POST['SectionName'] . "'
- WHERE sectionid = " . $_POST['SelectedSectionID'];
+ WHERE sectionid = '" . $_POST['SelectedSectionID'] . "'";
$msg = _('Record Updated');
} elseif ($InputError !=1) {
@@ -104,7 +104,7 @@
sectionname
) VALUES (
" . $_POST['SectionID'] . ",
- '" . $_POST['SectionName'] .")";
+ '" . $_POST['SectionName'] ."')";
$msg = _('Record inserted');
}
@@ -255,8 +255,11 @@
<td><input tabindex="2" ' . (in_array('SectionName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="SectionName" size="30" maxlength="30" value="' . $_POST['SectionName'] . '" /></td>
</tr>';
- echo '<tr><td colspan="2"><div class="centre"><input tabindex="3" type="submit" name="submit" value="' . _('Enter Information') . '" /></div></td></tr>';
- echo '</table><br />';
+ echo '<tr>
+ <td colspan="2"><div class="centre"><input tabindex="3" type="submit" name="submit" value="' . _('Enter Information') . '" /></div></td>
+ </tr>
+ </table>
+ <br />';
if (!isset($_GET['SelectedSectionID']) or $_GET['SelectedSectionID']=='') {
echo '<script type="text/javascript">defaultControl(document.AccountSections.SectionID);</script>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-21 19:36:19 UTC (rev 5445)
+++ trunk/doc/Change.log 2012-06-23 08:48:47 UTC (rev 5446)
@@ -1,10 +1,11 @@
webERP Change Log
+22/06/2012 Icedlava: Fixed bug preventing insert of new account section
21/06/2012 Phil: Added tooltip of long description to SelectProduct.php
-20/06/2012 Ricard: Added total QOH to NoSalesItems.php.
-20/06/2012 Ricard: Added opposite currency pair graph to ExchangeRateTrend.php.
-19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
-17/06/2012 Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
+20/06/2012 Ricard: Added total QOH to NoSalesItems.php.
+20/06/2012 Ricard: Added opposite currency pair graph to ExchangeRateTrend.php.
+19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
+17/06/2012 Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
15/6/12 Release 4.08
@@ -13,20 +14,20 @@
28/5/2012 Phil: Configure xmlrpc api to work correctly with utf-8 character encoding.
26/5/2012 Phil: Fix barcode printing on PDFPrintLabel.php - barcode functionality is unreliable so used (http://www.barcodepack.com) by Tomáš Horáček very simple and clean
23/5/2012 Klaus: PO_PDFPurchOrders.php print purchase orders with supplier's code where it is available in the purchasing data
-23/5/2012 Exson: Revise GLAccounts.php to make more than 10 digits account code is allowed.
+23/5/2012 Exson: Revise GLAccounts.php to make more than 10 digits account code is allowed.
2012/05/22 Exson: Modify accountcode to varchar(20) to meet some countries accounting regulation for more digits account code.
22/5/2012 Phil Klaus's spot - removed issue location (must always be the same as the manufacture location) and the issued date from WorkOrderStatus.php form - as materials could be issued on many different dates and incorrect to say they are always issued on the current date
20/5/2012 Klaus Beucher (Opto): move leadtime calculation into levelnetting function and resolve bug which does not use leadtime for highest level items of a BOM see also http://www.weberp.org/forum/showthread.php?tid=203
18/5/2012 Ahmed: Fixed bugs that the offer cannot store more than one item and remove function does not work in SupplierTenders.php and DefineOfferClass.php
18/5/2012 Ahmed.Fawzy: Fixed Branch code validation rule to rule out '-' in CustomerBranches.php.
-14/5/2012 Exson: Fixed bug that when users input a Exchang Rate manually, when ones changed minds and select another currency, it'll not show the suggested rate correctly in Payments.php.
+14/5/2012 Exson: Fixed bug that when users input a Exchang Rate manually, when ones changed minds and select another currency, it'll not show the suggested rate correctly in Payments.php.
14/5/2012 Exson: Fixed when user change the currency, the suggested rate can not changed accordingly in CustomerReceipt.php. Reported by Ahmed.Fawzy.
14/5/2012 Ahmed.Fawzy: Fixed bugs that ExchangRateText be applied with locale_number_format() function in CustomerReceipt.php
-10/5/2012 Exson: Fixed bug that Date selection does not work in ReverseGRN.php. Add GRN batch column.
+10/5/2012 Exson: Fixed bug that Date selection does not work in ReverseGRN.php. Add GRN batch column.
9/5/2012 Ahmed.Fawzy: Fixed bugs in Stocks.php that the properties for new items cannot be saved. Checked status is not kept and numeric values between max and min are not validated.
-8/5/2012 Exson: Fixed typo in SalesCategories.php which leads to the jpg pictures do not appear.
+8/5/2012 Exson: Fixed typo in SalesCategories.php which leads to the jpg pictures do not appear.
8/05/2012 Exson Fix typo and add 'L' type for selection in SelectOrderItems.php.
-8/05/2012 Exson: Fixed the bug of Credit_Invoice.php the total will be doubled when use Update button. The bug is introduced for a fix of directly proceed the Credit. Reported by PakRichard.
+8/05/2012 Exson: Fixed the bug of Credit_Invoice.php the total will be doubled when use Update button. The bug is introduced for a fix of directly proceed the Credit. Reported by PakRichard.
6/5/12 Phil: PaymentMethods.php added open cash drawer field for my POS.
4/5/12 Phil: Labels.php PDFPrintLabel.php fine tuning of new labels code
4/5/12 Phil: Fixed customer type name displayed when it is successfully deleted as reported by James Dupin
@@ -34,23 +35,23 @@
4/5/12 Phil: Allow SelectOrderItems.php to select labour type items
4/5/12 Phil: updated tcpdf to 5.9.160
4/5/12 Phil: Default lastcostupdate to 0000-00-00 to avoid issues inserting new items.
-1/5/12 MTPubRadio: Measurement unit in FormDesigner.php should be points instead of millimeters.
-1/5/12 MTPubRadio: Fixed Purch Order PDF file text of Order Total- Excl tax does not align with amount horizontally.
+1/5/12 MTPubRadio: Measurement unit in FormDesigner.php should be points instead of millimeters.
+1/5/12 MTPubRadio: Fixed Purch Order PDF file text of Order Total- Excl tax does not align with amount horizontally.
29/4/12 Opto/Klaus: SelectWorkOrder.php added start date for the work order to the work orders displayed for selection
29/4/12 David Short: Added EDISendInvoices_Reece.php to send Reece format EDI invoices - approved by Reece (Australian Plumbing retailer)
28/4/2012 Exson: Fixed bugs in MRPCalendar.php which caused working days cannot be calculated correctly.
06/4/2012 Exson: Fixed PO header that does not display user's default warehous when iusse a new PO in PO_Header.php.
25/4/12 Phil: Complete rewrite of PDFPrintLabels.php and Labels.php in webERP style - half the code and maintainable with templates stored with all the other data in the database. The new labels also allow fields to be printed as barcodes too.
24/4/2012 Phil: fix CopyBOM.php that was insering a blank stockid into stockmaster as reported by Ricard
-21/04/2012 Vitaly: Editable item description in PO.
+21/04/2012 Vitaly: Editable item description in PO.
16/04/2012 Vitaly: Added option to display only items that are currently on purchase order in StockLocStatus.php
16/04/2012 Vitaly: Fixed Days textbox where it did not remember entered value.
16/04/2012 Ricard: ReorderLevelLocation.php only showing items not discontinued (current).
14/04/2012 Ricard: Adding stock category as filter for selection in TopItems.php
12/4/2012 TurboPT: Replaced table row bgcolor [or style=background-color] with the appropriate css class.
-11/4/2012 Ricard: Code simplified on TopItems.php
-7/4/2012 TurboPT: Remove invalid attribute colspan found within table tag elements.
-5/4/2012 Exson: Fixed order delivery comments overlapped with Shipper in Packing slip of PDFOrderPageHeader_generic.inc Reported by CQZ from webERP Chinese Community QQ group
+11/4/2012 Ricard: Code simplified on TopItems.php
+7/4/2012 TurboPT: Remove invalid attribute colspan found within table tag elements.
+5/4/2012 Exson: Fixed order delivery comments overlapped with Shipper in Packing slip of PDFOrderPageHeader_generic.inc Reported by CQZ from webERP Chinese Community QQ group
3/4/2012 Vitaly: Cleaned up Petty Cash module. Fixed several errors in SQL INSERT statements.
3/4/2012 Exson: Fixed typo in PurchData.php.
3/4/2012 Tim: fixed Supplier Code and Supplier part code inconsistent with database field length definition in PurchData.php. Reported by rfthomas.
@@ -59,7 +60,7 @@
2/4/2012 Exson: fixed CopyBOM.php sql errors and header already sent error.
31/3/2012 Exson: Fixed for PcAuthorizeExpenses.php cannot authorized expenses due to no applying gettext function to 'Update'
31/3/2012: PakRichard: Fixed problem that on PCAssignCashToTab.php it should be used the decimal places of the currency of the tab, not the decimal places of the functional currency.The same in PcClaimExpensesFromTab.php
-31/3/2012 Kunshan-Ouhai?G Fixed bug in PDFStockCheckComparision.php when selecting Report and Close the Inventory Comparison, there will be seriously sql errors. Reported and fixed by Kunshan-Ouhai from webERP Chinese community QQ group.
+31/3/2012 Kunshan-Ouhai?G Fixed bug in PDFStockCheckComparision.php when selecting Report and Close the Inventory Comparison, there will be seriously sql errors. Reported and fixed by Kunshan-Ouhai from webERP Chinese community QQ group.
31/3/2012 Dafydd Crosby: Revise scripts Add_SerialItemsOut.php and OutputSerialItems.php fixes a problem that occurs when receiving a bulk inventory transfer. There was a hard-coded loop that prevented adding bundles that were greater than 10.
30/3/2012 Richard Andreu Modified security role to order by role name instead of by roleid to make it more user friendly in WWW_Access.php and WWW_Users.php
29/3/2012Exson:Fixed href typo error which lead to Select another location link does not work in InternalStockRequestFulfill.php
@@ -72,7 +73,7 @@
23/3/2012 Exson: Fixed accounting period displayed abnormal in simplified Chinese language in Win OS. Reported by CQZ from webERP Chinese community QQ group.
22/3/2012 Exson: Fixed no control of accumulated quantity of the same item during transferring which lead to negative quantity of stock in StockLocTransfer.php reported by Rong.
22/3/2012 Exson: Fixed time displayed incorrectly in footer in Win OS since the strftime() encoding is not UTF-8. Reported by CQZ and KE in webERP Chinese Community QQ group.
-22/3/2012 Exson: Fixed period displayed incorrectly in GL inquiry in Win OS since the strftime() encoding is not UTF-8. Reported by CQZ and KE in webERP Chinese Community QQ group.
+22/3/2012 Exson: Fixed period displayed incorrectly in GL inquiry in Win OS since the strftime() encoding is not UTF-8. Reported by CQZ and KE in webERP Chinese Community QQ group.
21/03/2012 CQZ,KE: (From webERP chinese community QQ Group) Fixed the csv file cannot display UTF-8 characters correctly in Excel.
20/03/2012 Exson: Fixed Multi currency payment exchange rate errors in Payments.php. Reported by PakRichard
20/3/2012 Exson: Fixed bugs that users push Process Credit button in Credit_Invoice.php directly without update will lead to unbalance Journal entry. Reported by Russ
@@ -100,7 +101,7 @@
26/02/2012 Exson: PO_Items.php Add $_SESSION and $_POST variables to fixed extra lines added while page refreshing or push F5. Reported by CQZ and Ke from webERP Chinese forum QQ group.
25/2/12 Vitaly: sql in PDFSuppTransListing.php would not fetch any data and debug message was not showing. Missing FROM in upgrade4.07-4.08.sql.
-25/2/12 James Dupin: Remove extra ) after Create GL entries for stock transactions in CompanyPreferences.php
+25/2/12 James Dupin: Remove extra ) after Create GL entries for stock transactions in CompanyPreferences.php
23/2/12 Ricard: Moved Utility scripts from Z_index.php to their own module named Utilities
22/2/12 Phil: Make daily sales inquiry work correctly with assembly items where costs are recalculated in the case of negatives stock when supplier invoices entered
22/2/12 James Dupin: Update to French translation
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-06-23 08:48:59
|
Revision: 5446
http://web-erp.svn.sourceforge.net/web-erp/?rev=5446&view=rev
Author: daintree
Date: 2012-06-23 08:48:47 +0000 (Sat, 23 Jun 2012)
Log Message:
-----------
icedlava changes
Modified Paths:
--------------
trunk/AccountSections.php
trunk/doc/Change.log
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2012-06-21 19:36:19 UTC (rev 5445)
+++ trunk/AccountSections.php 2012-06-23 08:48:47 UTC (rev 5446)
@@ -14,7 +14,7 @@
if( DB_num_rows($result) == 0 ) {
$sql = "INSERT INTO accountsection (sectionid,
- sectionname)
+ sectionname)
VALUES (1,
'Income')";
$result = DB_query($sql,$db);
@@ -25,7 +25,7 @@
if( DB_num_rows($result) == 0 ) {
$sql = "INSERT INTO accountsection (sectionid,
- sectionname)
+ sectionname)
VALUES (2,
'Cost Of Sales')";
$result = DB_query($sql,$db);
@@ -93,7 +93,7 @@
/*SelectedSectionID could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
$sql = "UPDATE accountsection SET sectionname='" . $_POST['SectionName'] . "'
- WHERE sectionid = " . $_POST['SelectedSectionID'];
+ WHERE sectionid = '" . $_POST['SelectedSectionID'] . "'";
$msg = _('Record Updated');
} elseif ($InputError !=1) {
@@ -104,7 +104,7 @@
sectionname
) VALUES (
" . $_POST['SectionID'] . ",
- '" . $_POST['SectionName'] .")";
+ '" . $_POST['SectionName'] ."')";
$msg = _('Record inserted');
}
@@ -255,8 +255,11 @@
<td><input tabindex="2" ' . (in_array('SectionName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="SectionName" size="30" maxlength="30" value="' . $_POST['SectionName'] . '" /></td>
</tr>';
- echo '<tr><td colspan="2"><div class="centre"><input tabindex="3" type="submit" name="submit" value="' . _('Enter Information') . '" /></div></td></tr>';
- echo '</table><br />';
+ echo '<tr>
+ <td colspan="2"><div class="centre"><input tabindex="3" type="submit" name="submit" value="' . _('Enter Information') . '" /></div></td>
+ </tr>
+ </table>
+ <br />';
if (!isset($_GET['SelectedSectionID']) or $_GET['SelectedSectionID']=='') {
echo '<script type="text/javascript">defaultControl(document.AccountSections.SectionID);</script>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-21 19:36:19 UTC (rev 5445)
+++ trunk/doc/Change.log 2012-06-23 08:48:47 UTC (rev 5446)
@@ -1,10 +1,11 @@
webERP Change Log
+22/06/2012 Icedlava: Fixed bug preventing insert of new account section
21/06/2012 Phil: Added tooltip of long description to SelectProduct.php
-20/06/2012 Ricard: Added total QOH to NoSalesItems.php.
-20/06/2012 Ricard: Added opposite currency pair graph to ExchangeRateTrend.php.
-19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
-17/06/2012 Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
+20/06/2012 Ricard: Added total QOH to NoSalesItems.php.
+20/06/2012 Ricard: Added opposite currency pair graph to ExchangeRateTrend.php.
+19/06/2012 Ricard: Added new script Z_ChangeLocationCode.
+17/06/2012 Ricard: Added a 2nd strategy for StockDispatch (items with overstock at FROM, RL=0 no matter if needed at TO).
15/6/12 Release 4.08
@@ -13,20 +14,20 @@
28/5/2012 Phil: Configure xmlrpc api to work correctly with utf-8 character encoding.
26/5/2012 Phil: Fix barcode printing on PDFPrintLabel.php - barcode functionality is unreliable so used (http://www.barcodepack.com) by Tomáš Horáček very simple and clean
23/5/2012 Klaus: PO_PDFPurchOrders.php print purchase orders with supplier's code where it is available in the purchasing data
-23/5/2012 Exson: Revise GLAccounts.php to make more than 10 digits account code is allowed.
+23/5/2012 Exson: Revise GLAccounts.php to make more than 10 digits account code is allowed.
2012/05/22 Exson: Modify accountcode to varchar(20) to meet some countries accounting regulation for more digits account code.
22/5/2012 Phil Klaus's spot - removed issue location (must always be the same as the manufacture location) and the issued date from WorkOrderStatus.php form - as materials could be issued on many different dates and incorrect to say they are always issued on the current date
20/5/2012 Klaus Beucher (Opto): move leadtime calculation into levelnetting function and resolve bug which does not use leadtime for highest level items of a BOM see also http://www.weberp.org/forum/showthread.php?tid=203
18/5/2012 Ahmed: Fixed bugs that the offer cannot store more than one item and remove function does not work in SupplierTenders.php and DefineOfferClass.php
18/5/2012 Ahmed.Fawzy: Fixed Branch code validation rule to rule out '-' in CustomerBranches.php.
-14/5/2012 Exson: Fixed bug that when users input a Exchang Rate manually, when ones changed minds and select another currency, it'll not show the suggested rate correctly in Payments.php.
+14/5/2012 Exson: Fixed bug that when users input a Exchang Rate manually, when ones changed minds and select another currency, it'll not show the suggested rate correctly in Payments.php.
14/5/2012 Exson: Fixed when user change the currency, the suggested rate can not changed accordingly in CustomerReceipt.php. Reported by Ahmed.Fawzy.
14/5/2012 Ahmed.Fawzy: Fixed bugs that ExchangRateText be applied with locale_number_format() function in CustomerReceipt.php
-10/5/2012 Exson: Fixed bug that Date selection does not work in ReverseGRN.php. Add GRN batch column.
+10/5/2012 Exson: Fixed bug that Date selection does not work in ReverseGRN.php. Add GRN batch column.
9/5/2012 Ahmed.Fawzy: Fixed bugs in Stocks.php that the properties for new items cannot be saved. Checked status is not kept and numeric values between max and min are not validated.
-8/5/2012 Exson: Fixed typo in SalesCategories.php which leads to the jpg pictures do not appear.
+8/5/2012 Exson: Fixed typo in SalesCategories.php which leads to the jpg pictures do not appear.
8/05/2012 Exson Fix typo and add 'L' type for selection in SelectOrderItems.php.
-8/05/2012 Exson: Fixed the bug of Credit_Invoice.php the total will be doubled when use Update button. The bug is introduced for a fix of directly proceed the Credit. Reported by PakRichard.
+8/05/2012 Exson: Fixed the bug of Credit_Invoice.php the total will be doubled when use Update button. The bug is introduced for a fix of directly proceed the Credit. Reported by PakRichard.
6/5/12 Phil: PaymentMethods.php added open cash drawer field for my POS.
4/5/12 Phil: Labels.php PDFPrintLabel.php fine tuning of new labels code
4/5/12 Phil: Fixed customer type name displayed when it is successfully deleted as reported by James Dupin
@@ -34,23 +35,23 @@
4/5/12 Phil: Allow SelectOrderItems.php to select labour type items
4/5/12 Phil: updated tcpdf to 5.9.160
4/5/12 Phil: Default lastcostupdate to 0000-00-00 to avoid issues inserting new items.
-1/5/12 MTPubRadio: Measurement unit in FormDesigner.php should be points instead of millimeters.
-1/5/12 MTPubRadio: Fixed Purch Order PDF file text of Order Total- Excl tax does not align with amount horizontally.
+1/5/12 MTPubRadio: Measurement unit in FormDesigner.php should be points instead of millimeters.
+1/5/12 MTPubRadio: Fixed Purch Order PDF file text of Order Total- Excl tax does not align with amount horizontally.
29/4/12 Opto/Klaus: SelectWorkOrder.php added start date for the work order to the work orders displayed for selection
29/4/12 David Short: Added EDISendInvoices_Reece.php to send Reece format EDI invoices - approved by Reece (Australian Plumbing retailer)
28/4/2012 Exson: Fixed bugs in MRPCalendar.php which caused working days cannot be calculated correctly.
06/4/2012 Exson: Fixed PO header that does not display user's default warehous when iusse a new PO in PO_Header.php.
25/4/12 Phil: Complete rewrite of PDFPrintLabels.php and Labels.php in webERP style - half the code and maintainable with templates stored with all the other data in the database. The new labels also allow fields to be printed as barcodes too.
24/4/2012 Phil: fix CopyBOM.php that was insering a blank stockid into stockmaster as reported by Ricard
-21/04/2012 Vitaly: Editable item description in PO.
+21/04/2012 Vitaly: Editable item description in PO.
16/04/2012 Vitaly: Added option to display only items that are currently on purchase order in StockLocStatus.php
16/04/2012 Vitaly: Fixed Days textbox where it did not remember entered value.
16/04/2012 Ricard: ReorderLevelLocation.php only showing items not discontinued (current).
14/04/2012 Ricard: Adding stock category as filter for selection in TopItems.php
12/4/2012 TurboPT: Replaced table row bgcolor [or style=background-color] with the appropriate css class.
-11/4/2012 Ricard: Code simplified on TopItems.php
-7/4/2012 TurboPT: Remove invalid attribute colspan found within table tag elements.
-5/4/2012 Exson: Fixed order delivery comments overlapped with Shipper in Packing slip of PDFOrderPageHeader_generic.inc Reported by CQZ from webERP Chinese Community QQ group
+11/4/2012 Ricard: Code simplified on TopItems.php
+7/4/2012 TurboPT: Remove invalid attribute colspan found within table tag elements.
+5/4/2012 Exson: Fixed order delivery comments overlapped with Shipper in Packing slip of PDFOrderPageHeader_generic.inc Reported by CQZ from webERP Chinese Community QQ group
3/4/2012 Vitaly: Cleaned up Petty Cash module. Fixed several errors in SQL INSERT statements.
3/4/2012 Exson: Fixed typo in PurchData.php.
3/4/2012 Tim: fixed Supplier Code and Supplier part code inconsistent with database field length definition in PurchData.php. Reported by rfthomas.
@@ -59,7 +60,7 @@
2/4/2012 Exson: fixed CopyBOM.php sql errors and header already sent error.
31/3/2012 Exson: Fixed for PcAuthorizeExpenses.php cannot authorized expenses due to no applying gettext function to 'Update'
31/3/2012: PakRichard: Fixed problem that on PCAssignCashToTab.php it should be used the decimal places of the currency of the tab, not the decimal places of the functional currency.The same in PcClaimExpensesFromTab.php
-31/3/2012 Kunshan-Ouhai?G Fixed bug in PDFStockCheckComparision.php when selecting Report and Close the Inventory Comparison, there will be seriously sql errors. Reported and fixed by Kunshan-Ouhai from webERP Chinese community QQ group.
+31/3/2012 Kunshan-Ouhai?G Fixed bug in PDFStockCheckComparision.php when selecting Report and Close the Inventory Comparison, there will be seriously sql errors. Reported and fixed by Kunshan-Ouhai from webERP Chinese community QQ group.
31/3/2012 Dafydd Crosby: Revise scripts Add_SerialItemsOut.php and OutputSerialItems.php fixes a problem that occurs when receiving a bulk inventory transfer. There was a hard-coded loop that prevented adding bundles that were greater than 10.
30/3/2012 Richard Andreu Modified security role to order by role name instead of by roleid to make it more user friendly in WWW_Access.php and WWW_Users.php
29/3/2012Exson:Fixed href typo error which lead to Select another location link does not work in InternalStockRequestFulfill.php
@@ -72,7 +73,7 @@
23/3/2012 Exson: Fixed accounting period displayed abnormal in simplified Chinese language in Win OS. Reported by CQZ from webERP Chinese community QQ group.
22/3/2012 Exson: Fixed no control of accumulated quantity of the same item during transferring which lead to negative quantity of stock in StockLocTransfer.php reported by Rong.
22/3/2012 Exson: Fixed time displayed incorrectly in footer in Win OS since the strftime() encoding is not UTF-8. Reported by CQZ and KE in webERP Chinese Community QQ group.
-22/3/2012 Exson: Fixed period displayed incorrectly in GL inquiry in Win OS since the strftime() encoding is not UTF-8. Reported by CQZ and KE in webERP Chinese Community QQ group.
+22/3/2012 Exson: Fixed period displayed incorrectly in GL inquiry in Win OS since the strftime() encoding is not UTF-8. Reported by CQZ and KE in webERP Chinese Community QQ group.
21/03/2012 CQZ,KE: (From webERP chinese community QQ Group) Fixed the csv file cannot display UTF-8 characters correctly in Excel.
20/03/2012 Exson: Fixed Multi currency payment exchange rate errors in Payments.php. Reported by PakRichard
20/3/2012 Exson: Fixed bugs that users push Process Credit button in Credit_Invoice.php directly without update will lead to unbalance Journal entry. Reported by Russ
@@ -100,7 +101,7 @@
26/02/2012 Exson: PO_Items.php Add $_SESSION and $_POST variables to fixed extra lines added while page refreshing or push F5. Reported by CQZ and Ke from webERP Chinese forum QQ group.
25/2/12 Vitaly: sql in PDFSuppTransListing.php would not fetch any data and debug message was not showing. Missing FROM in upgrade4.07-4.08.sql.
-25/2/12 James Dupin: Remove extra ) after Create GL entries for stock transactions in CompanyPreferences.php
+25/2/12 James Dupin: Remove extra ) after Create GL entries for stock transactions in CompanyPreferences.php
23/2/12 Ricard: Moved Utility scripts from Z_index.php to their own module named Utilities
22/2/12 Phil: Make daily sales inquiry work correctly with assembly items where costs are recalculated in the case of negatives stock when supplier invoices entered
22/2/12 James Dupin: Update to French translation
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-06-23 21:41:15
|
Revision: 5447
http://web-erp.svn.sourceforge.net/web-erp/?rev=5447&view=rev
Author: daintree
Date: 2012-06-23 21:41:05 +0000 (Sat, 23 Jun 2012)
Log Message:
-----------
before 4.08.1
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/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/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Removed Paths:
-------------
branches/stable/
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2012-06-23 08:48:47 UTC (rev 5446)
+++ trunk/UpgradeDatabase.php 2012-06-23 21:41:05 UTC (rev 5447)
@@ -145,6 +145,7 @@
case '4.07.6':
$SQLScripts[] = './sql/mysql/upgrade4.07-4.08.sql';
case '4.08.0':
+ case '4.08.1':
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-23 08:48:47 UTC (rev 5446)
+++ trunk/doc/Change.log 2012-06-23 21:41:05 UTC (rev 5447)
@@ -1,5 +1,7 @@
webERP Change Log
+24/6/2012 Release 4.08.1
+
22/06/2012 Icedlava: Fixed bug preventing insert of new account section
21/06/2012 Phil: Added tooltip of long description to SelectProduct.php
20/06/2012 Ricard: Added total QOH to NoSalesItems.php.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2012-06-23 08:48:47 UTC (rev 5446)
+++ trunk/includes/ConnectDB.inc 2012-06-23 21:41:05 UTC (rev 5447)
@@ -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.08'; //must update manually every time there is a DB change
+$Version='4.08.1'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
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 2012-06-23 08:48:47 UTC (rev 5446)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2012-06-23 21:41:05 UTC (rev 5447)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: web-erp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-16 16:39+1200\n"
+"POT-Creation-Date: 2012-06-24 09:40+1200\n"
"PO-Revision-Date: 2012-01-26 10:26+0000\n"
"Last-Translator: JC_Chuck <Unknown>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -447,7 +447,7 @@
msgid "Section In Accounts"
msgstr ""
-#: AccountGroups.php:415 AccountSections.php:258 AddCustomerContacts.php:260
+#: AccountGroups.php:415 AccountSections.php:259 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:228
#: BankAccounts.php:398 BOMs.php:785 COGSGLPostings.php:355
#: CreditStatus.php:259 Currencies.php:402 CustLoginSetup.php:273
@@ -582,8 +582,8 @@
#: AddCustomerContacts.php:126 CompanyPreferences.php:224
#: CustomerBranches.php:368 Customers.php:1020 Customers.php:1028
-#: SalesPeople.php:200 SelectCustomer.php:610 StockDispatch.php:243
-#: StockDispatch.php:254 StockDispatch.php:265 SupplierContacts.php:150
+#: SalesPeople.php:200 SelectCustomer.php:610 StockDispatch.php:237
+#: StockDispatch.php:248 StockDispatch.php:259 SupplierContacts.php:150
#: SuppTransGLAnalysis.php:105 includes/InputSerialItemsFile.php:92
#: includes/InputSerialItemsFile.php:144 includes/PDFTaxPageHeader.inc:37
msgid "Name"
@@ -694,7 +694,7 @@
#: PcAuthorizeExpenses.php:88 PDFRemittanceAdvice.php:308
#: PrintCustTrans.php:826 PrintCustTransPortrait.php:870 ReverseGRN.php:392
#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:491
-#: StockDispatch.php:245 StockDispatch.php:256 StockDispatch.php:267
+#: StockDispatch.php:239 StockDispatch.php:250 StockDispatch.php:261
#: StockLocMovements.php:91 StockMovements.php:95
#: StockSerialItemResearch.php:81 SupplierAllocations.php:456
#: SupplierAllocations.php:569 SupplierAllocations.php:644
@@ -870,7 +870,7 @@
#: PrintCustOrder.php:233 ReorderLevel.php:63 ReorderLevel.php:182
#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:30 StockCheck.php:46
#: StockCheck.php:68 StockCheck.php:99 StockCheck.php:142 StockCheck.php:153
-#: StockCheck.php:194 StockDispatch.php:100 StockDispatch.php:113
+#: StockCheck.php:194 StockDispatch.php:104 StockDispatch.php:117
#: SupplierBalsAtPeriodEnd.php:54 SupplierBalsAtPeriodEnd.php:65
#: SuppPaymentRun.php:112 SuppPaymentRun.php:122 SuppPaymentRun.php:186
#: SuppPaymentRun.php:217 SuppPriceList.php:134 Tax.php:63 Tax.php:168
@@ -996,7 +996,7 @@
#: OutstandingGRNs.php:182 PDFCustomerList.php:419 PDFLowGP.php:146
#: PDFPriceList.php:312 PDFRemittanceAdvice.php:175
#: PDFStockCheckComparison.php:361 PrintCustTrans.php:542
-#: PrintCustTransPortrait.php:579 ReorderLevel.php:259 StockDispatch.php:394
+#: PrintCustTransPortrait.php:579 ReorderLevel.php:259 StockDispatch.php:407
#: SupplierBalsAtPeriodEnd.php:160 SuppPriceList.php:255 Tax.php:352
msgid "Print PDF"
msgstr ""
@@ -1181,8 +1181,8 @@
#: SalesGraph.php:144 SalesGraph.php:146 SalesGraph.php:180
#: SalesInquiry.php:1079 SalesInquiry.php:1142 SelectCreditItems.php:955
#: SelectOrderItems.php:1626 SelectOrderItems.php:1629 SelectProduct.php:513
-#: SelectProduct.php:515 StockDispatch.php:59 StockDispatch.php:364
-#: StockDispatch.php:366 StockLocStatus.php:69 StockLocStatus.php:71
+#: SelectProduct.php:515 StockDispatch.php:59 StockDispatch.php:355
+#: StockDispatch.php:357 StockLocStatus.php:69 StockLocStatus.php:71
#: StockLocStatus.php:89 StockLocStatus.php:94 StockLocStatus.php:99
#: StockLocStatus.php:104 StockQuantityByDate.php:25 SupplierPriceList.php:23
#: SupplierPriceList.php:25 SupplierTenderCreate.php:647
@@ -1204,7 +1204,7 @@
msgstr ""
#: AuditTrail.php:82 InternalStockRequest.php:550 MRPReport.php:778
-#: PO_SelectPurchOrder.php:431 SelectContract.php:180 SelectProduct.php:780
+#: PO_SelectPurchOrder.php:431 SelectContract.php:180 SelectProduct.php:792
msgid "View"
msgstr ""
@@ -2000,7 +2000,7 @@
#: MRPPlannedWorkOrders.php:366 MRPReport.php:816 MRPReschedules.php:180
#: MRPShortages.php:334 PDFOrderStatus.php:308 PDFPriceList.php:344
#: PDFReceipt.php:31 PO_Header.php:829 PO_PDFPurchOrder.php:61
-#: PO_SelectOSPurchOrder.php:519 ReorderLevel.php:283 StockDispatch.php:424
+#: PO_SelectOSPurchOrder.php:519 ReorderLevel.php:283 StockDispatch.php:437
#: SuppPriceList.php:284 Tax.php:243 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBalanceSheetPageHeader.inc:25
@@ -2039,7 +2039,7 @@
#: PrintCustOrder.php:170 PrintCustTrans.php:741 PrintCustTrans.php:950
#: PrintCustTrans.php:999 PrintCustTransPortrait.php:781
#: PrintCustTransPortrait.php:1003 PrintCustTransPortrait.php:1059
-#: ReorderLevel.php:284 StockDispatch.php:425 SuppPriceList.php:285
+#: ReorderLevel.php:284 StockDispatch.php:438 SuppPriceList.php:285
#: Tax.php:243 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBalanceSheetPageHeader.inc:26
@@ -2096,12 +2096,11 @@
#: BOMExtendedQty.php:321 BOMInquiry.php:110 BOMs.php:883
#: CounterSales.php:2044 CounterSales.php:2233 InternalStockRequest.php:586
-#: NoSalesItems.php:157 PO_SelectOSPurchOrder.php:236
-#: PO_SelectPurchOrder.php:214 ReorderLevelLocation.php:70
-#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:552
-#: SelectOrderItems.php:1506 SelectOrderItems.php:1690
-#: SelectSalesOrder.php:583 SelectWorkOrder.php:194 Shipt_Select.php:192
-#: TopItems.php:168 includes/PDFTopItemsHeader.inc:54
+#: PO_SelectOSPurchOrder.php:236 PO_SelectPurchOrder.php:214
+#: ReorderLevelLocation.php:70 ReorderLevelLocation.php:71
+#: SelectCompletedOrder.php:552 SelectOrderItems.php:1506
+#: SelectOrderItems.php:1690 SelectSalesOrder.php:583 SelectWorkOrder.php:194
+#: Shipt_Select.php:192 TopItems.php:168 includes/PDFTopItemsHeader.inc:54
msgid "On Hand"
msgstr ""
@@ -2121,7 +2120,7 @@
#: POReport.php:539 POReport.php:625 POReport.php:725 POReport.php:1267
#: POReport.php:1276 POReport.php:1290 POReport.php:1305 POReport.php:1356
#: POReport.php:1419 POReport.php:1523 POReport.php:1588 POReport.php:1597
-#: ReorderLevel.php:297 StockDispatch.php:445 StockDispatch.php:452
+#: ReorderLevel.php:297 StockDispatch.php:463 StockDispatch.php:470
msgid "Part Number"
msgstr ""
@@ -2189,9 +2188,9 @@
#: SecurityTokens.php:104 SecurityTokens.php:120 SelectAsset.php:255
#: SelectCompletedOrder.php:551 SelectContract.php:140
#: SelectCreditItems.php:991 SelectOrderItems.php:1504
-#: SelectOrderItems.php:1688 SelectProduct.php:525 SelectProduct.php:744
+#: SelectOrderItems.php:1688 SelectProduct.php:525 SelectProduct.php:756
#: SelectSalesOrder.php:582 SelectWorkOrder.php:193 Shipt_Select.php:191
-#: StockCategories.php:234 StockDispatch.php:446 StockLocStatus.php:168
+#: StockCategories.php:234 StockDispatch.php:464 StockLocStatus.php:168
#: StockQuantityByDate.php:108 SuppCreditGRNs.php:92 SuppCreditGRNs.php:187
#: SuppFixedAssetChgs.php:75 SuppInvGRNs.php:126 SuppInvGRNs.php:307
#: SupplierCredit.php:317 SupplierCredit.php:385 SupplierInvoice.php:294
@@ -2208,7 +2207,7 @@
#: includes/PDFStockLocTransferHeader.inc:49
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:207
-#: includes/PDFTransPageHeaderPortrait.inc:262 api/api_xml-rpc.php:3398
+#: includes/PDFTransPageHeaderPortrait.inc:262 api/api_xml-rpc.php:3394
msgid "Description"
msgstr ""
@@ -2376,7 +2375,7 @@
#: PricesByCost.php:151 PurchData.php:382 ReorderLevelLocation.php:67
#: SalesPeople.php:199 SelectCompletedOrder.php:550 SelectCreditItems.php:990
#: SelectCustomer.php:415 SelectGLAccount.php:119 SelectOrderItems.php:1503
-#: SelectOrderItems.php:1687 SelectProduct.php:743 SelectSalesOrder.php:581
+#: SelectOrderItems.php:1687 SelectProduct.php:755 SelectSalesOrder.php:581
#: SelectSupplier.php:259 SelectWorkOrder.php:192 Shipt_Select.php:190
#: SpecialOrder.php:149 SupplierPriceList.php:260 SupplierPriceList.php:445
#: SupplierTenderCreate.php:583 SupplierTenderCreate.php:817
@@ -2392,11 +2391,11 @@
#: Credit_Invoice.php:273 GoodsReceived.php:102 GoodsReceived.php:106
#: InternalStockRequestAuthorisation.php:89
#: InternalStockRequestFulfill.php:301 InternalStockRequest.php:518
-#: InternalStockRequest.php:585 MRPReport.php:751 NoSalesItems.php:158
+#: InternalStockRequest.php:585 MRPReport.php:751 NoSalesItems.php:159
#: OffersReceived.php:109 PO_Items.php:1076 PO_SelectOSPurchOrder.php:238
#: PO_SelectPurchOrder.php:216 SelectCompletedOrder.php:555
#: SelectCreditItems.php:992 SelectOrderItems.php:1505
-#: SelectOrderItems.php:1689 SelectProduct.php:121 SelectProduct.php:746
+#: SelectOrderItems.php:1689 SelectProduct.php:121 SelectProduct.php:758
#: SelectSalesOrder.php:584 SelectWorkOrder.php:195 Shipments.php:402
#: Shipments.php:489 Shipt_Select.php:194 StockLocTransferReceive.php:433
#: SupplierPriceList.php:262 SupplierTenderCreate.php:819
@@ -2527,7 +2526,7 @@
#: PaymentTerms.php:196 PO_SelectOSPurchOrder.php:524
#: SalesAnalReptCols.php:285 SelectProduct.php:119 SelectProduct.php:165
#: SelectProduct.php:178 SelectProduct.php:262 SelectProduct.php:263
-#: SelectProduct.php:765 TopItems.php:187 TopItems.php:188
+#: SelectProduct.php:777 TopItems.php:187 TopItems.php:188
msgid "N/A"
msgstr ""
@@ -2546,11 +2545,11 @@
msgstr ""
#: BOMs.php:254 StockAdjustments.php:135 StockTransfers.php:172
-#: WorkOrderEntry.php:281
+#: WorkOrderEntry.php:281 Z_StockConversion.php:26
msgid "The quantity entered must be numeric"
msgstr ""
-#: BOMs.php:260 StockAdjustments.php:138
+#: BOMs.php:260 StockAdjustments.php:138 Z_StockConversion.php:29
msgid "The quantity entered cannot be zero"
msgstr ""
@@ -3643,7 +3642,7 @@
#: ShipmentCosting.php:432 ShipmentCosting.php:451 ShipmentCosting.php:465
#: StockAdjustments.php:203 StockAdjustments.php:234 StockAdjustments.php:252
#: StockAdjustments.php:268 StockAdjustments.php:281 StockAdjustments.php:309
-#: StockAdjustments.php:331 StockDispatch.php:235 StockLocTransfer.php:189
+#: StockAdjustments.php:331 StockDispatch.php:229 StockLocTransfer.php:189
#: StockLocTransfer.php:213 StockLocTransfer.php:217
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
@@ -3686,9 +3685,9 @@
#: WorkOrderReceive.php:499 WorkOrderReceive.php:514 WorkOrderReceive.php:524
#: WorkOrderReceive.php:543 WorkOrderReceive.php:570 WorkOrderReceive.php:585
#: WorkOrderReceive.php:605 WorkOrderReceive.php:639 WorkOrderReceive.php:659
-#: WorkOrderReceive.php:669 includes/SQL_CommonFunctions.inc:24
-#: includes/SQL_CommonFunctions.inc:31 includes/SQL_CommonFunctions.inc:185
-#: includes/SQL_CommonFunctions.inc:204
+#: WorkOrderReceive.php:669 Z_StockConversion.php:94 Z_StockConversion.php:106
+#: includes/SQL_CommonFunctions.inc:24 includes/SQL_CommonFunctions.inc:31
+#: includes/SQL_CommonFunctions.inc:185 includes/SQL_CommonFunctions.inc:204
msgid "CRITICAL ERROR"
msgstr ""
@@ -3800,9 +3799,10 @@
#: WorkOrderReceive.php:462 WorkOrderReceive.php:499 WorkOrderReceive.php:514
#: WorkOrderReceive.php:524 WorkOrderReceive.php:543 WorkOrderReceive.php:570
#: WorkOrderReceive.php:585 WorkOrderReceive.php:605 WorkOrderReceive.php:639
-#: WorkOrderReceive.php:659 WorkOrderReceive.php:669
-#: includes/SQL_CommonFunctions.inc:24 includes/SQL_CommonFunctions.inc:31
-#: includes/SQL_CommonFunctions.inc:185 includes/SQL_CommonFunctions.inc:204
+#: WorkOrderReceive.php:659 WorkOrderReceive.php:669 Z_StockConversion.php:94
+#: Z_StockConversion.php:106 includes/SQL_CommonFunctions.inc:24
+#: includes/SQL_CommonFunctions.inc:31 includes/SQL_CommonFunctions.inc:185
+#: includes/SQL_CommonFunctions.inc:204
msgid "NOTE DOWN THIS ERROR AND SEEK ASSISTANCE"
msgstr ""
@@ -4276,8 +4276,8 @@
msgstr ""
#: ContractBOM.php:140 PO_Items.php:990 SupplierTenderCreate.php:800
-#: SupplierTenders.php:670 Z_ChangeStockCategory.php:63
-#: Z_ChangeStockCode.php:104
+#: SupplierTenders.php:670 Z_ChangeLocationCode.php:90
+#: Z_ChangeStockCategory.php:63 Z_ChangeStockCode.php:104
msgid "The SQL statement that failed was"
msgstr ""
@@ -4560,7 +4560,7 @@
#: PDFStockCheckComparison.php:127 ReverseGRN.php:219 StockAdjustments.php:281
#: StockLocTransferReceive.php:293 StockLocTransferReceive.php:302
#: StockTransfers.php:431 StockTransfers.php:440 WorkOrderIssue.php:161
-#: WorkOrderReceive.php:432
+#: WorkOrderReceive.php:432 Z_StockConversion.php:106
msgid "The location stock record could not be updated because"
msgstr ""
@@ -5097,7 +5097,7 @@
#: Contracts.php:845 InventoryQuantities.php:237 PDFPriceList.php:365
#: PricesByCost.php:244 ReorderLevelLocation.php:172 ReorderLevel.php:286
#: SalesCategoryPeriodInquiry.php:164 SalesTopItemsInquiry.php:221
-#: SpecialOrder.php:697 StockDispatch.php:434 Stocks.php:881
+#: SpecialOrder.php:697 StockDispatch.php:447 Stocks.php:881
#: SuppPriceList.php:229 SuppPriceList.php:291
#: includes/PDFInventoryValnPageHeader.inc:32
#: includes/PDFInventoryValnPageHeader.inc:38
@@ -5484,7 +5484,8 @@
#: SuppContractChgs.php:168 SupplierCredit.php:421 SupplierCredit.php:460
#: SupplierInvoice.php:414 SupplierInvoice.php:458
#: SupplierTransInquiry.php:174 SuppTransGLAnalysis.php:107
-#: SuppTransGLAnalysis.php:200 includes/PDFBankingSummaryPageHeader.inc:58
+#: SuppTransGLAnalysis.php:200 Z_StockConversion.php:172
+#: includes/PDFBankingSummaryPageHeader.inc:58
msgid "Narrative"
msgstr ""
@@ -5742,8 +5743,8 @@
msgstr ""
#: CounterSales.php:2047 CounterSales.php:2236 InternalStockRequest.php:589
-#: SelectOrderItems.php:1509 SelectOrderItems.php:1693 StockDispatch.php:459
-#: StockDispatch.php:460 StockLocStatus.php:172 StockStatus.php:90
+#: SelectOrderItems.php:1509 SelectOrderItems.php:1693 StockDispatch.php:477
+#: StockDispatch.php:478 StockLocStatus.php:172 StockStatus.php:90
#: includes/OutputSerialItems.php:37 includes/PDFStockCheckPageHeader.inc:40
msgid "Available"
msgstr ""
@@ -5804,7 +5805,7 @@
#: CounterSales.php:2227 CounterSales.php:2352 InternalStockRequest.php:506
#: InternalStockRequest.php:581 InternalStockRequest.php:703 MRPReport.php:740
#: SelectAsset.php:248 SelectCustomer.php:409 SelectCustomer.php:492
-#: SelectOrderItems.php:1685 SelectOrderItems.php:1805 SelectProduct.php:734
+#: SelectOrderItems.php:1685 SelectOrderItems.php:1805 SelectProduct.php:746
#: SelectSupplier.php:250 SelectSupplier.php:312 SupplierPriceList.php:251
#: SupplierTenderCreate.php:574
msgid "Next"
@@ -7640,7 +7641,7 @@
#: CustomerReceipt.php:904 GoodsReceived.php:103 GoodsReceived.php:107
#: GoodsReceived.php:113 POReport.php:629 POReport.php:1360 ReverseGRN.php:392
#: ReverseGRN.php:393 ShipmentCosting.php:150 Shipments.php:403
-#: Shipments.php:490 StockDispatch.php:450 StockDispatch.php:457
+#: Shipments.php:490 StockDispatch.php:468 StockDispatch.php:475
#: SuppCreditGRNs.php:189
msgid "Received"
msgstr ""
@@ -8041,7 +8042,7 @@
#: FixedAssetRegister.php:358 PcReportTab.php:139 PcReportTab.php:260
#: SalesAnalRepts.php:432 SalesAnalRepts.php:460 SalesAnalRepts.php:489
#: SalesAnalRepts.php:508 ShipmentCosting.php:56 Shipments.php:308
-#: StockDispatch.php:454 StockLocTransferReceive.php:209
+#: StockDispatch.php:472 StockLocTransferReceive.php:209
#: StockTransfers.php:349 SuppContractChgs.php:72 SuppCreditGRNs.php:179
#: SuppFixedAssetChgs.php:70 SupplierTransInquiry.php:51 SuppShiptChgs.php:77
#: includes/PDFChequeListingPageHeader.inc:17
@@ -8062,7 +8063,7 @@
#: CustomerTransInquiry.php:54 FixedAssetRegister.php:359 PcReportTab.php:266
#: POReport.php:517 POReport.php:1519 SalesAnalRepts.php:433
#: SalesAnalRepts.php:461 SalesAnalRepts.php:490 SalesAnalRepts.php:509
-#: SalesInquiry.php:780 SalesInquiry.php:1090 StockDispatch.php:455
+#: SalesInquiry.php:780 SalesInquiry.php:1090 StockDispatch.php:473
#: StockLocTransferReceive.php:97 SupplierTransInquiry.php:53
#: includes/PO_PDFOrderPageHeader.inc:41
msgid "To"
@@ -9767,7 +9768,7 @@
msgid "View Currency Trend"
msgstr ""
-#: ExchangeRateTrend.php:66
+#: ExchangeRateTrend.php:66 ExchangeRateTrend.php:74
msgid "Trend Currently Unavailable"
msgstr ""
@@ -12443,21 +12444,21 @@
#: ImportStockQuantites.php:155 InternalStockRequestFulfill.php:82
#: PDFStockCheckComparison.php:119 StockAdjustments.php:203
#: StockLocTransferReceive.php:102 StockTransfers.php:239
-#: StockTransfers.php:353
+#: StockTransfers.php:353 Z_StockConversion.php:94
msgid "The stock movement record cannot be inserted because"
msgstr ""
#: ImportStockQuantites.php:156 InternalStockRequestFulfill.php:83
#: PDFStockCheckComparison.php:120 StockAdjustments.php:204
#: StockLocTransferReceive.php:103 StockLocTransferReceive.php:215
-#: StockTransfers.php:240 StockTransfers.php:354
+#: StockTransfers.php:240 StockTransfers.php:354 Z_StockConversion.php:95
msgid "The following SQL to insert the stock movement record was used"
msgstr ""
#: ImportStockQuantites.php:164 InternalStockRequestFulfill.php:96
#: InternalStockRequestFulfill.php:104 PDFStockCheckComparison.php:128
#: StockAdjustments.php:282 StockLocTransferReceive.php:294
-#: StockLocTransferReceive.php:303
+#: StockLocTransferReceive.php:303 Z_StockConversion.php:107
msgid "The following SQL to update the stock record was used"
msgstr ""
@@ -12591,7 +12592,7 @@
#: InternalStockRequestFulfill.php:35 InternalStockRequest.php:492
#: MRPReport.php:726 SelectAsset.php:234 SelectCustomer.php:395
-#: SelectCustomer.php:478 SelectOrderItems.php:1398 SelectProduct.php:720
+#: SelectCustomer.php:478 SelectOrderItems.php:1398 SelectProduct.php:732
#: SelectSupplier.php:236 SelectSupplier.php:298 StockLocTransfer.php:61
#: SupplierPriceList.php:237 SupplierTenderCreate.php:560
#: WorkOrderIssue.php:353 WorkOrderReceive.php:681
@@ -12777,7 +12778,7 @@
msgstr ""
#: InternalStockRequest.php:288 InventoryQuantities.php:181 MRPReport.php:508
-#: ReorderLevel.php:231 SelectProduct.php:39 StockDispatch.php:346
+#: ReorderLevel.php:231 SelectProduct.php:39 StockDispatch.php:340
#: StockLocStatus.php:57 SupplierTenderCreate.php:636 SupplierTenders.php:398
msgid ""
"There are no stock categories currently defined please use the link below to "
@@ -12785,14 +12786,14 @@
msgstr ""
#: InternalStockRequest.php:290 InventoryQuantities.php:182 MRPReport.php:509
-#: ReorderLevel.php:232 SelectProduct.php:40 StockDispatch.php:347
+#: ReorderLevel.php:232 SelectProduct.php:40 StockDispatch.php:341
#: StockLocStatus.php:58 SupplierTenderCreate.php:637 SupplierTenders.php:399
msgid "Define Stock Categories"
msgstr ""
#: InternalStockRequest.php:295 InventoryQuantities.php:188 MRPReport.php:518
#: NoSalesItems.php:65 ReorderLevel.php:238 SelectProduct.php:507
-#: StockDispatch.php:358 StockLocStatus.php:63 SupplierPriceList.php:17
+#: StockDispatch.php:349 StockLocStatus.php:63 SupplierPriceList.php:17
#: SupplierTenderCreate.php:642 SupplierTenders.php:403 TopItems.php:60
msgid "In Stock Category"
msgstr ""
@@ -12806,14 +12807,14 @@
msgstr ""
#: InternalStockRequest.php:492 MRPReport.php:726 SelectAsset.php:234
-#: SelectCustomer.php:395 SelectCustomer.php:478 SelectProduct.php:720
+#: SelectCustomer.php:395 SelectCustomer.php:478 SelectProduct.php:732
#: SelectSupplier.php:236 SelectSupplier.php:298 SupplierPriceList.php:237
#: SupplierTenderCreate.php:560
msgid "pages"
msgstr ""
#: InternalStockRequest.php:492 MRPReport.php:726 SelectAsset.php:234
-#: SelectCustomer.php:395 SelectCustomer.php:478 SelectProduct.php:720
+#: SelectCustomer.php:395 SelectCustomer.php:478 SelectProduct.php:732
#: SelectSupplier.php:236 SelectSupplier.php:298 SupplierPriceList.php:237
#: SupplierTenderCreate.php:560
msgid "Go to Page"
@@ -12822,28 +12823,28 @@
#: InternalStockRequest.php:504 MRPReport.php:738 PcAssignCashToTab.php:231
#: PcAuthorizeExpenses.php:61 PcClaimExpensesFromTab.php:204
#: SelectAsset.php:246 SelectCustomer.php:407 SelectCustomer.php:490
-#: SelectProduct.php:732 SelectSupplier.php:248 SelectSupplier.php:310
+#: SelectProduct.php:744 SelectSupplier.php:248 SelectSupplier.php:310
#: SupplierPriceList.php:249 SupplierTenderCreate.php:572
msgid "Go"
msgstr ""
#: InternalStockRequest.php:505 MRPReport.php:739 SelectAsset.php:247
-#: SelectCustomer.php:408 SelectCustomer.php:491 SelectProduct.php:733
+#: SelectCustomer.php:408 SelectCustomer.php:491 SelectProduct.php:745
#: SelectSupplier.php:249 SelectSupplier.php:311 SupplierPriceList.php:250
#: SupplierTenderCreate.php:573
msgid "Previous"
msgstr ""
-#: InternalStockRequest.php:517 MRPReport.php:750 SelectProduct.php:745
+#: InternalStockRequest.php:517 MRPReport.php:750 SelectProduct.php:757
msgid "Total Qty On Hand"
msgstr ""
-#: InternalStockRequest.php:519 MRPReport.php:752 SelectProduct.php:747
+#: InternalStockRequest.php:519 MRPReport.php:752 SelectProduct.php:759
#: StockStatus.php:7
msgid "Stock Status"
msgstr ""
-#: InternalStockRequest.php:541 SelectProduct.php:74 SelectProduct.php:770
+#: InternalStockRequest.php:541 SelectProduct.php:74 SelectProduct.php:782
#: Stocks.php:1020 Stocks.php:1022
msgid "Obsolete"
msgstr ""
@@ -13007,7 +13008,7 @@
msgstr ""
#: InventoryPlanningPrefSupplier.php:80 ShipmentCosting.php:154
-#: StockDispatch.php:387
+#: StockDispatch.php:397
msgid "Standard"
msgstr ""
@@ -13117,7 +13118,7 @@
#: MRPDemands.php:27 MRPDemandTypes.php:17 MRP.php:517
#: MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247
#: MRPPlannedWorkOrders.php:321 PricesByCost.php:8 ReorderLevelLocation.php:12
-#: ReorderLevel.php:194 SelectProduct.php:80 StockDispatch.php:287
+#: ReorderLevel.php:194 SelectProduct.php:80 StockDispatch.php:281
#: StockMovements.php:19 StockQties_csv.php:8 StockQuantityByDate.php:10
#: StockReorderLevel.php:18 StockSerialItemResearch.php:9
#: StockSerialItems.php:9 StockStatus.php:40 StockTransferControlled.php:14
@@ -14281,17 +14282,17 @@
msgstr ""
#: MRPReport.php:693 PO_SelectOSPurchOrder.php:124 PO_SelectPurchOrder.php:105
-#: SelectCompletedOrder.php:223 SelectProduct.php:688 SelectSalesOrder.php:472
+#: SelectCompletedOrder.php:223 SelectProduct.php:700 SelectSalesOrder.php:472
#: SupplierPriceList.php:203
msgid "No stock items were returned by the SQL because"
msgstr ""
-#: MRPReport.php:694 SelectAsset.php:202 SelectProduct.php:689
+#: MRPReport.php:694 SelectAsset.php:202 SelectProduct.php:701
#: SupplierPriceList.php:204
msgid "The SQL that returned an error was"
msgstr ""
-#: MRPReport.php:697 SelectProduct.php:692 SupplierPriceList.php:207
+#: MRPReport.php:697 SelectProduct.php:704 SupplierPriceList.php:207
msgid ""
"No stock items were returned by this search please re-enter alternative "
"criteria to try again"
@@ -14467,6 +14468,14 @@
msgid "Number Of Days"
msgstr ""
+#: NoSalesItems.php:157
+msgid "Location QOH"
+msgstr ""
+
+#: NoSalesItems.php:158
+msgid "Total QOH"
+msgstr ""
+
#: OffersReceived.php:6 OffersReceived.php:100
msgid "Supplier Offers"
msgstr ""
@@ -18188,7 +18197,7 @@
msgid "The report has been exported as a csv file."
msgstr ""
-#: POReport.php:1505 SalesInquiry.php:1049 StockDispatch.php:377
+#: POReport.php:1505 SalesInquiry.php:1049 StockDispatch.php:381
msgid "Report Type"
msgstr ""
@@ -20021,7 +20030,7 @@
msgid "Inventory Reorder Level Report"
msgstr ""
-#: ReorderLevel.php:206 SelectSalesOrder.php:497 StockDispatch.php:314
+#: ReorderLevel.php:206 SelectSalesOrder.php:497 StockDispatch.php:308
#: StockLocMovements.php:19 StockLocStatus.php:32 StockLocTransfer.php:259
#: StockMovements.php:35 StockTransfers.php:494 StockUsage.php:66
msgid "From Stock Location"
@@ -23796,21 +23805,21 @@
msgstr ""
#: StockAdjustments.php:132 StockCostUpdate.php:42 StockCostUpdate.php:64
-#: StockTransfers.php:168 StockTransfers.php:261
+#: StockTransfers.php:168 StockTransfers.php:261 Z_StockConversion.php:23
msgid "The entered item code does not exist"
msgstr ""
-#: StockAdjustments.php:138
+#: StockAdjustments.php:138 Z_StockConversion.php:29
msgid "There would be no adjustment to make"
msgstr ""
-#: StockAdjustments.php:141
+#: StockAdjustments.php:141 Z_StockConversion.php:32
msgid ""
"The item entered is a controlled item that requires the detail of the serial "
"numbers or batch references to be adjusted to be entered"
msgstr ""
-#: StockAdjustments.php:153
+#: StockAdjustments.php:153 Z_StockConversion.php:44
msgid ""
"The system parameters are set to prohibit negative stocks. Processing this "
"stock adjustment would result in negative stock at this location. This "
@@ -24358,7 +24367,7 @@
msgid "Save Changes"
msgstr ""
-#: StockDispatch.php:17 StockDispatch.php:285
+#: StockDispatch.php:17 StockDispatch.php:279
msgid "Stock Dispatch Report"
msgstr ""
@@ -24370,120 +24379,150 @@
msgid "Could not retrieve location name from the database"
m...
[truncated message content] |
|
From: <dai...@us...> - 2012-06-23 21:41:16
|
Revision: 5447
http://web-erp.svn.sourceforge.net/web-erp/?rev=5447&view=rev
Author: daintree
Date: 2012-06-23 21:41:05 +0000 (Sat, 23 Jun 2012)
Log Message:
-----------
before 4.08.1
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/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/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Removed Paths:
-------------
branches/stable/
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2012-06-23 08:48:47 UTC (rev 5446)
+++ trunk/UpgradeDatabase.php 2012-06-23 21:41:05 UTC (rev 5447)
@@ -145,6 +145,7 @@
case '4.07.6':
$SQLScripts[] = './sql/mysql/upgrade4.07-4.08.sql';
case '4.08.0':
+ case '4.08.1':
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-23 08:48:47 UTC (rev 5446)
+++ trunk/doc/Change.log 2012-06-23 21:41:05 UTC (rev 5447)
@@ -1,5 +1,7 @@
webERP Change Log
+24/6/2012 Release 4.08.1
+
22/06/2012 Icedlava: Fixed bug preventing insert of new account section
21/06/2012 Phil: Added tooltip of long description to SelectProduct.php
20/06/2012 Ricard: Added total QOH to NoSalesItems.php.
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2012-06-23 08:48:47 UTC (rev 5446)
+++ trunk/includes/ConnectDB.inc 2012-06-23 21:41:05 UTC (rev 5447)
@@ -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.08'; //must update manually every time there is a DB change
+$Version='4.08.1'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
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 2012-06-23 08:48:47 UTC (rev 5446)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2012-06-23 21:41:05 UTC (rev 5447)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: web-erp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-16 16:39+1200\n"
+"POT-Creation-Date: 2012-06-24 09:40+1200\n"
"PO-Revision-Date: 2012-01-26 10:26+0000\n"
"Last-Translator: JC_Chuck <Unknown>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -447,7 +447,7 @@
msgid "Section In Accounts"
msgstr ""
-#: AccountGroups.php:415 AccountSections.php:258 AddCustomerContacts.php:260
+#: AccountGroups.php:415 AccountSections.php:259 AddCustomerContacts.php:260
#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:228
#: BankAccounts.php:398 BOMs.php:785 COGSGLPostings.php:355
#: CreditStatus.php:259 Currencies.php:402 CustLoginSetup.php:273
@@ -582,8 +582,8 @@
#: AddCustomerContacts.php:126 CompanyPreferences.php:224
#: CustomerBranches.php:368 Customers.php:1020 Customers.php:1028
-#: SalesPeople.php:200 SelectCustomer.php:610 StockDispatch.php:243
-#: StockDispatch.php:254 StockDispatch.php:265 SupplierContacts.php:150
+#: SalesPeople.php:200 SelectCustomer.php:610 StockDispatch.php:237
+#: StockDispatch.php:248 StockDispatch.php:259 SupplierContacts.php:150
#: SuppTransGLAnalysis.php:105 includes/InputSerialItemsFile.php:92
#: includes/InputSerialItemsFile.php:144 includes/PDFTaxPageHeader.inc:37
msgid "Name"
@@ -694,7 +694,7 @@
#: PcAuthorizeExpenses.php:88 PDFRemittanceAdvice.php:308
#: PrintCustTrans.php:826 PrintCustTransPortrait.php:870 ReverseGRN.php:392
#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:491
-#: StockDispatch.php:245 StockDispatch.php:256 StockDispatch.php:267
+#: StockDispatch.php:239 StockDispatch.php:250 StockDispatch.php:261
#: StockLocMovements.php:91 StockMovements.php:95
#: StockSerialItemResearch.php:81 SupplierAllocations.php:456
#: SupplierAllocations.php:569 SupplierAllocations.php:644
@@ -870,7 +870,7 @@
#: PrintCustOrder.php:233 ReorderLevel.php:63 ReorderLevel.php:182
#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:30 StockCheck.php:46
#: StockCheck.php:68 StockCheck.php:99 StockCheck.php:142 StockCheck.php:153
-#: StockCheck.php:194 StockDispatch.php:100 StockDispatch.php:113
+#: StockCheck.php:194 StockDispatch.php:104 StockDispatch.php:117
#: SupplierBalsAtPeriodEnd.php:54 SupplierBalsAtPeriodEnd.php:65
#: SuppPaymentRun.php:112 SuppPaymentRun.php:122 SuppPaymentRun.php:186
#: SuppPaymentRun.php:217 SuppPriceList.php:134 Tax.php:63 Tax.php:168
@@ -996,7 +996,7 @@
#: OutstandingGRNs.php:182 PDFCustomerList.php:419 PDFLowGP.php:146
#: PDFPriceList.php:312 PDFRemittanceAdvice.php:175
#: PDFStockCheckComparison.php:361 PrintCustTrans.php:542
-#: PrintCustTransPortrait.php:579 ReorderLevel.php:259 StockDispatch.php:394
+#: PrintCustTransPortrait.php:579 ReorderLevel.php:259 StockDispatch.php:407
#: SupplierBalsAtPeriodEnd.php:160 SuppPriceList.php:255 Tax.php:352
msgid "Print PDF"
msgstr ""
@@ -1181,8 +1181,8 @@
#: SalesGraph.php:144 SalesGraph.php:146 SalesGraph.php:180
#: SalesInquiry.php:1079 SalesInquiry.php:1142 SelectCreditItems.php:955
#: SelectOrderItems.php:1626 SelectOrderItems.php:1629 SelectProduct.php:513
-#: SelectProduct.php:515 StockDispatch.php:59 StockDispatch.php:364
-#: StockDispatch.php:366 StockLocStatus.php:69 StockLocStatus.php:71
+#: SelectProduct.php:515 StockDispatch.php:59 StockDispatch.php:355
+#: StockDispatch.php:357 StockLocStatus.php:69 StockLocStatus.php:71
#: StockLocStatus.php:89 StockLocStatus.php:94 StockLocStatus.php:99
#: StockLocStatus.php:104 StockQuantityByDate.php:25 SupplierPriceList.php:23
#: SupplierPriceList.php:25 SupplierTenderCreate.php:647
@@ -1204,7 +1204,7 @@
msgstr ""
#: AuditTrail.php:82 InternalStockRequest.php:550 MRPReport.php:778
-#: PO_SelectPurchOrder.php:431 SelectContract.php:180 SelectProduct.php:780
+#: PO_SelectPurchOrder.php:431 SelectContract.php:180 SelectProduct.php:792
msgid "View"
msgstr ""
@@ -2000,7 +2000,7 @@
#: MRPPlannedWorkOrders.php:366 MRPReport.php:816 MRPReschedules.php:180
#: MRPShortages.php:334 PDFOrderStatus.php:308 PDFPriceList.php:344
#: PDFReceipt.php:31 PO_Header.php:829 PO_PDFPurchOrder.php:61
-#: PO_SelectOSPurchOrder.php:519 ReorderLevel.php:283 StockDispatch.php:424
+#: PO_SelectOSPurchOrder.php:519 ReorderLevel.php:283 StockDispatch.php:437
#: SuppPriceList.php:284 Tax.php:243 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBalanceSheetPageHeader.inc:25
@@ -2039,7 +2039,7 @@
#: PrintCustOrder.php:170 PrintCustTrans.php:741 PrintCustTrans.php:950
#: PrintCustTrans.php:999 PrintCustTransPortrait.php:781
#: PrintCustTransPortrait.php:1003 PrintCustTransPortrait.php:1059
-#: ReorderLevel.php:284 StockDispatch.php:425 SuppPriceList.php:285
+#: ReorderLevel.php:284 StockDispatch.php:438 SuppPriceList.php:285
#: Tax.php:243 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBalanceSheetPageHeader.inc:26
@@ -2096,12 +2096,11 @@
#: BOMExtendedQty.php:321 BOMInquiry.php:110 BOMs.php:883
#: CounterSales.php:2044 CounterSales.php:2233 InternalStockRequest.php:586
-#: NoSalesItems.php:157 PO_SelectOSPurchOrder.php:236
-#: PO_SelectPurchOrder.php:214 ReorderLevelLocation.php:70
-#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:552
-#: SelectOrderItems.php:1506 SelectOrderItems.php:1690
-#: SelectSalesOrder.php:583 SelectWorkOrder.php:194 Shipt_Select.php:192
-#: TopItems.php:168 includes/PDFTopItemsHeader.inc:54
+#: PO_SelectOSPurchOrder.php:236 PO_SelectPurchOrder.php:214
+#: ReorderLevelLocation.php:70 ReorderLevelLocation.php:71
+#: SelectCompletedOrder.php:552 SelectOrderItems.php:1506
+#: SelectOrderItems.php:1690 SelectSalesOrder.php:583 SelectWorkOrder.php:194
+#: Shipt_Select.php:192 TopItems.php:168 includes/PDFTopItemsHeader.inc:54
msgid "On Hand"
msgstr ""
@@ -2121,7 +2120,7 @@
#: POReport.php:539 POReport.php:625 POReport.php:725 POReport.php:1267
#: POReport.php:1276 POReport.php:1290 POReport.php:1305 POReport.php:1356
#: POReport.php:1419 POReport.php:1523 POReport.php:1588 POReport.php:1597
-#: ReorderLevel.php:297 StockDispatch.php:445 StockDispatch.php:452
+#: ReorderLevel.php:297 StockDispatch.php:463 StockDispatch.php:470
msgid "Part Number"
msgstr ""
@@ -2189,9 +2188,9 @@
#: SecurityTokens.php:104 SecurityTokens.php:120 SelectAsset.php:255
#: SelectCompletedOrder.php:551 SelectContract.php:140
#: SelectCreditItems.php:991 SelectOrderItems.php:1504
-#: SelectOrderItems.php:1688 SelectProduct.php:525 SelectProduct.php:744
+#: SelectOrderItems.php:1688 SelectProduct.php:525 SelectProduct.php:756
#: SelectSalesOrder.php:582 SelectWorkOrder.php:193 Shipt_Select.php:191
-#: StockCategories.php:234 StockDispatch.php:446 StockLocStatus.php:168
+#: StockCategories.php:234 StockDispatch.php:464 StockLocStatus.php:168
#: StockQuantityByDate.php:108 SuppCreditGRNs.php:92 SuppCreditGRNs.php:187
#: SuppFixedAssetChgs.php:75 SuppInvGRNs.php:126 SuppInvGRNs.php:307
#: SupplierCredit.php:317 SupplierCredit.php:385 SupplierInvoice.php:294
@@ -2208,7 +2207,7 @@
#: includes/PDFStockLocTransferHeader.inc:49
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:207
-#: includes/PDFTransPageHeaderPortrait.inc:262 api/api_xml-rpc.php:3398
+#: includes/PDFTransPageHeaderPortrait.inc:262 api/api_xml-rpc.php:3394
msgid "Description"
msgstr ""
@@ -2376,7 +2375,7 @@
#: PricesByCost.php:151 PurchData.php:382 ReorderLevelLocation.php:67
#: SalesPeople.php:199 SelectCompletedOrder.php:550 SelectCreditItems.php:990
#: SelectCustomer.php:415 SelectGLAccount.php:119 SelectOrderItems.php:1503
-#: SelectOrderItems.php:1687 SelectProduct.php:743 SelectSalesOrder.php:581
+#: SelectOrderItems.php:1687 SelectProduct.php:755 SelectSalesOrder.php:581
#: SelectSupplier.php:259 SelectWorkOrder.php:192 Shipt_Select.php:190
#: SpecialOrder.php:149 SupplierPriceList.php:260 SupplierPriceList.php:445
#: SupplierTenderCreate.php:583 SupplierTenderCreate.php:817
@@ -2392,11 +2391,11 @@
#: Credit_Invoice.php:273 GoodsReceived.php:102 GoodsReceived.php:106
#: InternalStockRequestAuthorisation.php:89
#: InternalStockRequestFulfill.php:301 InternalStockRequest.php:518
-#: InternalStockRequest.php:585 MRPReport.php:751 NoSalesItems.php:158
+#: InternalStockRequest.php:585 MRPReport.php:751 NoSalesItems.php:159
#: OffersReceived.php:109 PO_Items.php:1076 PO_SelectOSPurchOrder.php:238
#: PO_SelectPurchOrder.php:216 SelectCompletedOrder.php:555
#: SelectCreditItems.php:992 SelectOrderItems.php:1505
-#: SelectOrderItems.php:1689 SelectProduct.php:121 SelectProduct.php:746
+#: SelectOrderItems.php:1689 SelectProduct.php:121 SelectProduct.php:758
#: SelectSalesOrder.php:584 SelectWorkOrder.php:195 Shipments.php:402
#: Shipments.php:489 Shipt_Select.php:194 StockLocTransferReceive.php:433
#: SupplierPriceList.php:262 SupplierTenderCreate.php:819
@@ -2527,7 +2526,7 @@
#: PaymentTerms.php:196 PO_SelectOSPurchOrder.php:524
#: SalesAnalReptCols.php:285 SelectProduct.php:119 SelectProduct.php:165
#: SelectProduct.php:178 SelectProduct.php:262 SelectProduct.php:263
-#: SelectProduct.php:765 TopItems.php:187 TopItems.php:188
+#: SelectProduct.php:777 TopItems.php:187 TopItems.php:188
msgid "N/A"
msgstr ""
@@ -2546,11 +2545,11 @@
msgstr ""
#: BOMs.php:254 StockAdjustments.php:135 StockTransfers.php:172
-#: WorkOrderEntry.php:281
+#: WorkOrderEntry.php:281 Z_StockConversion.php:26
msgid "The quantity entered must be numeric"
msgstr ""
-#: BOMs.php:260 StockAdjustments.php:138
+#: BOMs.php:260 StockAdjustments.php:138 Z_StockConversion.php:29
msgid "The quantity entered cannot be zero"
msgstr ""
@@ -3643,7 +3642,7 @@
#: ShipmentCosting.php:432 ShipmentCosting.php:451 ShipmentCosting.php:465
#: StockAdjustments.php:203 StockAdjustments.php:234 StockAdjustments.php:252
#: StockAdjustments.php:268 StockAdjustments.php:281 StockAdjustments.php:309
-#: StockAdjustments.php:331 StockDispatch.php:235 StockLocTransfer.php:189
+#: StockAdjustments.php:331 StockDispatch.php:229 StockLocTransfer.php:189
#: StockLocTransfer.php:213 StockLocTransfer.php:217
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
@@ -3686,9 +3685,9 @@
#: WorkOrderReceive.php:499 WorkOrderReceive.php:514 WorkOrderReceive.php:524
#: WorkOrderReceive.php:543 WorkOrderReceive.php:570 WorkOrderReceive.php:585
#: WorkOrderReceive.php:605 WorkOrderReceive.php:639 WorkOrderReceive.php:659
-#: WorkOrderReceive.php:669 includes/SQL_CommonFunctions.inc:24
-#: includes/SQL_CommonFunctions.inc:31 includes/SQL_CommonFunctions.inc:185
-#: includes/SQL_CommonFunctions.inc:204
+#: WorkOrderReceive.php:669 Z_StockConversion.php:94 Z_StockConversion.php:106
+#: includes/SQL_CommonFunctions.inc:24 includes/SQL_CommonFunctions.inc:31
+#: includes/SQL_CommonFunctions.inc:185 includes/SQL_CommonFunctions.inc:204
msgid "CRITICAL ERROR"
msgstr ""
@@ -3800,9 +3799,10 @@
#: WorkOrderReceive.php:462 WorkOrderReceive.php:499 WorkOrderReceive.php:514
#: WorkOrderReceive.php:524 WorkOrderReceive.php:543 WorkOrderReceive.php:570
#: WorkOrderReceive.php:585 WorkOrderReceive.php:605 WorkOrderReceive.php:639
-#: WorkOrderReceive.php:659 WorkOrderReceive.php:669
-#: includes/SQL_CommonFunctions.inc:24 includes/SQL_CommonFunctions.inc:31
-#: includes/SQL_CommonFunctions.inc:185 includes/SQL_CommonFunctions.inc:204
+#: WorkOrderReceive.php:659 WorkOrderReceive.php:669 Z_StockConversion.php:94
+#: Z_StockConversion.php:106 includes/SQL_CommonFunctions.inc:24
+#: includes/SQL_CommonFunctions.inc:31 includes/SQL_CommonFunctions.inc:185
+#: includes/SQL_CommonFunctions.inc:204
msgid "NOTE DOWN THIS ERROR AND SEEK ASSISTANCE"
msgstr ""
@@ -4276,8 +4276,8 @@
msgstr ""
#: ContractBOM.php:140 PO_Items.php:990 SupplierTenderCreate.php:800
-#: SupplierTenders.php:670 Z_ChangeStockCategory.php:63
-#: Z_ChangeStockCode.php:104
+#: SupplierTenders.php:670 Z_ChangeLocationCode.php:90
+#: Z_ChangeStockCategory.php:63 Z_ChangeStockCode.php:104
msgid "The SQL statement that failed was"
msgstr ""
@@ -4560,7 +4560,7 @@
#: PDFStockCheckComparison.php:127 ReverseGRN.php:219 StockAdjustments.php:281
#: StockLocTransferReceive.php:293 StockLocTransferReceive.php:302
#: StockTransfers.php:431 StockTransfers.php:440 WorkOrderIssue.php:161
-#: WorkOrderReceive.php:432
+#: WorkOrderReceive.php:432 Z_StockConversion.php:106
msgid "The location stock record could not be updated because"
msgstr ""
@@ -5097,7 +5097,7 @@
#: Contracts.php:845 InventoryQuantities.php:237 PDFPriceList.php:365
#: PricesByCost.php:244 ReorderLevelLocation.php:172 ReorderLevel.php:286
#: SalesCategoryPeriodInquiry.php:164 SalesTopItemsInquiry.php:221
-#: SpecialOrder.php:697 StockDispatch.php:434 Stocks.php:881
+#: SpecialOrder.php:697 StockDispatch.php:447 Stocks.php:881
#: SuppPriceList.php:229 SuppPriceList.php:291
#: includes/PDFInventoryValnPageHeader.inc:32
#: includes/PDFInventoryValnPageHeader.inc:38
@@ -5484,7 +5484,8 @@
#: SuppContractChgs.php:168 SupplierCredit.php:421 SupplierCredit.php:460
#: SupplierInvoice.php:414 SupplierInvoice.php:458
#: SupplierTransInquiry.php:174 SuppTransGLAnalysis.php:107
-#: SuppTransGLAnalysis.php:200 includes/PDFBankingSummaryPageHeader.inc:58
+#: SuppTransGLAnalysis.php:200 Z_StockConversion.php:172
+#: includes/PDFBankingSummaryPageHeader.inc:58
msgid "Narrative"
msgstr ""
@@ -5742,8 +5743,8 @@
msgstr ""
#: CounterSales.php:2047 CounterSales.php:2236 InternalStockRequest.php:589
-#: SelectOrderItems.php:1509 SelectOrderItems.php:1693 StockDispatch.php:459
-#: StockDispatch.php:460 StockLocStatus.php:172 StockStatus.php:90
+#: SelectOrderItems.php:1509 SelectOrderItems.php:1693 StockDispatch.php:477
+#: StockDispatch.php:478 StockLocStatus.php:172 StockStatus.php:90
#: includes/OutputSerialItems.php:37 includes/PDFStockCheckPageHeader.inc:40
msgid "Available"
msgstr ""
@@ -5804,7 +5805,7 @@
#: CounterSales.php:2227 CounterSales.php:2352 InternalStockRequest.php:506
#: InternalStockRequest.php:581 InternalStockRequest.php:703 MRPReport.php:740
#: SelectAsset.php:248 SelectCustomer.php:409 SelectCustomer.php:492
-#: SelectOrderItems.php:1685 SelectOrderItems.php:1805 SelectProduct.php:734
+#: SelectOrderItems.php:1685 SelectOrderItems.php:1805 SelectProduct.php:746
#: SelectSupplier.php:250 SelectSupplier.php:312 SupplierPriceList.php:251
#: SupplierTenderCreate.php:574
msgid "Next"
@@ -7640,7 +7641,7 @@
#: CustomerReceipt.php:904 GoodsReceived.php:103 GoodsReceived.php:107
#: GoodsReceived.php:113 POReport.php:629 POReport.php:1360 ReverseGRN.php:392
#: ReverseGRN.php:393 ShipmentCosting.php:150 Shipments.php:403
-#: Shipments.php:490 StockDispatch.php:450 StockDispatch.php:457
+#: Shipments.php:490 StockDispatch.php:468 StockDispatch.php:475
#: SuppCreditGRNs.php:189
msgid "Received"
msgstr ""
@@ -8041,7 +8042,7 @@
#: FixedAssetRegister.php:358 PcReportTab.php:139 PcReportTab.php:260
#: SalesAnalRepts.php:432 SalesAnalRepts.php:460 SalesAnalRepts.php:489
#: SalesAnalRepts.php:508 ShipmentCosting.php:56 Shipments.php:308
-#: StockDispatch.php:454 StockLocTransferReceive.php:209
+#: StockDispatch.php:472 StockLocTransferReceive.php:209
#: StockTransfers.php:349 SuppContractChgs.php:72 SuppCreditGRNs.php:179
#: SuppFixedAssetChgs.php:70 SupplierTransInquiry.php:51 SuppShiptChgs.php:77
#: includes/PDFChequeListingPageHeader.inc:17
@@ -8062,7 +8063,7 @@
#: CustomerTransInquiry.php:54 FixedAssetRegister.php:359 PcReportTab.php:266
#: POReport.php:517 POReport.php:1519 SalesAnalRepts.php:433
#: SalesAnalRepts.php:461 SalesAnalRepts.php:490 SalesAnalRepts.php:509
-#: SalesInquiry.php:780 SalesInquiry.php:1090 StockDispatch.php:455
+#: SalesInquiry.php:780 SalesInquiry.php:1090 StockDispatch.php:473
#: StockLocTransferReceive.php:97 SupplierTransInquiry.php:53
#: includes/PO_PDFOrderPageHeader.inc:41
msgid "To"
@@ -9767,7 +9768,7 @@
msgid "View Currency Trend"
msgstr ""
-#: ExchangeRateTrend.php:66
+#: ExchangeRateTrend.php:66 ExchangeRateTrend.php:74
msgid "Trend Currently Unavailable"
msgstr ""
@@ -12443,21 +12444,21 @@
#: ImportStockQuantites.php:155 InternalStockRequestFulfill.php:82
#: PDFStockCheckComparison.php:119 StockAdjustments.php:203
#: StockLocTransferReceive.php:102 StockTransfers.php:239
-#: StockTransfers.php:353
+#: StockTransfers.php:353 Z_StockConversion.php:94
msgid "The stock movement record cannot be inserted because"
msgstr ""
#: ImportStockQuantites.php:156 InternalStockRequestFulfill.php:83
#: PDFStockCheckComparison.php:120 StockAdjustments.php:204
#: StockLocTransferReceive.php:103 StockLocTransferReceive.php:215
-#: StockTransfers.php:240 StockTransfers.php:354
+#: StockTransfers.php:240 StockTransfers.php:354 Z_StockConversion.php:95
msgid "The following SQL to insert the stock movement record was used"
msgstr ""
#: ImportStockQuantites.php:164 InternalStockRequestFulfill.php:96
#: InternalStockRequestFulfill.php:104 PDFStockCheckComparison.php:128
#: StockAdjustments.php:282 StockLocTransferReceive.php:294
-#: StockLocTransferReceive.php:303
+#: StockLocTransferReceive.php:303 Z_StockConversion.php:107
msgid "The following SQL to update the stock record was used"
msgstr ""
@@ -12591,7 +12592,7 @@
#: InternalStockRequestFulfill.php:35 InternalStockRequest.php:492
#: MRPReport.php:726 SelectAsset.php:234 SelectCustomer.php:395
-#: SelectCustomer.php:478 SelectOrderItems.php:1398 SelectProduct.php:720
+#: SelectCustomer.php:478 SelectOrderItems.php:1398 SelectProduct.php:732
#: SelectSupplier.php:236 SelectSupplier.php:298 StockLocTransfer.php:61
#: SupplierPriceList.php:237 SupplierTenderCreate.php:560
#: WorkOrderIssue.php:353 WorkOrderReceive.php:681
@@ -12777,7 +12778,7 @@
msgstr ""
#: InternalStockRequest.php:288 InventoryQuantities.php:181 MRPReport.php:508
-#: ReorderLevel.php:231 SelectProduct.php:39 StockDispatch.php:346
+#: ReorderLevel.php:231 SelectProduct.php:39 StockDispatch.php:340
#: StockLocStatus.php:57 SupplierTenderCreate.php:636 SupplierTenders.php:398
msgid ""
"There are no stock categories currently defined please use the link below to "
@@ -12785,14 +12786,14 @@
msgstr ""
#: InternalStockRequest.php:290 InventoryQuantities.php:182 MRPReport.php:509
-#: ReorderLevel.php:232 SelectProduct.php:40 StockDispatch.php:347
+#: ReorderLevel.php:232 SelectProduct.php:40 StockDispatch.php:341
#: StockLocStatus.php:58 SupplierTenderCreate.php:637 SupplierTenders.php:399
msgid "Define Stock Categories"
msgstr ""
#: InternalStockRequest.php:295 InventoryQuantities.php:188 MRPReport.php:518
#: NoSalesItems.php:65 ReorderLevel.php:238 SelectProduct.php:507
-#: StockDispatch.php:358 StockLocStatus.php:63 SupplierPriceList.php:17
+#: StockDispatch.php:349 StockLocStatus.php:63 SupplierPriceList.php:17
#: SupplierTenderCreate.php:642 SupplierTenders.php:403 TopItems.php:60
msgid "In Stock Category"
msgstr ""
@@ -12806,14 +12807,14 @@
msgstr ""
#: InternalStockRequest.php:492 MRPReport.php:726 SelectAsset.php:234
-#: SelectCustomer.php:395 SelectCustomer.php:478 SelectProduct.php:720
+#: SelectCustomer.php:395 SelectCustomer.php:478 SelectProduct.php:732
#: SelectSupplier.php:236 SelectSupplier.php:298 SupplierPriceList.php:237
#: SupplierTenderCreate.php:560
msgid "pages"
msgstr ""
#: InternalStockRequest.php:492 MRPReport.php:726 SelectAsset.php:234
-#: SelectCustomer.php:395 SelectCustomer.php:478 SelectProduct.php:720
+#: SelectCustomer.php:395 SelectCustomer.php:478 SelectProduct.php:732
#: SelectSupplier.php:236 SelectSupplier.php:298 SupplierPriceList.php:237
#: SupplierTenderCreate.php:560
msgid "Go to Page"
@@ -12822,28 +12823,28 @@
#: InternalStockRequest.php:504 MRPReport.php:738 PcAssignCashToTab.php:231
#: PcAuthorizeExpenses.php:61 PcClaimExpensesFromTab.php:204
#: SelectAsset.php:246 SelectCustomer.php:407 SelectCustomer.php:490
-#: SelectProduct.php:732 SelectSupplier.php:248 SelectSupplier.php:310
+#: SelectProduct.php:744 SelectSupplier.php:248 SelectSupplier.php:310
#: SupplierPriceList.php:249 SupplierTenderCreate.php:572
msgid "Go"
msgstr ""
#: InternalStockRequest.php:505 MRPReport.php:739 SelectAsset.php:247
-#: SelectCustomer.php:408 SelectCustomer.php:491 SelectProduct.php:733
+#: SelectCustomer.php:408 SelectCustomer.php:491 SelectProduct.php:745
#: SelectSupplier.php:249 SelectSupplier.php:311 SupplierPriceList.php:250
#: SupplierTenderCreate.php:573
msgid "Previous"
msgstr ""
-#: InternalStockRequest.php:517 MRPReport.php:750 SelectProduct.php:745
+#: InternalStockRequest.php:517 MRPReport.php:750 SelectProduct.php:757
msgid "Total Qty On Hand"
msgstr ""
-#: InternalStockRequest.php:519 MRPReport.php:752 SelectProduct.php:747
+#: InternalStockRequest.php:519 MRPReport.php:752 SelectProduct.php:759
#: StockStatus.php:7
msgid "Stock Status"
msgstr ""
-#: InternalStockRequest.php:541 SelectProduct.php:74 SelectProduct.php:770
+#: InternalStockRequest.php:541 SelectProduct.php:74 SelectProduct.php:782
#: Stocks.php:1020 Stocks.php:1022
msgid "Obsolete"
msgstr ""
@@ -13007,7 +13008,7 @@
msgstr ""
#: InventoryPlanningPrefSupplier.php:80 ShipmentCosting.php:154
-#: StockDispatch.php:387
+#: StockDispatch.php:397
msgid "Standard"
msgstr ""
@@ -13117,7 +13118,7 @@
#: MRPDemands.php:27 MRPDemandTypes.php:17 MRP.php:517
#: MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247
#: MRPPlannedWorkOrders.php:321 PricesByCost.php:8 ReorderLevelLocation.php:12
-#: ReorderLevel.php:194 SelectProduct.php:80 StockDispatch.php:287
+#: ReorderLevel.php:194 SelectProduct.php:80 StockDispatch.php:281
#: StockMovements.php:19 StockQties_csv.php:8 StockQuantityByDate.php:10
#: StockReorderLevel.php:18 StockSerialItemResearch.php:9
#: StockSerialItems.php:9 StockStatus.php:40 StockTransferControlled.php:14
@@ -14281,17 +14282,17 @@
msgstr ""
#: MRPReport.php:693 PO_SelectOSPurchOrder.php:124 PO_SelectPurchOrder.php:105
-#: SelectCompletedOrder.php:223 SelectProduct.php:688 SelectSalesOrder.php:472
+#: SelectCompletedOrder.php:223 SelectProduct.php:700 SelectSalesOrder.php:472
#: SupplierPriceList.php:203
msgid "No stock items were returned by the SQL because"
msgstr ""
-#: MRPReport.php:694 SelectAsset.php:202 SelectProduct.php:689
+#: MRPReport.php:694 SelectAsset.php:202 SelectProduct.php:701
#: SupplierPriceList.php:204
msgid "The SQL that returned an error was"
msgstr ""
-#: MRPReport.php:697 SelectProduct.php:692 SupplierPriceList.php:207
+#: MRPReport.php:697 SelectProduct.php:704 SupplierPriceList.php:207
msgid ""
"No stock items were returned by this search please re-enter alternative "
"criteria to try again"
@@ -14467,6 +14468,14 @@
msgid "Number Of Days"
msgstr ""
+#: NoSalesItems.php:157
+msgid "Location QOH"
+msgstr ""
+
+#: NoSalesItems.php:158
+msgid "Total QOH"
+msgstr ""
+
#: OffersReceived.php:6 OffersReceived.php:100
msgid "Supplier Offers"
msgstr ""
@@ -18188,7 +18197,7 @@
msgid "The report has been exported as a csv file."
msgstr ""
-#: POReport.php:1505 SalesInquiry.php:1049 StockDispatch.php:377
+#: POReport.php:1505 SalesInquiry.php:1049 StockDispatch.php:381
msgid "Report Type"
msgstr ""
@@ -20021,7 +20030,7 @@
msgid "Inventory Reorder Level Report"
msgstr ""
-#: ReorderLevel.php:206 SelectSalesOrder.php:497 StockDispatch.php:314
+#: ReorderLevel.php:206 SelectSalesOrder.php:497 StockDispatch.php:308
#: StockLocMovements.php:19 StockLocStatus.php:32 StockLocTransfer.php:259
#: StockMovements.php:35 StockTransfers.php:494 StockUsage.php:66
msgid "From Stock Location"
@@ -23796,21 +23805,21 @@
msgstr ""
#: StockAdjustments.php:132 StockCostUpdate.php:42 StockCostUpdate.php:64
-#: StockTransfers.php:168 StockTransfers.php:261
+#: StockTransfers.php:168 StockTransfers.php:261 Z_StockConversion.php:23
msgid "The entered item code does not exist"
msgstr ""
-#: StockAdjustments.php:138
+#: StockAdjustments.php:138 Z_StockConversion.php:29
msgid "There would be no adjustment to make"
msgstr ""
-#: StockAdjustments.php:141
+#: StockAdjustments.php:141 Z_StockConversion.php:32
msgid ""
"The item entered is a controlled item that requires the detail of the serial "
"numbers or batch references to be adjusted to be entered"
msgstr ""
-#: StockAdjustments.php:153
+#: StockAdjustments.php:153 Z_StockConversion.php:44
msgid ""
"The system parameters are set to prohibit negative stocks. Processing this "
"stock adjustment would result in negative stock at this location. This "
@@ -24358,7 +24367,7 @@
msgid "Save Changes"
msgstr ""
-#: StockDispatch.php:17 StockDispatch.php:285
+#: StockDispatch.php:17 StockDispatch.php:279
msgid "Stock Dispatch Report"
msgstr ""
@@ -24370,120 +24379,150 @@
msgid "Could not retrieve location name from the database"
m...
[truncated message content] |
|
From: <dai...@us...> - 2012-06-23 22:14:30
|
Revision: 5448
http://web-erp.svn.sourceforge.net/web-erp/?rev=5448&view=rev
Author: daintree
Date: 2012-06-23 22:14:24 +0000 (Sat, 23 Jun 2012)
Log Message:
-----------
pre 4.08.1
Modified Paths:
--------------
trunk/UpgradeDatabase.php
Added Paths:
-----------
trunk/sql/mysql/upgrade4.08-4.09.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2012-06-23 21:41:05 UTC (rev 5447)
+++ trunk/UpgradeDatabase.php 2012-06-23 22:14:24 UTC (rev 5448)
@@ -144,8 +144,9 @@
case '4.07.5':
case '4.07.6':
$SQLScripts[] = './sql/mysql/upgrade4.07-4.08.sql';
- case '4.08.0':
+ case '4.08':
case '4.08.1':
+ $SQLScripts[] = './sql/mysql/upgrade4.08-4.09.sql';
break;
} //end switch
}
Added: trunk/sql/mysql/upgrade4.08-4.09.sql
===================================================================
--- trunk/sql/mysql/upgrade4.08-4.09.sql (rev 0)
+++ trunk/sql/mysql/upgrade4.08-4.09.sql 2012-06-23 22:14:24 UTC (rev 5448)
@@ -0,0 +1,2 @@
+UPDATE config SET confvalue='4.08.1' WHERE confname='VersionNumber';
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-06-23 22:14:31
|
Revision: 5448
http://web-erp.svn.sourceforge.net/web-erp/?rev=5448&view=rev
Author: daintree
Date: 2012-06-23 22:14:24 +0000 (Sat, 23 Jun 2012)
Log Message:
-----------
pre 4.08.1
Modified Paths:
--------------
trunk/UpgradeDatabase.php
Added Paths:
-----------
trunk/sql/mysql/upgrade4.08-4.09.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2012-06-23 21:41:05 UTC (rev 5447)
+++ trunk/UpgradeDatabase.php 2012-06-23 22:14:24 UTC (rev 5448)
@@ -144,8 +144,9 @@
case '4.07.5':
case '4.07.6':
$SQLScripts[] = './sql/mysql/upgrade4.07-4.08.sql';
- case '4.08.0':
+ case '4.08':
case '4.08.1':
+ $SQLScripts[] = './sql/mysql/upgrade4.08-4.09.sql';
break;
} //end switch
}
Added: trunk/sql/mysql/upgrade4.08-4.09.sql
===================================================================
--- trunk/sql/mysql/upgrade4.08-4.09.sql (rev 0)
+++ trunk/sql/mysql/upgrade4.08-4.09.sql 2012-06-23 22:14:24 UTC (rev 5448)
@@ -0,0 +1,2 @@
+UPDATE config SET confvalue='4.08.1' WHERE confname='VersionNumber';
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ice...@us...> - 2012-06-24 05:37:00
|
Revision: 5450
http://web-erp.svn.sourceforge.net/web-erp/?rev=5450&view=rev
Author: icedlava
Date: 2012-06-24 05:36:51 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Adjust header.inc, ManualContents.php, ManualHeader.html to take ViewTopic and Bookmark parameters in displaying manual. Add ManualOutline.php file containing manual TOC, add CSS and rework all manual docs. Add $Viewtopic and $Bookmark to some functions (eg see Stocks.php) - ongoing work.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/doc/Manual/ManualAPITutorial.html
trunk/doc/Manual/ManualARInquiries.html
trunk/doc/Manual/ManualARReports.html
trunk/doc/Manual/ManualARTransactions.html
trunk/doc/Manual/ManualAccountsPayable.html
trunk/doc/Manual/ManualAccountsReceivable.html
trunk/doc/Manual/ManualContents.php
trunk/doc/Manual/ManualContracts.html
trunk/doc/Manual/ManualContributors.html
trunk/doc/Manual/ManualCreatingNewSystem.html
trunk/doc/Manual/ManualCreditStatus.html
trunk/doc/Manual/ManualCurrencies.html
trunk/doc/Manual/ManualDevelopmentStructure.html
trunk/doc/Manual/ManualFixedAssets.html
trunk/doc/Manual/ManualFooter.html
trunk/doc/Manual/ManualGeneralLedger.html
trunk/doc/Manual/ManualGettingStarted.html
trunk/doc/Manual/ManualHeader.html
trunk/doc/Manual/ManualIntroduction.html
trunk/doc/Manual/ManualInventory.html
trunk/doc/Manual/ManualMRP.html
trunk/doc/Manual/ManualManufacturing.html
trunk/doc/Manual/ManualMultilanguage.html
trunk/doc/Manual/ManualNewScripts.html
trunk/doc/Manual/ManualPaymentTerms.html
trunk/doc/Manual/ManualPettyCash.html
trunk/doc/Manual/ManualPrices.html
trunk/doc/Manual/ManualPurchaseOrdering.html
trunk/doc/Manual/ManualReportBuilder.html
trunk/doc/Manual/ManualRequirements.html
trunk/doc/Manual/ManualSalesAnalysis.html
trunk/doc/Manual/ManualSalesOrders.html
trunk/doc/Manual/ManualSalesPeople.html
trunk/doc/Manual/ManualSalesTypes.html
trunk/doc/Manual/ManualSecuritySchema.html
trunk/doc/Manual/ManualShipments.html
trunk/doc/Manual/ManualSpecialUtilities.html
trunk/doc/Manual/ManualSystemConventions.html
trunk/doc/Manual/ManualTax.html
trunk/includes/header.inc
Added Paths:
-----------
trunk/doc/Manual/ManualOutline.php
trunk/doc/Manual/style/
trunk/doc/Manual/style/manual.css
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-23 22:15:44 UTC (rev 5449)
+++ trunk/doc/Change.log 2012-06-24 05:36:51 UTC (rev 5450)
@@ -1,5 +1,7 @@
webERP Change Log
+24/06/2012: Icedlava: Adjust header.inc, ManualContents.php, ManualHeader.html to take Viewtopic and Bookmark parameters in displaying manual. Add ManualOutline.php file containing manual TOC, add CSS and rework all manual docs. Still to add $Viewtopic and $Bookmark to functions (eg see Stocks.php)
+
24/6/2012 Release 4.08.1
22/06/2012 Icedlava: Fixed bug preventing insert of new account section
Modified: trunk/doc/Manual/ManualAPITutorial.html
===================================================================
--- trunk/doc/Manual/ManualAPITutorial.html 2012-06-23 22:15:44 UTC (rev 5449)
+++ trunk/doc/Manual/ManualAPITutorial.html 2012-06-24 05:36:51 UTC (rev 5450)
@@ -1,99 +1,92 @@
-<a name="APITutorial"><font size="+3"><b>Application Programming Interface</b></font></a>
-<br /><br />
-<font size="+2"><b>webERP API - Getting Started</b></font>
-<br /><br />
+<a id="APITutorial"><h1>Application Programming Interface</h1></a>
+
+<h2>webERP API - Getting Started</h2>
+<p>
The API is an Application Program Interface, that is intended to expose webERP functionality to external programs. There are currently a number of low level functions it exposes to enable external applications to retrieve webERP data and to update or insert webERP data.
-<br /><br />
+</p>
The API in webERP uses XML-RPC in particular the phpxmlrpc class from Useful Inc originally developed by Edd Dumbill
-<br /><br />
-XML-RPC is a protocl to use XML to make RPC - remote procedure calls.
-<br /><br />
-Simply put the XML-RPC call is XML that contains the method of the remote procedure call together with any parameters and their data types and is sent over http as a POST to the XML-RPC server - the server returns an XML payload containing the results of the call. The parameters sent to the methods can contain arrays and associative arrays of data.
-<br /><br />
-The clever thing about XML-RPC is that it is the simplest protocol around for doing web-services. The newer and MUCH more complex SOAP - Simple Object Access Protocol - is quite involved and complicated. webERP is founded on the KISS principle.
-<br /><br />
-In fact the XML-RPC "Server" in webERP is just the script http://www.yourdomain.com/webERP/api/api_xml-rpc.php
-<br /><br />
-There is no daemon background process running continuously to field calls to the "server" it is just a script that is http posted to by the XML-RPC call sending the XML encoded method to be run together with the necessary parameters to the webERP API - the server script runs the API php functions exposed by the xml-rpc methods and returns the XML-RPC response as an XML payload. The phpxmlrpc class does the packaging converting the PHP variables and arrays to the XML required for the XML-RPC call and also has the functions to convert the XML response into something useable in PHP without having to write the XML parsing routines.
-<br /><br />
-It is worthwhile reading a how-to on XML-RPC with PHP which explains in more detail what is going on as a primer for the concepts.
-<br /><br />
-The beauty of XML-RPC is that the client calling the webERP XML-RPC server and performing native webERP functions can be called from any language (with XML-RPC bindings). I have used Vala, Genie and Python. Python particularly has been very straight forward as it has an xmlrpclib bundled with it. Of course a PHP client is also possible and is demonstrated below.
-<br /><br />
-The API help is actually produced by an xml-rpc call to the API using the system.listMethods method (this is a phpxmlrpc method - not a webERP API method). Aother system xml-rpc method of phpxmlrpc class is used to return the details of each method's parameters required. So the help file not only documents each of the API methods it is itself and illustration of how the API can be used!!
-<br /><br />
-Below is a simple example of how to use the API.
-<br /><br />
-<hr />
-<i>
-echo "<html><head>Test webERP API</head><body>";
-<br /><br />
-//the xmlrpc class can output some funny warnings so make sure notices are turned off
-error_reporting (E_ALL & ~E_NOTICE);
-<br /><br />
-/*you need to include the phpxmlrpc class - see link above - copy the whole directory structure of the class over to your client application from the webERP/xmlrpc directory
-*/
-<br /><br />
+</p>
+<p>XML-RPC is a protocl to use XML to make RPC - remote procedure calls.</p>
+<p>
+Simply put the XML-RPC call is XML that contains the method of the remote procedure call together with any parameters and their data types and is sent over http as a POST to the XML-RPC server - the server returns an XML payload containing the results of the call. The parameters sent to the methods can contain arrays and associative arrays of data.</p>
+<p>
+The clever thing about XML-RPC is that it is the simplest protocol around for doing web-services. The newer and MUCH more complex SOAP - Simple Object Access Protocol - is quite involved and complicated. webERP is founded on the KISS principle.</p>
+<p>
+In fact the XML-RPC "Server" in webERP is just the script http://www.yourdomain.com/webERP/api/api_xml-rpc.php</p>
+<p>There is no daemon background process running continuously to field calls to the "server" it is just a script that is http posted to by the XML-RPC call sending the XML encoded method to be run together with the necessary parameters to the webERP API - the server script runs the API php functions exposed by the xml-rpc methods and returns the XML-RPC response as an XML payload. The phpxmlrpc class does the packaging converting the PHP variables and arrays to the XML required for the XML-RPC call and also has the functions to convert the XML response into something useable in PHP without having to write the XML parsing routines.</p>
+<p>
+It is worthwhile reading a how-to on XML-RPC with PHP which explains in more detail what is going on as a primer for the concepts.</p>
+<p>
+The beauty of XML-RPC is that the client calling the webERP XML-RPC server and performing native webERP functions can be called from any language (with XML-RPC bindings). I have used Vala, Genie and Python. Python particularly has been very straight forward as it has an xmlrpclib bundled with it. Of course a PHP client is also possible and is demonstrated below.</p>
+<p>
+The API help is actually produced by an xml-rpc call to the API using the system.listMethods method (this is a phpxmlrpc method - not a webERP API method). Aother system xml-rpc method of phpxmlrpc class is used to return the details of each method's parameters required. So the help file not only documents each of the API methods it is itself and illustration of how the API can be used!!</p>
+<p>
+Below is a simple example of how to use the API.</p>
+<p>
+<hr>
+<pre>
+echo "Test webERP API";
+
+//the xmlrpc class can output some funny warnings so make sure notices are turned off error_reporting (E_ALL & ~E_NOTICE);
+
+/* you need to include the phpxmlrpc class - see link above - copy the whole directory structure of the class over to your client application from the webERP/xmlrpc directory */
+
include ("xmlrpc/lib/xmlrpc.inc");
-<br /><br />
+
//if your webERP install is on a server at http://www.yourdomain.com/webERP
-<br /><br />
+
$ServerURL = "http://www.yourdomain.com/webERP/api/api_xml-rpc.php";
-<br /><br />
+
$DebugLevel = 0; //Set to 0,1, or 2 with 2 being the highest level of debug info
-<br /><br />
+
$Parameters = array();
-<br /><br />
-/*The trap for me was that each parameter needs to be run through xmlrpcval() - to create the necessary xml required for the rpc call
-if one of the parameters required is an array then it needs to be processing into xml for the rpc call through php_xmlrpc_encode()*/
-<br /><br />
+
+/* The trap for me was that each parameter needs to be run through xmlrpcval() - to create the necessary xml required for the rpc call if one of the parameters required is an array then it needs to be processing into xml for the rpc call through php_xmlrpc_encode()*/
+
$Parameters['StockID'] = xmlrpcval('DVD-TOPGUN'); //the stockid of the item we wish to know the balance for
-<br /><br />
+
//assuming the demo username and password will work !
-<br /><br />
+
$Parameters['Username'] = xmlrpcval('admin');
-<br /><br />
+
$Parameters['Password'] = xmlrpcval('weberp');
-<br /><br />
+
$msg = new xmlrpcmsg("weberp.xmlrpc_GetStockBalance", $Parameters);
-<br /><br />
+
$client = new xmlrpc_client($ServerURL);
-<br /><br />
-$client->setDebug($DebugLevel);
-<br /><br />
-$response = $client->send($msg);
-<br /><br />
-$answer = php_xmlrpc_decode($response->value());
-<br /><br />
+
+$client->setDebug($DebugLevel);
+
+$response = $client->send($msg);
+
+$answer = php_xmlrpc_decode($response->value());
+
if ($answer[0]!=0){ //then the API returned some errors need to figure out what went wrong
-<br /><br />
+
//need to figure out how to return all the error descriptions associated with the codes
-<br /><br />
+
} else { //all went well the returned data is in $answer[1]
-<br /><br />
+
//answer will be an array of the locations and quantity on hand for DVD_TOPGUN so we need to run through the array to print out
-<br /><br />
-for ($i=0; $i < sizeof($answer[1]);$i++) {
-<br /><br />
- echo '<br>' . $answer[1][$i]['loccode'] . ' has ' . $answer[1][$i]['quantity'] . ' on hand';
- <br /><br />
+
+for ($i=0; $i < sizeof($answer[1]);$i++) {
+
+echo '<br>
+' . $answer[1][$i]['loccode'] . ' has ' . $answer[1][$i]['quantity'] . ' on hand';
+
}
-<br /><br />
-echo "</body></html>";
-<br /><br />
-</i>
-<hr />
-<br /><br />
-It is necessary to be logged in to see the API functions manual shows all the functions in the API with a description of the parameters required and what each function does.
-<br /><br />
-To create invoices in webERP you need to use the following methods:
-<br /><br />
-InsertOrderHeader
-InsertOrderLine - potentially multiple times for all the lines on the order then
-InvoiceSalesOrder - to invoice sales orders directly assuming the entire order is delivered - it cannot deal with controlled stock items though. However, it does process invoices in much the same way as standard webERP with updates to the stock quantities dispatched, GL entries and records required to record taxes and sales analysis records.
-<br /><br />
-To create a credit note just a sinlge API call is required:
-<br />
-CreateCreditNote - to create a credit note from some base header data and an array of line items (as an associative array. In the same way as the InvoiceSalesOrder function this does all the same processing as a standard credit note from the interface in webERP.
-<br /><br />
-There are some example scripts on the wiki showing how a number of the API XML-RPC functions are called - these scripts should be put on a web-server outside a webERP installation - all you need to do is edit the config.inc file to give the system your webERP username and password and the URL of your webERP installation you wish to connect to. As always playing with the examples helps to figure out how it all works.
\ No newline at end of file
+
+echo "";
+</pre>
+<p>
+It is necessary to be logged in to see the API functions manual shows all the functions in the API with a description of the parameters required and what each function does.</p>
+<p>
+To create invoices in webERP you need to use the following methods:</p>
+<p>
+InsertOrderHeader InsertOrderLine - potentially multiple times for all the lines on the order then InvoiceSalesOrder - to invoice sales orders directly assuming the entire order is delivered - it cannot deal with controlled stock items though. However, it does process invoices in much the same way as standard webERP with updates to the stock quantities dispatched, GL entries and records required to record taxes and sales analysis records.</p>
+<p>
+To create a credit note just a sinlge API call is required:</p>
+<p>
+CreateCreditNote - to create a credit note from some base header data and an array of line items (as an associative array. In the same way as the InvoiceSalesOrder function this does all the same processing as a standard credit note from the interface in webERP.</p>
+<p>
+There are some example scripts on the wiki showing how a number of the API XML-RPC functions are called - these scripts should be put on a web-server outside a webERP installation - all you need to do is edit the config.inc file to give the system your webERP username and password and the URL of your webERP installation you wish to connect to. As always playing with the examples helps to figure out how it all works.</p>
Modified: trunk/doc/Manual/ManualARInquiries.html
===================================================================
--- trunk/doc/Manual/ManualARInquiries.html 2012-06-23 22:15:44 UTC (rev 5449)
+++ trunk/doc/Manual/ManualARInquiries.html 2012-06-24 05:36:51 UTC (rev 5450)
@@ -1,40 +1,34 @@
-<br /><br />
-
<!-- Help Begin: CustomerInquiry -->
+<a id="ARInquiries"><h1>Accounts Receivable Inquiries</h1></a>
+<h2>Customer Inquiries</h2>
+<p>
+Complete "drill down" inquiries are available to extract the full detail of transactions. The system maintains more data than many systems, preferring to minimise the use of consolidated or batch entries, in favour of the full detail of each transaction. The enquires can show the account history for a customer and from this inquiry it is possible to look at the details behind each transaction, from the detail of the transaction it is possible to look at the line items on the original invoice and which receipts paid the invoice. The original invoice or credit can be viewed directly from customer inquiries and the general ledger transactions that were created by the invoice, credit or receipt may also be inspected.</p>
-<a name="ARInquiries"><font size="+3"><b>Accounts Receivable Inquiries</b></font></a>
-<br /><br />
-<font size="+2"><b>Customer Inquiries</b></font>
-<br /><br />
-Complete "drill down" inquiries are available to extract the full detail of transactions. The system maintains more data than many systems, preferring to minimise the use of consolidated or batch entries, in favour of the full detail of each transaction. The enquires can show the account history for a customer and from this inquiry it is possible to look at the details behind each transaction, from the detail of the transaction it is possible to look at the line items on the original invoice and which receipts paid the invoice. The original invoice or credit can be viewed directly from customer inquiries and the general ledger transactions that were created by the invoice, credit or receipt may also be inspected.
-<br /><br />
-<font size="+1"><b>Customer Account inquiries</b></font>
-<br /><br />
-From any page, click the "select customer" link. Having selected the customer all links applicable to the customer show. Among them the customer transactions inquiry.
-<br /><br />
-By default the inquiry screen shows only those transactions after a date six months ago. The default period can be modified by simple editing of the script CustomerInquiry.php. If transactions further back are required only occasionally and not by default - the date after which all transactions will show can be altered at will. When the screen opens the customer's account is shown in the currency of the customer. The aged analysis based on the customer's terms is displayed.
-<br /><br />
-If the transaction is an invoice or a credit note a magnifying glass icon shows on the same line as the transaction. A click on this magnifying glass then opens a new window showing the detail of the invoice or credit note.
-<br /><br />
-If the integration to the general ledger from accounts receivable - see the option to "Create GL entries for accounts receivable transactions" from the Company Preferences page under setup - then another link with the letters GL will show. This link shows a new page with the detail of the general ledger postings created by this transaction.
-<br /><br />
-If the transaction is a receipt or a credit note and the user has appropriate access privileges, a book icon shows. Clicking this icon takes the user to the page for allocating receipts and credits - if the receipt or credit is already allocated then the detail of how the receipt/credit was allocated is shown together with other invoices that could be used for allocating against. Invoices that have previously been allocated will not show.
-<br /><br />
-More (or less) history can be shown by changing the "Show all transactions after:
-<br /><br />
-" date - then clicking the refresh button. The balance on the customer's account should balance to the sum of the amounts outstanding. The amount outstanding is used to represent:
-<br /><br />
+<h2>Customer Account inquiries</h2>
+
+<p>From any page, click the "select customer" link. Having selected the customer all links applicable to the customer show. Among them the customer transactions inquiry.</p>
+
+<p>By default the inquiry screen shows only those transactions after a date six months ago. The default period can be modified by simple editing of the script CustomerInquiry.php. If transactions further back are required only occasionally and not by default - the date after which all transactions will show can be altered at will. When the screen opens the customer's account is shown in the currency of the customer. The aged analysis based on the customer's terms is displayed.</p>
+
+<p>If the transaction is an invoice or a credit note a magnifying glass icon shows on the same line as the transaction. A click on this magnifying glass then opens a new window showing the detail of the invoice or credit note.</p>
+
+<p>If the integration to the general ledger from accounts receivable - see the option to "Create GL entries for accounts receivable transactions" from the Company Preferences page under setup - then another link with the letters GL will show. This link shows a new page with the detail of the general ledger postings created by this transaction.</p>
+
+<p>If the transaction is a receipt or a credit note and the user has appropriate access privileges, a book icon shows. Clicking this icon takes the user to the page for allocating receipts and credits - if the receipt or credit is already allocated then the detail of how the receipt/credit was allocated is shown together with other invoices that could be used for allocating against. Invoices that have previously been allocated will not show.</p>
+
+<p>More (or less) history can be shown by changing the "Show all transactions after:</p>
+
+<p>" date - then clicking the refresh button. The balance on the customer's account should balance to the sum of the amounts outstanding. The amount outstanding is used to represent:</p>
+
<ul>
-<li>For Invoices, the amount which has not yet been settled by receipts or credit notes
-<li>For Receipts, the amount which has yet to be allocated (or matched off) against invoices.
+ <li>For Invoices, the amount which has not yet been settled by receipts or credit notes</li>
+ <li>For Receipts, the amount which has yet to be allocated (or matched off) against invoices.</li>
</ul>
-<font size="+1"><b>Transaction Detail inquiries</b></font>
-<br /><br />
-The detail of transactions can be inspected via one of two avenues:
-<br /><br />
+<h3>Transaction Detail inquiries</h3>
+The detail of transactions can be inspected via one of two avenues:</p>
+
<ul>
-<li>From the Customer's Account inquiry - click on the magnifying glass or the GL link against the transaction required.
-<li>From the Transaction Enquires - from the Accounts Receivable tab, click on the magnifying glass to see the actual invoice or credit note.
-</ul>
+ <li>From the Customer's Account inquiry - click on the magnifying glass or the GL link against the transaction required.</li>
-<!-- Help End: CustomerInquiry -->
+ <li>From the Transaction Enquires - from the Accounts Receivable tab, click on the magnifying glass to see the actual invoice or credit note.</li>
+</ul><!-- Help End: CustomerInquiry -->
Modified: trunk/doc/Manual/ManualARReports.html
===================================================================
--- trunk/doc/Manual/ManualARReports.html 2012-06-23 22:15:44 UTC (rev 5449)
+++ trunk/doc/Manual/ManualARReports.html 2012-06-24 05:36:51 UTC (rev 5450)
@@ -1,71 +1,50 @@
-<br /><br />
-<a name="ARReports"><font size="+3"><b>Accounts Receivable Reports</b></font></a>
-<br /><br />
-The system is designed for flexibility and to provide the framework of core functionality required to administer a debtors ledger system. The basic accounts receivable reports are available as standard since they are used by all businesses. However, since the database is open it is envisaged that the business will make use of ODBC drivers for database used and use Crystal Reports or Microsoft Access or some other analysis software, where the user is on the same LAN as the server for specialised reports.
-<br /><br />
+<a id="ARReports"><h1>Accounts Receivable Reports</h1></a>
+The system is designed for flexibility and to provide the framework of core functionality required to administer a debtors ledger system. The basic accounts receivable reports are available as standard since they are used by all businesses. However, since the database is open it is envisaged that the business will make use of ODBC drivers for database used and use Crystal Reports or Microsoft Access or some other analysis software, where the user is on the same LAN as the server for specialised reports.</p>
+
<!-- Help Begin: AgedDebtors -->
+<h2>Aged Customer Balance Listing</h2>
+<p>
+From the main menu select Customers, Reports, "Aged Customer Balances/Overdues Report".</p>
+<p>
+This report calculates the balances of the customers' accounts according to the parameters specified in config.php $PastDueDays1 and $PastDueDays2. The report is generated in the currency of the customer. The currency of the report must first be selected and the range of customers accounts to print.</p>
+<p>
+The report can be printed at two levels:</p>
-<font size="+1"><b>Aged Customer Balance Listing</b></font>
-<br /><br />
-From the main menu select Customers, Reports, "Aged Customer Balances/Overdues Report".
-<br /><br />
-This report calculates the balances of the customers' accounts according to the parameters specified in config.php $PastDueDays1 and $PastDueDays2. The report is generated in the currency of the customer. The currency of the report must first be selected and the range of customers accounts to print.
-<br /><br />
-The report can be printed at two levels:
-<br /><br />
<ul>
-<li>The full detail of the all outstanding amounts on the account, transaction by transaction analysed into current, Due, $PastDueDays1 and PastDueDays2. The detailed report also shows the terms applicable to each customer.
-<li>A summary of the account balances split in the same aged groupings.
-</ul>
-This report recalculates the balance on the customer's account from the outstanding transactions and analyses each outstanding transaction based on the date of invoice plus the expected time to deliver to the branch invoiced.
-<br /><br />
-The Aged Customer Balances can also be restricted to show just the accounts where there is some balance overdue. The same detail and summary reports are available. The resultant reports create pdf files that can be either saved or printed.
+ <li>The full detail of the all outstanding amounts on the account, transaction by transaction analysed into current, Due, $PastDueDays1 and PastDueDays2. The detailed report also shows the terms applicable to each customer.</li>
-<!-- Help End: AgedDebtors -->
+ <li>A summary of the account balances split in the same aged groupings.</li>
+</ul>This report recalculates the balance on the customer's account from the outstanding transactions and analyses each outstanding transaction based on the date of invoice plus the expected time to deliver to the branch invoiced.</p>
+<p>
+The Aged Customer Balances can also be restricted to show just the accounts where there is some balance overdue. The same detail and summary reports are available. The resultant reports create pdf files that can be either saved or printed. <!-- Help End: AgedDebtors -->
-<br /><br />
-
<!-- Help Begin: PrintCustStatements -->
+<h2>Customer Statements</h2>
+<p>
+The customer statement shows the outstanding transactions on the account. There is an option in config.php that allows transactions that have been settled at some time within the last month to be shown in a settled transactions section of the statement. The parameter, $Show_Settled_LastMonth should be set equal to 1 for this. If it is set to 0, then any settled transactions will not be shown on the statements. This saves printing zero balance statements and there is argument both ways as to which is best.</p>
+<p>
+When transactions are created, the date of the transaction determines the period into which it is posted in the general ledger. The date of the transaction is also used in the aging calculations used on the statement. All transactions to the date of the statement are included. It is not possible to print a statement as at some prior date. It may be necessary to delay the start of invoicing for the new month until all receipts are entered and allocated and the statements printed before processing new invoices that should appear on the following month's statement.</p>
+<p>
+Procedure - All receipts must be allocated for the aged analysis to be calculated correctly. Then from the main menu Accounts Receivable tab select from the reports and inquiries section, "Print Statements". The link will allow selection of a range of customers. A single customer's statement can be printed by selecting the same starting an finishing customer code. Statements will be printed in sequence of the Customer code set up in the customer details screen. A pdf file is created this can be saved or printed. <!-- Help End: PrintCustStatements -->
-<font size="+1"><b>Customer Statements</b></font>
-<br /><br />
-The customer statement shows the outstanding transactions on the account. There is an option in config.php that allows transactions that have been settled at some time within the last month to be shown in a settled transactions section of the statement. The parameter, $Show_Settled_LastMonth should be set equal to 1 for this. If it is set to 0, then any settled transactions will not be shown on the statements. This saves printing zero balance statements and there is argument both ways as to which is best.
-<br /><br />
-When transactions are created, the date of the transaction determines the period into which it is posted in the general ledger. The date of the transaction is also used in the aging calculations used on the statement. All transactions to the date of the statement are included. It is not possible to print a statement as at some prior date. It may be necessary to delay the start of invoicing for the new month until all receipts are entered and allocated and the statements printed before processing new invoices that should appear on the following month's statement.
-<br /><br />
-Procedure - All receipts must be allocated for the aged analysis to be calculated correctly. Then from the main menu Accounts Receivable tab select from the reports and inquiries section, "Print Statements". The link will allow selection of a range of customers. A single customer's statement can be printed by selecting the same s...
[truncated message content] |
|
From: <ice...@us...> - 2012-06-24 05:37:00
|
Revision: 5450
http://web-erp.svn.sourceforge.net/web-erp/?rev=5450&view=rev
Author: icedlava
Date: 2012-06-24 05:36:51 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Adjust header.inc, ManualContents.php, ManualHeader.html to take ViewTopic and Bookmark parameters in displaying manual. Add ManualOutline.php file containing manual TOC, add CSS and rework all manual docs. Add $Viewtopic and $Bookmark to some functions (eg see Stocks.php) - ongoing work.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/doc/Manual/ManualAPITutorial.html
trunk/doc/Manual/ManualARInquiries.html
trunk/doc/Manual/ManualARReports.html
trunk/doc/Manual/ManualARTransactions.html
trunk/doc/Manual/ManualAccountsPayable.html
trunk/doc/Manual/ManualAccountsReceivable.html
trunk/doc/Manual/ManualContents.php
trunk/doc/Manual/ManualContracts.html
trunk/doc/Manual/ManualContributors.html
trunk/doc/Manual/ManualCreatingNewSystem.html
trunk/doc/Manual/ManualCreditStatus.html
trunk/doc/Manual/ManualCurrencies.html
trunk/doc/Manual/ManualDevelopmentStructure.html
trunk/doc/Manual/ManualFixedAssets.html
trunk/doc/Manual/ManualFooter.html
trunk/doc/Manual/ManualGeneralLedger.html
trunk/doc/Manual/ManualGettingStarted.html
trunk/doc/Manual/ManualHeader.html
trunk/doc/Manual/ManualIntroduction.html
trunk/doc/Manual/ManualInventory.html
trunk/doc/Manual/ManualMRP.html
trunk/doc/Manual/ManualManufacturing.html
trunk/doc/Manual/ManualMultilanguage.html
trunk/doc/Manual/ManualNewScripts.html
trunk/doc/Manual/ManualPaymentTerms.html
trunk/doc/Manual/ManualPettyCash.html
trunk/doc/Manual/ManualPrices.html
trunk/doc/Manual/ManualPurchaseOrdering.html
trunk/doc/Manual/ManualReportBuilder.html
trunk/doc/Manual/ManualRequirements.html
trunk/doc/Manual/ManualSalesAnalysis.html
trunk/doc/Manual/ManualSalesOrders.html
trunk/doc/Manual/ManualSalesPeople.html
trunk/doc/Manual/ManualSalesTypes.html
trunk/doc/Manual/ManualSecuritySchema.html
trunk/doc/Manual/ManualShipments.html
trunk/doc/Manual/ManualSpecialUtilities.html
trunk/doc/Manual/ManualSystemConventions.html
trunk/doc/Manual/ManualTax.html
trunk/includes/header.inc
Added Paths:
-----------
trunk/doc/Manual/ManualOutline.php
trunk/doc/Manual/style/
trunk/doc/Manual/style/manual.css
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-23 22:15:44 UTC (rev 5449)
+++ trunk/doc/Change.log 2012-06-24 05:36:51 UTC (rev 5450)
@@ -1,5 +1,7 @@
webERP Change Log
+24/06/2012: Icedlava: Adjust header.inc, ManualContents.php, ManualHeader.html to take Viewtopic and Bookmark parameters in displaying manual. Add ManualOutline.php file containing manual TOC, add CSS and rework all manual docs. Still to add $Viewtopic and $Bookmark to functions (eg see Stocks.php)
+
24/6/2012 Release 4.08.1
22/06/2012 Icedlava: Fixed bug preventing insert of new account section
Modified: trunk/doc/Manual/ManualAPITutorial.html
===================================================================
--- trunk/doc/Manual/ManualAPITutorial.html 2012-06-23 22:15:44 UTC (rev 5449)
+++ trunk/doc/Manual/ManualAPITutorial.html 2012-06-24 05:36:51 UTC (rev 5450)
@@ -1,99 +1,92 @@
-<a name="APITutorial"><font size="+3"><b>Application Programming Interface</b></font></a>
-<br /><br />
-<font size="+2"><b>webERP API - Getting Started</b></font>
-<br /><br />
+<a id="APITutorial"><h1>Application Programming Interface</h1></a>
+
+<h2>webERP API - Getting Started</h2>
+<p>
The API is an Application Program Interface, that is intended to expose webERP functionality to external programs. There are currently a number of low level functions it exposes to enable external applications to retrieve webERP data and to update or insert webERP data.
-<br /><br />
+</p>
The API in webERP uses XML-RPC in particular the phpxmlrpc class from Useful Inc originally developed by Edd Dumbill
-<br /><br />
-XML-RPC is a protocl to use XML to make RPC - remote procedure calls.
-<br /><br />
-Simply put the XML-RPC call is XML that contains the method of the remote procedure call together with any parameters and their data types and is sent over http as a POST to the XML-RPC server - the server returns an XML payload containing the results of the call. The parameters sent to the methods can contain arrays and associative arrays of data.
-<br /><br />
-The clever thing about XML-RPC is that it is the simplest protocol around for doing web-services. The newer and MUCH more complex SOAP - Simple Object Access Protocol - is quite involved and complicated. webERP is founded on the KISS principle.
-<br /><br />
-In fact the XML-RPC "Server" in webERP is just the script http://www.yourdomain.com/webERP/api/api_xml-rpc.php
-<br /><br />
-There is no daemon background process running continuously to field calls to the "server" it is just a script that is http posted to by the XML-RPC call sending the XML encoded method to be run together with the necessary parameters to the webERP API - the server script runs the API php functions exposed by the xml-rpc methods and returns the XML-RPC response as an XML payload. The phpxmlrpc class does the packaging converting the PHP variables and arrays to the XML required for the XML-RPC call and also has the functions to convert the XML response into something useable in PHP without having to write the XML parsing routines.
-<br /><br />
-It is worthwhile reading a how-to on XML-RPC with PHP which explains in more detail what is going on as a primer for the concepts.
-<br /><br />
-The beauty of XML-RPC is that the client calling the webERP XML-RPC server and performing native webERP functions can be called from any language (with XML-RPC bindings). I have used Vala, Genie and Python. Python particularly has been very straight forward as it has an xmlrpclib bundled with it. Of course a PHP client is also possible and is demonstrated below.
-<br /><br />
-The API help is actually produced by an xml-rpc call to the API using the system.listMethods method (this is a phpxmlrpc method - not a webERP API method). Aother system xml-rpc method of phpxmlrpc class is used to return the details of each method's parameters required. So the help file not only documents each of the API methods it is itself and illustration of how the API can be used!!
-<br /><br />
-Below is a simple example of how to use the API.
-<br /><br />
-<hr />
-<i>
-echo "<html><head>Test webERP API</head><body>";
-<br /><br />
-//the xmlrpc class can output some funny warnings so make sure notices are turned off
-error_reporting (E_ALL & ~E_NOTICE);
-<br /><br />
-/*you need to include the phpxmlrpc class - see link above - copy the whole directory structure of the class over to your client application from the webERP/xmlrpc directory
-*/
-<br /><br />
+</p>
+<p>XML-RPC is a protocl to use XML to make RPC - remote procedure calls.</p>
+<p>
+Simply put the XML-RPC call is XML that contains the method of the remote procedure call together with any parameters and their data types and is sent over http as a POST to the XML-RPC server - the server returns an XML payload containing the results of the call. The parameters sent to the methods can contain arrays and associative arrays of data.</p>
+<p>
+The clever thing about XML-RPC is that it is the simplest protocol around for doing web-services. The newer and MUCH more complex SOAP - Simple Object Access Protocol - is quite involved and complicated. webERP is founded on the KISS principle.</p>
+<p>
+In fact the XML-RPC "Server" in webERP is just the script http://www.yourdomain.com/webERP/api/api_xml-rpc.php</p>
+<p>There is no daemon background process running continuously to field calls to the "server" it is just a script that is http posted to by the XML-RPC call sending the XML encoded method to be run together with the necessary parameters to the webERP API - the server script runs the API php functions exposed by the xml-rpc methods and returns the XML-RPC response as an XML payload. The phpxmlrpc class does the packaging converting the PHP variables and arrays to the XML required for the XML-RPC call and also has the functions to convert the XML response into something useable in PHP without having to write the XML parsing routines.</p>
+<p>
+It is worthwhile reading a how-to on XML-RPC with PHP which explains in more detail what is going on as a primer for the concepts.</p>
+<p>
+The beauty of XML-RPC is that the client calling the webERP XML-RPC server and performing native webERP functions can be called from any language (with XML-RPC bindings). I have used Vala, Genie and Python. Python particularly has been very straight forward as it has an xmlrpclib bundled with it. Of course a PHP client is also possible and is demonstrated below.</p>
+<p>
+The API help is actually produced by an xml-rpc call to the API using the system.listMethods method (this is a phpxmlrpc method - not a webERP API method). Aother system xml-rpc method of phpxmlrpc class is used to return the details of each method's parameters required. So the help file not only documents each of the API methods it is itself and illustration of how the API can be used!!</p>
+<p>
+Below is a simple example of how to use the API.</p>
+<p>
+<hr>
+<pre>
+echo "Test webERP API";
+
+//the xmlrpc class can output some funny warnings so make sure notices are turned off error_reporting (E_ALL & ~E_NOTICE);
+
+/* you need to include the phpxmlrpc class - see link above - copy the whole directory structure of the class over to your client application from the webERP/xmlrpc directory */
+
include ("xmlrpc/lib/xmlrpc.inc");
-<br /><br />
+
//if your webERP install is on a server at http://www.yourdomain.com/webERP
-<br /><br />
+
$ServerURL = "http://www.yourdomain.com/webERP/api/api_xml-rpc.php";
-<br /><br />
+
$DebugLevel = 0; //Set to 0,1, or 2 with 2 being the highest level of debug info
-<br /><br />
+
$Parameters = array();
-<br /><br />
-/*The trap for me was that each parameter needs to be run through xmlrpcval() - to create the necessary xml required for the rpc call
-if one of the parameters required is an array then it needs to be processing into xml for the rpc call through php_xmlrpc_encode()*/
-<br /><br />
+
+/* The trap for me was that each parameter needs to be run through xmlrpcval() - to create the necessary xml required for the rpc call if one of the parameters required is an array then it needs to be processing into xml for the rpc call through php_xmlrpc_encode()*/
+
$Parameters['StockID'] = xmlrpcval('DVD-TOPGUN'); //the stockid of the item we wish to know the balance for
-<br /><br />
+
//assuming the demo username and password will work !
-<br /><br />
+
$Parameters['Username'] = xmlrpcval('admin');
-<br /><br />
+
$Parameters['Password'] = xmlrpcval('weberp');
-<br /><br />
+
$msg = new xmlrpcmsg("weberp.xmlrpc_GetStockBalance", $Parameters);
-<br /><br />
+
$client = new xmlrpc_client($ServerURL);
-<br /><br />
-$client->setDebug($DebugLevel);
-<br /><br />
-$response = $client->send($msg);
-<br /><br />
-$answer = php_xmlrpc_decode($response->value());
-<br /><br />
+
+$client->setDebug($DebugLevel);
+
+$response = $client->send($msg);
+
+$answer = php_xmlrpc_decode($response->value());
+
if ($answer[0]!=0){ //then the API returned some errors need to figure out what went wrong
-<br /><br />
+
//need to figure out how to return all the error descriptions associated with the codes
-<br /><br />
+
} else { //all went well the returned data is in $answer[1]
-<br /><br />
+
//answer will be an array of the locations and quantity on hand for DVD_TOPGUN so we need to run through the array to print out
-<br /><br />
-for ($i=0; $i < sizeof($answer[1]);$i++) {
-<br /><br />
- echo '<br>' . $answer[1][$i]['loccode'] . ' has ' . $answer[1][$i]['quantity'] . ' on hand';
- <br /><br />
+
+for ($i=0; $i < sizeof($answer[1]);$i++) {
+
+echo '<br>
+' . $answer[1][$i]['loccode'] . ' has ' . $answer[1][$i]['quantity'] . ' on hand';
+
}
-<br /><br />
-echo "</body></html>";
-<br /><br />
-</i>
-<hr />
-<br /><br />
-It is necessary to be logged in to see the API functions manual shows all the functions in the API with a description of the parameters required and what each function does.
-<br /><br />
-To create invoices in webERP you need to use the following methods:
-<br /><br />
-InsertOrderHeader
-InsertOrderLine - potentially multiple times for all the lines on the order then
-InvoiceSalesOrder - to invoice sales orders directly assuming the entire order is delivered - it cannot deal with controlled stock items though. However, it does process invoices in much the same way as standard webERP with updates to the stock quantities dispatched, GL entries and records required to record taxes and sales analysis records.
-<br /><br />
-To create a credit note just a sinlge API call is required:
-<br />
-CreateCreditNote - to create a credit note from some base header data and an array of line items (as an associative array. In the same way as the InvoiceSalesOrder function this does all the same processing as a standard credit note from the interface in webERP.
-<br /><br />
-There are some example scripts on the wiki showing how a number of the API XML-RPC functions are called - these scripts should be put on a web-server outside a webERP installation - all you need to do is edit the config.inc file to give the system your webERP username and password and the URL of your webERP installation you wish to connect to. As always playing with the examples helps to figure out how it all works.
\ No newline at end of file
+
+echo "";
+</pre>
+<p>
+It is necessary to be logged in to see the API functions manual shows all the functions in the API with a description of the parameters required and what each function does.</p>
+<p>
+To create invoices in webERP you need to use the following methods:</p>
+<p>
+InsertOrderHeader InsertOrderLine - potentially multiple times for all the lines on the order then InvoiceSalesOrder - to invoice sales orders directly assuming the entire order is delivered - it cannot deal with controlled stock items though. However, it does process invoices in much the same way as standard webERP with updates to the stock quantities dispatched, GL entries and records required to record taxes and sales analysis records.</p>
+<p>
+To create a credit note just a sinlge API call is required:</p>
+<p>
+CreateCreditNote - to create a credit note from some base header data and an array of line items (as an associative array. In the same way as the InvoiceSalesOrder function this does all the same processing as a standard credit note from the interface in webERP.</p>
+<p>
+There are some example scripts on the wiki showing how a number of the API XML-RPC functions are called - these scripts should be put on a web-server outside a webERP installation - all you need to do is edit the config.inc file to give the system your webERP username and password and the URL of your webERP installation you wish to connect to. As always playing with the examples helps to figure out how it all works.</p>
Modified: trunk/doc/Manual/ManualARInquiries.html
===================================================================
--- trunk/doc/Manual/ManualARInquiries.html 2012-06-23 22:15:44 UTC (rev 5449)
+++ trunk/doc/Manual/ManualARInquiries.html 2012-06-24 05:36:51 UTC (rev 5450)
@@ -1,40 +1,34 @@
-<br /><br />
-
<!-- Help Begin: CustomerInquiry -->
+<a id="ARInquiries"><h1>Accounts Receivable Inquiries</h1></a>
+<h2>Customer Inquiries</h2>
+<p>
+Complete "drill down" inquiries are available to extract the full detail of transactions. The system maintains more data than many systems, preferring to minimise the use of consolidated or batch entries, in favour of the full detail of each transaction. The enquires can show the account history for a customer and from this inquiry it is possible to look at the details behind each transaction, from the detail of the transaction it is possible to look at the line items on the original invoice and which receipts paid the invoice. The original invoice or credit can be viewed directly from customer inquiries and the general ledger transactions that were created by the invoice, credit or receipt may also be inspected.</p>
-<a name="ARInquiries"><font size="+3"><b>Accounts Receivable Inquiries</b></font></a>
-<br /><br />
-<font size="+2"><b>Customer Inquiries</b></font>
-<br /><br />
-Complete "drill down" inquiries are available to extract the full detail of transactions. The system maintains more data than many systems, preferring to minimise the use of consolidated or batch entries, in favour of the full detail of each transaction. The enquires can show the account history for a customer and from this inquiry it is possible to look at the details behind each transaction, from the detail of the transaction it is possible to look at the line items on the original invoice and which receipts paid the invoice. The original invoice or credit can be viewed directly from customer inquiries and the general ledger transactions that were created by the invoice, credit or receipt may also be inspected.
-<br /><br />
-<font size="+1"><b>Customer Account inquiries</b></font>
-<br /><br />
-From any page, click the "select customer" link. Having selected the customer all links applicable to the customer show. Among them the customer transactions inquiry.
-<br /><br />
-By default the inquiry screen shows only those transactions after a date six months ago. The default period can be modified by simple editing of the script CustomerInquiry.php. If transactions further back are required only occasionally and not by default - the date after which all transactions will show can be altered at will. When the screen opens the customer's account is shown in the currency of the customer. The aged analysis based on the customer's terms is displayed.
-<br /><br />
-If the transaction is an invoice or a credit note a magnifying glass icon shows on the same line as the transaction. A click on this magnifying glass then opens a new window showing the detail of the invoice or credit note.
-<br /><br />
-If the integration to the general ledger from accounts receivable - see the option to "Create GL entries for accounts receivable transactions" from the Company Preferences page under setup - then another link with the letters GL will show. This link shows a new page with the detail of the general ledger postings created by this transaction.
-<br /><br />
-If the transaction is a receipt or a credit note and the user has appropriate access privileges, a book icon shows. Clicking this icon takes the user to the page for allocating receipts and credits - if the receipt or credit is already allocated then the detail of how the receipt/credit was allocated is shown together with other invoices that could be used for allocating against. Invoices that have previously been allocated will not show.
-<br /><br />
-More (or less) history can be shown by changing the "Show all transactions after:
-<br /><br />
-" date - then clicking the refresh button. The balance on the customer's account should balance to the sum of the amounts outstanding. The amount outstanding is used to represent:
-<br /><br />
+<h2>Customer Account inquiries</h2>
+
+<p>From any page, click the "select customer" link. Having selected the customer all links applicable to the customer show. Among them the customer transactions inquiry.</p>
+
+<p>By default the inquiry screen shows only those transactions after a date six months ago. The default period can be modified by simple editing of the script CustomerInquiry.php. If transactions further back are required only occasionally and not by default - the date after which all transactions will show can be altered at will. When the screen opens the customer's account is shown in the currency of the customer. The aged analysis based on the customer's terms is displayed.</p>
+
+<p>If the transaction is an invoice or a credit note a magnifying glass icon shows on the same line as the transaction. A click on this magnifying glass then opens a new window showing the detail of the invoice or credit note.</p>
+
+<p>If the integration to the general ledger from accounts receivable - see the option to "Create GL entries for accounts receivable transactions" from the Company Preferences page under setup - then another link with the letters GL will show. This link shows a new page with the detail of the general ledger postings created by this transaction.</p>
+
+<p>If the transaction is a receipt or a credit note and the user has appropriate access privileges, a book icon shows. Clicking this icon takes the user to the page for allocating receipts and credits - if the receipt or credit is already allocated then the detail of how the receipt/credit was allocated is shown together with other invoices that could be used for allocating against. Invoices that have previously been allocated will not show.</p>
+
+<p>More (or less) history can be shown by changing the "Show all transactions after:</p>
+
+<p>" date - then clicking the refresh button. The balance on the customer's account should balance to the sum of the amounts outstanding. The amount outstanding is used to represent:</p>
+
<ul>
-<li>For Invoices, the amount which has not yet been settled by receipts or credit notes
-<li>For Receipts, the amount which has yet to be allocated (or matched off) against invoices.
+ <li>For Invoices, the amount which has not yet been settled by receipts or credit notes</li>
+ <li>For Receipts, the amount which has yet to be allocated (or matched off) against invoices.</li>
</ul>
-<font size="+1"><b>Transaction Detail inquiries</b></font>
-<br /><br />
-The detail of transactions can be inspected via one of two avenues:
-<br /><br />
+<h3>Transaction Detail inquiries</h3>
+The detail of transactions can be inspected via one of two avenues:</p>
+
<ul>
-<li>From the Customer's Account inquiry - click on the magnifying glass or the GL link against the transaction required.
-<li>From the Transaction Enquires - from the Accounts Receivable tab, click on the magnifying glass to see the actual invoice or credit note.
-</ul>
+ <li>From the Customer's Account inquiry - click on the magnifying glass or the GL link against the transaction required.</li>
-<!-- Help End: CustomerInquiry -->
+ <li>From the Transaction Enquires - from the Accounts Receivable tab, click on the magnifying glass to see the actual invoice or credit note.</li>
+</ul><!-- Help End: CustomerInquiry -->
Modified: trunk/doc/Manual/ManualARReports.html
===================================================================
--- trunk/doc/Manual/ManualARReports.html 2012-06-23 22:15:44 UTC (rev 5449)
+++ trunk/doc/Manual/ManualARReports.html 2012-06-24 05:36:51 UTC (rev 5450)
@@ -1,71 +1,50 @@
-<br /><br />
-<a name="ARReports"><font size="+3"><b>Accounts Receivable Reports</b></font></a>
-<br /><br />
-The system is designed for flexibility and to provide the framework of core functionality required to administer a debtors ledger system. The basic accounts receivable reports are available as standard since they are used by all businesses. However, since the database is open it is envisaged that the business will make use of ODBC drivers for database used and use Crystal Reports or Microsoft Access or some other analysis software, where the user is on the same LAN as the server for specialised reports.
-<br /><br />
+<a id="ARReports"><h1>Accounts Receivable Reports</h1></a>
+The system is designed for flexibility and to provide the framework of core functionality required to administer a debtors ledger system. The basic accounts receivable reports are available as standard since they are used by all businesses. However, since the database is open it is envisaged that the business will make use of ODBC drivers for database used and use Crystal Reports or Microsoft Access or some other analysis software, where the user is on the same LAN as the server for specialised reports.</p>
+
<!-- Help Begin: AgedDebtors -->
+<h2>Aged Customer Balance Listing</h2>
+<p>
+From the main menu select Customers, Reports, "Aged Customer Balances/Overdues Report".</p>
+<p>
+This report calculates the balances of the customers' accounts according to the parameters specified in config.php $PastDueDays1 and $PastDueDays2. The report is generated in the currency of the customer. The currency of the report must first be selected and the range of customers accounts to print.</p>
+<p>
+The report can be printed at two levels:</p>
-<font size="+1"><b>Aged Customer Balance Listing</b></font>
-<br /><br />
-From the main menu select Customers, Reports, "Aged Customer Balances/Overdues Report".
-<br /><br />
-This report calculates the balances of the customers' accounts according to the parameters specified in config.php $PastDueDays1 and $PastDueDays2. The report is generated in the currency of the customer. The currency of the report must first be selected and the range of customers accounts to print.
-<br /><br />
-The report can be printed at two levels:
-<br /><br />
<ul>
-<li>The full detail of the all outstanding amounts on the account, transaction by transaction analysed into current, Due, $PastDueDays1 and PastDueDays2. The detailed report also shows the terms applicable to each customer.
-<li>A summary of the account balances split in the same aged groupings.
-</ul>
-This report recalculates the balance on the customer's account from the outstanding transactions and analyses each outstanding transaction based on the date of invoice plus the expected time to deliver to the branch invoiced.
-<br /><br />
-The Aged Customer Balances can also be restricted to show just the accounts where there is some balance overdue. The same detail and summary reports are available. The resultant reports create pdf files that can be either saved or printed.
+ <li>The full detail of the all outstanding amounts on the account, transaction by transaction analysed into current, Due, $PastDueDays1 and PastDueDays2. The detailed report also shows the terms applicable to each customer.</li>
-<!-- Help End: AgedDebtors -->
+ <li>A summary of the account balances split in the same aged groupings.</li>
+</ul>This report recalculates the balance on the customer's account from the outstanding transactions and analyses each outstanding transaction based on the date of invoice plus the expected time to deliver to the branch invoiced.</p>
+<p>
+The Aged Customer Balances can also be restricted to show just the accounts where there is some balance overdue. The same detail and summary reports are available. The resultant reports create pdf files that can be either saved or printed. <!-- Help End: AgedDebtors -->
-<br /><br />
-
<!-- Help Begin: PrintCustStatements -->
+<h2>Customer Statements</h2>
+<p>
+The customer statement shows the outstanding transactions on the account. There is an option in config.php that allows transactions that have been settled at some time within the last month to be shown in a settled transactions section of the statement. The parameter, $Show_Settled_LastMonth should be set equal to 1 for this. If it is set to 0, then any settled transactions will not be shown on the statements. This saves printing zero balance statements and there is argument both ways as to which is best.</p>
+<p>
+When transactions are created, the date of the transaction determines the period into which it is posted in the general ledger. The date of the transaction is also used in the aging calculations used on the statement. All transactions to the date of the statement are included. It is not possible to print a statement as at some prior date. It may be necessary to delay the start of invoicing for the new month until all receipts are entered and allocated and the statements printed before processing new invoices that should appear on the following month's statement.</p>
+<p>
+Procedure - All receipts must be allocated for the aged analysis to be calculated correctly. Then from the main menu Accounts Receivable tab select from the reports and inquiries section, "Print Statements". The link will allow selection of a range of customers. A single customer's statement can be printed by selecting the same starting an finishing customer code. Statements will be printed in sequence of the Customer code set up in the customer details screen. A pdf file is created this can be saved or printed. <!-- Help End: PrintCustStatements -->
-<font size="+1"><b>Customer Statements</b></font>
-<br /><br />
-The customer statement shows the outstanding transactions on the account. There is an option in config.php that allows transactions that have been settled at some time within the last month to be shown in a settled transactions section of the statement. The parameter, $Show_Settled_LastMonth should be set equal to 1 for this. If it is set to 0, then any settled transactions will not be shown on the statements. This saves printing zero balance statements and there is argument both ways as to which is best.
-<br /><br />
-When transactions are created, the date of the transaction determines the period into which it is posted in the general ledger. The date of the transaction is also used in the aging calculations used on the statement. All transactions to the date of the statement are included. It is not possible to print a statement as at some prior date. It may be necessary to delay the start of invoicing for the new month until all receipts are entered and allocated and the statements printed before processing new invoices that should appear on the following month's statement.
-<br /><br />
-Procedure - All receipts must be allocated for the aged analysis to be calculated correctly. Then from the main menu Accounts Receivable tab select from the reports and inquiries section, "Print Statements". The link will allow selection of a range of customers. A single customer's statement can be printed by selecting the same s...
[truncated message content] |
|
From: <ice...@us...> - 2012-06-24 05:49:46
|
Revision: 5451
http://web-erp.svn.sourceforge.net/web-erp/?rev=5451&view=rev
Author: icedlava
Date: 2012-06-24 05:49:39 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Add ViewTopic and BookMark vars to some functions to take advantage of new Manual contextual help. Must be added before header.inc include. Ongoing work.
Modified Paths:
--------------
trunk/InventoryPlanning.php
trunk/SelectProduct.php
trunk/StockAdjustments.php
trunk/StockMovements.php
trunk/StockTransfers.php
trunk/Stocks.php
trunk/doc/Change.log
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/InventoryPlanning.php 2012-06-24 05:49:39 UTC (rev 5451)
@@ -3,6 +3,9 @@
/* $Id$ */
include('includes/session.inc');
+/* webERP manual links before header.inc */
+$ViewTopic= "Inventory";
+$BookMark = "PlanningReport";
if (isset($_POST['PrintPDF'])
and isset($_POST['FromCriteria'])
@@ -409,7 +412,7 @@
<tr>
<td>' . _('For Inventory in Location') . ':</td>
<td><select name="Location">';
-
+
$sql = "SELECT loccode, locationname FROM locations";
$LocnResult=DB_query($sql,$db);
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/SelectProduct.php 2012-06-24 05:49:39 UTC (rev 5451)
@@ -6,6 +6,8 @@
include ('includes/session.inc');
$title = _('Search Inventory Items');
+/* webERP manual links before header.inc */
+$ViewTopic= "Inventory";
include ('includes/header.inc');
if (isset($_GET['StockID'])) {
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/StockAdjustments.php 2012-06-24 05:49:39 UTC (rev 5451)
@@ -6,7 +6,9 @@
include('includes/DefineSerialItems.php');
include('includes/session.inc');
$title = _('Stock Adjustments');
-
+/* webERP manual links before header.inc */
+$ViewTopic= "Inventory";
+$BookMark = "InventoryAdjustments";
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -38,16 +40,16 @@
}
}
if ($NewAdjustment==true){
-
+
$_SESSION['Adjustment' . $identifier]->StockID = trim(mb_strtoupper($StockID));
- $result = DB_query("SELECT description,
- controlled,
- serialised,
+ $result = DB_query("SELECT description,
+ controlled,
+ serialised,
decimalplaces,
perishable,
materialcost+labourcost+overheadcost AS totalcost,
units
- FROM stockmaster
+ FROM stockmaster
WHERE stockid='" . $_SESSION['Adjustment' . $identifier]->StockID . "'",$db);
$myrow = DB_fetch_array($result);
$_SESSION['Adjustment' . $identifier]->ItemDescription = $myrow['description'];
@@ -64,7 +66,7 @@
$DecimalPlaces = $myrow['decimalplaces'];
DB_free_result($result);
-
+
} //end if it's a new adjustment
if (isset($_POST['tag'])){
$_SESSION['Adjustment' . $identifier]->tag = $_POST['tag'];
@@ -93,14 +95,14 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . _('Select Item to Adjust') . '</p>';
if (mb_strlen($_POST['StockText'])>0) {
- $sql="SELECT stockid,
- description
- FROM stockmaster
+ $sql="SELECT stockid,
+ description
+ FROM stockmaster
WHERE description " . LIKE . " '%" . $_POST['StockText'] ."%'";
} else {
- $sql="SELECT stockid,
- description
- FROM stockmaster
+ $sql="SELECT stockid,
+ description
+ FROM stockmaster
WHERE stockid " . LIKE . " '%" . $_POST['StockCode'] ."%'";
}
$ErrMsg=_('The stock information cannot be retrieved because');
@@ -332,7 +334,7 @@
$DbgMsg = _('The following SQL to insert the GL entries was used');
$Result = DB_query($SQL,$db, $ErrMsg, $DbgMsg,true);
}
-
+
EnsureGLEntriesBalance(17, $AdjustmentNumber,$db);
$Result = DB_Txn_Commit($db);
@@ -345,7 +347,7 @@
$EmailSubject = _('Stock adjustment for'). ' ' . $_SESSION['Adjustment' . $identifier]->StockID;
mail($_SESSION['InventoryManagerEmail'],$EmailSubject,$ConfirmationText);
}
-
+
unset ($_SESSION['Adjustment' . $identifier]);
} /* end if there was no input error */
@@ -365,14 +367,14 @@
$StockID = $_SESSION['Adjustment' . $identifier]->StockID;
$Controlled = $_SESSION['Adjustment' . $identifier]->Controlled;
$Quantity = $_SESSION['Adjustment' . $identifier]->Quantity;
- $sql="SELECT materialcost,
- labourcost,
- overheadcost,
- units,
- decimalplaces
- FROM stockmaster
+ $sql="SELECT materialcost,
+ labourcost,
+ overheadcost,
+ units,
+ decimalplaces
+ FROM stockmaster
WHERE stockid='".$StockID."'";
-
+
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
$_SESSION['Adjustment' . $identifier]->PartUnit=$myrow['units'];
Modified: trunk/StockMovements.php
===================================================================
--- trunk/StockMovements.php 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/StockMovements.php 2012-06-24 05:49:39 UTC (rev 5451)
@@ -4,6 +4,9 @@
include('includes/session.inc');
$title = _('Stock Movements');
+/* webERP manual links before header.inc */
+$ViewTopic= "Inventory";
+$BookMark = "InventoryMovement";
include('includes/header.inc');
if (isset($_GET['StockID'])){
@@ -101,7 +104,7 @@
<th>' . _('Discount') . '</th>
<th>' . _('New Qty') . '</th>
</tr>';
-
+
echo $tableheader;
$j = 1;
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/StockTransfers.php 2012-06-24 05:49:39 UTC (rev 5451)
@@ -7,7 +7,9 @@
include('includes/session.inc');
$title = _('Stock Transfers');
-
+/* webERP manual links before header.inc */
+$ViewTopic= "Inventory";
+$BookMark = "LocationTransfers";
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -29,14 +31,14 @@
</p>';
if (mb_strlen($_POST['StockText'])>0) {
- $sql="SELECT stockid,
- description
- FROM stockmaster
+ $sql="SELECT stockid,
+ description
+ FROM stockmaster
WHERE description " . LIKE . " '%" . $_POST['StockText'] . "%'";
} else {
- $sql="SELECT stockid,
- description
- FROM stockmaster
+ $sql="SELECT stockid,
+ description
+ FROM stockmaster
WHERE stockid " . LIKE . " '%" . $_POST['StockCode']."%'";
}
$ErrMsg=_('The stock information cannot be retrieved because');
@@ -54,7 +56,7 @@
<td><a href="' . $rootpath . '/StockTransfers.php?StockID='.$myrow['stockid'].'&Description='.$myrow['description'].'&NewTransfer=Yes&Quantity='. filter_number_format($_POST['Quantity']).'&From='.$_POST['StockLocationFrom'].'&To='.$_POST['StockLocationTo'].'">'
._('Transfer').'</a></td>
</tr>';
-
+
}
echo '</table>';
include('includes/footer.inc');
@@ -110,7 +112,7 @@
FROM stockmaster
WHERE stockid='" . trim(mb_strtoupper($_POST['StockID'])) . "'",
$db);
-
+
if (DB_num_rows($result) == 0){
prnMsg( _('Unable to locate Stock Code').' '.mb_strtoupper($_POST['StockID']), 'error' );
} elseif (DB_num_rows($result)>0){
@@ -123,8 +125,8 @@
$myrow['serialised'],
$myrow['perishable'],
$myrow['decimalplaces']);
-
+
$_SESSION['Transfer']->TransferItem[0]->StandardCost = $myrow['standardcost'];
if ($myrow['mbflag']=='D' OR $myrow['mbflag']=='A' OR $myrow['mbflag']=='K'){
@@ -138,17 +140,17 @@
}
}
-if (isset($_POST['Quantity'])
- AND isset($_SESSION['Transfer']->TransferItem[0]->Controlled)
+if (isset($_POST['Quantity'])
+ AND isset($_SESSION['Transfer']->TransferItem[0]->Controlled)
AND $_SESSION['Transfer']->TransferItem[0]->Controlled==0){
-
+
$_SESSION['Transfer']->TransferItem[0]->Quantity = filter_number_format($_POST['Quantity']);
}
-if ( isset($_POST['StockLocationFrom'])
+if ( isset($_POST['StockLocationFrom'])
AND $_POST['StockLocationFrom']!= $_SESSION['Transfer']->StockLocationFrom ){
-
+
$_SESSION['Transfer']->StockLocationFrom = $_POST['StockLocationFrom'];
$_SESSION['Transfer']->StockLocationTo = $_POST['StockLocationTo'];
$_SESSION['Transfer']->TransferItem[0]->Quantity=filter_number_format($_POST['Quantity']);
@@ -208,7 +210,7 @@
// There must actually be some error this should never happen
$QtyOnHandPrior = 0;
}
- if ($_SESSION['ProhibitNegativeStock']==1
+ if ($_SESSION['ProhibitNegativeStock']==1
AND $QtyOnHandPrior<$_SESSION['Transfer']->TransferItem[0]->Quantity) {
prnMsg( _('There is insufficient stock to make this transfer and webERP is setup to prevent negative stock'), 'warn');
include('includes/footer.inc');
@@ -399,7 +401,7 @@
'" . $Item->BundleRef . "',
'" . FormatDateForSQL($Item->ExpiryDate) . "',
'" . $Item->BundleQty . "')";
-
+
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be added because');
$DbgMsg = _('The following SQL to insert the serial stock item record was used:');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
@@ -482,9 +484,9 @@
}
echo '</td><td><input type="submit" name="CheckCode" value="'._('Check Part').'" /></td></tr>';
-if (isset($_SESSION['Transfer']->TransferItem[0]->ItemDescription)
+if (isset($_SESSION['Transfer']->TransferItem[0]->ItemDescription)
AND mb_strlen($_SESSION['Transfer']->TransferItem[0]->ItemDescription)>1){
-
+
echo '<tr>
<td colspan="3"><font color="blue" size="3">' . $_SESSION['Transfer']->TransferItem[0]->ItemDescription . ' ('._('In Units of').' ' . $_SESSION['Transfer']->TransferItem[0]->PartUnit . ' )</font></td>
</tr>';
@@ -540,9 +542,9 @@
echo '<tr>
<td>'._('Transfer Quantity').':</td>';
-if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled)
+if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled)
AND $_SESSION['Transfer']->TransferItem[0]->Controlled==1){
-
+
echo '<td class="number"><input type="hidden" name="Quantity" value="' . locale_number_format($_SESSION['Transfer']->TransferItem[0]->Quantity) . '" /><a href="' . $rootpath .'/StockTransferControlled.php?StockLocationFrom='.$_SESSION['Transfer']->StockLocationFrom.'">' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '</a></td></tr>';
} elseif (isset($_SESSION['Transfer']->TransferItem[0]->Controlled)){
echo '<td><input type="text" class="number" name="Quantity" size="12" maxlength="12" value="' . locale_number_format($_SESSION['Transfer']->TransferItem[0]->Quantity) . '" /></td></tr>';
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/Stocks.php 2012-06-24 05:49:39 UTC (rev 5451)
@@ -4,6 +4,10 @@
include('includes/session.inc');
$title = _('Item Maintenance');
+$title = _('Item Maintenance');
+/* webERP manual links before header.inc */
+$ViewTopic= "Inventory";
+$BookMark = "InventoryAddingItems";
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -18,11 +22,11 @@
}
if (isset($StockID) and !isset($_POST['UpdateCategories'])) {
- $sql = "SELECT COUNT(stockid)
- FROM stockmaster
- WHERE stockid='".$StockID."'
+ $sql = "SELECT COUNT(stockid)
+ FROM stockmaster
+ WHERE stockid='".$StockID."'
GROUP BY stockid";
-
+
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0]==0) {
@@ -181,12 +185,12 @@
$Errors[$i] = 'NextSerialNo';
$i++;
}
- if (($_POST['MBFlag']=='A'
- OR $_POST['MBFlag']=='K'
- OR $_POST['MBFlag']=='D'
- OR $_POST['MBFlag']=='G')
+ if (($_POST['MBFlag']=='A'
+ OR $_POST['MBFlag']=='K'
+ OR $_POST['MBFlag']=='D'
+ OR $_POST['MBFlag']=='G')
AND $_POST['Controlled']==1){
-
+
$InputError = 1;
prnMsg(_('Assembly/Kitset/Phantom/Service/Labour items cannot also be controlled items') . '. ' . _('Assemblies/Dummies/Phantom and Kitsets are not physical items and batch/serial control is therefore not appropriate'),'error');
$Errors[$i] = 'Controlled';
@@ -226,8 +230,8 @@
materialcost+labourcost+overheadcost AS itemcost,
stockcategory.stockact,
stockcategory.wipact
- FROM stockmaster
- INNER JOIN stockcategory
+ FROM stockmaster
+ INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockid = '".$StockID."'";
$MBFlagResult = DB_query($sql,$db);
@@ -238,26 +242,26 @@
$UnitCost = $myrow[3];
$OldStockAccount = $myrow[4];
$OldWIPAccount = $myrow[5];
-
- $sql = "SELECT SUM(locstock.quantity)
- FROM locstock
- WHERE stockid='".$StockID."'
+
+ $sql = "SELECT SUM(locstock.quantity)
+ FROM locstock
+ WHERE stockid='".$StockID."'
GROUP BY stockid";
$result = DB_query($sql,$db);
$StockQtyRow = DB_fetch_row($result);
/*Now check the GL account of the new category to see if it is different to the old stock gl account */
-
+
$result = DB_query("SELECT stockact,
wipact
- FROM stockcategory
+ FROM stockcategory
WHERE categoryid='" . $_POST['CategoryID'] . "'",
$db);
$NewStockActRow = DB_fetch_array($result);
$NewStockAct = $NewStockActRow['stockact'];
$NewWIPAct = $NewStockActRow['wipact'];
-
+
if ($OldMBFlag != $_POST['MBFlag']){
if (($OldMBFlag == 'M' OR $OldMBFlag=='B') AND ($_POST['MBFlag']=='A' OR $_POST['MBFlag']=='K' OR $_POST['MBFlag']=='D' OR $_POST['MBFlag']=='G')){ /*then need to check that there is no stock holding first */
/* stock holding OK for phantom (ghost) items */
@@ -303,9 +307,9 @@
/*now check that if it was a Manufactured, Kitset, Phantom or Assembly and is being changed to a purchased or dummy - that no BOM exists */
if (($OldMBFlag=='M' OR $OldMBFlag =='K' OR $OldMBFlag=='A' OR $OldMBFlag=='G') AND ($_POST['MBFlag']=='B' OR $_POST['MBFlag']=='D')) {
- $sql = "SELECT COUNT(*)
- FROM bom
- WHERE parent = '".$StockID."'
+ $sql = "SELECT COUNT(*)
+ FROM bom
+ WHERE parent = '".$StockID."'
GROUP BY parent";
$result = DB_query($sql,$db);
$ChkBOM = DB_fetch_row($result);
@@ -317,9 +321,9 @@
/*now check that if it was Manufac, Phantom or Purchased and is being changed to assembly or kitset, it is not a component on an existing BOM */
if (($OldMBFlag=='M' OR $OldMBFlag =='B' OR $OldMBFlag=='D' OR $OldMBFlag=='G') AND ($_POST['MBFlag']=='A' OR $_POST['MBFlag']=='K')) {
- $sql = "SELECT COUNT(*)
- FROM bom
- WHERE component = '".$StockID."'
+ $sql = "SELECT COUNT(*)
+ FROM bom
+ WHERE component = '".$StockID."'
GROUP BY component";
$result = DB_query($sql,$db);
$ChkBOM = DB_fetch_row($result);
@@ -341,7 +345,7 @@
prnMsg( _('You can not change a Serialised Item to Non-Serialised (or vice-versa) when there is a quantity on hand for the item') , 'error');
}
/* Do some check for property input */
-
+
for ($i=0;$i<$_POST['PropertyCounter'];$i++){
if ($_POST['PropNumeric' .$i]==1){
if ( filter_number_format($_POST['PropValue' . $i]) < $_POST['PropMin' . $i] OR filter_number_format($_POST['PropValue' . $i]) > $_POST['PropMax' . $i]){
@@ -354,9 +358,9 @@
if ($InputError == 0){
-
+
DB_Txn_Begin($db);
-
+
$sql = "UPDATE stockmaster
SET longdescription='" . $_POST['LongDescription'] . "',
description='" . $_POST['Description'] . "',
@@ -411,7 +415,7 @@
'" . $_POST['PropValue' . $i] . "')",
$db,$ErrMsg,$DbgMsg,true);
} //end of loop around properties defined for the category
-
+
if ($OldStockAccount != $NewStockAct AND $_SESSION['CompanyRecord']['gllink_stock']==1) {
/*Then we need to make a journal to transfer the cost to the new stock account */
$JournalNo = GetNextTransNo(0,$db); //enter as a journal
@@ -447,20 +451,20 @@
'" . $StockID . ' ' . _('Change stock category') . "',
'" . (-$UnitCost* $StockQtyRow[0]) . "')";
$result = DB_query($SQL,$db, $ErrMsg, $DbgMsg,true);
-
+
} /* end if the stock category changed and forced a change in stock cost account */
if ($OldWIPAccount != $NewWIPAct AND $_SESSION['CompanyRecord']['gllink_stock']==1) {
/*Then we need to make a journal to transfer the cost of WIP to the new WIP account */
/*First get the total cost of WIP for this category */
-
+
$WOCostsResult = DB_query("SELECT workorders.costissued,
SUM(woitems.qtyreqd * woitems.stdcost) AS costrecd
FROM woitems INNER JOIN workorders
ON woitems.wo = workorders.wo
INNER JOIN stockmaster
ON woitems.stockid=stockmaster.stockid
- WHERE stockmaster.stockid='". $StockID . "'
- AND workorders.closed=0
+ WHERE stockmaster.stockid='". $StockID . "'
+ AND workorders.closed=0
GROUP BY workorders.costissued",
$db,
_('Error retrieving value of finished goods received and cost issued against work orders for this item'));
@@ -468,7 +472,7 @@
while ($WIPRow=DB_fetch_array($WOCostsResult)){
$WIPValue += ($WIPRow['costissued']-$WIPRow['costrecd']);
}
- if ($WIPValue !=0){
+ if ($WIPValue !=0){
$JournalNo = GetNextTransNo(0,$db); //enter as a journal
$SQL = "INSERT INTO gltrans (type,
typeno,
@@ -507,12 +511,12 @@
DB_Txn_Commit($db);
prnMsg( _('Stock Item') . ' ' . $StockID . ' ' . _('has been updated'), 'success');
echo '<br />';
- }
+ }
} else { //it is a NEW part
//but lets be really sure here
- $result = DB_query("SELECT stockid
- FROM stockmaster
+ $result = DB_query("SELECT stockid
+ FROM stockmaster
WHERE stockid='" . $StockID ."'",$db);
if (DB_num_rows($result)==1){
prnMsg(_('The stock code entered is actually already in the database - duplicate stock codes are prohibited by the system. Try choosing an alternative stock code'),'error');
@@ -563,7 +567,7 @@
if (DB_error_no($db) ==0) {
//now insert any item properties
for ($i=0;$i<$_POST['PropertyCounter'];$i++){
-
+
if ($_POST['PropType' . $i] ==2){
if ($_POST['PropValue' . $i]=='on'){
$_POST['PropValue' . $i]=1;
@@ -571,7 +575,7 @@
$_POST['PropValue' . $i]=0;
}
}
-
+
if ($_POST['PropNumeric' .$i]==1){
$_POST['PropValue' . $i]=filter_number_format($_POST['PropValue' . $i]);
} else {
@@ -600,9 +604,9 @@
$InsResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
if (DB_error_no($db) ==0) {
- prnMsg( _('New Item') .' ' . '<a href="SelectProduct.php?StockID=' . $StockID . '">' . $StockID . '</a> '. _('has been added to the database') .
+ prnMsg( _('New Item') .' ' . '<a href="SelectProduct.php?StockID=' . $StockID . '">' . $StockID . '</a> '. _('has been added to the database') .
'<br />' . _('NB: The item cost and pricing must also be setup') .
- '<br />' . '<a target="_blank" href="StockCostUpdate.php?StockID=' . $StockID . '">' . _('Enter Item Cost') . '</a>
+ '<br />' . '<a target="_blank" href="StockCostUpdate.php?StockID=' . $StockID . '">' . _('Enter Item Cost') . '</a>
<br />' . '<a target="_blank" href="Prices.php?Item=' . $StockID . '">' . _('Enter Item Prices') . '</a> ','success');
echo '<br />';
unset($_POST['Description']);
@@ -630,8 +634,8 @@
}//THE INSERT OF THE NEW CODE WORKED SO BANG IN THE STOCK LOCATION RECORDS TOO
}//END CHECK FOR ALREADY EXISTING ITEM OF THE SAME CODE
}
-
+
} else {
echo '<br />'. "\n";
prnMsg( _('Validation failed, no updates or deletes took place'), 'error');
@@ -746,7 +750,7 @@
unset($_POST['DecimalPlaces']);
unset($_SESSION['SelectedStockItem']);
unset($StockID);
-
+
$New=1;
} //end if Delete Part
}
@@ -798,7 +802,7 @@
shrinkfactor
FROM stockmaster
WHERE stockid = '".$StockID."'";
-
+
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -820,7 +824,7 @@
$_POST['DecimalPlaces'] = $myrow['decimalplaces'];
$_POST['NextSerialNo'] = $myrow['nextserialno'];
$_POST['Pansize'] = $myrow['pansize'];
- $_POST['ShrinkFactor'] = $myrow['shrinkfactor'];
+ $_POST['ShrinkFactor'] = $myrow['shrinkfactor'];
echo '<tr><td>' . _('Item Code') . ':</td>
@@ -1010,7 +1014,7 @@
echo '<tr>
<td>' . _('Current or Obsolete') . ':</td>
<td><select name="Discontinued">';
-
+
if ($_POST['Discontinued']==0){
echo '<option selected="selected" value="0">' . _('Current') . '</option>';
} else {
@@ -1182,7 +1186,7 @@
echo '<input type="hidden" name="PropID' . $PropertyCounter . '" value="' .$PropertyRow['stkcatpropid'] .'" />';
echo '<input type="hidden" name="PropNumeric' . $PropertyCounter . '" value="' .$PropertyRow['numericvalue'] .'" />';
echo $PropertyRow['label'] . '</td>
-
+
<td>';
switch ($PropertyRow['controltype']) {
case 0; //textbox
@@ -1219,7 +1223,7 @@
echo '<input type="hidden" name="PropType' . $PropertyCounter .'" value="' . $PropertyRow['controltype'] . '" />';
echo '</td></tr>';
$PropertyCounter++;
-
+
} //end loop round properties for the item category
unset($StockID);
echo '</table>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/doc/Change.log 2012-06-24 05:49:39 UTC (rev 5451)
@@ -1,5 +1,5 @@
webERP Change Log
-
+24/06/2012: Icedlava: Add ViewTopic and BookMark vars to some functions to take advantage of new Manual contextual help. Must be added before header.inc include.
24/06/2012: Icedlava: Adjust header.inc, ManualContents.php, ManualHeader.html to take Viewtopic and Bookmark parameters in displaying manual. Add ManualOutline.php file containing manual TOC, add CSS and rework all manual docs. Still to add $Viewtopic and $Bookmark to functions (eg see Stocks.php)
24/6/2012 Release 4.08.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ice...@us...> - 2012-06-24 05:49:46
|
Revision: 5451
http://web-erp.svn.sourceforge.net/web-erp/?rev=5451&view=rev
Author: icedlava
Date: 2012-06-24 05:49:39 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Add ViewTopic and BookMark vars to some functions to take advantage of new Manual contextual help. Must be added before header.inc include. Ongoing work.
Modified Paths:
--------------
trunk/InventoryPlanning.php
trunk/SelectProduct.php
trunk/StockAdjustments.php
trunk/StockMovements.php
trunk/StockTransfers.php
trunk/Stocks.php
trunk/doc/Change.log
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/InventoryPlanning.php 2012-06-24 05:49:39 UTC (rev 5451)
@@ -3,6 +3,9 @@
/* $Id$ */
include('includes/session.inc');
+/* webERP manual links before header.inc */
+$ViewTopic= "Inventory";
+$BookMark = "PlanningReport";
if (isset($_POST['PrintPDF'])
and isset($_POST['FromCriteria'])
@@ -409,7 +412,7 @@
<tr>
<td>' . _('For Inventory in Location') . ':</td>
<td><select name="Location">';
-
+
$sql = "SELECT loccode, locationname FROM locations";
$LocnResult=DB_query($sql,$db);
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/SelectProduct.php 2012-06-24 05:49:39 UTC (rev 5451)
@@ -6,6 +6,8 @@
include ('includes/session.inc');
$title = _('Search Inventory Items');
+/* webERP manual links before header.inc */
+$ViewTopic= "Inventory";
include ('includes/header.inc');
if (isset($_GET['StockID'])) {
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/StockAdjustments.php 2012-06-24 05:49:39 UTC (rev 5451)
@@ -6,7 +6,9 @@
include('includes/DefineSerialItems.php');
include('includes/session.inc');
$title = _('Stock Adjustments');
-
+/* webERP manual links before header.inc */
+$ViewTopic= "Inventory";
+$BookMark = "InventoryAdjustments";
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -38,16 +40,16 @@
}
}
if ($NewAdjustment==true){
-
+
$_SESSION['Adjustment' . $identifier]->StockID = trim(mb_strtoupper($StockID));
- $result = DB_query("SELECT description,
- controlled,
- serialised,
+ $result = DB_query("SELECT description,
+ controlled,
+ serialised,
decimalplaces,
perishable,
materialcost+labourcost+overheadcost AS totalcost,
units
- FROM stockmaster
+ FROM stockmaster
WHERE stockid='" . $_SESSION['Adjustment' . $identifier]->StockID . "'",$db);
$myrow = DB_fetch_array($result);
$_SESSION['Adjustment' . $identifier]->ItemDescription = $myrow['description'];
@@ -64,7 +66,7 @@
$DecimalPlaces = $myrow['decimalplaces'];
DB_free_result($result);
-
+
} //end if it's a new adjustment
if (isset($_POST['tag'])){
$_SESSION['Adjustment' . $identifier]->tag = $_POST['tag'];
@@ -93,14 +95,14 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . _('Select Item to Adjust') . '</p>';
if (mb_strlen($_POST['StockText'])>0) {
- $sql="SELECT stockid,
- description
- FROM stockmaster
+ $sql="SELECT stockid,
+ description
+ FROM stockmaster
WHERE description " . LIKE . " '%" . $_POST['StockText'] ."%'";
} else {
- $sql="SELECT stockid,
- description
- FROM stockmaster
+ $sql="SELECT stockid,
+ description
+ FROM stockmaster
WHERE stockid " . LIKE . " '%" . $_POST['StockCode'] ."%'";
}
$ErrMsg=_('The stock information cannot be retrieved because');
@@ -332,7 +334,7 @@
$DbgMsg = _('The following SQL to insert the GL entries was used');
$Result = DB_query($SQL,$db, $ErrMsg, $DbgMsg,true);
}
-
+
EnsureGLEntriesBalance(17, $AdjustmentNumber,$db);
$Result = DB_Txn_Commit($db);
@@ -345,7 +347,7 @@
$EmailSubject = _('Stock adjustment for'). ' ' . $_SESSION['Adjustment' . $identifier]->StockID;
mail($_SESSION['InventoryManagerEmail'],$EmailSubject,$ConfirmationText);
}
-
+
unset ($_SESSION['Adjustment' . $identifier]);
} /* end if there was no input error */
@@ -365,14 +367,14 @@
$StockID = $_SESSION['Adjustment' . $identifier]->StockID;
$Controlled = $_SESSION['Adjustment' . $identifier]->Controlled;
$Quantity = $_SESSION['Adjustment' . $identifier]->Quantity;
- $sql="SELECT materialcost,
- labourcost,
- overheadcost,
- units,
- decimalplaces
- FROM stockmaster
+ $sql="SELECT materialcost,
+ labourcost,
+ overheadcost,
+ units,
+ decimalplaces
+ FROM stockmaster
WHERE stockid='".$StockID."'";
-
+
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
$_SESSION['Adjustment' . $identifier]->PartUnit=$myrow['units'];
Modified: trunk/StockMovements.php
===================================================================
--- trunk/StockMovements.php 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/StockMovements.php 2012-06-24 05:49:39 UTC (rev 5451)
@@ -4,6 +4,9 @@
include('includes/session.inc');
$title = _('Stock Movements');
+/* webERP manual links before header.inc */
+$ViewTopic= "Inventory";
+$BookMark = "InventoryMovement";
include('includes/header.inc');
if (isset($_GET['StockID'])){
@@ -101,7 +104,7 @@
<th>' . _('Discount') . '</th>
<th>' . _('New Qty') . '</th>
</tr>';
-
+
echo $tableheader;
$j = 1;
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/StockTransfers.php 2012-06-24 05:49:39 UTC (rev 5451)
@@ -7,7 +7,9 @@
include('includes/session.inc');
$title = _('Stock Transfers');
-
+/* webERP manual links before header.inc */
+$ViewTopic= "Inventory";
+$BookMark = "LocationTransfers";
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -29,14 +31,14 @@
</p>';
if (mb_strlen($_POST['StockText'])>0) {
- $sql="SELECT stockid,
- description
- FROM stockmaster
+ $sql="SELECT stockid,
+ description
+ FROM stockmaster
WHERE description " . LIKE . " '%" . $_POST['StockText'] . "%'";
} else {
- $sql="SELECT stockid,
- description
- FROM stockmaster
+ $sql="SELECT stockid,
+ description
+ FROM stockmaster
WHERE stockid " . LIKE . " '%" . $_POST['StockCode']."%'";
}
$ErrMsg=_('The stock information cannot be retrieved because');
@@ -54,7 +56,7 @@
<td><a href="' . $rootpath . '/StockTransfers.php?StockID='.$myrow['stockid'].'&Description='.$myrow['description'].'&NewTransfer=Yes&Quantity='. filter_number_format($_POST['Quantity']).'&From='.$_POST['StockLocationFrom'].'&To='.$_POST['StockLocationTo'].'">'
._('Transfer').'</a></td>
</tr>';
-
+
}
echo '</table>';
include('includes/footer.inc');
@@ -110,7 +112,7 @@
FROM stockmaster
WHERE stockid='" . trim(mb_strtoupper($_POST['StockID'])) . "'",
$db);
-
+
if (DB_num_rows($result) == 0){
prnMsg( _('Unable to locate Stock Code').' '.mb_strtoupper($_POST['StockID']), 'error' );
} elseif (DB_num_rows($result)>0){
@@ -123,8 +125,8 @@
$myrow['serialised'],
$myrow['perishable'],
$myrow['decimalplaces']);
-
+
$_SESSION['Transfer']->TransferItem[0]->StandardCost = $myrow['standardcost'];
if ($myrow['mbflag']=='D' OR $myrow['mbflag']=='A' OR $myrow['mbflag']=='K'){
@@ -138,17 +140,17 @@
}
}
-if (isset($_POST['Quantity'])
- AND isset($_SESSION['Transfer']->TransferItem[0]->Controlled)
+if (isset($_POST['Quantity'])
+ AND isset($_SESSION['Transfer']->TransferItem[0]->Controlled)
AND $_SESSION['Transfer']->TransferItem[0]->Controlled==0){
-
+
$_SESSION['Transfer']->TransferItem[0]->Quantity = filter_number_format($_POST['Quantity']);
}
-if ( isset($_POST['StockLocationFrom'])
+if ( isset($_POST['StockLocationFrom'])
AND $_POST['StockLocationFrom']!= $_SESSION['Transfer']->StockLocationFrom ){
-
+
$_SESSION['Transfer']->StockLocationFrom = $_POST['StockLocationFrom'];
$_SESSION['Transfer']->StockLocationTo = $_POST['StockLocationTo'];
$_SESSION['Transfer']->TransferItem[0]->Quantity=filter_number_format($_POST['Quantity']);
@@ -208,7 +210,7 @@
// There must actually be some error this should never happen
$QtyOnHandPrior = 0;
}
- if ($_SESSION['ProhibitNegativeStock']==1
+ if ($_SESSION['ProhibitNegativeStock']==1
AND $QtyOnHandPrior<$_SESSION['Transfer']->TransferItem[0]->Quantity) {
prnMsg( _('There is insufficient stock to make this transfer and webERP is setup to prevent negative stock'), 'warn');
include('includes/footer.inc');
@@ -399,7 +401,7 @@
'" . $Item->BundleRef . "',
'" . FormatDateForSQL($Item->ExpiryDate) . "',
'" . $Item->BundleQty . "')";
-
+
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be added because');
$DbgMsg = _('The following SQL to insert the serial stock item record was used:');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
@@ -482,9 +484,9 @@
}
echo '</td><td><input type="submit" name="CheckCode" value="'._('Check Part').'" /></td></tr>';
-if (isset($_SESSION['Transfer']->TransferItem[0]->ItemDescription)
+if (isset($_SESSION['Transfer']->TransferItem[0]->ItemDescription)
AND mb_strlen($_SESSION['Transfer']->TransferItem[0]->ItemDescription)>1){
-
+
echo '<tr>
<td colspan="3"><font color="blue" size="3">' . $_SESSION['Transfer']->TransferItem[0]->ItemDescription . ' ('._('In Units of').' ' . $_SESSION['Transfer']->TransferItem[0]->PartUnit . ' )</font></td>
</tr>';
@@ -540,9 +542,9 @@
echo '<tr>
<td>'._('Transfer Quantity').':</td>';
-if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled)
+if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled)
AND $_SESSION['Transfer']->TransferItem[0]->Controlled==1){
-
+
echo '<td class="number"><input type="hidden" name="Quantity" value="' . locale_number_format($_SESSION['Transfer']->TransferItem[0]->Quantity) . '" /><a href="' . $rootpath .'/StockTransferControlled.php?StockLocationFrom='.$_SESSION['Transfer']->StockLocationFrom.'">' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '</a></td></tr>';
} elseif (isset($_SESSION['Transfer']->TransferItem[0]->Controlled)){
echo '<td><input type="text" class="number" name="Quantity" size="12" maxlength="12" value="' . locale_number_format($_SESSION['Transfer']->TransferItem[0]->Quantity) . '" /></td></tr>';
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/Stocks.php 2012-06-24 05:49:39 UTC (rev 5451)
@@ -4,6 +4,10 @@
include('includes/session.inc');
$title = _('Item Maintenance');
+$title = _('Item Maintenance');
+/* webERP manual links before header.inc */
+$ViewTopic= "Inventory";
+$BookMark = "InventoryAddingItems";
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -18,11 +22,11 @@
}
if (isset($StockID) and !isset($_POST['UpdateCategories'])) {
- $sql = "SELECT COUNT(stockid)
- FROM stockmaster
- WHERE stockid='".$StockID."'
+ $sql = "SELECT COUNT(stockid)
+ FROM stockmaster
+ WHERE stockid='".$StockID."'
GROUP BY stockid";
-
+
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
if ($myrow[0]==0) {
@@ -181,12 +185,12 @@
$Errors[$i] = 'NextSerialNo';
$i++;
}
- if (($_POST['MBFlag']=='A'
- OR $_POST['MBFlag']=='K'
- OR $_POST['MBFlag']=='D'
- OR $_POST['MBFlag']=='G')
+ if (($_POST['MBFlag']=='A'
+ OR $_POST['MBFlag']=='K'
+ OR $_POST['MBFlag']=='D'
+ OR $_POST['MBFlag']=='G')
AND $_POST['Controlled']==1){
-
+
$InputError = 1;
prnMsg(_('Assembly/Kitset/Phantom/Service/Labour items cannot also be controlled items') . '. ' . _('Assemblies/Dummies/Phantom and Kitsets are not physical items and batch/serial control is therefore not appropriate'),'error');
$Errors[$i] = 'Controlled';
@@ -226,8 +230,8 @@
materialcost+labourcost+overheadcost AS itemcost,
stockcategory.stockact,
stockcategory.wipact
- FROM stockmaster
- INNER JOIN stockcategory
+ FROM stockmaster
+ INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockid = '".$StockID."'";
$MBFlagResult = DB_query($sql,$db);
@@ -238,26 +242,26 @@
$UnitCost = $myrow[3];
$OldStockAccount = $myrow[4];
$OldWIPAccount = $myrow[5];
-
- $sql = "SELECT SUM(locstock.quantity)
- FROM locstock
- WHERE stockid='".$StockID."'
+
+ $sql = "SELECT SUM(locstock.quantity)
+ FROM locstock
+ WHERE stockid='".$StockID."'
GROUP BY stockid";
$result = DB_query($sql,$db);
$StockQtyRow = DB_fetch_row($result);
/*Now check the GL account of the new category to see if it is different to the old stock gl account */
-
+
$result = DB_query("SELECT stockact,
wipact
- FROM stockcategory
+ FROM stockcategory
WHERE categoryid='" . $_POST['CategoryID'] . "'",
$db);
$NewStockActRow = DB_fetch_array($result);
$NewStockAct = $NewStockActRow['stockact'];
$NewWIPAct = $NewStockActRow['wipact'];
-
+
if ($OldMBFlag != $_POST['MBFlag']){
if (($OldMBFlag == 'M' OR $OldMBFlag=='B') AND ($_POST['MBFlag']=='A' OR $_POST['MBFlag']=='K' OR $_POST['MBFlag']=='D' OR $_POST['MBFlag']=='G')){ /*then need to check that there is no stock holding first */
/* stock holding OK for phantom (ghost) items */
@@ -303,9 +307,9 @@
/*now check that if it was a Manufactured, Kitset, Phantom or Assembly and is being changed to a purchased or dummy - that no BOM exists */
if (($OldMBFlag=='M' OR $OldMBFlag =='K' OR $OldMBFlag=='A' OR $OldMBFlag=='G') AND ($_POST['MBFlag']=='B' OR $_POST['MBFlag']=='D')) {
- $sql = "SELECT COUNT(*)
- FROM bom
- WHERE parent = '".$StockID."'
+ $sql = "SELECT COUNT(*)
+ FROM bom
+ WHERE parent = '".$StockID."'
GROUP BY parent";
$result = DB_query($sql,$db);
$ChkBOM = DB_fetch_row($result);
@@ -317,9 +321,9 @@
/*now check that if it was Manufac, Phantom or Purchased and is being changed to assembly or kitset, it is not a component on an existing BOM */
if (($OldMBFlag=='M' OR $OldMBFlag =='B' OR $OldMBFlag=='D' OR $OldMBFlag=='G') AND ($_POST['MBFlag']=='A' OR $_POST['MBFlag']=='K')) {
- $sql = "SELECT COUNT(*)
- FROM bom
- WHERE component = '".$StockID."'
+ $sql = "SELECT COUNT(*)
+ FROM bom
+ WHERE component = '".$StockID."'
GROUP BY component";
$result = DB_query($sql,$db);
$ChkBOM = DB_fetch_row($result);
@@ -341,7 +345,7 @@
prnMsg( _('You can not change a Serialised Item to Non-Serialised (or vice-versa) when there is a quantity on hand for the item') , 'error');
}
/* Do some check for property input */
-
+
for ($i=0;$i<$_POST['PropertyCounter'];$i++){
if ($_POST['PropNumeric' .$i]==1){
if ( filter_number_format($_POST['PropValue' . $i]) < $_POST['PropMin' . $i] OR filter_number_format($_POST['PropValue' . $i]) > $_POST['PropMax' . $i]){
@@ -354,9 +358,9 @@
if ($InputError == 0){
-
+
DB_Txn_Begin($db);
-
+
$sql = "UPDATE stockmaster
SET longdescription='" . $_POST['LongDescription'] . "',
description='" . $_POST['Description'] . "',
@@ -411,7 +415,7 @@
'" . $_POST['PropValue' . $i] . "')",
$db,$ErrMsg,$DbgMsg,true);
} //end of loop around properties defined for the category
-
+
if ($OldStockAccount != $NewStockAct AND $_SESSION['CompanyRecord']['gllink_stock']==1) {
/*Then we need to make a journal to transfer the cost to the new stock account */
$JournalNo = GetNextTransNo(0,$db); //enter as a journal
@@ -447,20 +451,20 @@
'" . $StockID . ' ' . _('Change stock category') . "',
'" . (-$UnitCost* $StockQtyRow[0]) . "')";
$result = DB_query($SQL,$db, $ErrMsg, $DbgMsg,true);
-
+
} /* end if the stock category changed and forced a change in stock cost account */
if ($OldWIPAccount != $NewWIPAct AND $_SESSION['CompanyRecord']['gllink_stock']==1) {
/*Then we need to make a journal to transfer the cost of WIP to the new WIP account */
/*First get the total cost of WIP for this category */
-
+
$WOCostsResult = DB_query("SELECT workorders.costissued,
SUM(woitems.qtyreqd * woitems.stdcost) AS costrecd
FROM woitems INNER JOIN workorders
ON woitems.wo = workorders.wo
INNER JOIN stockmaster
ON woitems.stockid=stockmaster.stockid
- WHERE stockmaster.stockid='". $StockID . "'
- AND workorders.closed=0
+ WHERE stockmaster.stockid='". $StockID . "'
+ AND workorders.closed=0
GROUP BY workorders.costissued",
$db,
_('Error retrieving value of finished goods received and cost issued against work orders for this item'));
@@ -468,7 +472,7 @@
while ($WIPRow=DB_fetch_array($WOCostsResult)){
$WIPValue += ($WIPRow['costissued']-$WIPRow['costrecd']);
}
- if ($WIPValue !=0){
+ if ($WIPValue !=0){
$JournalNo = GetNextTransNo(0,$db); //enter as a journal
$SQL = "INSERT INTO gltrans (type,
typeno,
@@ -507,12 +511,12 @@
DB_Txn_Commit($db);
prnMsg( _('Stock Item') . ' ' . $StockID . ' ' . _('has been updated'), 'success');
echo '<br />';
- }
+ }
} else { //it is a NEW part
//but lets be really sure here
- $result = DB_query("SELECT stockid
- FROM stockmaster
+ $result = DB_query("SELECT stockid
+ FROM stockmaster
WHERE stockid='" . $StockID ."'",$db);
if (DB_num_rows($result)==1){
prnMsg(_('The stock code entered is actually already in the database - duplicate stock codes are prohibited by the system. Try choosing an alternative stock code'),'error');
@@ -563,7 +567,7 @@
if (DB_error_no($db) ==0) {
//now insert any item properties
for ($i=0;$i<$_POST['PropertyCounter'];$i++){
-
+
if ($_POST['PropType' . $i] ==2){
if ($_POST['PropValue' . $i]=='on'){
$_POST['PropValue' . $i]=1;
@@ -571,7 +575,7 @@
$_POST['PropValue' . $i]=0;
}
}
-
+
if ($_POST['PropNumeric' .$i]==1){
$_POST['PropValue' . $i]=filter_number_format($_POST['PropValue' . $i]);
} else {
@@ -600,9 +604,9 @@
$InsResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
if (DB_error_no($db) ==0) {
- prnMsg( _('New Item') .' ' . '<a href="SelectProduct.php?StockID=' . $StockID . '">' . $StockID . '</a> '. _('has been added to the database') .
+ prnMsg( _('New Item') .' ' . '<a href="SelectProduct.php?StockID=' . $StockID . '">' . $StockID . '</a> '. _('has been added to the database') .
'<br />' . _('NB: The item cost and pricing must also be setup') .
- '<br />' . '<a target="_blank" href="StockCostUpdate.php?StockID=' . $StockID . '">' . _('Enter Item Cost') . '</a>
+ '<br />' . '<a target="_blank" href="StockCostUpdate.php?StockID=' . $StockID . '">' . _('Enter Item Cost') . '</a>
<br />' . '<a target="_blank" href="Prices.php?Item=' . $StockID . '">' . _('Enter Item Prices') . '</a> ','success');
echo '<br />';
unset($_POST['Description']);
@@ -630,8 +634,8 @@
}//THE INSERT OF THE NEW CODE WORKED SO BANG IN THE STOCK LOCATION RECORDS TOO
}//END CHECK FOR ALREADY EXISTING ITEM OF THE SAME CODE
}
-
+
} else {
echo '<br />'. "\n";
prnMsg( _('Validation failed, no updates or deletes took place'), 'error');
@@ -746,7 +750,7 @@
unset($_POST['DecimalPlaces']);
unset($_SESSION['SelectedStockItem']);
unset($StockID);
-
+
$New=1;
} //end if Delete Part
}
@@ -798,7 +802,7 @@
shrinkfactor
FROM stockmaster
WHERE stockid = '".$StockID."'";
-
+
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
@@ -820,7 +824,7 @@
$_POST['DecimalPlaces'] = $myrow['decimalplaces'];
$_POST['NextSerialNo'] = $myrow['nextserialno'];
$_POST['Pansize'] = $myrow['pansize'];
- $_POST['ShrinkFactor'] = $myrow['shrinkfactor'];
+ $_POST['ShrinkFactor'] = $myrow['shrinkfactor'];
echo '<tr><td>' . _('Item Code') . ':</td>
@@ -1010,7 +1014,7 @@
echo '<tr>
<td>' . _('Current or Obsolete') . ':</td>
<td><select name="Discontinued">';
-
+
if ($_POST['Discontinued']==0){
echo '<option selected="selected" value="0">' . _('Current') . '</option>';
} else {
@@ -1182,7 +1186,7 @@
echo '<input type="hidden" name="PropID' . $PropertyCounter . '" value="' .$PropertyRow['stkcatpropid'] .'" />';
echo '<input type="hidden" name="PropNumeric' . $PropertyCounter . '" value="' .$PropertyRow['numericvalue'] .'" />';
echo $PropertyRow['label'] . '</td>
-
+
<td>';
switch ($PropertyRow['controltype']) {
case 0; //textbox
@@ -1219,7 +1223,7 @@
echo '<input type="hidden" name="PropType' . $PropertyCounter .'" value="' . $PropertyRow['controltype'] . '" />';
echo '</td></tr>';
$PropertyCounter++;
-
+
} //end loop round properties for the item category
unset($StockID);
echo '</table>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-24 05:36:51 UTC (rev 5450)
+++ trunk/doc/Change.log 2012-06-24 05:49:39 UTC (rev 5451)
@@ -1,5 +1,5 @@
webERP Change Log
-
+24/06/2012: Icedlava: Add ViewTopic and BookMark vars to some functions to take advantage of new Manual contextual help. Must be added before header.inc include.
24/06/2012: Icedlava: Adjust header.inc, ManualContents.php, ManualHeader.html to take Viewtopic and Bookmark parameters in displaying manual. Add ManualOutline.php file containing manual TOC, add CSS and rework all manual docs. Still to add $Viewtopic and $Bookmark to functions (eg see Stocks.php)
24/6/2012 Release 4.08.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-06-24 07:52:39
|
Revision: 5452
http://web-erp.svn.sourceforge.net/web-erp/?rev=5452&view=rev
Author: daintree
Date: 2012-06-24 07:52:33 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
added title/tooltip of long description to a number of stock scripts
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/CounterSales.php
trunk/Credit_Invoice.php
trunk/DeliveryDetails.php
trunk/RecurringSalesOrders.php
trunk/SelectCreditItems.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/doc/Change.log
trunk/includes/DefineCartClass.php
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/ConfirmDispatch_Invoice.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -131,6 +131,7 @@
$LineItemsSQL = "SELECT stkcode,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.controlled,
stockmaster.serialised,
stockmaster.volume,
@@ -167,6 +168,7 @@
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['unitprice'],
$myrow['discountpercent'],
$myrow['units'],
@@ -319,7 +321,7 @@
echo $RowStarter;
echo '<td>'.$LnItm->StockID.'</td>
- <td>'.$LnItm->ItemDescription.'</td>
+ <td title="'. $LnItm->LongDescription . '">' .$LnItm->ItemDescription.'</td>
<td class="number">' . locale_number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
<td>'.$LnItm->Units.'</td>
<td class="number">' . locale_number_format($LnItm->QtyInv,$LnItm->DecimalPlaces) . '</td>';
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/CounterSales.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -783,7 +783,7 @@
echo '<input type="hidden" name="ItemDue_' . $OrderLine->LineNumber . '" value="'.$OrderLine->ItemDue.'" />';
echo '<a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td>
- <td>' . $OrderLine->ItemDescription . '</td>';
+ <td title="' . $OrderLine->LongDescription . '">' . $OrderLine->ItemDescription . '</td>';
echo '<td><input class="number" tabindex="2" type="text" name="Quantity_' . $OrderLine->LineNumber . '" size="6" maxlength="6" value="' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces) . '" />';
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/Credit_Invoice.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -99,6 +99,7 @@
$LineItemsSQL = "SELECT stockmoves.stkmoveno,
stockmoves.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.volume,
stockmaster.kgs,
stockmaster.mbflag,
@@ -136,6 +137,7 @@
$_SESSION['CreditItems']->add_to_cart($myrow['stockid'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['price'],
$myrow['discountpercent'],
$myrow['units'],
@@ -329,7 +331,7 @@
$j++;
echo '<tr '.$RowStarter.'><td>' . $LnItm->StockID . '</td>
- <td>' . $LnItm->ItemDescription . '</td>
+ <td title="'. $LnItm->LongDescription . '">' . $LnItm->ItemDescription . '</td>
<td class="number">' . locale_number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
<td>' . $LnItm->Units . '</td>';
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/DeliveryDetails.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -865,7 +865,7 @@
}
echo '<td>'.$StockItem->StockID.'</td>
- <td>'.$StockItem->ItemDescription.'</td>
+ <td title="' . $StockItem->LongDescription . '">'.$StockItem->ItemDescription.'</td>
<td class="number">'.$DisplayQuantity.'</td>
<td>'.$StockItem->Units.'</td>
<td class="number">'.$DisplayPrice.'</td>
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/RecurringSalesOrders.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -105,6 +105,7 @@
/*need to look up customer name from debtors master then populate the line items array with the sales order details records */
$LineItemsSQL = "SELECT recurrsalesorderdetails.stkcode,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.volume,
stockmaster.kgs,
stockmaster.units,
@@ -130,6 +131,7 @@
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['unitprice'],
$myrow['discountpercent'],
$myrow['units'],
@@ -347,7 +349,7 @@
}
echo '<td>' . $StockItem->StockID . '</td>
- <td>' . $StockItem->ItemDescription . '</td>
+ <td title="'. $StockItem->LongDescription . '">' . $StockItem->ItemDescription . '</td>
<td class="number">' . $DisplayQuantity . '</td>
<td>' . $StockItem->Units . '</td>
<td class="number">' . $DisplayPrice . '</td>
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/SelectCreditItems.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -442,6 +442,7 @@
if ($AlreadyOnThisCredit!=1){
$sql = "SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
@@ -466,6 +467,7 @@
if ($_SESSION['CreditItems'.$identifier]->add_to_cart ($myrow['stockid'],
$NewItemQty,
$myrow['description'],
+ $myrow['longdescription'],
GetPrice ($_POST['NewItem'],
$_SESSION['CreditItems'.$identifier]->DebtorNo,
$_SESSION['CreditItems'.$identifier]->Branch, $db),
@@ -608,6 +610,7 @@
if ($AlreadyOnThisCredit!=1){
$sql = "SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
@@ -632,6 +635,7 @@
if ($_SESSION['CreditItems'.$identifier]->add_to_cart ($myrow['stockid'],
1,
$myrow['description'],
+ $myrow['longdescription'],
GetPrice($_POST['NewItem'],
$_SESSION['CreditItems'.$identifier]->DebtorNo,
$_SESSION['CreditItems'.$identifier]->Branch,
@@ -708,7 +712,7 @@
}
echo $RowStarter . '<td>' . $LineItem->StockID . '</td>
- <td>' . $LineItem->ItemDescription . '</td>';
+ <td title="'. $LineItem->LongDescription . '">' . $LineItem->ItemDescription . '</td>';
if ($LineItem->Controlled==0){
echo '<td><input type="text" class="number" name="Quantity_' . $LineItem->LineNumber . '" maxlength="6" size="6" value="' . locale_number_format(round($LineItem->Quantity,$LineItem->DecimalPlaces),$LineItem->DecimalPlaces) . '" /></td>';
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/SelectOrderItems.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -190,6 +190,7 @@
$LineItemsSQL = "SELECT salesorderdetails.orderlineno,
salesorderdetails.stkcode,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.volume,
stockmaster.kgs,
stockmaster.units,
@@ -226,6 +227,7 @@
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['unitprice'],
$myrow['discountpercent'],
$myrow['units'],
@@ -747,6 +749,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -758,6 +761,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -777,6 +781,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -788,6 +793,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -803,6 +809,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -813,6 +820,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -1391,7 +1399,7 @@
}
echo '<a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td>
- <td>' . $OrderLine->ItemDescription . '</td>';
+ <td title="' . $OrderLine->LongDescription . '">' . $OrderLine->ItemDescription . '</td>';
echo '<td><input class="number" tabindex="2" type="text" name="Quantity_' . $OrderLine->LineNumber . '" size="6" maxlength="6" value="' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces) . '" />';
if ($QtyRemain != $QtyOrdered){
@@ -1484,6 +1492,7 @@
$SQL="SELECT stockmaster.units,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
salesorderdetails.stkcode,
SUM(qtyinvoiced) salesqty
@@ -1588,8 +1597,8 @@
$Available = $QOH - $DemandQty + $OnOrder;
printf('<td>%s</td>
+ <td title="%s">%s</td>
<td>%s</td>
- <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
@@ -1599,6 +1608,7 @@
</td>
</tr>',
$myrow['stockid'],
+ $myrow['longdescription'],
$myrow['description'],
$myrow['units'],
locale_number_format($QOH, $QOHRow['decimalplaces']),
@@ -1775,8 +1785,8 @@
$Available = $QOH - $DemandQty + $OnOrder;
printf('<td>%s</td>
+ <td title="%s">%s</td>
<td>%s</td>
- <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
@@ -1786,6 +1796,7 @@
</td>
</tr>',
$myrow['stockid'],
+ $myrow['longdescription'],
$myrow['description'],
$myrow['units'],
locale_number_format($QOH,$QOHRow['decimalplaces']),
@@ -1882,4 +1893,4 @@
echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectCustomer.CustKeywords);}</script>';
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/SelectProduct.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -53,6 +53,7 @@
$StockID = $_SESSION['SelectedStockItem'];
}
$result = DB_query("SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockcategory.stocktype,
stockmaster.units,
@@ -79,7 +80,7 @@
}
echo '<table width="90%">
<tr>
- <th colspan="3"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['description'] . '</b> ' . $ItemStatus . '</th>
+ <th colspan="3"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b title="' . $myrow['longdescription'] . '">' . ' ' . $StockID . ' - ' . $myrow['description'] . '</b> ' . $ItemStatus . '</th>
</tr>';
echo '<tr>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/doc/Change.log 2012-06-24 07:52:33 UTC (rev 5452)
@@ -1,7 +1,9 @@
webERP Change Log
-24/06/2012: Icedlava: Add ViewTopic and BookMark vars to some functions to take advantage of new Manual contextual help. Must be added before header.inc include.
-24/06/2012: Icedlava: Adjust header.inc, ManualContents.php, ManualHeader.html to take Viewtopic and Bookmark parameters in displaying manual. Add ManualOutline.php file containing manual TOC, add CSS and rework all manual docs. Still to add $Viewtopic and $Bookmark to functions (eg see Stocks.php)
+24/06/2012 Phil: Added tooltip/title showing long description on many scripts where short description is currently shown SelectOrderItems.php SelectCreditItems.php CreditInvoice.php DeliveryDetails.php CounterSales.php RecurringSalesOrders.php
+24/06/2012 Icedlava: Add ViewTopic and BookMark vars to some functions to take advantage of new Manual contextual help. Must be added before header.inc include.
+24/06/2012 Icedlava: Adjust header.inc, ManualContents.php, ManualHeader.html to take Viewtopic and Bookmark parameters in displaying manual. Add ManualOutline.php file containing manual TOC, add CSS and rework all manual docs. Still to add $Viewtopic and $Bookmark to functions (eg see Stocks.php)
+
24/6/2012 Release 4.08.1
22/06/2012 Icedlava: Fixed bug preventing insert of new account section
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/includes/DefineCartClass.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -77,6 +77,7 @@
function add_to_cart($StockID,
$Qty,
$Descr,
+ $LongDescr,
$Price,
$Disc=0,
$UOM,
@@ -116,6 +117,7 @@
$this->LineItems[$LineNumber] = new LineDetails($LineNumber,
$StockID,
$Descr,
+ $LongDescr,
$Qty,
$Price,
$Disc,
@@ -418,6 +420,7 @@
Var $LineNumber;
Var $StockID;
Var $ItemDescription;
+ Var $LongDescription;
Var $Quantity;
Var $Price;
Var $DiscountPercent;
@@ -448,6 +451,7 @@
function LineDetails ($LineNumber,
$StockItem,
$Descr,
+ $LongDescr,
$Qty,
$Prc,
$DiscPercent,
@@ -475,6 +479,7 @@
$this->LineNumber = $LineNumber;
$this->StockID =$StockItem;
$this->ItemDescription = $Descr;
+ $this->LongDescription = $LongDescr;
$this->Quantity = $Qty;
$this->Price = $Prc;
$this->DiscountPercent = $DiscPercent;
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2012-06-24 07:52:33 UTC (rev 5452)
@@ -32,6 +32,7 @@
if ($AlreadyOnThisOrder!=1){
$sql = "SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
@@ -133,6 +134,7 @@
$_SESSION['Items'.$identifier]->add_to_cart ($NewItem,
$NewItemQty,
$myItemRow['description'],
+ $myItemRow['longdescription'],
$Price,
$Discount,
$myItemRow['units'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-06-24 07:52:40
|
Revision: 5452
http://web-erp.svn.sourceforge.net/web-erp/?rev=5452&view=rev
Author: daintree
Date: 2012-06-24 07:52:33 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
added title/tooltip of long description to a number of stock scripts
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/CounterSales.php
trunk/Credit_Invoice.php
trunk/DeliveryDetails.php
trunk/RecurringSalesOrders.php
trunk/SelectCreditItems.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/doc/Change.log
trunk/includes/DefineCartClass.php
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/ConfirmDispatch_Invoice.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -131,6 +131,7 @@
$LineItemsSQL = "SELECT stkcode,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.controlled,
stockmaster.serialised,
stockmaster.volume,
@@ -167,6 +168,7 @@
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['unitprice'],
$myrow['discountpercent'],
$myrow['units'],
@@ -319,7 +321,7 @@
echo $RowStarter;
echo '<td>'.$LnItm->StockID.'</td>
- <td>'.$LnItm->ItemDescription.'</td>
+ <td title="'. $LnItm->LongDescription . '">' .$LnItm->ItemDescription.'</td>
<td class="number">' . locale_number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
<td>'.$LnItm->Units.'</td>
<td class="number">' . locale_number_format($LnItm->QtyInv,$LnItm->DecimalPlaces) . '</td>';
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/CounterSales.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -783,7 +783,7 @@
echo '<input type="hidden" name="ItemDue_' . $OrderLine->LineNumber . '" value="'.$OrderLine->ItemDue.'" />';
echo '<a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td>
- <td>' . $OrderLine->ItemDescription . '</td>';
+ <td title="' . $OrderLine->LongDescription . '">' . $OrderLine->ItemDescription . '</td>';
echo '<td><input class="number" tabindex="2" type="text" name="Quantity_' . $OrderLine->LineNumber . '" size="6" maxlength="6" value="' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces) . '" />';
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/Credit_Invoice.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -99,6 +99,7 @@
$LineItemsSQL = "SELECT stockmoves.stkmoveno,
stockmoves.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.volume,
stockmaster.kgs,
stockmaster.mbflag,
@@ -136,6 +137,7 @@
$_SESSION['CreditItems']->add_to_cart($myrow['stockid'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['price'],
$myrow['discountpercent'],
$myrow['units'],
@@ -329,7 +331,7 @@
$j++;
echo '<tr '.$RowStarter.'><td>' . $LnItm->StockID . '</td>
- <td>' . $LnItm->ItemDescription . '</td>
+ <td title="'. $LnItm->LongDescription . '">' . $LnItm->ItemDescription . '</td>
<td class="number">' . locale_number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
<td>' . $LnItm->Units . '</td>';
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/DeliveryDetails.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -865,7 +865,7 @@
}
echo '<td>'.$StockItem->StockID.'</td>
- <td>'.$StockItem->ItemDescription.'</td>
+ <td title="' . $StockItem->LongDescription . '">'.$StockItem->ItemDescription.'</td>
<td class="number">'.$DisplayQuantity.'</td>
<td>'.$StockItem->Units.'</td>
<td class="number">'.$DisplayPrice.'</td>
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/RecurringSalesOrders.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -105,6 +105,7 @@
/*need to look up customer name from debtors master then populate the line items array with the sales order details records */
$LineItemsSQL = "SELECT recurrsalesorderdetails.stkcode,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.volume,
stockmaster.kgs,
stockmaster.units,
@@ -130,6 +131,7 @@
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['unitprice'],
$myrow['discountpercent'],
$myrow['units'],
@@ -347,7 +349,7 @@
}
echo '<td>' . $StockItem->StockID . '</td>
- <td>' . $StockItem->ItemDescription . '</td>
+ <td title="'. $StockItem->LongDescription . '">' . $StockItem->ItemDescription . '</td>
<td class="number">' . $DisplayQuantity . '</td>
<td>' . $StockItem->Units . '</td>
<td class="number">' . $DisplayPrice . '</td>
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/SelectCreditItems.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -442,6 +442,7 @@
if ($AlreadyOnThisCredit!=1){
$sql = "SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
@@ -466,6 +467,7 @@
if ($_SESSION['CreditItems'.$identifier]->add_to_cart ($myrow['stockid'],
$NewItemQty,
$myrow['description'],
+ $myrow['longdescription'],
GetPrice ($_POST['NewItem'],
$_SESSION['CreditItems'.$identifier]->DebtorNo,
$_SESSION['CreditItems'.$identifier]->Branch, $db),
@@ -608,6 +610,7 @@
if ($AlreadyOnThisCredit!=1){
$sql = "SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
@@ -632,6 +635,7 @@
if ($_SESSION['CreditItems'.$identifier]->add_to_cart ($myrow['stockid'],
1,
$myrow['description'],
+ $myrow['longdescription'],
GetPrice($_POST['NewItem'],
$_SESSION['CreditItems'.$identifier]->DebtorNo,
$_SESSION['CreditItems'.$identifier]->Branch,
@@ -708,7 +712,7 @@
}
echo $RowStarter . '<td>' . $LineItem->StockID . '</td>
- <td>' . $LineItem->ItemDescription . '</td>';
+ <td title="'. $LineItem->LongDescription . '">' . $LineItem->ItemDescription . '</td>';
if ($LineItem->Controlled==0){
echo '<td><input type="text" class="number" name="Quantity_' . $LineItem->LineNumber . '" maxlength="6" size="6" value="' . locale_number_format(round($LineItem->Quantity,$LineItem->DecimalPlaces),$LineItem->DecimalPlaces) . '" /></td>';
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/SelectOrderItems.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -190,6 +190,7 @@
$LineItemsSQL = "SELECT salesorderdetails.orderlineno,
salesorderdetails.stkcode,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.volume,
stockmaster.kgs,
stockmaster.units,
@@ -226,6 +227,7 @@
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
$myrow['quantity'],
$myrow['description'],
+ $myrow['longdescription'],
$myrow['unitprice'],
$myrow['discountpercent'],
$myrow['units'],
@@ -747,6 +749,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -758,6 +761,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -777,6 +781,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -788,6 +793,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -803,6 +809,7 @@
if ($_POST['StockCat']=='All'){
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -813,6 +820,7 @@
} else {
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.units
FROM stockmaster INNER JOIN stockcategory
ON stockmaster.categoryid=stockcategory.categoryid
@@ -1391,7 +1399,7 @@
}
echo '<a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $OrderLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $OrderLine->StockID . '</a></td>
- <td>' . $OrderLine->ItemDescription . '</td>';
+ <td title="' . $OrderLine->LongDescription . '">' . $OrderLine->ItemDescription . '</td>';
echo '<td><input class="number" tabindex="2" type="text" name="Quantity_' . $OrderLine->LineNumber . '" size="6" maxlength="6" value="' . locale_number_format($OrderLine->Quantity,$OrderLine->DecimalPlaces) . '" />';
if ($QtyRemain != $QtyOrdered){
@@ -1484,6 +1492,7 @@
$SQL="SELECT stockmaster.units,
stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
salesorderdetails.stkcode,
SUM(qtyinvoiced) salesqty
@@ -1588,8 +1597,8 @@
$Available = $QOH - $DemandQty + $OnOrder;
printf('<td>%s</td>
+ <td title="%s">%s</td>
<td>%s</td>
- <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
@@ -1599,6 +1608,7 @@
</td>
</tr>',
$myrow['stockid'],
+ $myrow['longdescription'],
$myrow['description'],
$myrow['units'],
locale_number_format($QOH, $QOHRow['decimalplaces']),
@@ -1775,8 +1785,8 @@
$Available = $QOH - $DemandQty + $OnOrder;
printf('<td>%s</td>
+ <td title="%s">%s</td>
<td>%s</td>
- <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
@@ -1786,6 +1796,7 @@
</td>
</tr>',
$myrow['stockid'],
+ $myrow['longdescription'],
$myrow['description'],
$myrow['units'],
locale_number_format($QOH,$QOHRow['decimalplaces']),
@@ -1882,4 +1893,4 @@
echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectCustomer.CustKeywords);}</script>';
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/SelectProduct.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -53,6 +53,7 @@
$StockID = $_SESSION['SelectedStockItem'];
}
$result = DB_query("SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.mbflag,
stockcategory.stocktype,
stockmaster.units,
@@ -79,7 +80,7 @@
}
echo '<table width="90%">
<tr>
- <th colspan="3"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['description'] . '</b> ' . $ItemStatus . '</th>
+ <th colspan="3"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b title="' . $myrow['longdescription'] . '">' . ' ' . $StockID . ' - ' . $myrow['description'] . '</b> ' . $ItemStatus . '</th>
</tr>';
echo '<tr>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/doc/Change.log 2012-06-24 07:52:33 UTC (rev 5452)
@@ -1,7 +1,9 @@
webERP Change Log
-24/06/2012: Icedlava: Add ViewTopic and BookMark vars to some functions to take advantage of new Manual contextual help. Must be added before header.inc include.
-24/06/2012: Icedlava: Adjust header.inc, ManualContents.php, ManualHeader.html to take Viewtopic and Bookmark parameters in displaying manual. Add ManualOutline.php file containing manual TOC, add CSS and rework all manual docs. Still to add $Viewtopic and $Bookmark to functions (eg see Stocks.php)
+24/06/2012 Phil: Added tooltip/title showing long description on many scripts where short description is currently shown SelectOrderItems.php SelectCreditItems.php CreditInvoice.php DeliveryDetails.php CounterSales.php RecurringSalesOrders.php
+24/06/2012 Icedlava: Add ViewTopic and BookMark vars to some functions to take advantage of new Manual contextual help. Must be added before header.inc include.
+24/06/2012 Icedlava: Adjust header.inc, ManualContents.php, ManualHeader.html to take Viewtopic and Bookmark parameters in displaying manual. Add ManualOutline.php file containing manual TOC, add CSS and rework all manual docs. Still to add $Viewtopic and $Bookmark to functions (eg see Stocks.php)
+
24/6/2012 Release 4.08.1
22/06/2012 Icedlava: Fixed bug preventing insert of new account section
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/includes/DefineCartClass.php 2012-06-24 07:52:33 UTC (rev 5452)
@@ -77,6 +77,7 @@
function add_to_cart($StockID,
$Qty,
$Descr,
+ $LongDescr,
$Price,
$Disc=0,
$UOM,
@@ -116,6 +117,7 @@
$this->LineItems[$LineNumber] = new LineDetails($LineNumber,
$StockID,
$Descr,
+ $LongDescr,
$Qty,
$Price,
$Disc,
@@ -418,6 +420,7 @@
Var $LineNumber;
Var $StockID;
Var $ItemDescription;
+ Var $LongDescription;
Var $Quantity;
Var $Price;
Var $DiscountPercent;
@@ -448,6 +451,7 @@
function LineDetails ($LineNumber,
$StockItem,
$Descr,
+ $LongDescr,
$Qty,
$Prc,
$DiscPercent,
@@ -475,6 +479,7 @@
$this->LineNumber = $LineNumber;
$this->StockID =$StockItem;
$this->ItemDescription = $Descr;
+ $this->LongDescription = $LongDescr;
$this->Quantity = $Qty;
$this->Price = $Prc;
$this->DiscountPercent = $DiscPercent;
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2012-06-24 05:49:39 UTC (rev 5451)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2012-06-24 07:52:33 UTC (rev 5452)
@@ -32,6 +32,7 @@
if ($AlreadyOnThisOrder!=1){
$sql = "SELECT stockmaster.description,
+ stockmaster.longdescription,
stockmaster.stockid,
stockmaster.units,
stockmaster.volume,
@@ -133,6 +134,7 @@
$_SESSION['Items'.$identifier]->add_to_cart ($NewItem,
$NewItemQty,
$myItemRow['description'],
+ $myItemRow['longdescription'],
$Price,
$Discount,
$myItemRow['units'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-06-24 08:14:38
|
Revision: 5453
http://web-erp.svn.sourceforge.net/web-erp/?rev=5453&view=rev
Author: daintree
Date: 2012-06-24 08:14:32 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
added a few bookmarks
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/BankAccounts.php
trunk/Payments.php
trunk/SelectProduct.php
trunk/StockCategories.php
trunk/Stocks.php
trunk/doc/Manual/ManualGeneralLedger.html
trunk/doc/Manual/ManualInventory.html
trunk/includes/header.inc
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/AccountGroups.php 2012-06-24 08:14:32 UTC (rev 5453)
@@ -5,7 +5,8 @@
include('includes/session.inc');
$title = _('Account Groups');
-
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'AccountGroups';
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/BankAccounts.php 2012-06-24 08:14:32 UTC (rev 5453)
@@ -5,7 +5,8 @@
include('includes/session.inc');
$title = _('Bank Accounts Maintenance');
-
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'BankAccounts';
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $title . '</p>';
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/Payments.php 2012-06-24 08:14:32 UTC (rev 5453)
@@ -6,7 +6,8 @@
include('includes/session.inc');
$title = _('Payment Entry');
-
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'BankAccountPayments';
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/SelectProduct.php 2012-06-24 08:14:32 UTC (rev 5453)
@@ -7,7 +7,9 @@
include ('includes/session.inc');
$title = _('Search Inventory Items');
/* webERP manual links before header.inc */
-$ViewTopic= "Inventory";
+$ViewTopic= 'Inventory';
+$BookMark = 'SelectingInventory';
+
include ('includes/header.inc');
if (isset($_GET['StockID'])) {
Modified: trunk/StockCategories.php
===================================================================
--- trunk/StockCategories.php 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/StockCategories.php 2012-06-24 08:14:32 UTC (rev 5453)
@@ -4,7 +4,8 @@
include('includes/session.inc');
$title = _('Stock Category Maintenance');
-
+$ViewTopic= 'Inventory';
+$BookMark = 'InventoryCategories';
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Inventory Adjustment') . '" alt="" />' . ' ' . $title . '</p>';
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/Stocks.php 2012-06-24 08:14:32 UTC (rev 5453)
@@ -6,8 +6,8 @@
$title = _('Item Maintenance');
$title = _('Item Maintenance');
/* webERP manual links before header.inc */
-$ViewTopic= "Inventory";
-$BookMark = "InventoryAddingItems";
+$ViewTopic= 'Inventory';
+$BookMark = 'InventoryAddingItems';
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2012-06-24 08:14:32 UTC (rev 5453)
@@ -23,7 +23,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div><!-- Help Begin: AccountGroups -->
-<h2>Account Groups</h2>
+<h2><a id="AccountGroups">Account Groups</a></h2>
<p>The account group is the parent object of a general ledger account for someone who understands OO programming. Child accounts created inherit the properties of the account group - ie the account will be a profit and loss account if it belongs to an account group that is a balance sheet account, the child accounts will display in the trial balance (TB) together in the sequence determined by the account groups sequence in the trial balance (TB).</p>
@@ -42,7 +42,7 @@
<p>A balance sheet account is one where only the balance at the end of the period concerned is of interest. A profit and loss is one where we are interested in the movement over the period. eg. Motor expenses we are not concerned with the balance at the end of the month so much as how much was spent over the period of the profit and loss. However, for a bank account we wish to know what we have now as a balance not the movements in the account. As noted accounts created as a member of an account group will inherit the properties of the account group ie if the account group is a balance sheet group then the accounts will be interpreted as balance sheet accounts.</p><!-- Help End: AccountGroups -->
<!-- Help Begin: BankAccounts -->
-<h2>Bank Accounts</h2>
+<h2><a id="BankAccounts">Bank Accounts</a></h2>
<p>Certain general ledger accounts can be defined as bank accounts - as many bank accounts as needed can be defined. At the time of defining a general ledger account as bank account the currency of the bank account must also be specified. General ledger accounts defined as bank accounts can be reconciled to bank statements using the matching facilities - all receipts and payments show in the currency of the bank account for easy matching off statments. Entries made to bank accounts using receipts or payments, also create a total receipt or payment, which is retained for the purposes of matching off the bank statements. Using the bank payments page, general ledger payments can be analysed to any number of other general ledger accounts, but only one entry to the bank account is made. This page also allows payments to supplier accounts to be created. Similarly, using the receipt entry page, a series of receipts from customers which may all have been banked together can be deposited as one amount to a bank account. There is only one amount appearing on the statement as the total of all these receipts, this bank account transaction is created and available for matching deposits off the bank statements.</p>
@@ -55,7 +55,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
-<h2>Bank Account Payments</h2>
+<h2><a id="BankAccountPayments">Bank Account Payments</a></h2>
<p>From the general ledger tab, the first link under transactions is Bank Account Payments.</p>
Modified: trunk/doc/Manual/ManualInventory.html
===================================================================
--- trunk/doc/Manual/ManualInventory.html 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/doc/Manual/ManualInventory.html 2012-06-24 08:14:32 UTC (rev 5453)
@@ -325,7 +325,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
- <h2>Selecting Inventory Items</h2>
+ <h2><a id="SelectingInventory">Selecting Inventory Items</a></h2>
<p>From all pages in the system the main title bar has links to select from the critical tables in the system. Customers, inventory and suppliers. Clicking on the "Select Item" link takes the user directly to the inventory item selection page. In addition, from the menu, the Inventory tab has a link to "Modify or Delete an Inventory Item Or Maintain Pricing". Using either method, the select item or product page will show.</p>
@@ -404,7 +404,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
- <h2>Inventory Categories</h2>
+ <h2><a id="InventoryCategories">Inventory Categories</a></h2>
<p>Inventory Categories are the natural groupings which apply to certain types of stock. A business will normally have several distinct categories. E. g. A manufacturing jeweller might have stock categories for gold chain, silver chain, diamonds, rubies etc.</p>
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/includes/header.inc 2012-06-24 08:14:32 UTC (rev 5453)
@@ -67,7 +67,7 @@
echo '<td class="quick_menu_tab" align="center"><a href="' . $rootpath . '/SelectSupplier.php"><span style="text-decoration:underline;">4</span> ' . _('Suppliers') . '</a></td>';
- $DefaultManualLink = '<td class="quick_menu_tab" align="center"><a rel="external" accesskey="8" href="' . $rootpath . '/doc/Manual/ManualContents.php'.$ViewTopic . $BookMark. '"><span style="text-decoration:underline;">8</span> ' . _('Manual') . '</a></td>';
+ $DefaultManualLink = '<td class="quick_menu_tab" align="center"><a rel="external" accesskey="8" href="' . $rootpath . '/doc/Manual/ManualContents.php'. $ViewTopic . $BookMark. '"><span style="text-decoration:underline;">8</span> ' . _('Manual') . '</a></td>';
if (mb_substr($_SESSION['Language'],0,2) !='en'){
if (file_exists('locale/' . $_SESSION['Language'] . '/Manual/ManualContents.php')){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-06-24 08:14:38
|
Revision: 5453
http://web-erp.svn.sourceforge.net/web-erp/?rev=5453&view=rev
Author: daintree
Date: 2012-06-24 08:14:32 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
added a few bookmarks
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/BankAccounts.php
trunk/Payments.php
trunk/SelectProduct.php
trunk/StockCategories.php
trunk/Stocks.php
trunk/doc/Manual/ManualGeneralLedger.html
trunk/doc/Manual/ManualInventory.html
trunk/includes/header.inc
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/AccountGroups.php 2012-06-24 08:14:32 UTC (rev 5453)
@@ -5,7 +5,8 @@
include('includes/session.inc');
$title = _('Account Groups');
-
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'AccountGroups';
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/BankAccounts.php 2012-06-24 08:14:32 UTC (rev 5453)
@@ -5,7 +5,8 @@
include('includes/session.inc');
$title = _('Bank Accounts Maintenance');
-
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'BankAccounts';
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $title . '</p>';
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/Payments.php 2012-06-24 08:14:32 UTC (rev 5453)
@@ -6,7 +6,8 @@
include('includes/session.inc');
$title = _('Payment Entry');
-
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'BankAccountPayments';
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/SelectProduct.php 2012-06-24 08:14:32 UTC (rev 5453)
@@ -7,7 +7,9 @@
include ('includes/session.inc');
$title = _('Search Inventory Items');
/* webERP manual links before header.inc */
-$ViewTopic= "Inventory";
+$ViewTopic= 'Inventory';
+$BookMark = 'SelectingInventory';
+
include ('includes/header.inc');
if (isset($_GET['StockID'])) {
Modified: trunk/StockCategories.php
===================================================================
--- trunk/StockCategories.php 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/StockCategories.php 2012-06-24 08:14:32 UTC (rev 5453)
@@ -4,7 +4,8 @@
include('includes/session.inc');
$title = _('Stock Category Maintenance');
-
+$ViewTopic= 'Inventory';
+$BookMark = 'InventoryCategories';
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Inventory Adjustment') . '" alt="" />' . ' ' . $title . '</p>';
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/Stocks.php 2012-06-24 08:14:32 UTC (rev 5453)
@@ -6,8 +6,8 @@
$title = _('Item Maintenance');
$title = _('Item Maintenance');
/* webERP manual links before header.inc */
-$ViewTopic= "Inventory";
-$BookMark = "InventoryAddingItems";
+$ViewTopic= 'Inventory';
+$BookMark = 'InventoryAddingItems';
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2012-06-24 08:14:32 UTC (rev 5453)
@@ -23,7 +23,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div><!-- Help Begin: AccountGroups -->
-<h2>Account Groups</h2>
+<h2><a id="AccountGroups">Account Groups</a></h2>
<p>The account group is the parent object of a general ledger account for someone who understands OO programming. Child accounts created inherit the properties of the account group - ie the account will be a profit and loss account if it belongs to an account group that is a balance sheet account, the child accounts will display in the trial balance (TB) together in the sequence determined by the account groups sequence in the trial balance (TB).</p>
@@ -42,7 +42,7 @@
<p>A balance sheet account is one where only the balance at the end of the period concerned is of interest. A profit and loss is one where we are interested in the movement over the period. eg. Motor expenses we are not concerned with the balance at the end of the month so much as how much was spent over the period of the profit and loss. However, for a bank account we wish to know what we have now as a balance not the movements in the account. As noted accounts created as a member of an account group will inherit the properties of the account group ie if the account group is a balance sheet group then the accounts will be interpreted as balance sheet accounts.</p><!-- Help End: AccountGroups -->
<!-- Help Begin: BankAccounts -->
-<h2>Bank Accounts</h2>
+<h2><a id="BankAccounts">Bank Accounts</a></h2>
<p>Certain general ledger accounts can be defined as bank accounts - as many bank accounts as needed can be defined. At the time of defining a general ledger account as bank account the currency of the bank account must also be specified. General ledger accounts defined as bank accounts can be reconciled to bank statements using the matching facilities - all receipts and payments show in the currency of the bank account for easy matching off statments. Entries made to bank accounts using receipts or payments, also create a total receipt or payment, which is retained for the purposes of matching off the bank statements. Using the bank payments page, general ledger payments can be analysed to any number of other general ledger accounts, but only one entry to the bank account is made. This page also allows payments to supplier accounts to be created. Similarly, using the receipt entry page, a series of receipts from customers which may all have been banked together can be deposited as one amount to a bank account. There is only one amount appearing on the statement as the total of all these receipts, this bank account transaction is created and available for matching deposits off the bank statements.</p>
@@ -55,7 +55,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
-<h2>Bank Account Payments</h2>
+<h2><a id="BankAccountPayments">Bank Account Payments</a></h2>
<p>From the general ledger tab, the first link under transactions is Bank Account Payments.</p>
Modified: trunk/doc/Manual/ManualInventory.html
===================================================================
--- trunk/doc/Manual/ManualInventory.html 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/doc/Manual/ManualInventory.html 2012-06-24 08:14:32 UTC (rev 5453)
@@ -325,7 +325,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
- <h2>Selecting Inventory Items</h2>
+ <h2><a id="SelectingInventory">Selecting Inventory Items</a></h2>
<p>From all pages in the system the main title bar has links to select from the critical tables in the system. Customers, inventory and suppliers. Clicking on the "Select Item" link takes the user directly to the inventory item selection page. In addition, from the menu, the Inventory tab has a link to "Modify or Delete an Inventory Item Or Maintain Pricing". Using either method, the select item or product page will show.</p>
@@ -404,7 +404,7 @@
<a class="minitext" href="#top">⬆ Top</a>
</div>
- <h2>Inventory Categories</h2>
+ <h2><a id="InventoryCategories">Inventory Categories</a></h2>
<p>Inventory Categories are the natural groupings which apply to certain types of stock. A business will normally have several distinct categories. E. g. A manufacturing jeweller might have stock categories for gold chain, silver chain, diamonds, rubies etc.</p>
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2012-06-24 07:52:33 UTC (rev 5452)
+++ trunk/includes/header.inc 2012-06-24 08:14:32 UTC (rev 5453)
@@ -67,7 +67,7 @@
echo '<td class="quick_menu_tab" align="center"><a href="' . $rootpath . '/SelectSupplier.php"><span style="text-decoration:underline;">4</span> ' . _('Suppliers') . '</a></td>';
- $DefaultManualLink = '<td class="quick_menu_tab" align="center"><a rel="external" accesskey="8" href="' . $rootpath . '/doc/Manual/ManualContents.php'.$ViewTopic . $BookMark. '"><span style="text-decoration:underline;">8</span> ' . _('Manual') . '</a></td>';
+ $DefaultManualLink = '<td class="quick_menu_tab" align="center"><a rel="external" accesskey="8" href="' . $rootpath . '/doc/Manual/ManualContents.php'. $ViewTopic . $BookMark. '"><span style="text-decoration:underline;">8</span> ' . _('Manual') . '</a></td>';
if (mb_substr($_SESSION['Language'],0,2) !='en'){
if (file_exists('locale/' . $_SESSION['Language'] . '/Manual/ManualContents.php')){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X